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

Moved the expiry check to the splash screen.

Browse Source 
This avoids a possible problem where the app expires while it's running
and every activity shows the expiry warning, leaving the user with no
way to quit.
This commit is contained in:
akwizgran
2014-02-06 14:52:52 +00:00
parent 33f37e241c
commit 9564433496
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
briar-android/src/org/briarproject/android/BriarActivity.java
View File

@@ -18,8 +18,6 @@ import android.os.IBinder;
public class BriarActivity extends RoboFragmentActivity {
// This build expires on 7 February 2014
private static final long EXPIRY_DATE = 1391731200 * 1000L;
private static final int REQUEST_PASSWORD = 1;
private static final Logger LOG =
@@ -34,13 +32,7 @@ public class BriarActivity extends RoboFragmentActivity {
@Override
public void onCreate(Bundle state) {
super.onCreate(state);
if(System.currentTimeMillis() >= EXPIRY_DATE) {
if(LOG.isLoggable(INFO)) LOG.info("Expired");
Intent i = new Intent(this, ExpiredActivity.class);
i.setFlags(FLAG_ACTIVITY_NO_ANIMATION);
startActivity(i);
finish();
} else if(databaseConfig.getEncryptionKey() == null) {
if(databaseConfig.getEncryptionKey() == null) {
if(LOG.isLoggable(INFO)) LOG.info("No password");
Intent i = new Intent(this, PasswordActivity.class);
i.setFlags(FLAG_ACTIVITY_NO_ANIMATION);