diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index 38bb0393d..f7f9d95c2 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -66,6 +66,7 @@ + diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs index 48ca1b692..38f1506bb 100644 --- a/src/Android/MainActivity.cs +++ b/src/Android/MainActivity.cs @@ -7,9 +7,9 @@ namespace Bit.Droid { [Activity( Label = "Bitwarden", - MainLauncher = true, Icon = "@mipmap/ic_launcher", Theme = "@style/MainTheme", + Exported = false, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] [Register("com.x8bit.bitwarden.MainActivity")] public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity diff --git a/src/Android/SplashActivity.cs b/src/Android/SplashActivity.cs new file mode 100644 index 000000000..b06248977 --- /dev/null +++ b/src/Android/SplashActivity.cs @@ -0,0 +1,39 @@ +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; + +namespace Bit.Droid +{ + [Activity( + Label = "Bitwarden", + MainLauncher = true, + NoHistory = true, + Icon = "@mipmap/ic_launcher", + Theme = "@style/MainTheme.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) + { + 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(); + } + } +}