From f7bc8bd0563916ea8b0865d75a384713580cbfa0 Mon Sep 17 00:00:00 2001
From: RichyHBM <gitemail@richyhbm.co.uk>
Date: Sat, 10 Feb 2018 17:26:59 +0000
Subject: [PATCH] Move backupFileName into static class

---
 .../andotp/Activities/BackupActivity.java     | 33 +++----------------
 .../flocke/andotp/Utilities/FileHelper.java   | 26 +++++++++++++++
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Activities/BackupActivity.java b/app/src/main/java/org/shadowice/flocke/andotp/Activities/BackupActivity.java
index 81864aae..bf71b861 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Activities/BackupActivity.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Activities/BackupActivity.java
@@ -314,16 +314,16 @@ public class BackupActivity extends BaseActivity {
             Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
             intent.addCategory(Intent.CATEGORY_OPENABLE);
             intent.setType(mimeType);
-            intent.putExtra(Intent.EXTRA_TITLE, backupFilename(backupType));
+            intent.putExtra(Intent.EXTRA_TITLE, FileHelper.backupFilename(this, backupType));
             startActivityForResult(intent, intentId);
         } else {
             if (Tools.mkdir(settings.getBackupDir())) {
                 if (intentId == Constants.INTENT_BACKUP_SAVE_DOCUMENT_PLAIN)
-                    doBackupPlain(Tools.buildUri(settings.getBackupDir(), backupFilename(Constants.BackupType.PLAIN_TEXT)));
+                    doBackupPlain(Tools.buildUri(settings.getBackupDir(), FileHelper.backupFilename(this, Constants.BackupType.PLAIN_TEXT)));
                 else if (intentId == Constants.INTENT_BACKUP_SAVE_DOCUMENT_CRYPT)
-                    doBackupCrypt(Tools.buildUri(settings.getBackupDir(), backupFilename(Constants.BackupType.ENCRYPTED)));
+                    doBackupCrypt(Tools.buildUri(settings.getBackupDir(), FileHelper.backupFilename(this, Constants.BackupType.ENCRYPTED)));
                 else if (intentId == Constants.INTENT_BACKUP_SAVE_DOCUMENT_PGP)
-                    backupEncryptedWithPGP(Tools.buildUri(settings.getBackupDir(), backupFilename(Constants.BackupType.OPEN_PGP)), null);
+                    backupEncryptedWithPGP(Tools.buildUri(settings.getBackupDir(), FileHelper.backupFilename(this, Constants.BackupType.OPEN_PGP)), null);
             } else {
                 Toast.makeText(this, R.string.backup_toast_mkdir_failed, Toast.LENGTH_LONG).show();
             }
@@ -586,29 +586,4 @@ public class BackupActivity extends BaseActivity {
             Toast.makeText(this, String.format(getString(R.string.backup_toast_openpgp_error), error.getMessage()), Toast.LENGTH_LONG).show();
         }
     }
-
-    private String backupFilename(Constants.BackupType type) {
-        switch (type) {
-            case PLAIN_TEXT:
-                if (settings.getIsAppendingDateTimeToBackups()) {
-                    return String.format(Constants.BACKUP_FILENAME_PLAIN_FORMAT, Tools.getDateTimeString());
-                } else {
-                    return Constants.BACKUP_FILENAME_PLAIN;
-                }
-            case ENCRYPTED:
-                if (settings.getIsAppendingDateTimeToBackups()) {
-                    return String.format(Constants.BACKUP_FILENAME_CRYPT_FORMAT, Tools.getDateTimeString());
-                } else {
-                    return Constants.BACKUP_FILENAME_CRYPT;
-                }
-            case OPEN_PGP:
-                if (settings.getIsAppendingDateTimeToBackups()) {
-                    return String.format(Constants.BACKUP_FILENAME_PGP_FORMAT, Tools.getDateTimeString());
-                } else {
-                    return Constants.BACKUP_FILENAME_PGP;
-                }
-        }
-
-        return Constants.BACKUP_FILENAME_PLAIN;
-    }
 }
diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Utilities/FileHelper.java b/app/src/main/java/org/shadowice/flocke/andotp/Utilities/FileHelper.java
index 4bde8fad..4b9e053c 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Utilities/FileHelper.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Utilities/FileHelper.java
@@ -121,5 +121,31 @@ public class FileHelper {
             out.close();
         }
     }
+
+    public static String backupFilename(Context context, Constants.BackupType type) {
+        Settings settings = new Settings(context);
+        switch (type) {
+            case PLAIN_TEXT:
+                if (settings.getIsAppendingDateTimeToBackups()) {
+                    return String.format(Constants.BACKUP_FILENAME_PLAIN_FORMAT, Tools.getDateTimeString());
+                } else {
+                    return Constants.BACKUP_FILENAME_PLAIN;
+                }
+            case ENCRYPTED:
+                if (settings.getIsAppendingDateTimeToBackups()) {
+                    return String.format(Constants.BACKUP_FILENAME_CRYPT_FORMAT, Tools.getDateTimeString());
+                } else {
+                    return Constants.BACKUP_FILENAME_CRYPT;
+                }
+            case OPEN_PGP:
+                if (settings.getIsAppendingDateTimeToBackups()) {
+                    return String.format(Constants.BACKUP_FILENAME_PGP_FORMAT, Tools.getDateTimeString());
+                } else {
+                    return Constants.BACKUP_FILENAME_PGP;
+                }
+        }
+
+        return Constants.BACKUP_FILENAME_PLAIN;
+    }
 }