From ba9688a12f189d10c2334f7557f641d334ba7891 Mon Sep 17 00:00:00 2001
From: Srihari Vishnu <srihari.vishnu@gmail.com>
Date: Thu, 20 Aug 2020 02:20:23 -0400
Subject: [PATCH] setting: upgrade bluetooth beta (#1388)

---
 .../treehouses/remote/ui/home/BaseHomeFragment.kt |  3 ++-
 app/src/main/res/xml/app_preferences.xml          | 15 +++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/home/BaseHomeFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/home/BaseHomeFragment.kt
index b622d57ea..87d4d74f8 100644
--- a/app/src/main/kotlin/io/treehouses/remote/ui/home/BaseHomeFragment.kt
+++ b/app/src/main/kotlin/io/treehouses/remote/ui/home/BaseHomeFragment.kt
@@ -10,6 +10,7 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.Toast
 import androidx.fragment.app.viewModels
+import androidx.preference.PreferenceManager
 import io.treehouses.remote.IntroActivity
 import io.treehouses.remote.MainApplication
 import io.treehouses.remote.R
@@ -200,7 +201,7 @@ open class BaseHomeFragment : BaseFragment() {
             noInternetForBluetoothUpgrade()
         }
         //If there is no error, compare the server hashes to determine whether an upgrade is needed
-        else if (hashed.trim() != serverHash.trim()) {
+        else if (hashed.trim() != serverHash.trim() && PreferenceManager.getDefaultSharedPreferences(requireContext()).getBoolean("bluetooth_file_local_upgrade", false)) {
             askForBluetoothUpgradeStable(localString)
         }
     }
diff --git a/app/src/main/res/xml/app_preferences.xml b/app/src/main/res/xml/app_preferences.xml
index 03569b765..f2f3c269b 100644
--- a/app/src/main/res/xml/app_preferences.xml
+++ b/app/src/main/res/xml/app_preferences.xml
@@ -52,10 +52,17 @@
 
     <PreferenceCategory android:title="Advanced" app:layout="@layout/custom_pref_category">
         <Preference
-        android:layout="@layout/custom_pref_whole"
-        android:icon="@drawable/bluetooth"
-        android:key="bluetooth_file"
-        android:title="View Bluetooth Server File"/>
+            android:layout="@layout/custom_pref_top"
+            android:icon="@drawable/bluetooth"
+            android:key="bluetooth_file"
+            android:title="View Bluetooth Server File"/>
+
+        <SwitchPreference
+            android:layout="@layout/custom_pref_bottom"
+            android:defaultValue="false"
+            android:key="bluetooth_file_local_upgrade"
+            android:title="Sync Bluetooth File with Local File"
+            android:summary="Prompt for replacing the Bluetooth server on the Raspberry Pi with the one that is compatible with the one that is on the Remote."/>
     </PreferenceCategory>
 
 </PreferenceScreen>