remove "singleTask" launch mode on Android 11+ (#1673)

* remove "singleTask" launch mode on Android 12+ * remove commented and unneccesary code * fix formatting and change from Android 12 to Android 11
cozy · Dec 6, 2021 · 05bcc10 · 05bcc10
1 parent ea1ee2c
commit 05bcc10
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 25 deletions.
diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
@@ -206,6 +206,8 @@
     <AndroidResource Include="Resources\values-night\styles.xml" />
     <AndroidResource Include="Resources\values\styles.xml" />
     <AndroidResource Include="Resources\values\colors.xml" />
+    <AndroidResource Include="Resources\values\manifest.xml" />
+    <AndroidResource Include="Resources\values-v30\manifest.xml" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\splash_screen.xml" />
@@ -271,5 +273,8 @@
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\values-v30\" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs
@@ -22,25 +22,10 @@
 
 namespace Bit.Droid
 {
-    [Activity(
-        Label = "Bitwarden",
-        Icon = "@mipmap/ic_launcher",
-        Theme = "@style/LaunchTheme",
-        MainLauncher = true,
-        LaunchMode = LaunchMode.SingleTask,
-        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation |
-                               ConfigChanges.Keyboard | ConfigChanges.KeyboardHidden |
-                               ConfigChanges.Navigation | ConfigChanges.UiMode)]
-    [IntentFilter(
-        new[] { Intent.ActionSend },
-        Categories = new[] { Intent.CategoryDefault },
-        DataMimeTypes = new[]
-        {
-            @"application/*",
-            @"image/*",
-            @"video/*",
-            @"text/*"
-        })]
+    // Activity and IntentFilter declarations have been moved to Properties/AndroidManifest.xml
+    // They have been hardcoded so we can use the default LaunchMode on Android 11+
+    // LaunchMode defined in values/manifest.xml for Android 10- and values-v30/manifest.xml for Android 11+
+    // See https://github.com/bitwarden/mobile/pull/1673 for details
     [Register("com.x8bit.bitwarden.MainActivity")]
     public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
@@ -159,7 +144,15 @@ protected override void OnNewIntent(Intent intent)
             base.OnNewIntent(intent);
             try
             {
-                if (intent.GetBooleanExtra("generatorTile", false))
+                if (intent?.GetStringExtra("uri") is string uri)
+                {
+                    _messagingService.Send("popAllAndGoToAutofillCiphers");
+                    if (_appOptions != null)
+                    {
+                       _appOptions.Uri = uri;
+                    }
+                }
+                else if (intent.GetBooleanExtra("generatorTile", false))
                 {
                     _messagingService.Send("popAllAndGoToTabGenerator");
                     if (_appOptions != null)

diff --git a/src/Android/Properties/AndroidManifest.xml b/src/Android/Properties/AndroidManifest.xml
@@ -49,13 +49,35 @@
 
     <!-- Support for LG "Dual Window" mode (for Android < 7.0 users) -->
     <meta-data android:name="com.lge.support.SPLIT_WINDOW" android:value="true" />
+	<!-- Declare MainActivity manually so we can set LaunchMode using API dependant resource -->
+	<activity
+		android:name="com.x8bit.bitwarden.MainActivity"
+		android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|uiMode"
+		android:exported="true"
+		android:icon="@mipmap/ic_launcher"
+		android:label="Bitwarden"
+		android:launchMode="@integer/launchModeAPIlevel"
+		android:theme="@style/LaunchTheme">
+	  <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+		<category android:name="android.intent.category.LAUNCHER" />
+	  </intent-filter>
+	  <intent-filter>
+	    <action android:name="android.intent.action.SEND" />
+		<category android:name="android.intent.category.DEFAULT" />
+		<data android:mimeType="application/*" />
+		<data android:mimeType="image/*" />
+		<data android:mimeType="video/*" />
+		<data android:mimeType="text/*" />
+	  </intent-filter>
+	</activity>
   </application>
 
   <!-- Package visibility (for Android 11+) -->
   <queries>
-      <intent>
-          <action android:name="*"/>
-      </intent>
+    <intent>
+      <action android:name="*"/>
+    </intent>
   </queries>
 
 </manifest>
diff --git a/src/Android/Resources/values-v30/manifest.xml b/src/Android/Resources/values-v30/manifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+  <integer name="launchModeAPIlevel">0</integer>
+</resources>
diff --git a/src/Android/Resources/values/manifest.xml b/src/Android/Resources/values/manifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+  <integer name="launchModeAPIlevel">2</integer>
+</resources>
diff --git a/src/App/App.xaml.cs b/src/App/App.xaml.cs
@@ -113,7 +113,8 @@ public App(AppOptions appOptions)
                 }
                 else if (message.Command == "popAllAndGoToTabGenerator" ||
                     message.Command == "popAllAndGoToTabMyVault" ||
-                    message.Command == "popAllAndGoToTabSend")
+                    message.Command == "popAllAndGoToTabSend" ||
+                    message.Command == "popAllAndGoToAutofillCiphers")
                 {
                     Device.BeginInvokeOnMainThread(async () =>
                     {
@@ -123,7 +124,11 @@ public App(AppOptions appOptions)
                             {
                                 await tabsPage.Navigation.PopModalAsync(false);
                             }
-                            if (message.Command == "popAllAndGoToTabMyVault")
+                            if (message.Command == "popAllAndGoToAutofillCiphers")
+                            {
+                                Current.MainPage = new NavigationPage(new AutofillCiphersPage(Options));
+                            }
+                            else if (message.Command == "popAllAndGoToTabMyVault")
                             {
                                 Options.MyVaultTile = false;
                                 tabsPage.ResetToVaultPage();