Skip to content
Snippets Groups Projects
Unverified Commit e39a74bd authored by akwizgran's avatar akwizgran
Browse files

Finish SplashScreenActivity when starting next activity.

Fixes #270.
parent d605e1ca
No related branches found
No related tags found
No related merge requests found
......@@ -15,7 +15,6 @@ import org.briarproject.R;
import org.briarproject.android.util.AndroidUtils;
import org.briarproject.android.util.LayoutUtils;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.util.FileUtils;
import java.util.logging.Logger;
......@@ -34,12 +33,8 @@ public class SplashScreenActivity extends BaseActivity {
// This build expires on 1 April 2016
private static final long EXPIRY_DATE = 1459465200 * 1000L;
private long now = System.currentTimeMillis();
@Inject
DatabaseConfig dbConfig;
protected DatabaseConfig dbConfig;
public SplashScreenActivity() {
Logger.getLogger("").setLevel(DEFAULT_LOG_LEVEL);
......@@ -70,6 +65,7 @@ public class SplashScreenActivity extends BaseActivity {
@Override
public void run() {
startNextActivity();
finish();
}
}, 500);
}
......@@ -85,7 +81,6 @@ public class SplashScreenActivity extends BaseActivity {
startActivity(new Intent(this, ExpiredActivity.class));
} else {
String hex = getEncryptedDatabaseKey();
if (hex != null && dbConfig.databaseExists()) {
startActivity(new Intent(this, NavDrawerActivity.class));
} else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment