diff --git a/android/app/build.gradle b/android/app/build.gradle index 3af93635..4ae86830 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.moimob.drinkable" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 14900 - versionName "1.49.0" + versionCode 15000 + versionName "1.50.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/fastlane/metadata/android/en-US/changelogs/15000.txt b/fastlane/metadata/android/en-US/changelogs/15000.txt new file mode 100644 index 00000000..655cb40e --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/15000.txt @@ -0,0 +1 @@ +• Added ability to restore backup without accessing files in the filesystem \ No newline at end of file diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json index 948158b8..608b88c0 100644 --- a/src/locales/en/translation.json +++ b/src/locales/en/translation.json @@ -182,5 +182,8 @@ "create-backup": "Create Backup", "backup-restore-warning-text": "Are you sure you want to restore this backup? This will overwrite your current data.", "backup-restored-successfully": "Backup restored successfully", - "backup-name-placeholder": "Backup {{date}}" + "backup-name-placeholder": "Backup {{date}}", + "paste-backup-content-title": "Paste Backup Content", + "paste-backup-content": "Paste the content of your backup file here to restore it", + "android-storage-limitations": "Due to Android 11 storage limitations, backups cannot be loaded if the app was reinstalled or backup was modified externally" } diff --git a/src/modules/user/backups/backups.html b/src/modules/user/backups/backups.html index 18c0b65f..02525c68 100644 --- a/src/modules/user/backups/backups.html +++ b/src/modules/user/backups/backups.html @@ -1,7 +1,31 @@