From cd7832a6e168725ecfdbac8e398deca3055031fe Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 7 Dec 2022 09:52:52 +0100
Subject: [PATCH] Fix password reset feature

---
 app/src/main/java/info/nightscout/androidaps/MainActivity.kt | 5 +----
 .../nightscout/androidaps/danar/AbstractDanaRPlugin.java     | 1 +
 .../main/java/info/nightscout/pump/danars/DanaRSPlugin.kt    | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index de431719af..1eca9dadd1 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -151,10 +151,6 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({ processPreferenceChange(it) }, fabricPrivacy::logException)
-        disposable += rxBus
-            .toObservable(EventInitializationChanged::class.java)
-            .observeOn(aapsSchedulers.main)
-            .subscribe({ passwordResetCheck(this) }, fabricPrivacy::logException)
         if (startWizard() && !isRunningRealPumpTest()) {
             protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, {
                 startActivity(Intent(this, SetupWizardActivity::class.java))
@@ -168,6 +164,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
             androidPermission.notifyForSystemWindowPermissions(this)
             androidPermission.notifyForBtConnectPermission(this)
         }
+        passwordResetCheck(this)
     }
 
     private fun checkPluginPreferences(viewPager: ViewPager2) {
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
index e2245e4d41..4501712c26 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
@@ -120,6 +120,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
                     }
                 })
         );
+        danaPump.setSerialNumber(sp.getString(info.nightscout.pump.dana.R.string.key_danar_bt_name, "")); // fill at start to allow password reset
     }
 
     @Override protected void onStop() {
diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt
index 0be916a6fb..b1c6c51bea 100644
--- a/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt
+++ b/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt
@@ -154,6 +154,7 @@ class DanaRSPlugin @Inject constructor(
     fun changePump() {
         mDeviceAddress = sp.getString(info.nightscout.pump.dana.R.string.key_danars_address, "")
         mDeviceName = sp.getString(info.nightscout.pump.dana.R.string.key_danars_name, "")
+        danaPump.serialNumber = sp.getString(info.nightscout.pump.dana.R.string.key_danars_name, "")
         danaPump.reset()
         commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.device_changed), null)
     }