fix: reset the show notifications flag when there is an app upgrade

dashpay · Aug 29, 2023 · f174b95 · f174b95
1 parent 904ff0c
commit f174b95
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/wallet/src/de/schildbach/wallet/service/BootstrapReceiver.java b/wallet/src/de/schildbach/wallet/service/BootstrapReceiver.java
@@ -71,6 +71,8 @@ public class BootstrapReceiver extends BroadcastReceiver {
     protected WalletDataProvider walletDataProvider;
     @Inject
     protected WalletApplication application;
+    @Inject
+    protected Configuration configuration;
 
     @Override
     public void onReceive(final Context context, final Intent intent) {
@@ -100,7 +102,11 @@ private void onAsyncReceive(final Context context, final Intent intent) {
 
             // if the app hasn't been used for a while and contains coins, maybe show reminder
             maybeShowInactivityNotification();
-            application.myPackageReplaced = packageReplaced;
+            application.myPackageReplaced = true;
+
+            // reset the notification explainer flag
+            if (packageReplaced)
+                configuration.setShowNotificationsExplainer(true);
         } else if (ACTION_DISMISS.equals(action)) {
             dismissNotification(context);
         } else if (ACTION_DISMISS_FOREVER.equals(action)) {

diff --git a/wallet/src/de/schildbach/wallet/ui/main/WalletActivity.java b/wallet/src/de/schildbach/wallet/ui/main/WalletActivity.java
@@ -127,7 +127,7 @@ protected void onCreate(final Bundle savedInstanceState) {
     public void onStart() {
         super.onStart();
 
-        if (!getLockScreenDisplayed() && (configuration.getShowNotificationsExplainer() || walletApplication.myPackageReplaced)) {
+        if (!getLockScreenDisplayed() && configuration.getShowNotificationsExplainer()) {
             explainPushNotifications();
         }
     }
@@ -368,7 +368,7 @@ public void onNewKeyChainEncrypted() {
 
     @Override
     public void onLockScreenDeactivated() {
-        if (configuration.getShowNotificationsExplainer() || walletApplication.myPackageReplaced) {
+        if (configuration.getShowNotificationsExplainer()) {
             explainPushNotifications();
         }
     }