feat(qr): support qr code sharing for connection requests and profile…

…s - epic (WPB-10535) (#3342)
wireapp · Aug 26, 2024 · ef29e32 · ef29e32
1 parent fce45ea
commit ef29e32
Show file tree

Hide file tree

Showing 15 changed files with 761 additions and 70 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -239,6 +239,7 @@ dependencies {
 
     implementation(libs.aboutLibraries.core)
     implementation(libs.aboutLibraries.ui)
+    implementation(libs.compose.qr.code)
 
     // Unit/Android tests dependencies
     testImplementation(libs.androidx.test.archCore)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -150,6 +150,10 @@
                         android:host="conversation"
                         android:scheme="wire" />
 
+                <data
+                        android:host="user"
+                        android:scheme="wire" />
+
                 <data
                         android:host="other-user-profile"
                         android:scheme="wire" />

diff --git a/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt b/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
@@ -21,6 +21,7 @@ package com.wire.android.ui
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.view.WindowManager
 import android.widget.Toast
@@ -64,8 +65,8 @@ import com.wire.android.navigation.MainNavHost
 import com.wire.android.navigation.Navigator
 import com.wire.android.navigation.rememberNavigator
 import com.wire.android.ui.calling.getIncomingCallIntent
-import com.wire.android.ui.calling.ongoing.getOngoingCallIntent
 import com.wire.android.ui.calling.getOutgoingCallIntent
+import com.wire.android.ui.calling.ongoing.getOngoingCallIntent
 import com.wire.android.ui.common.snackbar.LocalSnackbarHostState
 import com.wire.android.ui.common.topappbar.CommonTopAppBar
 import com.wire.android.ui.common.topappbar.CommonTopAppBarViewModel
@@ -513,17 +514,26 @@ class WireActivity : AppCompatActivity() {
 
     override fun onSaveInstanceState(outState: Bundle) {
         outState.putBoolean(HANDLED_DEEPLINK_FLAG, true)
+        outState.putParcelable(ORIGINAL_SAVED_INTENT_FLAG, intent)
         super.onSaveInstanceState(outState)
     }
 
+    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
+        super.onRestoreInstanceState(savedInstanceState)
+        savedInstanceState.getOriginalIntent()?.let {
+            this.intent = it
+        }
+    }
+
     @Suppress("ComplexCondition")
     private fun handleDeepLink(
         intent: Intent?,
         savedInstanceState: Bundle? = null
     ) {
+        val originalIntent = savedInstanceState.getOriginalIntent()
         if (intent == null
             || intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0
-            || savedInstanceState?.getBoolean(HANDLED_DEEPLINK_FLAG, false) == true
+            || originalIntent == intent // This is the case when the activity is recreated and already handled
             || intent.getBooleanExtra(HANDLED_DEEPLINK_FLAG, false)
         ) {
             return
@@ -560,6 +570,15 @@ class WireActivity : AppCompatActivity() {
         }
     }
 
+    private fun Bundle?.getOriginalIntent(): Intent? {
+        return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            @Suppress("DEPRECATION") // API 33
+            this?.getParcelable(ORIGINAL_SAVED_INTENT_FLAG)
+        } else {
+            this?.getParcelable(ORIGINAL_SAVED_INTENT_FLAG, Intent::class.java)
+        }
+    }
+
     private fun handleDeepLinkResult(result: DeepLinkResult) {
         val navigate: (NavigationCommand) -> Unit = { lifecycleScope.launch { navigationCommands.emit(it) } }
         when (result) {
@@ -597,6 +616,7 @@ class WireActivity : AppCompatActivity() {
 
     companion object {
         private const val HANDLED_DEEPLINK_FLAG = "deeplink_handled_flag_key"
+        private const val ORIGINAL_SAVED_INTENT_FLAG = "original_saved_intent"
         private const val TAG = "WireActivity"
     }
 }