2 files changed, 13 insertions, 8 deletions
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/logbook/LogbookStorage.kt b/android-app/app/src/main/kotlin/org/terst/nav/logbook/LogbookStorage.kt
index 6b90542..51f1f09 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/logbook/LogbookStorage.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/logbook/LogbookStorage.kt
@@ -16,10 +16,10 @@ class LogbookStorage(private val context: Context) {
     private val adapter = moshi.adapter(LogEntryList::class.java)
 
     private val storageFile: File
-        get() = File(context.getExternalFilesDir(null), "nav_logbook.json")
+        get() = File(context.getExternalFilesDir(null) ?: context.filesDir, "nav_logbook.json")
 
     val photoDir: File
-        get() = File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "Nav")
+        get() = File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: context.filesDir, "Nav")
             .also { it.mkdirs() }
 
     fun loadAll(): List<LogEntry> = runCatching {
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/ui/voicelog/VoiceLogFragment.kt b/android-app/app/src/main/kotlin/org/terst/nav/ui/voicelog/VoiceLogFragment.kt
index 3638f8f..2557eb4 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/ui/voicelog/VoiceLogFragment.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/ui/voicelog/VoiceLogFragment.kt
@@ -1,12 +1,14 @@
 package org.terst.nav.ui.voicelog
 
 import android.Manifest
+import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import android.provider.MediaStore
 import android.speech.RecognitionListener
 import android.speech.RecognizerIntent
 import android.speech.SpeechRecognizer
@@ -73,9 +75,9 @@ class VoiceLogFragment : Fragment() {
     private var pendingCameraUri: Uri? = null
 
     private val cameraLauncher = registerForActivityResult(
-        ActivityResultContracts.TakePicture()
-    ) { success: Boolean ->
-        if (success) {
+        ActivityResultContracts.StartActivityForResult()
+    ) { result ->
+        if (result.resultCode == Activity.RESULT_OK) {
             val path = pendingPhotoPath ?: return@registerForActivityResult
             setPhoto(path) {
                 val bm = BitmapFactory.decodeFile(path)
@@ -140,13 +142,16 @@ class VoiceLogFragment : Fragment() {
         fabMic.setOnClickListener { startListening() }
 
         btnCamera.setOnClickListener {
-            val dir = NavApplication.logbookRepository.photoDir
-            val file = File(dir, "log_${System.currentTimeMillis()}.jpg")
+            val file = File(NavApplication.logbookRepository.photoDir, "log_${System.currentTimeMillis()}.jpg")
             pendingPhotoPath = file.absolutePath
             pendingCameraUri = FileProvider.getUriForFile(
                 requireContext(), "${requireContext().packageName}.fileprovider", file
             )
-            cameraLauncher.launch(pendingCameraUri!!)
+            val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE).apply {
+                putExtra(MediaStore.EXTRA_OUTPUT, pendingCameraUri)
+                addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+            }
+            cameraLauncher.launch(intent)
         }
 
         btnGallery.setOnClickListener { galleryLauncher.launch("image/*") }