#150. Refactore BackupListener.

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

@@ -9,11 +9,6 @@
 import com.blogspot.e_kanivets.moneytracker.controller.backup.tasks.DropboxRestoreBackupAsyncTask;
 import com.dropbox.core.v2.DbxClientV2;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -32,98 +27,29 @@ public BackupController(FormatController formatController, String filesDir) {
         this.filesDir = filesDir;
     }
 
-    public void makeBackup(@NonNull DbxClientV2 dbClient,
-                           @Nullable OnBackupListener listener) {
-        FileInputStream fileInputStream = readAppDb();
-        long fileLength = readAppDbFileLength();
-        if (fileInputStream == null) return;
-
-        DropboxBackupAsyncTask asyncTask = new DropboxBackupAsyncTask(dbClient,
-                formatController.formatDateAndTime(System.currentTimeMillis()),
-                fileInputStream, fileLength, listener);
+    public void makeBackup(@NonNull DbxClientV2 dbClient, @Nullable OnBackupListener listener) {
+        DropboxBackupAsyncTask asyncTask =
+                new DropboxBackupAsyncTask(dbClient, formatController.formatDateAndTime(System.currentTimeMillis()),
+                        getAppDbFileName(), listener);
         asyncTask.execute();
     }
 
     public void restoreBackup(@NonNull DbxClientV2 dbClient, @NonNull String backupName,
-                              @Nullable final OnRestoreBackupListener listener) {
-        final File file = new File(getRestoreFileName());
-        FileOutputStream outputStream = null;
-        try {
-            outputStream = new FileOutputStream(file);
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        if (outputStream == null) {
-            if (listener != null) listener.onRestoreFailure(null);
-        } else {
-            final FileOutputStream finalOutputStream = outputStream;
-            DropboxRestoreBackupAsyncTask asyncTask = new DropboxRestoreBackupAsyncTask(dbClient,
-                    backupName, outputStream, new OnRestoreBackupListener() {
-                @Override
-                public void onRestoreSuccess() {
-                    try {
-                        finalOutputStream.close();
-                    } catch (IOException e) {
-                        if (listener != null) listener.onRestoreFailure(null);
-                        e.printStackTrace();
-                    }
-
-                    if (file.exists() && file.length() != 0) {
-                        boolean renamed = file.renameTo(new File(getAppDbFileName()));
-                        if (listener != null) {
-                            if (renamed) listener.onRestoreSuccess();
-                            else listener.onRestoreFailure(null);
-                        }
-                    }
-                }
-
-                @Override
-                public void onRestoreFailure(String reason) {
-                    if (listener != null) listener.onRestoreFailure(reason);
-                }
-            });
-            asyncTask.execute();
-        }
+            @Nullable final OnRestoreBackupListener listener) {
+        DropboxRestoreBackupAsyncTask asyncTask =
+                new DropboxRestoreBackupAsyncTask(dbClient, getAppDbFileName(), backupName, listener);
+        asyncTask.execute();
     }
 
-    public void fetchBackups(@NonNull DbxClientV2 dbClient,
-                             @Nullable OnFetchBackupListListener listener) {
+    public void fetchBackups(@NonNull DbxClientV2 dbClient, @Nullable OnFetchBackupListListener listener) {
         DropboxFetchBackupListAsyncTask asyncTask = new DropboxFetchBackupListAsyncTask(dbClient, listener);
         asyncTask.execute();
     }
 
-    @Nullable
-    private FileInputStream readAppDb() {
-        File dbFile = new File(getAppDbFileName());
-        FileInputStream fis = null;
-
-        try {
-            fis = new FileInputStream(dbFile);
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        return fis;
-    }
-
-    private long readAppDbFileLength() {
-        File dbFile = new File(getAppDbFileName());
-
-        if (dbFile.exists()) return dbFile.length();
-        else return 0;
-    }
-
-    @NonNull
-    private String getAppDbFileName() {
+    @NonNull private String getAppDbFileName() {
         return filesDir + "/databases/database";
     }
 
-    @NonNull
-    private String getRestoreFileName() {
-        return getAppDbFileName() + ".restore";
-    }
-
     public interface OnBackupListener {
         String SUCCESS = "success";
         String ERROR_AUTHENTICATION = "error_authentication";

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

@@ -7,30 +7,31 @@
 import com.dropbox.core.DbxException;
 import com.dropbox.core.v2.DbxClientV2;
 import com.dropbox.core.v2.files.FileMetadata;
+import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 
 public class DropboxBackupAsyncTask extends AsyncTask<Void, String, String> {
+
     private DbxClientV2 dbClient;
+    private String appDbFileName;
     private String fileName;
-    private FileInputStream fileInputStream;
-    private long fileLength;
 
-    @Nullable
-    private BackupController.OnBackupListener listener;
+    @Nullable private BackupController.OnBackupListener listener;
 
-    public DropboxBackupAsyncTask(@NonNull DbxClientV2 dbClient, String fileName,
-            FileInputStream fileInputStream, long fileLength,
+    public DropboxBackupAsyncTask(@NonNull DbxClientV2 dbClient, String fileName, String appDbFileName,
             @Nullable BackupController.OnBackupListener listener) {
         this.dbClient = dbClient;
         this.fileName = fileName;
-        this.fileInputStream = fileInputStream;
-        this.fileLength = fileLength;
+        this.appDbFileName = appDbFileName;
         this.listener = listener;
     }
 
-    @Override
-    protected String doInBackground(Void... params) {
+    @Override protected String doInBackground(Void... params) {
+        FileInputStream fileInputStream = readAppDb();
+        if (fileInputStream == null) return null;
+
         FileMetadata info = null;
 
         try {
@@ -41,16 +42,34 @@ protected String doInBackground(Void... params) {
             e.printStackTrace();
         }
 
-        if (info == null) return null;
-        else return BackupController.OnBackupListener.SUCCESS;
+        if (info == null) {
+            return null;
+        } else {
+            return BackupController.OnBackupListener.SUCCESS;
+        }
     }
 
-    @Override
-    protected void onPostExecute(String result) {
+    @Override protected void onPostExecute(String result) {
         super.onPostExecute(result);
         if (listener == null) return;
 
-        if (BackupController.OnBackupListener.SUCCESS.equals(result)) listener.onBackupSuccess();
-        else listener.onBackupFailure(result);
+        if (BackupController.OnBackupListener.SUCCESS.equals(result)) {
+            listener.onBackupSuccess();
+        } else {
+            listener.onBackupFailure(result);
+        }
+    }
+
+    @Nullable private FileInputStream readAppDb() {
+        File dbFile = new File(appDbFileName);
+        FileInputStream fis = null;
+
+        try {
+            fis = new FileInputStream(dbFile);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        return fis;
     }
 }

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

@@ -1,41 +1,69 @@
 package com.blogspot.e_kanivets.moneytracker.controller.backup.tasks;
 
 import android.os.AsyncTask;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import com.blogspot.e_kanivets.moneytracker.controller.backup.BackupController;
 import com.dropbox.core.DbxException;
 import com.dropbox.core.v2.DbxClientV2;
 import com.dropbox.core.v2.files.FileMetadata;
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
 public class DropboxRestoreBackupAsyncTask extends AsyncTask<Void, String, String> {
+
     private DbxClientV2 dbClient;
+    private String appDbFileName;
     private String backupName;
-    private FileOutputStream outputStream;
 
     @Nullable private BackupController.OnRestoreBackupListener listener;
 
-    public DropboxRestoreBackupAsyncTask(DbxClientV2 dbClient, String backupName, FileOutputStream outputStream,
+    public DropboxRestoreBackupAsyncTask(DbxClientV2 dbClient, String appDbFileName, String backupName,
             @Nullable BackupController.OnRestoreBackupListener listener) {
         this.dbClient = dbClient;
+        this.appDbFileName = appDbFileName;
         this.backupName = backupName;
-        this.outputStream = outputStream;
         this.listener = listener;
     }
 
     @Override protected String doInBackground(Void... params) {
-        FileMetadata info = null;
+        final File file = new File(getRestoreFileName());
+        FileOutputStream outputStream = null;
         try {
-            info = dbClient.files().download("/" + backupName).download(outputStream);
-        } catch (DbxException | IOException e) {
+            outputStream = new FileOutputStream(file);
+        } catch (FileNotFoundException e) {
             e.printStackTrace();
         }
 
-        if (info == null) {
+        if (outputStream == null) {
             return null;
         } else {
-            return BackupController.OnBackupListener.SUCCESS;
+            FileMetadata info = null;
+            try {
+                info = dbClient.files().download("/" + backupName).download(outputStream);
+            } catch (DbxException | IOException e) {
+                e.printStackTrace();
+            }
+
+            if (info == null) {
+                return null;
+            } else {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    return null;
+                }
+
+                if (file.exists() && file.length() != 0) {
+                    boolean renamed = file.renameTo(new File(appDbFileName));
+                    return renamed ? BackupController.OnBackupListener.SUCCESS : null;
+                } else {
+                    return null;
+                }
+            }
         }
     }
 
@@ -49,4 +77,8 @@ public DropboxRestoreBackupAsyncTask(DbxClientV2 dbClient, String backupName, Fi
             listener.onRestoreFailure(result);
         }
     }
+
+    @NonNull private String getRestoreFileName() {
+        return appDbFileName + ".restore";
+    }
 }