From 6939d444e2ea05cd8e0f4a364050a93786519d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Thu, 8 Feb 2018 19:24:20 +0300
Subject: [PATCH] [android] Added backup bookmark setting in preferences

---
 android/res/values/donottranslate.xml           |  1 +
 android/res/xml/prefs_main.xml                  | 10 +++++++---
 .../data/BookmarkBackupController.java          |  4 ++--
 .../maps/settings/SettingsPrefsFragment.java    | 17 +++++++++++++++++
 android/src/com/mapswithme/util/Config.java     |  1 -
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml
index 0f3fea42f9..0131b524c3 100644
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@@ -49,6 +49,7 @@
   <string name="pref_tts_info_link" translatable="false">TtsInfoLink</string>
   <string name="tts_info_link" translatable="false">https://support.maps.me/hc/en-us/articles/208628985-How-can-I-check-TTS-settings-on-my-Android-device-</string>
   <string name="pref_autodownload" translatable="false">AutoDownloadMap</string>
+  <string name="pref_backupbookmarks" translatable="false">BackupBookmarks</string>
   <string name="pref_3d" translatable="false">3D</string>
   <string name="pref_3d_buildings" translatable="false">3DBuildings</string>
   <string name="pref_track_screen" translatable="false">TrackScreen</string>
diff --git a/android/res/xml/prefs_main.xml b/android/res/xml/prefs_main.xml
index 3fe765045e..85b20fca4d 100644
--- a/android/res/xml/prefs_main.xml
+++ b/android/res/xml/prefs_main.xml
@@ -31,21 +31,25 @@
       android:key="@string/pref_autodownload"
       android:title="@string/autodownload"
       android:order="4"/>
+    <SwitchPreferenceCompat
+      android:key="@string/pref_backupbookmarks"
+      android:title="@string/settings_backup_bookmarks"
+      android:order="5"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_large_fonts_size"
       android:title="@string/big_font"
       android:defaultValue="false"
-      android:order="5"/>
+      android:order="6"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_transliteration"
       android:title="@string/whatsnew_transliteration_title"
       android:defaultValue="false"
-      android:order="6"/>
+      android:order="7"/>
     <android.support.v7.preference.PreferenceScreen
       android:key="@string/pref_track_screen"
       android:title="@string/pref_track_record_title"
       android:persistent="false"
-      android:order="7">
+      android:order="8">
       <SwitchPreferenceCompat
         android:key="@string/pref_track_record_time"
         android:title="@string/pref_track_record_title"
diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkBackupController.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkBackupController.java
index fc46967cf5..99e4b4f711 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkBackupController.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkBackupController.java
@@ -59,11 +59,11 @@ public class BookmarkBackupController
       return;
     }
 
-    boolean isEnabled = false /** TODO: add real call here **/;
+    boolean isEnabled = false; // TODO: read setting from the core here;
 
     if (isEnabled)
     {
-      long backupTime = System.currentTimeMillis() /** TODO: use real timestamp here **/;
+      long backupTime = System.currentTimeMillis() /* TODO: use real timestamp here */;
       String msg;
       if (backupTime > 0)
       {
diff --git a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
index 73ced9ef98..ac884a1aad 100644
--- a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
@@ -292,6 +292,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
     initZoomPrefsCallbacks();
     initMapStylePrefsCallbacks();
     initAutoDownloadPrefsCallbacks();
+    initBackupBookmarksPrefsCallbacks();
     initLargeFontSizePrefsCallbacks();
     initTransliterationPrefsCallbacks();
     init3dModePrefsCallbacks();
@@ -749,6 +750,22 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
     });
   }
 
+  private void initBackupBookmarksPrefsCallbacks()
+  {
+    TwoStatePreference pref = (TwoStatePreference)findPreference(getString(R.string.pref_backupbookmarks));
+    if (pref == null)
+      return;
+
+    pref.setChecked(false/* TODO: read setting from the core*/);
+    pref.setOnPreferenceChangeListener(
+        (preference, newValue) ->
+        {
+          boolean value = (Boolean) newValue;
+          //TODO: set setting here.
+          return true;
+        });
+  }
+
   private void initMapStylePrefsCallbacks()
   {
     final ListPreference pref = (ListPreference)findPreference(getString(R.string.pref_map_style));
diff --git a/android/src/com/mapswithme/util/Config.java b/android/src/com/mapswithme/util/Config.java
index d85a9ad5df..d45994f782 100644
--- a/android/src/com/mapswithme/util/Config.java
+++ b/android/src/com/mapswithme/util/Config.java
@@ -22,7 +22,6 @@ public final class Config
   private static final String KEY_TTS_LANGUAGE = "TtsLanguage";
 
   private static final String KEY_DOWNLOADER_AUTO = "AutoDownloadEnabled";
-
   private static final String KEY_PREF_ZOOM_BUTTONS = "ZoomButtonsEnabled";
   static final String KEY_PREF_STATISTICS = "StatisticsEnabled";
   private static final String KEY_PREF_USE_GS = "UseGoogleServices";