From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Sat, 3 Sep 2022 15:00:43 +0000 (+0300)
Subject: fix cloud backup
X-Git-Tag: v0.21.5~2
X-Git-Url: https://git.ktnx.net/?a=commitdiff_plain;h=12b3fbee517ab05cf21cc5f675822954e9364479;p=mobile-ledger.git

fix cloud backup

by making the BackupAgent-extending class public

also, dereive directly from BackupAgent, because only the profile
configuration is stored, not the whole database

as a side action, drop the backup descriptor and its mention in the
manifests, because it is not used in the key-value backup MoLe uses
---

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 47f9b1d4..6d4948bc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,13 +24,12 @@
         android:name=".App"
         android:allowBackup="true"
         android:appCategory="productivity"
-        android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@drawable/app_icon"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@drawable/app_icon_round"
         android:supportsRtl="true"
-        android:backupAgent="net.ktnx.mobileledger.backup.MobileLedgerBackupAgent"
+        android:backupAgent=".backup.MobileLedgerBackupAgent"
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".BackupsActivity"
diff --git a/app/src/main/java/net/ktnx/mobileledger/backup/MobileLedgerBackupAgent.java b/app/src/main/java/net/ktnx/mobileledger/backup/MobileLedgerBackupAgent.java
index ea09e514..66538435 100644
--- a/app/src/main/java/net/ktnx/mobileledger/backup/MobileLedgerBackupAgent.java
+++ b/app/src/main/java/net/ktnx/mobileledger/backup/MobileLedgerBackupAgent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021 Damyan Ivanov.
+ * Copyright © 2022 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 
 package net.ktnx.mobileledger.backup;
 
-import android.app.backup.BackupAgentHelper;
+import android.app.backup.BackupAgent;
 import android.app.backup.BackupDataInput;
 import android.app.backup.BackupDataOutput;
 import android.os.ParcelFileDescriptor;
@@ -29,13 +29,13 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-class MobileLedgerBackupAgent extends BackupAgentHelper {
+public class MobileLedgerBackupAgent extends BackupAgent {
     private static final int READ_BUF_LEN = 10;
     public static String SETTINGS_KEY = "settings";
     @Override
     public void onBackup(ParcelFileDescriptor oldState, BackupDataOutput data,
                          ParcelFileDescriptor newState) throws IOException {
-        super.onBackup(oldState, data, newState);
+        Logger.debug("backup", "onBackup()");
         backupSettings(data);
         newState.close();
     }
diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml
deleted file mode 100644
index 93cbcaec..00000000
--- a/app/src/main/res/xml/backup_descriptor.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright © 2019 Damyan Ivanov.
-  ~ This file is part of MoLe.
-  ~ MoLe is free software: you can distribute it and/or modify it
-  ~ under the term of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your opinion), any later version.
-  ~
-  ~ MoLe is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License terms for details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with MoLe. If not, see <https://www.gnu.org/licenses/>.
-  -->
-
-<full-backup-content>
-    <!-- Exclude specific shared preferences that contain GCM registration Id -->
-</full-backup-content>