From d24d4adf7fc49c69f5e3ebe207b953115deec199 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 1 May 2013 00:08:33 +0100
Subject: [PATCH] Reference retrieved from reference manager may be null.
Fixes issue #3612379.
---
.../src/net/sf/briar/android/HomeScreenActivity.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
index 02ae13fcc5..40cdc12dc2 100644
--- a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
+++ b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
@@ -99,8 +99,12 @@ public class HomeScreenActivity extends RoboActivity {
showSpinner();
startService(new Intent(BriarService.class.getName()));
bindService();
- storeLocalAuthor(referenceManager.removeReference(handle,
- LocalAuthor.class));
+ LocalAuthor a = referenceManager.removeReference(handle,
+ LocalAuthor.class);
+ // The reference may be null if the activity has been recreated,
+ // for example due to screen rotation
+ if(a == null) showButtons();
+ else storeLocalAuthor(a);
} else if(databaseConfig.getEncryptionKey() == null) {
// The activity was launched from the splash screen
if(System.currentTimeMillis() < EXPIRY_DATE) showPasswordPrompt();
--
GitLab