From 93151ee77b55e42f4d259f5d1ec168ffadecc6bc Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Thu, 19 Dec 2013 23:06:54 +0000
Subject: [PATCH] Fixed a NullPointerException when a local message triggered
an event.
---
.../src/net/sf/briar/android/contact/ContactListActivity.java | 4 +++-
.../net/sf/briar/android/contact/ConversationActivity.java | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java b/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
index 14e6193999..e1f939324d 100644
--- a/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
+++ b/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
@@ -239,7 +239,9 @@ implements OnClickListener, DatabaseListener, ConnectionListener {
reloadContact(((ContactRemovedEvent) e).getContactId());
} else if(e instanceof MessageAddedEvent) {
if(LOG.isLoggable(INFO)) LOG.info("Message added, reloading");
- reloadContact(((MessageAddedEvent) e).getContactId());
+ ContactId source = ((MessageAddedEvent) e).getContactId();
+ if(source == null) loadContacts();
+ else reloadContact(source);
} else if(e instanceof MessageExpiredEvent) {
if(LOG.isLoggable(INFO)) LOG.info("Message expired, reloading");
loadContacts();
diff --git a/briar-android/src/net/sf/briar/android/contact/ConversationActivity.java b/briar-android/src/net/sf/briar/android/contact/ConversationActivity.java
index 30a5502a9d..40f55c9333 100644
--- a/briar-android/src/net/sf/briar/android/contact/ConversationActivity.java
+++ b/briar-android/src/net/sf/briar/android/contact/ConversationActivity.java
@@ -201,7 +201,8 @@ implements DatabaseListener, OnClickListener, OnItemClickListener {
});
}
} else if(e instanceof MessageAddedEvent) {
- if(((MessageAddedEvent) e).getContactId().equals(contactId)) {
+ ContactId source = ((MessageAddedEvent) e).getContactId();
+ if(source == null || source.equals(contactId)) {
if(LOG.isLoggable(INFO)) LOG.info("Message added, reloading");
loadHeaders();
}
--
GitLab