Merge branch 'refs/heads/1203-file-manager-can-not-be-found-when-doin…

…g-backups' into develop
keymapperorg · Jul 7, 2024 · b5e96fe · b5e96fe
2 parents 91cffbf + b172419
commit b5e96fe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/app/src/main/java/io/github/sds100/keymapper/home/HomeFragment.kt b/app/src/main/java/io/github/sds100/keymapper/home/HomeFragment.kt
@@ -61,14 +61,14 @@ class HomeFragment : Fragment() {
         }
 
     private val backupFingerprintMapsLauncher =
-        registerForActivityResult(CreateDocument("todo/todo")) {
+        registerForActivityResult(CreateDocument(FileUtils.MIME_TYPE_ZIP)) {
             it ?: return@registerForActivityResult
 
             homeViewModel.backupFingerprintMaps(it.toString())
         }
 
     private val backupKeyMapsLauncher =
-        registerForActivityResult(CreateDocument("todo/todo")) {
+        registerForActivityResult(CreateDocument(FileUtils.MIME_TYPE_ZIP)) {
             it ?: return@registerForActivityResult
 
             homeViewModel.backupSelectedKeyMaps(it.toString())

diff --git a/app/src/main/java/io/github/sds100/keymapper/logging/LogFragment.kt b/app/src/main/java/io/github/sds100/keymapper/logging/LogFragment.kt
@@ -17,6 +17,7 @@ import com.michaelflisar.dragselectrecyclerview.DragSelectionProcessor
 import io.github.sds100.keymapper.R
 import io.github.sds100.keymapper.databinding.FragmentSimpleRecyclerviewBinding
 import io.github.sds100.keymapper.logEntry
+import io.github.sds100.keymapper.system.files.FileUtils
 import io.github.sds100.keymapper.util.Inject
 import io.github.sds100.keymapper.util.State
 import io.github.sds100.keymapper.util.launchRepeatOnLifecycle
@@ -43,7 +44,7 @@ class LogFragment : SimpleRecyclerViewFragment<LogEntryListItem>() {
     private val recyclerViewController by lazy { RecyclerViewController() }
 
     private val saveLogToFileLauncher =
-        registerForActivityResult(CreateDocument("todo/todo")) {
+        registerForActivityResult(CreateDocument(FileUtils.MIME_TYPE_ZIP)) {
             it ?: return@registerForActivityResult
 
             viewModel.onPickFileToSaveTo(it.toString())

diff --git a/app/src/main/java/io/github/sds100/keymapper/reportbug/ReportBugActivity.kt b/app/src/main/java/io/github/sds100/keymapper/reportbug/ReportBugActivity.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import com.github.appintro.AppIntro2
 import io.github.sds100.keymapper.R
+import io.github.sds100.keymapper.system.files.FileUtils
 import io.github.sds100.keymapper.system.permissions.RequestPermissionDelegate
 import io.github.sds100.keymapper.util.Inject
 import io.github.sds100.keymapper.util.launchRepeatOnLifecycle
@@ -27,7 +28,7 @@ class ReportBugActivity : AppIntro2() {
     private lateinit var requestPermissionDelegate: RequestPermissionDelegate
 
     private val chooseReportLocationLauncher =
-        registerForActivityResult(CreateDocument("todo/todo")) {
+        registerForActivityResult(CreateDocument(FileUtils.MIME_TYPE_ZIP)) {
             it ?: return@registerForActivityResult
 
             viewModel.onChooseBugReportLocation(it.toString())

diff --git a/app/src/main/java/io/github/sds100/keymapper/settings/MainSettingsFragment.kt b/app/src/main/java/io/github/sds100/keymapper/settings/MainSettingsFragment.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.view.View
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
 import androidx.annotation.RequiresApi
 import androidx.lifecycle.Lifecycle
@@ -21,6 +22,7 @@ import io.github.sds100.keymapper.backup.BackupUtils
 import io.github.sds100.keymapper.data.Keys
 import io.github.sds100.keymapper.data.PreferenceDefaults
 import io.github.sds100.keymapper.shizuku.ShizukuUtils
+import io.github.sds100.keymapper.system.files.FileUtils
 import io.github.sds100.keymapper.system.notifications.NotificationController
 import io.github.sds100.keymapper.system.notifications.NotificationUtils
 import io.github.sds100.keymapper.util.firstBlocking
@@ -49,7 +51,7 @@ class MainSettingsFragment : BaseSettingsFragment() {
     }
 
     private val chooseAutomaticBackupLocationLauncher =
-        registerForActivityResult(CreateDocument("todo/todo")) {
+        registerForActivityResult(CreateDocument(FileUtils.MIME_TYPE_ZIP)) {
             it ?: return@registerForActivityResult
 
             viewModel.setAutomaticBackupLocation(it.toString())