diff --git a/briar-android/src/net/sf/briar/android/groups/GroupActivity.java b/briar-android/src/net/sf/briar/android/groups/GroupActivity.java index b012ac39379c457ae28f1a168d8ef5dd48065023..467a52295b31fa1df4b5bf639c30e9bad1c6b9e7 100644 --- a/briar-android/src/net/sf/briar/android/groups/GroupActivity.java +++ b/briar-android/src/net/sf/briar/android/groups/GroupActivity.java @@ -183,11 +183,15 @@ OnClickListener, OnItemClickListener { public void eventOccurred(DatabaseEvent e) { if(e instanceof GroupMessageAddedEvent) { GroupMessageAddedEvent g = (GroupMessageAddedEvent) e; - if(g.getMessage().getGroup().getId().equals(groupId)) + if(g.getMessage().getGroup().getId().equals(groupId)) { + if(LOG.isLoggable(INFO)) LOG.info("Message added, reloading"); loadHeaders(); + } } else if(e instanceof MessageExpiredEvent) { + if(LOG.isLoggable(INFO)) LOG.info("Message expired, reloading"); loadHeaders(); // FIXME: Don't reload everything } else if(e instanceof RatingChangedEvent) { + if(LOG.isLoggable(INFO)) LOG.info("Rating changed, reloading"); loadHeaders(); } else if(e instanceof SubscriptionRemovedEvent) { if(((SubscriptionRemovedEvent) e).getGroupId().equals(groupId)) { diff --git a/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java b/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java index e6ac1d6e72716c03ee5f21d9efa7cb2cd2bc9c8c..e3b5ecec86e198a2311e22ecf383aa84a195f92c 100644 --- a/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java +++ b/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java @@ -294,11 +294,14 @@ implements OnClickListener, DatabaseListener { // FIXME: Load operations may overlap, resulting in an inconsistent view public void eventOccurred(DatabaseEvent e) { if(e instanceof GroupMessageAddedEvent) { + if(LOG.isLoggable(INFO)) LOG.info("Message added, reloading"); GroupMessageAddedEvent g = (GroupMessageAddedEvent) e; loadHeaders(g.getMessage().getGroup().getId()); } else if(e instanceof MessageExpiredEvent) { + if(LOG.isLoggable(INFO)) LOG.info("Message expired, reloading"); loadHeaders(); // FIXME: Don't reload everything } else if(e instanceof SubscriptionRemovedEvent) { + if(LOG.isLoggable(INFO)) LOG.info("Removing group"); removeGroup(((SubscriptionRemovedEvent) e).getGroupId()); } } diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java index 156c0f7c1441c94ec1ed3c2998c13424a860994e..2a987771626b338e99bb735343ce17fa0388fa04 100644 --- a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java +++ b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java @@ -187,10 +187,14 @@ implements DatabaseListener, OnClickListener, OnItemClickListener { finishOnUiThread(); } } else if(e instanceof MessageExpiredEvent) { + if(LOG.isLoggable(INFO)) LOG.info("Message expired, reloading"); loadHeaders(); // FIXME: Don't reload everything } else if(e instanceof PrivateMessageAddedEvent) { - if(((PrivateMessageAddedEvent) e).getContactId().equals(contactId)) + PrivateMessageAddedEvent p = (PrivateMessageAddedEvent) e; + if(p.getContactId().equals(contactId)) { + if(LOG.isLoggable(INFO)) LOG.info("Message added, reloading"); loadHeaders(); + } } } diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java index c7ab7d8a350f2721be18cdc76755519eb7b13aa3..0bcdbe392cd1fc1ba8a06aa20e806f44f207ae68 100644 --- a/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java +++ b/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java @@ -252,10 +252,13 @@ implements OnClickListener, DatabaseListener { // FIXME: Load operations may overlap, resulting in an inconsistent view public void eventOccurred(DatabaseEvent e) { if(e instanceof ContactRemovedEvent) { + if(LOG.isLoggable(INFO)) LOG.info("Removing conversation"); removeConversation(((ContactRemovedEvent) e).getContactId()); } else if(e instanceof MessageExpiredEvent) { + if(LOG.isLoggable(INFO)) LOG.info("Message expired, reloading"); loadHeaders(); // FIXME: Don't reload everything } else if(e instanceof PrivateMessageAddedEvent) { + if(LOG.isLoggable(INFO)) LOG.info("Message added, reloading"); loadHeaders(((PrivateMessageAddedEvent) e).getContactId()); } }