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

Check the expiry date on first run. Fixes bug #35.

Browse Source
This commit is contained in:
akwizgran
2014-01-05 21:53:32 +00:00
parent 09e16e3b34
commit c403df0e20
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
briar-android/src/net/sf/briar/android/HomeScreenActivity.java
View File

@@ -89,15 +89,19 @@ public class HomeScreenActivity extends RoboActivity {
long handle = i.getLongExtra("net.sf.briar.LOCAL_AUTHOR_HANDLE", -1); long handle = i.getLongExtra("net.sf.briar.LOCAL_AUTHOR_HANDLE", -1);
if(handle != -1) { if(handle != -1) {
// The activity was launched from the setup wizard // The activity was launched from the setup wizard
showSpinner(); if(System.currentTimeMillis() < EXPIRY_DATE) {
startService(new Intent(BriarService.class.getName())); showSpinner();
bindService(); startService(new Intent(BriarService.class.getName()));
LocalAuthor a = referenceManager.removeReference(handle, bindService();
LocalAuthor.class); LocalAuthor a = referenceManager.removeReference(handle,
// The reference may be null if the activity has been recreated, LocalAuthor.class);
// for example due to screen rotation // The reference may be null if the activity has been recreated,
if(a == null) showButtons(); // for example due to screen rotation
else storeLocalAuthor(a); if(a == null) showButtons();
else storeLocalAuthor(a);
} else {
showExpiryWarning();
}
} else if(databaseConfig.getEncryptionKey() == null) { } else if(databaseConfig.getEncryptionKey() == null) {
// The activity was launched from the splash screen // The activity was launched from the splash screen
if(System.currentTimeMillis() < EXPIRY_DATE) showPasswordPrompt(); if(System.currentTimeMillis() < EXPIRY_DATE) showPasswordPrompt();