Implements FS#67: Introduce central logging class to use log prefix, new activity to show logcat output and button to copy contents

2 files changed, 49 insertions, 49 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java b/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java
index 2b8ed579..eee81b90 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java
@@ -1,6 +1,6 @@
 package de.thedevstack.conversationsplus.services;
 
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -106,13 +106,13 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 	private void execute(final Query query) {
 		final Account account=  query.getAccount();
 		if (account.getStatus() == Account.State.ONLINE) {
-			Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": running mam query " + query.toString());
+			Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": running mam query " + query.toString());
 			IqPacket packet = this.mXmppConnectionService.getIqGenerator().queryMessageArchiveManagement(query);
 			this.mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() {
 				@Override
 				public void onIqPacketReceived(Account account, IqPacket packet) {
 					if (packet.getType() == IqPacket.TYPE.ERROR) {
-						Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": error executing mam: " + packet.toString());
+						Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": error executing mam: " + packet.toString());
 						finalizeQuery(query);
 					}
 				}
@@ -182,7 +182,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 		boolean abort = (query.getStart() == 0 && query.getTotalCount() >= Config.PAGE_SIZE) || query.getTotalCount() >= Config.MAM_MAX_MESSAGES;
 		if (complete || relevant == null || abort) {
 			this.finalizeQuery(query);
-			Log.d(Config.LOGTAG,query.getAccount().getJid().toBareJid().toString()+": finished mam after "+query.getTotalCount()+" messages");
+			Logging.d(Config.LOGTAG,query.getAccount().getJid().toBareJid().toString()+": finished mam after "+query.getTotalCount()+" messages");
 		} else {
 			final Query nextQuery;
 			if (query.getPagingOrder() == PagingOrder.NORMAL) {
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
index 624914dd..30fae7cc 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
@@ -21,7 +21,7 @@ import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
 import android.provider.ContactsContract;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 import net.java.otr4j.OtrException;
 import net.java.otr4j.session.Session;
@@ -223,7 +223,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				Element error = packet.findChild("error");
 				String text = error != null ? error.findChildContent("text") : null;
 				if (text != null) {
-					Log.d(Config.LOGTAG,account.getJid().toBareJid()+": received iq error - "+text);
+					Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": received iq error - "+text);
 				}
 			}
 		}
