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

Removed unnecessary intent flags.

Browse Source
This commit is contained in:
akwizgran
2014-02-06 15:14:09 +00:00
parent 9564433496
commit 54bc30ee39
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,5 @@
package org.briarproject.android; package org.briarproject.android;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
import static android.view.Gravity.CENTER; import static android.view.Gravity.CENTER;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH; import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
@@ -66,21 +64,13 @@ public class SplashScreenActivity extends RoboSplashActivity {
LOG.info("Guice startup took " + duration + " ms"); LOG.info("Guice startup took " + duration + " ms");
if(System.currentTimeMillis() >= EXPIRY_DATE) { if(System.currentTimeMillis() >= EXPIRY_DATE) {
if(LOG.isLoggable(INFO)) LOG.info("Expired"); if(LOG.isLoggable(INFO)) LOG.info("Expired");
Intent i = new Intent(this, ExpiredActivity.class); startActivity(new Intent(this, ExpiredActivity.class));
i.setFlags(FLAG_ACTIVITY_NO_ANIMATION);
startActivity(i);
} else { } else {
Application app = getApplication(); Application app = getApplication();
Injector guice = RoboGuice.getBaseApplicationInjector(app); Injector guice = RoboGuice.getBaseApplicationInjector(app);
if(guice.getInstance(DatabaseConfig.class).databaseExists()) { if(guice.getInstance(DatabaseConfig.class).databaseExists())
Intent i = new Intent(this, DashboardActivity.class); startActivity(new Intent(this, DashboardActivity.class));
i.setFlags(FLAG_ACTIVITY_NEW_TASK); else startActivity(new Intent(this, SetupActivity.class));
startActivity(i);
} else {
Intent i = new Intent(this, SetupActivity.class);
i.setFlags(FLAG_ACTIVITY_NEW_TASK);
startActivity(i);
}
} }
} }
} }