Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Finish SplashScreenActivity when starting next activity.

Browse Source 
Fixes #270.
This commit is contained in:
akwizgran
2016-03-15 20:58:57 +00:00
parent d605e1cae4
commit e39a74bd40
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/org/briarproject/android/SplashScreenActivity.java
View File

@@ -15,7 +15,6 @@ import org.briarproject.R;
import org.briarproject.android.util.AndroidUtils; import org.briarproject.android.util.AndroidUtils;
import org.briarproject.android.util.LayoutUtils; import org.briarproject.android.util.LayoutUtils;
import org.briarproject.api.db.DatabaseConfig; import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.util.FileUtils;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -34,12 +33,8 @@ public class SplashScreenActivity extends BaseActivity {
// This build expires on 1 April 2016 // This build expires on 1 April 2016
private static final long EXPIRY_DATE = 1459465200 * 1000L; private static final long EXPIRY_DATE = 1459465200 * 1000L;
private long now = System.currentTimeMillis();
@Inject @Inject
DatabaseConfig dbConfig; protected DatabaseConfig dbConfig;
public SplashScreenActivity() { public SplashScreenActivity() {
Logger.getLogger("").setLevel(DEFAULT_LOG_LEVEL); Logger.getLogger("").setLevel(DEFAULT_LOG_LEVEL);
@@ -70,6 +65,7 @@ public class SplashScreenActivity extends BaseActivity {
@Override @Override
public void run() { public void run() {
startNextActivity(); startNextActivity();
finish();
} }
}, 500); }, 500);
} }
@@ -85,7 +81,6 @@ public class SplashScreenActivity extends BaseActivity {
startActivity(new Intent(this, ExpiredActivity.class)); startActivity(new Intent(this, ExpiredActivity.class));
} else { } else {
String hex = getEncryptedDatabaseKey(); String hex = getEncryptedDatabaseKey();
if (hex != null && dbConfig.databaseExists()) { if (hex != null && dbConfig.databaseExists()) {
startActivity(new Intent(this, NavDrawerActivity.class)); startActivity(new Intent(this, NavDrawerActivity.class));
} else { } else {