splash screen dismissed too early

tinode · Aug 23, 2019 · 3d910ff · 3d910ff
1 parent 79e2aa5
commit 3d910ff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -51,7 +51,8 @@
 
         <activity
             android:name=".SplashActivity"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -62,7 +63,7 @@
             android:name=".LoginActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme">
-            <intent-filter android:autoVerify="true">
+            <intent-filter android:autoVerify="true" tools:targetApi="m">
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>

diff --git a/app/src/main/java/co/tinode/tindroid/SplashActivity.java b/app/src/main/java/co/tinode/tindroid/SplashActivity.java
@@ -37,7 +37,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
                 // Account found, try to use it for login
                 UiUtils.loginWithSavedAccount(this, accountManager, account);
-                finish();
                 return;
             }
         }

diff --git a/app/src/main/java/co/tinode/tindroid/UiUtils.java b/app/src/main/java/co/tinode/tindroid/UiUtils.java
@@ -326,6 +326,7 @@ public void run(AccountManagerFuture<Bundle> future) {
                 }
                 launch.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_TASK_ON_HOME);
                 activity.startActivity(launch);
+                activity.finish();
             }
         }, null);
     }