@@ -270,11 +270,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				}
 				if (connection != null && connection.getFeatures().csi()) {
 					if (checkListeners()) {
-						Log.d(Config.LOGTAG, account.getJid().toBareJid()
+						Logging.d(Config.LOGTAG, account.getJid().toBareJid()
 								+ " sending csi//inactive");
 						connection.sendInactive();
 					} else {
-						Log.d(Config.LOGTAG, account.getJid().toBareJid()
+						Logging.d(Config.LOGTAG, account.getJid().toBareJid()
 								+ " sending csi//active");
 						connection.sendActive();
 					}
@@ -294,7 +294,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					&& (account.getStatus() != Account.State.NO_INTERNET)) {
 				if (connection != null) {
 					int next = connection.getTimeToNextAttempt();
-					Log.d(Config.LOGTAG, account.getJid().toBareJid()
+					Logging.d(Config.LOGTAG, account.getJid().toBareJid()
 							+ ": error connecting account. try again in "
 							+ next + "s for the "
 							+ (connection.getAttempt() + 1) + " time");
@@ -430,17 +430,17 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
                     message.setBody(Long.toString(imageSize) + '|' + imageWidth + '|' + imageHeight);
                     callback.success(message);
                 } catch (FileNotFoundException e) {
-                    Log.e("pictureresize", "File not found to send not resized. " + e.getMessage());
+                    Logging.e("pictureresize", "File not found to send not resized. " + e.getMessage());
                     callback.error(R.string.error_file_not_found, message);
                 } catch (IOException e) {
-                    Log.e("pictureresize", "Error while sending not resized picture. " + e.getMessage());
+                    Logging.e("pictureresize", "Error while sending not resized picture. " + e.getMessage());
                     callback.error(R.string.error_io_exception, message);
                 } finally {
                     if (null != is) {
                         try {
                             is.close();
                         } catch (IOException e) {
-                            Log.w("pictureresize", "Error while closing stream for sending not resized picture. " + e.getMessage());
+                            Logging.w("pictureresize", "Error while closing stream for sending not resized picture. " + e.getMessage());
                         }
                     }
                 }
@@ -555,7 +555,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						long pingTimeoutIn = (lastSent + Config.PING_TIMEOUT * 1000) - SystemClock.elapsedRealtime();
 						if (lastSent > lastReceived) {
 							if (pingTimeoutIn < 0) {
-								Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": ping timeout");
+								Logging.d(Config.LOGTAG, account.getJid().toBareJid() + ": ping timeout");
 								this.reconnectAccount(account, true);
 							} else {
 								int secs = (int) (pingTimeoutIn / 1000);
@@ -563,7 +563,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 							}
 						} else if (msToNextPing <= 0) {
 							account.getXmppConnection().sendPing();
-							Log.d(Config.LOGTAG, account.getJid().toBareJid()+" send ping");
+							Logging.d(Config.LOGTAG, account.getJid().toBareJid()+" send ping");
 							this.scheduleWakeUpCall(Config.PING_TIMEOUT,account.getUuid().hashCode());
 						} else {
 							this.scheduleWakeUpCall((int) (msToNextPing / 1000), account.getUuid().hashCode());
@@ -573,7 +573,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					} else if (account.getStatus() == Account.State.CONNECTING) {
 						long timeout = Config.CONNECT_TIMEOUT - ((SystemClock.elapsedRealtime() - account.getXmppConnection().getLastConnect()) / 1000);
 						if (timeout < 0) {
-							Log.d(Config.LOGTAG, account.getJid() + ": time out during connect reconnecting");
+							Logging.d(Config.LOGTAG, account.getJid() + ": time out during connect reconnecting");
 							reconnectAccount(account, true);
 						} else {
 							scheduleWakeUpCall((int) timeout,account.getUuid().hashCode());
@@ -604,7 +604,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	private void resetAllAttemptCounts(boolean reallyAll) {
-		Log.d(Config.LOGTAG, "resetting all attepmt counts");
+		Logging.d(Config.LOGTAG, "resetting all attepmt counts");
 		for(Account account : accounts) {
 			if (account.hasErrorStatus() || reallyAll) {
 				final XmppConnection connection = account.getXmppConnection();
@@ -696,7 +696,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				.getSystemService(Context.ALARM_SERVICE);
 		Intent intent = new Intent(context, EventReceiver.class);
 		alarmManager.cancel(PendingIntent.getBroadcast(context, 0, intent, 0));
-		Log.d(Config.LOGTAG, "good bye");
+		Logging.d(Config.LOGTAG, "good bye");
 		stopSelf();
 	}
 
@@ -734,7 +734,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	private void sendFileMessage(final Message message) {
-		Log.d(Config.LOGTAG, "send file message");
+		Logging.d(Config.LOGTAG, "send file message");
 		final Account account = message.getConversation().getAccount();
 		final XmppConnection connection = account.getXmppConnection();
 		if (connection != null && connection.getFeatures().httpUpload()) {
@@ -884,10 +884,10 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public void fetchRosterFromServer(final Account account) {
 		final IqPacket iqPacket = new IqPacket(IqPacket.TYPE.GET);
 		if (!"".equals(account.getRosterVersion())) {
-			Log.d(Config.LOGTAG, account.getJid().toBareJid()
+			Logging.d(Config.LOGTAG, account.getJid().toBareJid()
 					+ ": fetching roster version " + account.getRosterVersion());
 		} else {
-			Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": fetching roster");
+			Logging.d(Config.LOGTAG, account.getJid().toBareJid() + ": fetching roster");
 		}
 		iqPacket.query(Xmlns.ROSTER).setAttribute("ver", account.getRosterVersion());
 		sendIqPacket(account, iqPacket, mIqParser);
@@ -945,12 +945,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		mPhoneContactMergerThread = new Thread(new Runnable() {
 			@Override
 			public void run() {
-				Log.d(Config.LOGTAG,"start merging phone contacts with roster");
+				Logging.d(Config.LOGTAG,"start merging phone contacts with roster");
 				for (Account account : accounts) {
 					List<Contact> withSystemAccounts = account.getRoster().getWithSystemAccounts();
 					for (Bundle phoneContact : phoneContacts) {
 						if (Thread.interrupted()) {
-							Log.d(Config.LOGTAG,"interrupted merging phone contacts");
+							Logging.d(Config.LOGTAG,"interrupted merging phone contacts");
 							return;
 						}
 						Jid jid;
@@ -978,7 +978,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						}
 					}
 				}
-				Log.d(Config.LOGTAG,"finished merging phone contacts");
+				Logging.d(Config.LOGTAG,"finished merging phone contacts");
 				updateAccountUi();
 			}
 		});
@@ -999,7 +999,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			Runnable runnable =new Runnable() {
 				@Override
 				public void run() {
-					Log.d(Config.LOGTAG,"restoring roster");
+					Logging.d(Config.LOGTAG,"restoring roster");
 					for(Account account : accounts) {
 						databaseBackend.readRoster(account.getRoster());
 					}
@@ -1008,13 +1008,13 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					PhoneHelper.loadPhoneContacts(getApplicationContext(),
 							new CopyOnWriteArrayList<Bundle>(),
 							XmppConnectionService.this);
-					Log.d(Config.LOGTAG,"restoring messages");
+					Logging.d(Config.LOGTAG,"restoring messages");
 					for (Conversation conversation : conversations) {
 						conversation.addAll(0, databaseBackend.getMessages(conversation, Config.PAGE_SIZE));
 						checkDeletedFiles(conversation);
 					}
 					mRestoredFromDatabase = true;
-					Log.d(Config.LOGTAG,"restored all messages");
+					Logging.d(Config.LOGTAG,"restored all messages");
 					updateConversationUi();
 				}
 			};
@@ -1084,9 +1084,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void loadMoreMessages(final Conversation conversation, final long timestamp, final OnMoreMessagesLoaded callback) {
-		Log.d(Config.LOGTAG, "load more messages for " + conversation.getName() + " prior to " + MessageGenerator.getTimestamp(timestamp));
+		Logging.d(Config.LOGTAG, "load more messages for " + conversation.getName() + " prior to " + MessageGenerator.getTimestamp(timestamp));
 		if (XmppConnectionService.this.getMessageArchiveService().queryInProgress(conversation,callback)) {
-            Log.d("mam", "Query in progress");
+            Logging.d("mam", "Query in progress");
 			return;
 		}
         //TODO Create a separate class for this runnable to store if messages are getting loaded or not. Not really a good idea to do this in the callback.
@@ -1099,23 +1099,23 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
                     }
                     final Account account = conversation.getAccount();
                     List<Message> messages = databaseBackend.getMessages(conversation, 50, timestamp);
-                    Log.d("mam", "runnable load more messages");
+                    Logging.d("mam", "runnable load more messages");
                     if (messages.size() > 0) {
-                        Log.d("mam", "At least one message");
+                        Logging.d("mam", "At least one message");
                         conversation.addAll(0, messages);
                         checkDeletedFiles(conversation);
                         callback.onMoreMessagesLoaded(messages.size(), conversation);
                     } else if (conversation.hasMessagesLeftOnServer()
                             && account.isOnlineAndConnected()
                             && account.getXmppConnection().getFeatures().mam()) {
-                        Log.d("mam", "mam activate, account online and connected and messages left on server");
+                        Logging.d("mam", "mam activate, account online and connected and messages left on server");
                         MessageArchiveService.Query query = getMessageArchiveService().query(conversation, 0, timestamp - 1);
                         if (query != null) {
                             query.setCallback(callback);
                         }
                         callback.informUser(R.string.fetching_history_from_server);
                     } else {
-                        Log.d("mam", ((!conversation.hasMessagesLeftOnServer()) ? "no" : "") + " more messages left on server, mam " + ((account.getXmppConnection().getFeatures().mam()) ? "" : "not") + " activated, account is " + ((account.isOnlineAndConnected()) ? "" : "not") + " online or connected)");
+                        Logging.d("mam", ((!conversation.hasMessagesLeftOnServer()) ? "no" : "") + " more messages left on server, mam " + ((account.getXmppConnection().getFeatures().mam()) ? "" : "not") + " activated, account is " + ((account.isOnlineAndConnected()) ? "" : "not") + " online or connected)");
                         callback.onMoreMessagesLoaded(0, conversation);
                         callback.informUser(R.string.no_more_history_on_server);
                     }
@@ -1457,7 +1457,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				}
 			}
 		}
-		Log.d(Config.LOGTAG, "app switched into foreground");
+		Logging.d(Config.LOGTAG, "app switched into foreground");
 	}
 
 	private void switchToBackground() {
@@ -1473,7 +1473,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			conversation.setIncomingChatState(ChatState.ACTIVE);
 		}
 		this.mNotificationService.setIsInForeground(false);
-		Log.d(Config.LOGTAG, "app switched into background");
+		Logging.d(Config.LOGTAG, "app switched into background");
 	}
 
 	private void connectMultiModeConversations(Account account) {
@@ -1497,7 +1497,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			if (joinJid == null) {
 				return; //safety net
 			}
-			Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": joining conversation " + joinJid.toString());
+			Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": joining conversation " + joinJid.toString());
 			PresencePacket packet = new PresencePacket();
 			packet.setFrom(conversation.getAccount().getJid());
 			packet.setTo(joinJid);
@@ -1596,7 +1596,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			sendPresencePacket(conversation.getAccount(), packet);
 			conversation.getMucOptions().setOffline();
 			conversation.deregisterWithBookmark();
-			Log.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid()
+			Logging.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid()
 					+ ": leaving muc " + conversation.getJid());
 		} else {
 			account.pendingConferenceLeaves.add(conversation);
@@ -1623,7 +1623,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void createAdhocConference(final Account account, final Iterable<Jid> jids, final UiCallback<Conversation> callback) {
-		Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": creating adhoc conference with " + jids.toString());
+		Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": creating adhoc conference with " + jids.toString());
 		if (account.getStatus() == Account.State.ONLINE) {
 			try {
 				String server = findConferenceServer(account);
@@ -1781,11 +1781,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 	public void changeRoleInConference(final Conversation conference, final String nick, MucOptions.Role role, final OnRoleChanged callback) {
 		IqPacket request = this.mIqGenerator.changeRole(conference, nick, role.toString());
-		Log.d(Config.LOGTAG, request.toString());
+		Logging.d(Config.LOGTAG, request.toString());
 		sendIqPacket(conference.getAccount(), request, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket packet) {
-				Log.d(Config.LOGTAG, packet.toString());
+				Logging.d(Config.LOGTAG, packet.toString());
 				if (packet.getType() == IqPacket.TYPE.RESULT) {
 					callback.onRoleChangedSuccessful(nick);
 				} else {
@@ -1806,7 +1806,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 							leaveMuc(conversation);
 						} else {
 							if (conversation.endOtrIfNeeded()) {
-								Log.d(Config.LOGTAG, account.getJid().toBareJid()
+								Logging.d(Config.LOGTAG, account.getJid().toBareJid()
 										+ ": ended otr session with "
 										+ conversation.getJid());
 							}
@@ -1851,7 +1851,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public void onOtrSessionEstablished(Conversation conversation) {
 		final Account account = conversation.getAccount();
 		final Session otrSession = conversation.getOtrSession();
-		Log.d(Config.LOGTAG,
+		Logging.d(Config.LOGTAG,
 				account.getJid().toBareJid() + " otr session established with "
 						+ conversation.getJid() + "/"
 						+ otrSession.getSessionID().getUserID());
@@ -2049,20 +2049,20 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 							if (callback != null) {
 								callback.success(avatar);
 							}
-							Log.d(Config.LOGTAG, account.getJid().toBareJid()
+							Logging.d(Config.LOGTAG, account.getJid().toBareJid()
 									+ ": succesfuly fetched pep avatar for " + avatar.owner);
 							return;
 						}
 					} else {
 
-						Log.d(Config.LOGTAG, ERROR + "(parsing error)");
+						Logging.d(Config.LOGTAG, ERROR + "(parsing error)");
 					}
 				} else {
 					Element error = result.findChild("error");
 					if (error == null) {
-						Log.d(Config.LOGTAG, ERROR + "(server error)");
+						Logging.d(Config.LOGTAG, ERROR + "(server error)");
 					} else {
-						Log.d(Config.LOGTAG, ERROR + error.toString());
+						Logging.d(Config.LOGTAG, ERROR + error.toString());
 					}
 				}
 				if (callback != null) {
@@ -2088,7 +2088,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					if (image != null) {
 						avatar.image = image;
 						if (AvatarUtil.save(avatar)) {
-							Log.d(Config.LOGTAG, account.getJid().toBareJid()
+							Logging.d(Config.LOGTAG, account.getJid().toBareJid()
 									+ ": successfully fetched vCard avatar for " + avatar.owner);
 							Contact contact = account.getRoster()
 									.getContact(avatar.owner);
@@ -2194,7 +2194,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void invite(Conversation conversation, Jid contact) {
-		Log.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid() + ": inviting " + contact + " to " + conversation.getJid().toBareJid());
+		Logging.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid() + ": inviting " + contact + " to " + conversation.getJid().toBareJid());
 		MessagePacket packet = mMessageGenerator.invite(conversation, contact);
 		sendMessagePacket(conversation.getAccount(), packet);
 	}
@@ -2332,7 +2332,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public synchronized void updateUnreadCountBadge() {
 		int count = unreadCount();
 		if (unreadCount != count) {
-			Log.d(Config.LOGTAG, "update unread count to " + count);
+			Logging.d(Config.LOGTAG, "update unread count to " + count);
 			if (count > 0) {
 				ShortcutBadger.with(getApplicationContext()).count(count);
 			} else {
@@ -2346,7 +2346,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		final Message markable = conversation.getLatestMarkableMessage();
 		this.markRead(conversation);
 		if (Settings.CONFIRM_MESSAGE_READ && markable != null && markable.getRemoteMsgId() != null) {
-			Log.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid() + ": sending read marker to " + markable.getCounterpart().toString());
+			Logging.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid() + ": sending read marker to " + markable.getCounterpart().toString());
 			Account account = conversation.getAccount();
 			final Jid to = markable.getCounterpart();
 			MessagePacket packet = mMessageGenerator.confirm(account, to, markable.getRemoteMsgId());