From aeb3dd3c7a9df29129e066432d1dff8bede1c002 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sun, 16 Feb 2020 09:21:57 -0600
Subject: [PATCH] Fix missing sync menu for fdroid

---
 CHANGELOG.md                                  |  4 +++
 app/build.gradle.kts                          |  4 +--
 .../tasks/preferences/BasicPreferences.java   | 26 +++++++++----------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 708ba0030..538578dee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Change Log
 ---
+### 8.0.1 (2020-02-16)
+
+* Fix missing sync settings on fdroid
+
 ### 8.0 (2020-02-12)
 
 * EteSync support
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e51965ebe..627ce5618 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -36,8 +36,8 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 669
-        versionName = "8.0"
+        versionCode = 670
+        versionName = "8.0.1"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)
         multiDexEnabled = true
diff --git a/app/src/main/java/org/tasks/preferences/BasicPreferences.java b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
index e4045c92e..f94582c40 100644
--- a/app/src/main/java/org/tasks/preferences/BasicPreferences.java
+++ b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
@@ -415,6 +415,19 @@ public class BasicPreferences extends InjectingPreferenceActivity
     }
     googleDriveBackup.setChecked(preferences.getBoolean(R.string.p_google_drive_backup, false));
 
+    PreferenceCategory synchronizationPreferences =
+        (PreferenceCategory) findPreference(R.string.synchronization);
+    synchronizationPreferences.removeAll();
+
+    boolean hasGoogleAccounts = addGoogleTasksAccounts(synchronizationPreferences);
+    boolean hasCaldavAccounts = addCaldavAccounts(synchronizationPreferences);
+    if (!hasGoogleAccounts) {
+      removeGroup(R.string.gtasks_GPr_header);
+    }
+    if (!(hasGoogleAccounts || hasCaldavAccounts)) {
+      removeGroup(R.string.sync_SPr_interval_title);
+    }
+
     //noinspection ConstantConditions
     if (!BuildConfig.FLAVOR.equals("googleplay")) {
       return;
@@ -482,19 +495,6 @@ public class BasicPreferences extends InjectingPreferenceActivity
         });
     int placeProvider = getPlaceProvider();
     placeProviderPreference.setSummary(choices.get(placeProvider));
-
-    PreferenceCategory synchronizationPreferences =
-        (PreferenceCategory) findPreference(R.string.synchronization);
-    synchronizationPreferences.removeAll();
-
-    boolean hasGoogleAccounts = addGoogleTasksAccounts(synchronizationPreferences);
-    boolean hasCaldavAccounts = addCaldavAccounts(synchronizationPreferences);
-    if (!hasGoogleAccounts) {
-      removeGroup(R.string.gtasks_GPr_header);
-    }
-    if (!(hasGoogleAccounts || hasCaldavAccounts)) {
-      removeGroup(R.string.sync_SPr_interval_title);
-    }
   }
 
   private boolean addGoogleTasksAccounts(PreferenceCategory category) {