Merge pull request #585 from rivaldi8/bugfix-583-scheduled-exports-always-daily

Bugfix 583:   Scheduled exports are always executed twice a day - fixes #583

Author: codinguser

app/src/main/java/org/gnucash/android/service/ScheduledActionService.java

@@ -164,6 +164,9 @@ private static int executeBackup(ScheduledAction scheduledAction, SQLiteDatabase
         if (endTime > 0 && endTime < now)
             return executionCount;
 
+        if (scheduledAction.computeNextScheduledExecutionTime() > now)
+            return 0;
+
         ExportParams params = ExportParams.parseCsv(scheduledAction.getTag());
         try {
             //wait for async task to finish before we proceed (we are holding a wake lock)

app/src/test/java/org/gnucash/android/test/unit/service/ScheduledActionServiceTest.java

@@ -44,6 +44,7 @@
 import org.gnucash.android.test.unit.testutil.ShadowCrashlytics;
 import org.gnucash.android.test.unit.testutil.ShadowUserVoice;
 import org.joda.time.DateTime;
+import org.joda.time.LocalDateTime;
 import org.joda.time.Weeks;
 import org.junit.After;
 import org.junit.Before;
@@ -304,6 +305,36 @@ public void scheduledBackups_shouldRunOnlyOnce(){
         assertThat(backupFiles[0]).exists().hasExtension("gnca");
     }
 
+    /**
+     * Tests that a scheduled backup isn't executed before the next scheduled
+     * execution according to its recurrence.
+     *
+     * <p>Tests for bug https://github.com/codinguser/gnucash-android/issues/583</p>
+     */
+    @Test
+    public void scheduledBackups_shouldNotRunBeforeNextScheduledExecution(){
+        ScheduledAction scheduledBackup = new ScheduledAction(ScheduledAction.ActionType.BACKUP);
+        scheduledBackup.setStartTime(LocalDateTime.now().minusDays(2).toDate().getTime());
+        scheduledBackup.setExecutionCount(1);
+        scheduledBackup.setRecurrence(PeriodType.WEEK, 1);
+
+        ExportParams backupParams = new ExportParams(ExportFormat.XML);
+        backupParams.setExportTarget(ExportParams.ExportTarget.SD_CARD);
+        scheduledBackup.setTag(backupParams.toCsv());
+
+        File backupFolder = new File(
+                Exporter.getExportFolderPath(BooksDbAdapter.getInstance().getActiveBookUID()));
+        assertThat(backupFolder).exists();
+        assertThat(backupFolder.listFiles()).isEmpty();
+
+        List<ScheduledAction> actions = new ArrayList<>();
+        actions.add(scheduledBackup);
+        ScheduledActionService.processScheduledActions(actions, mDb);
+
+        assertThat(scheduledBackup.getExecutionCount()).isEqualTo(1);
+        assertThat(backupFolder.listFiles()).hasSize(0);
+    }
+
     @After
     public void tearDown(){
         TransactionsDbAdapter.getInstance().deleteAllRecords();