Fix for the app starting from Share Screen on some devices when launc…

…hed from home screen. Upping versionCode to 57.
zotero · Apr 19, 2024 · 5af0ce0 · 5af0ce0
1 parent 3422d92
commit 5af0ce0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/app/src/main/java/org/zotero/android/screens/root/RootActivity.kt b/app/src/main/java/org/zotero/android/screens/root/RootActivity.kt
@@ -18,7 +18,7 @@ class RootActivity : BaseActivity(), Screen<RootViewState, RootViewEffect> {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        viewModel.init()
+        viewModel.init(this.intent.extras)
         viewModel.observeViewChanges(this)
     }
 

diff --git a/app/src/main/java/org/zotero/android/screens/root/RootViewModel.kt b/app/src/main/java/org/zotero/android/screens/root/RootViewModel.kt
@@ -1,26 +1,26 @@
 package org.zotero.android.screens.root
 
-import androidx.lifecycle.SavedStateHandle
+import android.os.Bundle
 import dagger.hilt.android.lifecycle.HiltViewModel
 import org.zotero.android.architecture.BaseViewModel2
 import org.zotero.android.architecture.ViewEffect
 import org.zotero.android.architecture.ViewState
+import org.zotero.android.screens.share.ShareRawAttachmentLoader
 import org.zotero.android.sync.SessionController
 import javax.inject.Inject
 
 @HiltViewModel
 class RootViewModel @Inject constructor(
     private val sessionController: SessionController,
-    private val stateHandle: SavedStateHandle,
-
+    private val shareRawAttachmentLoader: ShareRawAttachmentLoader
     ) : BaseViewModel2<
         RootViewState,
         RootViewEffect>(initialState = RootViewState()) {
 
-    fun init() {
+    fun init(extras: Bundle?) {
         if (!sessionController.isLoggedIn) {
             triggerEffect(RootViewEffect.NavigateToSignIn)
-        } else if (stateHandle.keys().isNotEmpty()) {
+        } else if (shareRawAttachmentLoader.doesBundleContainShareData(extras)) {
             triggerEffect(RootViewEffect.NavigateToShare)
         } else {
             triggerEffect(RootViewEffect.NavigateToDashboard)

diff --git a/app/src/main/java/org/zotero/android/screens/share/ShareRawAttachmentLoader.kt b/app/src/main/java/org/zotero/android/screens/share/ShareRawAttachmentLoader.kt
@@ -49,4 +49,13 @@ class ShareRawAttachmentLoader @Inject constructor() {
         }
     }
 
+    fun doesBundleContainShareData(bundleExtras: Bundle?): Boolean {
+        if (bundleExtras == null) {
+            return false
+        }
+        val urlPath = bundleExtras.getString(Intent.EXTRA_TEXT)
+        val fileContentUri = bundleExtras.getSupportParcelable(Intent.EXTRA_STREAM, Uri::class.java)
+        return urlPath != null || fileContentUri != null
+    }
+
 }
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,7 +4,7 @@ object BuildConfig {
     const val compileSdkVersion = 34
     const val targetSdk = 33
 
-    val versionCode = 56 // Must be updated on every build
+    val versionCode = 57 // Must be updated on every build
     val version = Version(
         major = 1,
         minor = 0,