Fixed restore of events

Futsch1 · Sep 14, 2024 · d7f5164 · d7f5164
1 parent 818d05e
commit d7f5164
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/src/main/java/com/futsch1/medtimer/BackupManager.java b/app/src/main/java/com/futsch1/medtimer/BackupManager.java
@@ -6,6 +6,7 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
@@ -118,6 +119,7 @@ public void fileSelected(Uri data) {
         String json = FileHelper.readFromUri(data, context.getContentResolver());
         boolean restoreSuccessful = false;
         if (json != null) {
+            Log.d("BackupManager", "Starting backup restore: " + data);
             try {
                 JsonObject rootElement = JsonParser.parseString(json).getAsJsonObject();
                 if (rootElement.has(MEDICINE_KEY)) {
@@ -137,7 +139,7 @@ public void fileSelected(Uri data) {
             // Try legacy backup formats
             restoreSuccessful = restoreBackup(json, new JSONMedicineBackup()) || restoreBackup(json, new JSONReminderEventBackup());
         }
-
+        Log.d("BackupManager", "Backup restore finished");
         new AlertDialog.Builder(context)
                 .setMessage(restoreSuccessful ? R.string.restore_successful : R.string.restore_failed)
                 .setPositiveButton(R.string.ok, (dialog, which) -> {

diff --git a/app/src/main/java/com/futsch1/medtimer/database/Reminder.java b/app/src/main/java/com/futsch1/medtimer/database/Reminder.java
@@ -15,6 +15,7 @@ public class Reminder {
     public static final int DEFAULT_TIME = 480;
     public int medicineRelId;
     @PrimaryKey(autoGenerate = true)
+    @Expose
     public int reminderId;
     @Expose
     public int timeInMinutes;