Standalone: Open URIs directly as fallback

Fixes #290 Signed-off-by: IacobIonut01 <[email protected]>
IacobIonut01 · Dec 25, 2023 · 75fdf9e · 75fdf9e
1 parent 9ffc224
commit 75fdf9e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/...rc/main/kotlin/com/dot/gallery/feature_node/presentation/standalone/StandaloneActivity.kt b/...rc/main/kotlin/com/dot/gallery/feature_node/presentation/standalone/StandaloneActivity.kt
@@ -29,7 +29,7 @@ class StandaloneActivity : ComponentActivity() {
         val action = intent.action.toString()
         val isSecure = action.toLowerCase(Locale.current).contains("secure")
         val clipData = intent.clipData
-        val uriList = ArrayList<Uri>()
+        val uriList = mutableSetOf<Uri>()
         intent.data?.let(uriList::add)
         if (clipData != null) {
             for (i in 0 until clipData.itemCount) {
@@ -42,7 +42,7 @@ class StandaloneActivity : ComponentActivity() {
                 Scaffold { paddingValues ->
                     val viewModel = hiltViewModel<StandaloneViewModel>().apply {
                         reviewMode = action.contains("REVIEW")
-                        dataList = uriList
+                        dataList = uriList.toList()
                     }
 
                     MediaViewScreen(

diff --git a/...c/main/kotlin/com/dot/gallery/feature_node/presentation/standalone/StandaloneViewModel.kt b/...c/main/kotlin/com/dot/gallery/feature_node/presentation/standalone/StandaloneViewModel.kt
@@ -9,6 +9,7 @@ import android.net.Uri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.dot.gallery.core.MediaState
+import com.dot.gallery.feature_node.domain.model.Media
 import com.dot.gallery.feature_node.domain.use_case.MediaUseCases
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -49,10 +50,20 @@ class StandaloneViewModel @Inject constructor(
                         if (data != null) {
                             mediaId = data.first().id
                             _mediaState.value = MediaState(media = data)
+                        } else {
+                            _mediaState.value = mediaFromUris()
                         }
                     }
             }
         }
     }
 
+    private fun mediaFromUris(): MediaState {
+        val list = mutableListOf<Media>()
+        dataList.forEach {
+            Media.createFromUri(it)?.let { it1 -> list.add(it1) }
+        }
+        return MediaState(media = list)
+    }
+
 }