#150. Consolidate OnBackupListener.

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/BackupActivity.java

@@ -27,7 +27,8 @@
 import org.jetbrains.annotations.NotNull;
 import timber.log.Timber;
 
-public class BackupActivity extends BaseBackActivity implements BackupAdapter.OnBackupListener {
+public class BackupActivity extends BaseBackActivity
+        implements BackupAdapter.OnBackupListener, BackupController.OnBackupListener {
     private static final String APP_KEY = "5lqugcckdy9y6lj";
 
     @Inject PreferenceController preferenceController;
@@ -51,6 +52,7 @@ public class BackupActivity extends BaseBackActivity implements BackupAdapter.On
         } else {
             DbxRequestConfig config = new DbxRequestConfig("open_money_tracker");
             dbClient = new DbxClientV2(config, accessToken);
+            backupController.setOnBackupListener(this);
             fetchBackups();
         }
 
@@ -91,30 +93,72 @@ public class BackupActivity extends BaseBackActivity implements BackupAdapter.On
         builder.show();
     }
 
-    @OnClick(R.id.btn_backup_now) public void backupNow() {
-        AnswersProxy.get().logButton("Make Backup");
-        startProgress(getString(R.string.making_backup));
-        backupController.makeBackup(dbClient, new BackupController.OnBackupListener() {
-            @Override public void onBackupSuccess() {
-                AnswersProxy.get().logEvent("Backup success");
-                Timber.d("Backup success.");
-                if (isFinishing()) return;
+    @Override public void onBackupsFetched(@NonNull List<String> backupList) {
+        if (isFinishing()) return;
 
-                stopProgress();
-                fetchBackups();
-            }
+        stopProgress();
+
+        BackupAdapter backupAdapter = new BackupAdapter(BackupActivity.this, backupList);
+        backupAdapter.setOnBackupListener(BackupActivity.this);
+        listView.setAdapter(backupAdapter);
+    }
+
+    @Override public void onBackupSuccess() {
+        AnswersProxy.get().logEvent("Backup success");
+        Timber.d("Backup success.");
+        if (isFinishing()) return;
+
+        stopProgress();
+        fetchBackups();
+    }
+
+    @Override public void onBackupFailure(String reason) {
+        AnswersProxy.get().logEvent("Backup failure");
+        Timber.d("Backup failure.");
+        if (isFinishing()) return;
+
+        stopProgress();
+        showToast(R.string.failed_create_backup);
+
+        if (BackupController.OnBackupListener.ERROR_AUTHENTICATION.equals(reason)) logout();
+    }
 
-            @Override public void onBackupFailure(String reason) {
-                AnswersProxy.get().logEvent("Backup failure");
-                Timber.d("Backup failure.");
-                if (isFinishing()) return;
+    @Override public void onRestoreSuccess(@NonNull String backupName) {
+        AnswersProxy.get().logEvent("Restore Success");
+        Timber.d("Restore success.");
+        if (isFinishing()) return;
 
-                stopProgress();
-                showToast(R.string.failed_create_backup);
+        stopProgress();
 
-                if (BackupController.OnBackupListener.ERROR_AUTHENTICATION.equals(reason)) logout();
+        AlertDialog.Builder builder = new AlertDialog.Builder(BackupActivity.this);
+        builder.setTitle(getString(R.string.backup_is_restored));
+        builder.setMessage(getString(R.string.backup_restored, backupName));
+        builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override public void onDismiss(DialogInterface dialog) {
+                MtApp.get().buildAppComponent();
+                setResult(RESULT_OK);
+                finish();
             }
         });
+        builder.setPositiveButton(android.R.string.ok, null);
+        builder.show();
+    }
+
+    @Override public void onRestoreFailure(String reason) {
+        AnswersProxy.get().logEvent("Restore Failure");
+        Timber.d("Restore failure.");
+        if (isFinishing()) return;
+
+        stopProgress();
+        showToast(R.string.failed_restore_backup);
+
+        if (BackupController.OnBackupListener.ERROR_AUTHENTICATION.equals(reason)) logout();
+    }
+
+    @OnClick(R.id.btn_backup_now) public void backupNow() {
+        AnswersProxy.get().logButton("Make Backup");
+        startProgress(getString(R.string.making_backup));
+        backupController.makeBackup(dbClient);
     }
 
     @OnItemClick(R.id.list_view) public void restoreBackupClicked(int position) {
@@ -135,54 +179,12 @@ public class BackupActivity extends BaseBackActivity implements BackupAdapter.On
 
     private void restoreBackup(final String backupName) {
         startProgress(getString(R.string.restoring_backup));
-        backupController.restoreBackup(dbClient, backupName, new BackupController.OnRestoreBackupListener() {
-            @Override public void onRestoreSuccess() {
-                AnswersProxy.get().logEvent("Restore Success");
-                Timber.d("Restore success.");
-                if (isFinishing()) return;
-
-                stopProgress();
-
-                AlertDialog.Builder builder = new AlertDialog.Builder(BackupActivity.this);
-                builder.setTitle(getString(R.string.backup_is_restored));
-                builder.setMessage(getString(R.string.backup_restored, backupName));
-                builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
-                    @Override public void onDismiss(DialogInterface dialog) {
-                        MtApp.get().buildAppComponent();
-                        setResult(RESULT_OK);
-                        finish();
-                    }
-                });
-                builder.setPositiveButton(android.R.string.ok, null);
-                builder.show();
-            }
-
-            @Override public void onRestoreFailure(String reason) {
-                AnswersProxy.get().logEvent("Restore Failure");
-                Timber.d("Restore failure.");
-                if (isFinishing()) return;
-
-                stopProgress();
-                showToast(R.string.failed_restore_backup);
-
-                if (BackupController.OnRestoreBackupListener.ERROR_AUTHENTICATION.equals(reason)) logout();
-            }
-        });
+        backupController.restoreBackup(dbClient, backupName);
     }
 
     private void fetchBackups() {
         startProgress(getString(R.string.fetching_backups));
-        backupController.fetchBackups(dbClient, new BackupController.OnFetchBackupListListener() {
-            @Override public void onBackupsFetched(@NonNull List<String> backupList) {
-                if (isFinishing()) return;
-
-                stopProgress();
-
-                BackupAdapter backupAdapter = new BackupAdapter(BackupActivity.this, backupList);
-                backupAdapter.setOnBackupListener(BackupActivity.this);
-                listView.setAdapter(backupAdapter);
-            }
-        });
+        backupController.fetchBackups(dbClient);
     }
 
     private void deleteBackup(String backupName) {

app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/backup/BackupController.kt

@@ -0,0 +1,55 @@
+package com.blogspot.e_kanivets.moneytracker.controller.backup
+
+import com.blogspot.e_kanivets.moneytracker.controller.FormatController
+import com.blogspot.e_kanivets.moneytracker.controller.backup.tasks.DropboxBackupAsyncTask
+import com.blogspot.e_kanivets.moneytracker.controller.backup.tasks.DropboxFetchBackupListAsyncTask
+import com.blogspot.e_kanivets.moneytracker.controller.backup.tasks.DropboxRestoreBackupAsyncTask
+import com.dropbox.core.v2.DbxClientV2
+
+/**
+ * Controller class to encapsulate backup logic.
+ * Created on 8/10/16.
+ *
+ * @author Evgenii Kanivets
+ */
+class BackupController(private val formatController: FormatController, filesDir: String) {
+
+    var onBackupListener: OnBackupListener? = null
+
+    private val appDbFileName: String = "$filesDir/databases/database"
+
+    fun makeBackup(dbClient: DbxClientV2) {
+        val fileName = formatController.formatDateAndTime(System.currentTimeMillis())
+        val asyncTask = DropboxBackupAsyncTask(dbClient, fileName, appDbFileName, onBackupListener)
+        asyncTask.execute()
+    }
+
+    fun restoreBackup(dbClient: DbxClientV2, backupName: String) {
+        val asyncTask = DropboxRestoreBackupAsyncTask(dbClient, appDbFileName, backupName, onBackupListener)
+        asyncTask.execute()
+    }
+
+    fun fetchBackups(dbClient: DbxClientV2) {
+        val asyncTask = DropboxFetchBackupListAsyncTask(dbClient, onBackupListener)
+        asyncTask.execute()
+    }
+
+    interface OnBackupListener {
+
+        fun onBackupsFetched(backupList: List<String>)
+
+        fun onBackupSuccess()
+
+        fun onBackupFailure(reason: String?)
+
+        fun onRestoreSuccess(backupName: String)
+
+        fun onRestoreFailure(reason: String?)
+
+        companion object {
+            const val SUCCESS = "success"
+            const val ERROR_AUTHENTICATION = "error_authentication"
+        }
+    }
+
+}

app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/backup/tasks/DropboxFetchBackupListAsyncTask.java

@@ -14,10 +14,10 @@ public class DropboxFetchBackupListAsyncTask extends AsyncTask<Void, List<String
     private DbxClientV2 dbClient;
 
     @Nullable
-    private BackupController.OnFetchBackupListListener listener;
+    private BackupController.OnBackupListener listener;
 
     public DropboxFetchBackupListAsyncTask(DbxClientV2 dbClient,
-            @Nullable BackupController.OnFetchBackupListListener listener) {
+            @Nullable BackupController.OnBackupListener listener) {
         this.dbClient = dbClient;
         this.listener = listener;
     }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/backup/tasks/DropboxRestoreBackupAsyncTask.java

@@ -18,10 +18,10 @@ public class DropboxRestoreBackupAsyncTask extends AsyncTask<Void, String, Strin
     private String appDbFileName;
     private String backupName;
 
-    @Nullable private BackupController.OnRestoreBackupListener listener;
+    @Nullable private BackupController.OnBackupListener listener;
 
     public DropboxRestoreBackupAsyncTask(DbxClientV2 dbClient, String appDbFileName, String backupName,
-            @Nullable BackupController.OnRestoreBackupListener listener) {
+            @Nullable BackupController.OnBackupListener listener) {
         this.dbClient = dbClient;
         this.appDbFileName = appDbFileName;
         this.backupName = backupName;
@@ -72,7 +72,7 @@ public DropboxRestoreBackupAsyncTask(DbxClientV2 dbClient, String appDbFileName,
         if (listener == null) return;
 
         if (BackupController.OnBackupListener.SUCCESS.equals(result)) {
-            listener.onRestoreSuccess();
+            listener.onRestoreSuccess(backupName);
         } else {
             listener.onRestoreFailure(result);
         }