From 855c600a3e5fe52fd6b9bc17626e175e2717aa98 Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Mon, 29 May 2017 11:05:46 +0200
Subject: [PATCH] hotfix list restore NPE for user testing
---
.../threaded/ThreadListControllerImpl.java | 26 ++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java
index 0793d785ad..5f520611af 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java
@@ -99,19 +99,21 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
@Override
public void onActivityDestroy() {
- dbExecutor.execute(new Runnable() {
- @Override
- public void run() {
- try {
- messageTracker
- .storeMessageId(groupId,
- listener.getFirstVisibleMessageId());
- } catch (DbException e) {
- if (LOG.isLoggable(WARNING))
- LOG.log(WARNING, e.toString(), e);
+ final MessageId messageId = listener.getFirstVisibleMessageId();
+ if (messageId != null) {
+ dbExecutor.execute(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ messageTracker
+ .storeMessageId(groupId, messageId);
+ } catch (DbException e) {
+ if (LOG.isLoggable(WARNING))
+ LOG.log(WARNING, e.toString(), e);
+ }
}
- }
- });
+ });
+ }
}
@CallSuper
--
GitLab