Google Drive daily backup mobile data option

NightscoutFoundation · Sep 12, 2023 · 1c0952f · 1c0952f
1 parent f9346ab
commit 1c0952f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/Backup.java b/app/src/main/java/com/eveningoutpost/dexdrip/cloud/backup/Backup.java
@@ -62,6 +62,7 @@ public class Backup {
     private static final String TAG = "xDrip-Backup";
     private static final String PREF_BACKUP_URI = "backup-document-uri";
     public static final String PREF_AUTO_BACKUP = "backup-automatic-enabled";
+    public static final String PREF_AUTO_BACKUP_MOBILE = "backup-automatic-mobile";
     private static final String XDRIP_CONTENT_TYPE = "xDripBackup://";
     private static final String[] dbSuffix = {"-journal", "-shm", "-wal"};
 
@@ -298,7 +299,7 @@ public static boolean isBackupSuitableForAutomatic() {
 
     public static void doCompleteBackupIfEnabled() {
         if (Pref.getBooleanDefaultFalse(PREF_AUTO_BACKUP)
-                && isBackupSuitableForAutomatic()) {
+                && isBackupSuitableForAutomatic() && ((Pref.getBooleanDefaultFalse(PREF_AUTO_BACKUP_MOBILE)) || (JoH.isLANConnected()))) {
             UserError.Log.e(TAG, "Attempting automatic backup");
             val success = doCompleteBackup(new LogStatus());
             if (!success) {

diff --git a/app/src/main/res/layout/activity_backup_picker.xml b/app/src/main/res/layout/activity_backup_picker.xml
@@ -103,6 +103,17 @@
                 app:checked="@={prefs[`backup-automatic-enabled`]}"
                 app:showIfTrueAnimatedFastOff="@{vm.showAuto}" />
 
+            <CheckBox
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:dependency="backup-automatic-enabled"
+                android:layout_gravity="center"
+                android:layout_marginBottom="20dp"
+                android:gravity="center"
+                android:text="@string/use_mobile_data"
+                app:checked="@={prefs[`backup-automatic-mobile`]}"
+                app:showIfTrueAnimatedFastOff="@{vm.showAuto}" />
+
             <Button
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"