From 726ff1a1261f621d35aa824d9fb7f98853c4e22d Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Fri, 23 Jul 2021 18:42:22 +0200
Subject: [PATCH] Add timestamp in database file export #1035

---
 CHANGELOG                                                     | 1 +
 .../java/com/kunzisoft/keepass/settings/SettingsActivity.kt   | 4 +++-
 app/src/main/res/values/donottranslate.xml                    | 2 +-
 fastlane/metadata/android/en-US/changelogs/84.txt             | 3 ++-
 fastlane/metadata/android/fr-FR/changelogs/84.txt             | 3 ++-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bdf82cc05..bf730d2e2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 KeePassDX(3.0.0)
  * Add / Manage dynamic templates #191
  * Manually select RecycleBin group and Templates group #191
+ * Small changes #1035
 
 KeePassDX(2.10.5)
  * Increase the saving speed of database #1028
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt
index eae0a823d..0ebcbcaeb 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt
@@ -43,6 +43,7 @@ import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.view.showActionErrorIfNeeded
+import org.joda.time.DateTime
 import java.util.*
 
 open class SettingsActivity
@@ -254,7 +255,8 @@ open class SettingsActivity
     }
 
     fun exportAppProperties() {
-        appPropertiesFileCreationRequestCode = mExternalFileHelper?.createDocument(getString(R.string.app_properties_file_name))
+        appPropertiesFileCreationRequestCode = mExternalFileHelper?.createDocument(getString(R.string.app_properties_file_name,
+            DateTime.now().toLocalDateTime().toString("yyyy-MM-dd'_'HH-mm")))
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 5a17e508d..cb21a9372 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -47,7 +47,7 @@
     <string name="database_file_name_default" translatable="false">keepass</string>
     <string name="database_file_extension_default" translatable="false">.kdbx</string>
     <string name="database_default_name" translatable="false">KeePassDX Database</string>
-    <string name="app_properties_file_name" translatable="false">keepassdx.properties</string>
+    <string name="app_properties_file_name" translatable="false">keepassdx_%1$s.properties</string>
 
     <!--
     *******************
diff --git a/fastlane/metadata/android/en-US/changelogs/84.txt b/fastlane/metadata/android/en-US/changelogs/84.txt
index 1daf5e9ce..2c2fbaaab 100644
--- a/fastlane/metadata/android/en-US/changelogs/84.txt
+++ b/fastlane/metadata/android/en-US/changelogs/84.txt
@@ -1,2 +1,3 @@
  * Add / Manage dynamic templates #191
- * Allow to manually select RecycleBin group and Templates group #191
\ No newline at end of file
+ * Allow to manually select RecycleBin group and Templates group #191
+ * Small changes #1035
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/84.txt b/fastlane/metadata/android/fr-FR/changelogs/84.txt
index f8a6f295e..804f0382c 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/84.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/84.txt
@@ -1,2 +1,3 @@
  * Ajout / Gestion dynamique des templates #191
- * Sélection manuelle des groupes de la corbeille et des templates #191
\ No newline at end of file
+ * Sélection manuelle des groupes de la corbeille et des templates #191
+ * Petits changements #1035
\ No newline at end of file