From b323967936cd53ba2f3fee22b824655f6a9cb6a2 Mon Sep 17 00:00:00 2001 From: Kieron Quinn Date: Wed, 1 Mar 2023 17:24:05 +0000 Subject: [PATCH] Fixed Restore option not showing any options of files to restore Updated dependencies --- app/build.gradle | 14 +++++++------- app/release/output-metadata.json | 4 ++-- .../backuprestore/BackupRestoreViewModel.kt | 4 +--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 322709a..15ccd48 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,10 +11,10 @@ plugins { apply plugin: 'com.google.android.gms.oss-licenses-plugin' -String DEFAULT_MANIFEST = "243:https://storage.googleapis.com/music-iq-db/updatable_ytm_db/20230212-030106/manifest.json" +String DEFAULT_MANIFEST = "244:https://storage.googleapis.com/music-iq-db/updatable_ytm_db/20230219-030030/manifest.json" -def tagName = '2.1.1' -def version = 211 +def tagName = '2.1.2' +def version = 212 def getKeystoreProperties() { def properties = new Properties() @@ -110,23 +110,23 @@ protobuf { dependencies { //AndroidX implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.appcompat:appcompat:1.6.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-splashscreen:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version" - implementation "androidx.work:work-runtime-ktx:2.7.1" + implementation "androidx.work:work-runtime-ktx:2.8.0" implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" implementation "androidx.lifecycle:lifecycle-service:2.5.1" //Material UI - implementation 'com.google.android.material:material:1.7.0' + implementation 'com.google.android.material:material:1.8.0' //MonetCompat for colours on < S implementation 'com.github.KieronQuinn:MonetCompat:0.4.1' //Dependency Injection - implementation "io.insert-koin:koin-android:3.3.1" + implementation "io.insert-koin:koin-android:3.3.3" //Protobuf is used in reading data from ASI implementation "com.google.protobuf:protobuf-javalite:3.21.9" diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index b28b7bd..5618569 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 211, - "versionName": "2.1.1", + "versionCode": 212, + "versionName": "2.1.2", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/com/kieronquinn/app/ambientmusicmod/ui/screens/backuprestore/BackupRestoreViewModel.kt b/app/src/main/java/com/kieronquinn/app/ambientmusicmod/ui/screens/backuprestore/BackupRestoreViewModel.kt index 0d506c8..faf365c 100644 --- a/app/src/main/java/com/kieronquinn/app/ambientmusicmod/ui/screens/backuprestore/BackupRestoreViewModel.kt +++ b/app/src/main/java/com/kieronquinn/app/ambientmusicmod/ui/screens/backuprestore/BackupRestoreViewModel.kt @@ -25,8 +25,6 @@ class BackupRestoreViewModelImpl( companion object { const val BACKUP_FILE_TEMPLATE = "amm_backup_%s.ammbkp" - private val BACKUP_MIME_TYPE = MimeTypeMap.getSingleton() - .getMimeTypeFromExtension("ammbkp") } override fun onBackupClicked(launcher: ActivityResultLauncher) { @@ -34,7 +32,7 @@ class BackupRestoreViewModelImpl( } override fun onRestoreClicked(launcher: ActivityResultLauncher>) { - launcher.launch(listOfNotNull(BACKUP_MIME_TYPE).toTypedArray()) + launcher.launch(arrayOf("*/*")) } override fun onBackupLocationSelected(uri: Uri) {