From 578f05a6b17d6a812eec760dbe9f331bd8eb6637 Mon Sep 17 00:00:00 2001
From: RichyHBM <gitemail@richyhbm.co.uk>
Date: Thu, 1 Feb 2018 13:21:04 +0000
Subject: [PATCH] Add settings to select appending

---
 .../org/shadowice/flocke/andotp/Utilities/Settings.java     | 4 ++++
 app/src/main/res/values/settings.xml                        | 1 +
 app/src/main/res/values/strings_settings.xml                | 4 ++++
 app/src/main/res/xml/preferences.xml                        | 6 ++++++
 4 files changed, 15 insertions(+)

diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java b/app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java
index 66e74adf..c7f69f43 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java
@@ -462,4 +462,8 @@ public class Settings {
     public void setLastUsedDialogShown(boolean value) {
         setBoolean(R.string.settings_key_last_used_dialog_shown, value);
     }
+
+    public boolean getIsAppendingDateTimeToBackups() {
+        return getBoolean(R.string.settings_key_backup_append_date_time, false);
+    }
 }
diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
index 11db6c59..1a4af210 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -24,6 +24,7 @@
     <string name="settings_key_thumbnail_size" translatable="false">pref_thumbnail_size</string>
     <string name="settings_key_split_group_size" translatable="false">pref_split_group_size</string>
 
+    <string name="settings_key_backup_append_date_time" translatable="false">pref_backup_append_date_time</string>
     <string name="settings_key_backup_ask" translatable="false">pref_backup_ask</string>
     <string name="settings_key_backup_directory" translatable="false">pref_backup_directory</string>
     <string name="settings_key_backup_password" translatable="false">pref_backup_password</string>          <!-- Deprecated -->
diff --git a/app/src/main/res/values/strings_settings.xml b/app/src/main/res/values/strings_settings.xml
index e641dcd2..f5a8f77b 100644
--- a/app/src/main/res/values/strings_settings.xml
+++ b/app/src/main/res/values/strings_settings.xml
@@ -23,6 +23,7 @@
     <string name="settings_title_thumbnail_size_ask">Thumbnail size</string>
     <string name="settings_title_split_group_size">Split Token with space</string>
 
+    <string name="settings_title_backup_append_date">Append date to filename</string>
     <string name="settings_title_backup_ask">Ask for filename</string>
     <string name="settings_title_backup_directory">Backup directory</string>
     <string name="settings_title_backup_password">Backup password</string>
@@ -44,6 +45,9 @@
 
     <string name="settings_desc_label_scroll">Scroll overlong labels instead of truncating them</string>
 
+
+    <string name="settings_desc_backup_append_date">Append the current date and time to the suggested
+        backup filename</string>
     <string name="settings_desc_backup_ask">Ask for the filename every time a backup is created or
         restored</string>
     <string name="settings_desc_backup_directory">Directory for the backups (filenames will depend
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 148aa001..e59feb08 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -96,6 +96,12 @@
     <PreferenceCategory
         android:title="@string/settings_category_title_backup">
 
+        <CheckBoxPreference
+            android:key="@string/settings_key_backup_append_date_time"
+            android:title="@string/settings_title_backup_append_date"
+            android:summary="@string/settings_desc_backup_append_date"
+            android:defaultValue="false" />
+
         <CheckBoxPreference
             android:key="@string/settings_key_backup_ask"
             android:title="@string/settings_title_backup_ask"