Merge branch 'meshtastic:master' into feature/osmand-migration

app/src/main/java/com/geeksville/mesh/BaseActivity.kt

@@ -37,12 +37,12 @@ open class BaseActivity: AppCompatActivity(), Logging {
         }
     }
 
-    private fun createLocale(language: String):Locale {
-        var langArray = language.split("_")
-        if (langArray.size == 2) {
-            return Locale(langArray[0], langArray[1]);
+    private fun createLocale(language: String): Locale {
+        val langArray = language.split("_")
+        return if (langArray.size == 2) {
+            Locale(langArray[0], langArray[1])
         } else {
-            return Locale(langArray[0]);
+            Locale(langArray[0])
         }
     }
 

app/src/main/java/com/geeksville/mesh/MainActivity.kt

@@ -410,11 +410,10 @@ class MainActivity : BaseActivity(), Logging,
         installSplashScreen()
         super.onCreate(savedInstanceState)
 
-        if (preferences.getBoolean("app_intro_completed", false) == false) {
+        if (!preferences.getBoolean("app_intro_completed", false)) {
             startActivity(Intent(this, AppIntroduction::class.java))
         }
 
-
         binding = ActivityMainBinding.inflate(layoutInflater)
 
         val prefs = UIViewModel.getPreferences(this)

app/src/main/java/com/geeksville/mesh/android/ContextServices.kt

@@ -1,7 +1,6 @@
 package com.geeksville.mesh.android
 
 import android.Manifest
-import android.annotation.SuppressLint
 import android.app.NotificationManager
 import android.bluetooth.BluetoothManager
 import android.companion.CompanionDeviceManager
@@ -19,7 +18,6 @@ import com.geeksville.mesh.MainActivity
 val Context.bluetoothManager: BluetoothManager? get() = getSystemService(Context.BLUETOOTH_SERVICE) as? BluetoothManager?
 
 val Context.deviceManager: CompanionDeviceManager?
-    @SuppressLint("InlinedApi")
     get() {
         if (GeeksvilleApplication.currentActivity is MainActivity) {
             val activity = GeeksvilleApplication.currentActivity
@@ -47,7 +45,7 @@ fun Context.hasGps(): Boolean =
     packageManager.hasSystemFeature(PackageManager.FEATURE_LOCATION_GPS)
 
 /**
- * return app install source (sideload = null)
+ * return app install source (play store = com.android.vending)
  */
 fun Context.installSource(): String? {
     return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)

app/src/main/java/com/geeksville/mesh/model/UIState.kt

@@ -71,13 +71,10 @@ class UIViewModel @Inject constructor(
     private val _allPacketState = MutableStateFlow<List<Packet>>(emptyList())
     val allPackets: StateFlow<List<Packet>> = _allPacketState
 
-    private val _localConfig = MutableLiveData<LocalOnlyProtos.LocalConfig?>()
-    val localConfig: LiveData<LocalOnlyProtos.LocalConfig?> get() = _localConfig
+    private val _localConfig = MutableLiveData<LocalOnlyProtos.LocalConfig>()
+    val localConfig: LiveData<LocalOnlyProtos.LocalConfig> get() = _localConfig
 
-    private val _quickChatActions =
-        MutableStateFlow<List<com.geeksville.mesh.database.entity.QuickChatAction>>(
-            emptyList()
-        )
+    private val _quickChatActions = MutableStateFlow<List<QuickChatAction>>(emptyList())
     val quickChatActions: StateFlow<List<QuickChatAction>> = _quickChatActions
 
     init {

app/src/main/java/com/geeksville/mesh/repository/datastore/LocalConfigRepository.kt

@@ -61,6 +61,7 @@ class LocalConfigRepository @Inject constructor(
         if (config.hasWifi()) setWifiConfig(config.wifi)
         if (config.hasDisplay()) setDisplayConfig(config.display)
         if (config.hasLora()) setLoraConfig(config.lora)
+        if (config.hasBluetooth()) setBluetoothConfig(config.bluetooth)
     }
 
     private suspend fun setDeviceConfig(config: ConfigProtos.Config.DeviceConfig) {
@@ -99,6 +100,12 @@ class LocalConfigRepository @Inject constructor(
         }
     }
 
+    private suspend fun setBluetoothConfig(config: ConfigProtos.Config.BluetoothConfig) {
+        localConfigStore.updateData { preference ->
+            preference.toBuilder().setBluetooth(config).build()
+        }
+    }
+
     suspend fun fetchInitialLocalConfig() = localConfigStore.data.first()
 
 }

app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt

@@ -115,6 +115,7 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging {
                 .setNeutralButton(R.string.cancel) { _, _ ->
                 }
                 .setPositiveButton(getString(R.string.okay)) { _, _ ->
+                    debug("User clicked requestShutdown")
                     model.requestShutdown()
                 }
                 .show()
@@ -126,6 +127,7 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging {
                 .setNeutralButton(R.string.cancel) { _, _ ->
                 }
                 .setPositiveButton(getString(R.string.okay)) { _, _ ->
+                    debug("User clicked requestReboot")
                     model.requestReboot()
                 }
                 .show()

app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt

@@ -281,7 +281,17 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
         }
 
         model.localConfig.observe(viewLifecycleOwner) {
-            updateNodeInfo()
+            if (!model.isConnected()) {
+                val configCount = it.allFields.size
+                binding.scanStatusText.text = "Device config ($configCount / 7)"
+            } else updateNodeInfo()
+        }
+
+        model.channels.observe(viewLifecycleOwner) {
+            if (!model.isConnected()) {
+                val channelCount = it?.protobuf?.settingsCount ?: 0
+                binding.scanStatusText.text = "Channels ($channelCount / 8)"
+            }
         }
 
         // Also watch myNodeInfo because it might change later