From a1a5d3b3630af3c1b5abf1ff16994ba0a88df0e9 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 5 Jun 2019 15:09:13 -0400
Subject: [PATCH] dont need splash activity

---
 src/Android/Android.csproj                 |  1 -
 src/Android/MainActivity.cs                |  6 +--
 src/Android/Properties/AndroidManifest.xml |  2 -
 src/Android/SplashActivity.cs              | 61 ----------------------
 src/Android/Tile/MyVaultTileService.cs     |  2 +-
 5 files changed, 4 insertions(+), 68 deletions(-)
 delete mode 100644 src/Android/SplashActivity.cs

diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index ed25bc9bf..4bfa1d1b6 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -126,7 +126,6 @@
     <Compile Include="Renderers\HybridWebViewRenderer.cs" />
     <Compile Include="Services\AndroidPushNotificationService.cs" />
     <Compile Include="Services\AndroidLogService.cs" />
-    <Compile Include="SplashActivity.cs" />
     <Compile Include="MainApplication.cs" />
     <Compile Include="MainActivity.cs" />
     <Compile Include="Resources\Resource.designer.cs" />
diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs
index 628a2164c..ffce1caff 100644
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -23,8 +23,8 @@ namespace Bit.Droid
     [Activity(
         Label = "Bitwarden",
         Icon = "@mipmap/ic_launcher",
-        Theme = "@style/LightTheme",
-        Exported = false,
+        Theme = "@style/LightTheme.Splash",
+        MainLauncher = true,
         ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     [Register("com.x8bit.bitwarden.MainActivity")]
     public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
@@ -301,7 +301,7 @@ namespace Bit.Droid
 
         private void RestartApp()
         {
-            var intent = new Intent(this, typeof(SplashActivity));
+            var intent = new Intent(this, typeof(MainActivity));
             var pendingIntent = PendingIntent.GetActivity(this, 5923650, intent, PendingIntentFlags.CancelCurrent);
             var alarmManager = GetSystemService(AlarmService) as AlarmManager;
             var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + 500;
diff --git a/src/Android/Properties/AndroidManifest.xml b/src/Android/Properties/AndroidManifest.xml
index 92ea739c6..47e2653d6 100644
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -19,8 +19,6 @@
   <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
 
   <application
-    android:label="Bitwarden"
-    android:theme="@style/LightTheme"
     android:allowBackup="false"
     tools:replace="android:allowBackup"
     android:icon="@mipmap/ic_launcher"
diff --git a/src/Android/SplashActivity.cs b/src/Android/SplashActivity.cs
deleted file mode 100644
index 12073c320..000000000
--- a/src/Android/SplashActivity.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Android.App;
-using Android.Content.PM;
-using Android.Runtime;
-using Android.OS;
-using Android.Support.V7.App;
-using System.Threading.Tasks;
-using Android.Content;
-using Bit.App.Utilities;
-
-namespace Bit.Droid
-{
-    [Activity(
-        Label = "Bitwarden",
-        MainLauncher = true,
-        NoHistory = true,
-        Icon = "@mipmap/ic_launcher",
-        Theme = "@style/LightTheme.Splash",
-        WindowSoftInputMode = Android.Views.SoftInput.StateHidden,
-        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
-    [Register("com.x8bit.bitwarden.SplashActivity")]
-    public class SplashActivity : AppCompatActivity
-    {
-        public override void OnCreate(Bundle savedInstanceState, PersistableBundle persistentState)
-        {
-            UpdateTheme(ThemeManager.GetTheme());
-            base.OnCreate(savedInstanceState, persistentState);
-        }
-
-        protected override void OnResume()
-        {
-            base.OnResume();
-            var startupWork = new Task(() =>
-            {
-                var mainIntent = new Intent(Application.Context, typeof(MainActivity));
-                mainIntent.PutExtra("myVaultTile", Intent.GetBooleanExtra("myVaultTile", false));
-                StartActivity(mainIntent);
-            });
-            startupWork.Start();
-        }
-
-        private void UpdateTheme(string theme)
-        {
-            if(theme == "dark")
-            {
-                SetTheme(Resource.Style.DarkTheme_Splash);
-            }
-            else if(theme == "black")
-            {
-                SetTheme(Resource.Style.BlackTheme_Splash);
-            }
-            else if(theme == "nord")
-            {
-                SetTheme(Resource.Style.NordTheme_Splash);
-            }
-            else
-            {
-                SetTheme(Resource.Style.LightTheme_Splash);
-            }
-        }
-    }
-}
diff --git a/src/Android/Tile/MyVaultTileService.cs b/src/Android/Tile/MyVaultTileService.cs
index 535abf830..56b74585b 100644
--- a/src/Android/Tile/MyVaultTileService.cs
+++ b/src/Android/Tile/MyVaultTileService.cs
@@ -59,7 +59,7 @@ namespace Bit.Droid.Tile
 
         private void LaunchMyVault()
         {
-            var intent = new Intent(this, typeof(SplashActivity));
+            var intent = new Intent(this, typeof(MainActivity));
             intent.SetFlags(ActivityFlags.NewTask | ActivityFlags.SingleTop | ActivityFlags.ClearTop);
             intent.PutExtra("myVaultTile", true);
             StartActivityAndCollapse(intent);