Improve intent handling

app/build.gradle.kts

@@ -199,7 +199,7 @@ dependencies {
     }
     implementation("androidx.media3:media3-session:1.11.1")
     kapt("org.jetbrains.kotlin:kotlin-metadata-jvm:$kotlinVersion")
-    implementation("androidx.room:room-testing-android:$roomVersion")
+    androidTestImplementation("androidx.room:room-testing-android:$roomVersion")
     implementation("androidx.compose.foundation:foundation-layout:1.12.1")
     spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0")
     spotbugsPlugins("com.mebigfatguy.fb-contrib:fb-contrib:7.7.4")
@@ -209,7 +209,7 @@ dependencies {
     implementation("androidx.preference:preference-ktx:1.2.1")
     implementation("androidx.datastore:datastore-core:1.3.0")
     implementation("androidx.datastore:datastore-preferences:1.3.0")
-    implementation("androidx.test.ext:junit-ktx:1.3.0")
+    androidTestImplementation("androidx.test.ext:junit-ktx:1.3.0")
 
     implementation(fileTree(mapOf("include" to listOf("*"), "dir" to "libs")))
 
@@ -329,6 +329,7 @@ dependencies {
     }
 
     implementation("androidx.core:core-ktx:1.19.1")
+    implementation("androidx.core:core-splashscreen:1.2.0")
     implementation("androidx.sharetarget:sharetarget:1.2.0")
     implementation("androidx.activity:activity-ktx:1.13.0")
     implementation("com.github.nextcloud.android-common:ui:0.34.0")

app/src/androidTest/java/com/nextcloud/talk/activities/MainActivityTest.kt → app/src/androidTest/java/com/nextcloud/talk/account/ServerSelectionActivityTest.kt

@@ -6,7 +6,7 @@
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
-package com.nextcloud.talk.activities
+package com.nextcloud.talk.account
 
 import androidx.test.espresso.intent.rule.IntentsTestRule
 import com.nextcloud.talk.users.UserManager
@@ -15,10 +15,10 @@ import org.junit.Assert.assertNotNull
 import org.junit.Rule
 import org.junit.Test
 
-class MainActivityTest {
+class ServerSelectionActivityTest {
     @get:Rule
-    val activityRule: IntentsTestRule<MainActivity> = IntentsTestRule(
-        MainActivity::class.java,
+    val activityRule: IntentsTestRule<ServerSelectionActivity> = IntentsTestRule(
+        ServerSelectionActivity::class.java,
         true,
         false
     )

app/src/androidTest/java/com/nextcloud/talk/ui/LoginIT.java

@@ -11,14 +11,16 @@
 import android.os.Bundle;
 
 import com.nextcloud.talk.R;
-import com.nextcloud.talk.activities.MainActivity;
+import com.nextcloud.talk.conversationlist.ConversationsListActivity;
+import com.nextcloud.talk.utils.AppTasks;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Objects;
 
 import androidx.test.core.app.ActivityScenario;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.web.webdriver.DriverAtoms;
 import androidx.test.espresso.web.webdriver.Locator;
@@ -44,7 +46,9 @@ public class LoginIT {
     @Test
     public void login() throws InterruptedException {
 
-        ActivityScenario<MainActivity> activityScenario = ActivityScenario.launch(MainActivity.class);
+        // started like by the launcher, without an account
+        ActivityScenario<ConversationsListActivity> activityScenario = ActivityScenario.launch(
+            AppTasks.INSTANCE.createLauncherIntent(ApplicationProvider.getApplicationContext()));
 
         Bundle arguments = androidx.test.platform.app.InstrumentationRegistry.getArguments();
 

app/src/gplay/AndroidManifest.xml

@@ -17,7 +17,7 @@
         android:label="@string/nc_app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.Launcher"
+        android:theme="@style/AppTheme"
         tools:replace="label, icon, theme, name, allowBackup"
         tools:ignore="UnusedAttribute, ExportedService">
 

app/src/main/AndroidManifest.xml

@@ -86,14 +86,15 @@
     <application
         android:name=".application.NextcloudTalkApplication"
         android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_config"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/nc_app_name"
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.Launcher"
+        android:theme="@style/AppTheme"
         android:taskAffinity=""
         tools:ignore="UnusedAttribute"
         tools:replace="label, icon, theme, name, allowBackup">
@@ -106,16 +107,14 @@
             android:name="com.google.android.gms.car.application"
             android:resource="@xml/automotive_app_desc"/>
 
+        <!-- Entry point for the intents of other apps that open a conversation. It shows nothing and passes them on to
+             the conversation list in the app's task, so it is kept out of the recents. -->
         <activity
-            android:name=".activities.MainActivity"
+            android:name=".activities.DeepLinkActivity"
+            android:excludeFromRecents="true"
             android:exported="true"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
+            android:noHistory="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -125,10 +124,6 @@
                 <data android:scheme="file" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
-
             <!-- Custom URI scheme for opening conversations from external apps/launchers -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -167,16 +162,27 @@
         <activity
             android:name=".conversationlist.ConversationsListActivity"
             android:exported="true"
-            android:theme="@style/AppTheme.DisplayCutout">
-
-            <meta-data
-                android:name="android.service.chooser.chooser_target_service"
-                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
+            android:theme="@style/Theme.App.Starting">
 
             <intent-filter>
                 <action android:name="com.nextcloud.intent.OPEN_ECOSYSTEM_APP" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+        </activity>
+
+        <!-- Entry point for the content other apps share. It copies the shared files and opens the conversation list
+             to pick the conversation, in a task that is kept out of the recents. It handles all configuration
+             changes itself: it only shows a progress indicator, and being recreated would copy the files again. -->
+        <activity
+            android:name=".conversationlist.ShareActivity"
+            android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden|navigation|touchscreen|uiMode|locale|layoutDirection|fontScale|fontWeightAdjustment|density|colorMode|mcc|mnc"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:theme="@style/AppTheme.Translucent">
+
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
 
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -191,6 +197,29 @@
             </intent-filter>
         </activity>
 
+        <!-- Entry point for in-app intents of the conversation list. Not exported, so it can trust the account and
+             conversation of intents started through it. -->
+        <activity-alias
+            android:name=".conversationlist.InternalConversationsListActivity"
+            android:exported="false"
+            android:targetActivity=".conversationlist.ConversationsListActivity" />
+
+        <!-- The launcher activity: the conversation list, under the name home-screen icons and pinned shortcuts of
+             earlier versions refer to. -->
+        <activity-alias
+            android:name=".activities.MainActivity"
+            android:exported="true"
+            android:targetActivity=".conversationlist.ConversationsListActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+        </activity-alias>
+
         <activity
             android:name=".chat.ChatActivity"
             android:theme="@style/AppTheme.DisplayCutout" />

app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt

@@ -437,7 +437,7 @@ class AccountVerificationActivity : BaseActivity() {
                 ApplicationWideMessageHolder.getInstance().messageType =
                     ApplicationWideMessageHolder.MessageType.ACCOUNT_WAS_IMPORTED
             }
-            val intent = Intent(context, ConversationsListActivity::class.java)
+            val intent = ConversationsListActivity.createIntent(context)
             intent.putExtra(BundleKeys.KEY_INTERNAL_USER_ID, userToSetAsActive.id)
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
             startActivity(intent)

app/src/main/java/com/nextcloud/talk/account/BrowserLoginActivity.kt

@@ -27,10 +27,10 @@ import com.nextcloud.talk.R
 import com.nextcloud.talk.account.data.LoginRepository
 import com.nextcloud.talk.account.viewmodels.BrowserLoginActivityViewModel
 import com.nextcloud.talk.activities.BaseActivity
-import com.nextcloud.talk.activities.MainActivity
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
 import com.nextcloud.talk.databinding.ActivityWebViewLoginBinding
+import com.nextcloud.talk.utils.AppTasks
 import com.nextcloud.talk.utils.bundle.BundleKeys
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_BASE_URL
 import kotlinx.coroutines.launch
@@ -49,9 +49,7 @@ class BrowserLoginActivity : BaseActivity() {
     private var reauthorizeAccount = false
     private val onBackPressedCallback = object : OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
-            val intent = Intent(context, MainActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(intent)
+            startActivity(AppTasks.createRestartIntent(context))
         }
     }
 
@@ -187,9 +185,7 @@ class BrowserLoginActivity : BaseActivity() {
     }
 
     private fun restartApp() {
-        val intent = Intent(context, MainActivity::class.java)
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-        startActivity(intent)
+        startActivity(AppTasks.createRestartIntent(context))
     }
 
     public override fun onDestroy() {

app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt

@@ -11,6 +11,7 @@ package com.nextcloud.talk.account
 import android.Manifest
 import android.accounts.Account
 import android.annotation.SuppressLint
+import android.content.Context
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.os.Bundle
@@ -520,5 +521,18 @@ class ServerSelectionActivity : BaseActivity() {
         private val TAG = ServerSelectionActivity::class.java.simpleName
         const val MIN_SERVER_MAJOR_VERSION = 13
         private const val QR_URI = "com.blikoon.qrcodescanner.got_qr_scan_relult"
+
+        /**
+         * Creates the intent that starts the login: the web login on the server of a branded client, or else the
+         * selection of the server.
+         */
+        fun createLoginIntent(context: Context): Intent {
+            val brandedServerUrl = context.getString(R.string.weblogin_url)
+            return if (brandedServerUrl.isNotEmpty()) {
+                Intent(context, BrowserLoginActivity::class.java).putExtra(BundleKeys.KEY_BASE_URL, brandedServerUrl)
+            } else {
+                Intent(context, ServerSelectionActivity::class.java)
+            }
+        }
     }
 }

app/src/main/java/com/nextcloud/talk/account/SwitchAccountActivity.kt

@@ -88,8 +88,8 @@ class SwitchAccountActivity : BaseActivity() {
             if (userManager.setUserAsActive(user)) {
                 DirectShareHelper.removeAllShareTargetShortcuts(this@SwitchAccountActivity)
                 cookieManager.cookieStore.removeAll()
-                val intent = ConversationsListActivity.createAccountSwitchIntent(this@SwitchAccountActivity, user.id!!)
-                startActivity(intent)
+                val context = this@SwitchAccountActivity
+                startActivity(ConversationsListActivity.createInPlaceAccountSwitchIntent(context, user.id!!))
                 finish()
             }
         }