fix repeating notification times when closed

mattvchandler · Mar 14, 2018 · 1b3b589 · 1b3b589
1 parent 60650e7
commit 1b3b589
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.mattvchandler.progressbars"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 16
-        versionName "1.4.1"
+        versionCode 17
+        versionName "1.4.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/org/mattvchandler/progressbars/Progress_bars.java b/app/src/main/java/org/mattvchandler/progressbars/Progress_bars.java
@@ -23,6 +23,7 @@
 import org.mattvchandler.progressbars.settings.Settings;
 import org.mattvchandler.progressbars.util.About_dialog_frag;
 import org.mattvchandler.progressbars.util.Dynamic_theme_activity;
+import org.mattvchandler.progressbars.util.Notification_handler;
 import org.mattvchandler.progressbars.util.Preferences;
 import org.mattvchandler.progressbars.databinding.ActivityProgressBarsBinding;
 
@@ -83,6 +84,10 @@ protected void onCreate(Bundle savedInstanceState)
         ItemTouchHelper touch_helper = new ItemTouchHelper(new Touch_helper_callback(adapter));
         touch_helper.attachToRecyclerView(binding.mainList);
 
+        // update repeat times and alarms
+        Data.apply_all_repeats(this);
+        Notification_handler.reset_all_alarms(this);
+
         long scroll_to_rowid = getIntent().getLongExtra(EXTRA_SCROLL_TO_ROWID, -1);
         if(scroll_to_rowid >= 0)
         {

diff --git a/app/src/main/java/org/mattvchandler/progressbars/util/Resetting_application.java b/app/src/main/java/org/mattvchandler/progressbars/util/Resetting_application.java
@@ -56,10 +56,6 @@ public void onCreate() // runs on App startup
         cursor.close();
         db.close();
 
-        // update repeat times and alarms
-        Data.apply_all_repeats(this);
-        Notification_handler.reset_all_alarms(this);
-
         // register notification handler
         Notification_handler.setup_notification_channel(this);
     }