Fixed a NullPointerException when a local message triggered an event.

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();

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();
 			}