From a69560d056aa68fc18d0ea2e565e41549fc47c7c Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Wed, 10 Jun 2020 13:01:32 -0700
Subject: [PATCH] #38: Don't warn about bluetooth so much - just on the
 settings page

---
 .../com/geeksville/mesh/ui/ScreenFragment.kt  | 19 -------------------
 .../geeksville/mesh/ui/SettingsFragment.kt    | 10 ++++++++++
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/ScreenFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ScreenFragment.kt
index 79061cbaf..f02a49911 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ScreenFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ScreenFragment.kt
@@ -1,12 +1,7 @@
 package com.geeksville.mesh.ui
 
-import android.bluetooth.BluetoothAdapter
-import android.bluetooth.BluetoothManager
-import android.content.Context
-import android.widget.Toast
 import androidx.fragment.app.Fragment
 import com.geeksville.android.GeeksvilleApplication
-import com.geeksville.mesh.R
 
 /**
  * A fragment that represents a current 'screen' in our app.
@@ -14,24 +9,10 @@ import com.geeksville.mesh.R
  * Useful for tracking analytics
  */
 open class ScreenFragment(private val screenName: String) : Fragment() {
-    private val bluetoothAdapter: BluetoothAdapter? by lazy(LazyThreadSafetyMode.NONE) {
-        val bluetoothManager =
-            requireContext().getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
-        bluetoothManager.adapter
-    }
 
     override fun onResume() {
         super.onResume()
         GeeksvilleApplication.analytics.sendScreenView(screenName)
-
-        // Keep reminding user BLE is still off
-        if (bluetoothAdapter?.isEnabled != true) {
-            Toast.makeText(
-                requireContext(),
-                R.string.error_bluetooth,
-                Toast.LENGTH_SHORT
-            ).show()
-        }
     }
 
     override fun onPause() {
diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index a0c42ae34..98b464438 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -21,6 +21,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.widget.RadioButton
+import android.widget.Toast
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
@@ -748,6 +749,15 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
         super.onResume()
         if (!hasCompanionDeviceApi && model.bluetoothEnabled.value!!)
             scanModel.startScan()
+
+        // Keep reminding user BLE is still off
+        if (scanModel.bluetoothAdapter?.isEnabled != true) {
+            Toast.makeText(
+                requireContext(),
+                R.string.error_bluetooth,
+                Toast.LENGTH_SHORT
+            ).show()
+        }
     }
 }