From e63555123a350d79b494f3af4cde95db202f6465 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 15 Mar 2013 16:42:33 +0000
Subject: [PATCH] Added logging for DB events.
---
.../src/net/sf/briar/android/groups/GroupActivity.java | 6 +++++-
.../src/net/sf/briar/android/groups/GroupListActivity.java | 3 +++
.../net/sf/briar/android/messages/ConversationActivity.java | 6 +++++-
.../sf/briar/android/messages/ConversationListActivity.java | 3 +++
4 files changed, 16 insertions(+), 2 deletions(-)
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 b012ac3937..467a52295b 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 e6ac1d6e72..e3b5ecec86 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 156c0f7c14..2a98777162 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 c7ab7d8a35..0bcdbe392c 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());
}
}
--
GitLab