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

1 files changed, 42 insertions, 42 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java
index 79556a0a..2b084d4b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java
@@ -6,7 +6,7 @@ import android.os.Parcelable;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 import android.util.Pair;
 import android.util.SparseArray;
 
@@ -142,7 +142,7 @@ public class XmppConnection implements Runnable {
 	}
 
 	protected void connect() {
-		Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": connecting");
+		Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": connecting");
 		features.encryptionEnabled = false;
 		lastConnect = SystemClock.elapsedRealtime();
 		lastPingSent = SystemClock.elapsedRealtime();
@@ -183,12 +183,12 @@ public class XmppConnection implements Runnable {
 							final InetSocketAddress addr;
 							if (srvIpServer != null) {
 								addr = new InetSocketAddress(srvIpServer, srvRecordPort);
-								Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
+								Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString()
 										+ ": using values from dns " + srvRecordServer
 										+ "[" + srvIpServer + "]:" + srvRecordPort);
 							} else {
 								addr = new InetSocketAddress(srvRecordServer, srvRecordPort);
-								Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
+								Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString()
 										+ ": using values from dns "
 										+ srvRecordServer + ":" + srvRecordPort);
 							}
@@ -196,10 +196,10 @@ public class XmppConnection implements Runnable {
 							socket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
 							socketError = false;
 						} catch (final UnknownHostException e) {
-							Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
+							Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
 							i++;
 						} catch (final IOException e) {
-							Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
+							Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
 							i++;
 						}
 					}
@@ -237,7 +237,7 @@ public class XmppConnection implements Runnable {
 		} catch (final UnknownHostException | ConnectException e) {
 			this.changeStatus(Account.State.SERVER_NOT_FOUND);
 		} catch (final IOException | XmlPullParserException | NoSuchAlgorithmException e) {
-			Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
+			Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
 			this.changeStatus(Account.State.OFFLINE);
 			this.attempt--; //don't count attempt when reconnecting instantly anyway
 		} finally {
@@ -286,9 +286,9 @@ public class XmppConnection implements Runnable {
 									saslMechanism.getResponse(challenge);
 								} catch (final SaslMechanism.AuthenticationException e) {
 									disconnect(true);
-									Log.e(Config.LOGTAG, String.valueOf(e));
+									Logging.e(Config.LOGTAG, String.valueOf(e));
 								}
-								Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": logged in");
+								Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": logged in");
 								account.setKey(Account.PINNED_MECHANISM_KEY,
 										String.valueOf(saslMechanism.getPriority()));
 								tagReader.reset();
@@ -306,18 +306,18 @@ public class XmppConnection implements Runnable {
 									response.setContent(saslMechanism.getResponse(challenge));
 								} catch (final SaslMechanism.AuthenticationException e) {
 									// TODO: Send auth abort tag.
-									Log.e(Config.LOGTAG, e.toString());
+									Logging.e(Config.LOGTAG, e.toString());
 								}
 								tagWriter.writeElement(response);
 							} else if (nextTag.isStart("enabled")) {
 								final Element enabled = tagReader.readElement(nextTag);
 								if ("true".equals(enabled.getAttribute("resume"))) {
 									this.streamId = enabled.getAttribute("id");
-									Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
+									Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString()
 											+ ": stream managment(" + smVersion
 											+ ") enabled (resumable)");
 								} else {
-									Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
+									Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString()
 											+ ": stream managment(" + smVersion + ") enabled");
 								}
 								this.lastSessionStarted = SystemClock.elapsedRealtime();
@@ -331,11 +331,11 @@ public class XmppConnection implements Runnable {
 								try {
 									final int serverCount = Integer.parseInt(h);
 									if (serverCount != stanzasSent) {
-										Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
+										Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString()
 												+ ": session resumed with lost packages");
 										stanzasSent = serverCount;
 									} else {
-										Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
+										Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString()
 												+ ": session resumed");
 									}
 									if (acknowledgedListener != null) {
@@ -356,7 +356,7 @@ public class XmppConnection implements Runnable {
 							} else if (nextTag.isStart("r")) {
 								tagReader.readElement(nextTag);
 								if (Config.EXTENDED_SM_LOGGING) {
-									Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": acknowledging stanza #" + this.stanzasReceived);
+									Logging.d(Config.LOGTAG, account.getJid().toBareJid() + ": acknowledging stanza #" + this.stanzasReceived);
 								}
 								final AckPacket ack = new AckPacket(this.stanzasReceived, smVersion);
 								tagWriter.writeStanzaAsync(ack);
@@ -366,7 +366,7 @@ public class XmppConnection implements Runnable {
 								try {
 									final int serverSequence = Integer.parseInt(ack.getAttribute("h"));
 									if (Config.EXTENDED_SM_LOGGING) {
-										Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": server acknowledged stanza #" + serverSequence);
+										Logging.d(Config.LOGTAG, account.getJid().toBareJid() + ": server acknowledged stanza #" + serverSequence);
 									}
 									final String msgId = this.messageReceipts.get(serverSequence);
 									if (msgId != null) {
@@ -377,11 +377,11 @@ public class XmppConnection implements Runnable {
 										this.messageReceipts.remove(serverSequence);
 									}
 								} catch (NumberFormatException e) {
-									Log.d(Config.LOGTAG,account.getJid().toBareJid()+": server send ack without sequence number");
+									Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": server send ack without sequence number");
 								}
 							} else if (nextTag.isStart("failed")) {
 								tagReader.readElement(nextTag);
-								Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": resumption failed");
+								Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": resumption failed");
 								streamId = null;
 								if (account.getStatus() != Account.State.ONLINE) {
 									sendBindRequest();
@@ -404,14 +404,14 @@ public class XmppConnection implements Runnable {
 	}
 
 	private void sendInitialPing() {
-		Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": sending intial ping");
+		Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": sending intial ping");
 		final IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
 		iq.setFrom(account.getJid());
 		iq.addChild("ping", "urn:xmpp:ping");
 		this.sendIqPacket(iq, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(final Account account, final IqPacket packet) {
-				Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
+				Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString()
 						+ ": online with resource " + account.getResource());
 				changeStatus(Account.State.ONLINE);
 			}
@@ -486,14 +486,14 @@ public class XmppConnection implements Runnable {
 						packetCallbackDuple.second.onIqPacketReceived(account, packet);
 						packetCallbacks.remove(packet.getId());
 					} else {
-						Log.e(Config.LOGTAG,account.getJid().toBareJid().toString()+": ignoring spoofed iq packet");
+						Logging.e(Config.LOGTAG,account.getJid().toBareJid().toString()+": ignoring spoofed iq packet");
 					}
 				} else {
 					if (packet.getFrom().equals(packetCallbackDuple.first.getTo())) {
 						packetCallbackDuple.second.onIqPacketReceived(account, packet);
 						packetCallbacks.remove(packet.getId());
 					} else {
-						Log.e(Config.LOGTAG,account.getJid().toBareJid().toString()+": ignoring spoofed iq packet");
+						Logging.e(Config.LOGTAG,account.getJid().toBareJid().toString()+": ignoring spoofed iq packet");
 					}
 				}
 			} else if (packet.getType() == IqPacket.TYPE.GET|| packet.getType() == IqPacket.TYPE.SET) {
@@ -547,24 +547,24 @@ public class XmppConnection implements Runnable {
 
 			final String[] cipherSuites = CryptoHelper.getOrderedCipherSuites(
 					sslSocket.getSupportedCipherSuites());
-			//Log.d(Config.LOGTAG, "Using ciphers: " + Arrays.toString(cipherSuites));
+			//Logging.d(Config.LOGTAG, "Using ciphers: " + Arrays.toString(cipherSuites));
 			if (cipherSuites.length > 0) {
 				sslSocket.setEnabledCipherSuites(cipherSuites);
 			}
 
 			if (!verifier.verify(account.getServer().getDomainpart(),sslSocket.getSession())) {
-				Log.d(Config.LOGTAG,account.getJid().toBareJid()+": TLS certificate verification failed");
+				Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": TLS certificate verification failed");
 				throw new SecurityException();
 			}
 			tagReader.setInputStream(sslSocket.getInputStream());
 			tagWriter.setOutputStream(sslSocket.getOutputStream());
 			sendStartStream();
-			Log.d(Config.LOGTAG, account.getJid().toBareJid()+ ": TLS connection established");
+			Logging.d(Config.LOGTAG, account.getJid().toBareJid()+ ": TLS connection established");
 			features.encryptionEnabled = true;
 			processStream(tagReader.readTag());
 			sslSocket.close();
 		} catch (final NoSuchAlgorithmException | KeyManagementException e1) {
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": TLS certificate verification failed");
+			Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": TLS certificate verification failed");
 			throw new SecurityException();
 		}
 	}
@@ -600,16 +600,16 @@ public class XmppConnection implements Runnable {
 				try {
 					if (keys.has(Account.PINNED_MECHANISM_KEY) &&
 							keys.getInt(Account.PINNED_MECHANISM_KEY) > saslMechanism.getPriority()) {
-						Log.e(Config.LOGTAG, "Auth failed. Authentication mechanism " + saslMechanism.getMechanism() +
+						Logging.e(Config.LOGTAG, "Auth failed. Authentication mechanism " + saslMechanism.getMechanism() +
 								" has lower priority (" + String.valueOf(saslMechanism.getPriority()) +
 								") than pinned priority (" + keys.getInt(Account.PINNED_MECHANISM_KEY) +
 								"). Possible downgrade attack?");
 						throw new SecurityException();
 					}
 				} catch (final JSONException e) {
-					Log.d(Config.LOGTAG, "Parse error while checking pinned auth mechanism");
+					Logging.d(Config.LOGTAG, "Parse error while checking pinned auth mechanism");
 				}
-				Log.d(Config.LOGTAG, account.getJid().toString() + ": Authenticating with " + saslMechanism.getMechanism());
+				Logging.d(Config.LOGTAG, account.getJid().toString() + ": Authenticating with " + saslMechanism.getMechanism());
 				auth.setAttribute("mechanism", saslMechanism.getMechanism());
 				if (!saslMechanism.getClientFirstMessage().isEmpty()) {
 					auth.setContent(saslMechanism.getClientFirstMessage());
@@ -622,7 +622,7 @@ public class XmppConnection implements Runnable {
 					+ smVersion)
 				&& streamId != null) {
 			if (Config.EXTENDED_SM_LOGGING) {
-				Log.d(Config.LOGTAG,account.getJid().toBareJid()+": resuming after stanza #"+stanzasReceived);
+				Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": resuming after stanza #"+stanzasReceived);
 			}
 			final ResumePacket resume = new ResumePacket(this.streamId, stanzasReceived, smVersion);
 			this.tagWriter.writeStanzaAsync(resume);
@@ -673,7 +673,7 @@ public class XmppConnection implements Runnable {
 								changeStatus(Account.State.REGISTRATION_CONFLICT);
 							} else {
 								changeStatus(Account.State.REGISTRATION_FAILED);
-								Log.d(Config.LOGTAG, packet.toString());
+								Logging.d(Config.LOGTAG, packet.toString());
 							}
 							disconnect(true);
 						}
@@ -681,7 +681,7 @@ public class XmppConnection implements Runnable {
 				} else {
 					changeStatus(Account.State.REGISTRATION_FAILED);
 					disconnect(true);
-					Log.d(Config.LOGTAG, account.getJid().toBareJid()
+					Logging.d(Config.LOGTAG, account.getJid().toBareJid()
 							+ ": could not register. instructions are"
 							+ (instructions != null ? instructions.getContent() : ""));
 				}
@@ -810,7 +810,7 @@ public class XmppConnection implements Runnable {
 			sendEnableCarbons();
 		}
 		if (getFeatures().blocking() && !features.blockListRequested) {
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": Requesting block list");
+			Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": Requesting block list");
 			this.sendIqPacket(getIqGenerator().generateGetBlockList(), mXmppConnectionService.getIqParser());
 		}
 	}
@@ -844,11 +844,11 @@ public class XmppConnection implements Runnable {
 			@Override
 			public void onIqPacketReceived(final Account account, final IqPacket packet) {
 				if (!packet.hasChild("error")) {
-					Log.d(Config.LOGTAG, account.getJid().toBareJid()
+					Logging.d(Config.LOGTAG, account.getJid().toBareJid()
 							+ ": successfully enabled carbons");
 					features.carbonsEnabled = true;
 				} else {
-					Log.d(Config.LOGTAG, account.getJid().toBareJid()
+					Logging.d(Config.LOGTAG, account.getJid().toBareJid()
 							+ ": error enableing carbons " + packet.toString());
 				}
 			}
@@ -861,7 +861,7 @@ public class XmppConnection implements Runnable {
 		if (streamError != null && streamError.hasChild("conflict")) {
 			final String resource = account.getResource().split("\\.")[0];
 			account.setResource(resource + "." + nextRandomId());
-			Log.d(Config.LOGTAG,
+			Logging.d(Config.LOGTAG,
 					account.getJid().toBareJid() + ": switching resource due to conflict ("
 					+ account.getResource() + ")");
 		}
@@ -923,7 +923,7 @@ public class XmppConnection implements Runnable {
 		tagWriter.writeStanzaAsync(packet);
 		if (packet instanceof MessagePacket && packet.getId() != null && getFeatures().sm()) {
 			if (Config.EXTENDED_SM_LOGGING) {
-				Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": requesting ack for message stanza #" + stanzasSent);
+				Logging.d(Config.LOGTAG, account.getJid().toBareJid() + ": requesting ack for message stanza #" + stanzasSent);
 			}
 			this.messageReceipts.put(stanzasSent, packet.getId());
 			tagWriter.writeStanzaAsync(new RequestPacket(this.smVersion));
@@ -981,7 +981,7 @@ public class XmppConnection implements Runnable {
 	}
 
 	public void disconnect(final boolean force) {
-		Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": disconnecting");
+		Logging.d(Config.LOGTAG, account.getJid().toBareJid() + ": disconnecting");
 		try {
 			if (force) {
 				socket.close();
@@ -995,22 +995,22 @@ public class XmppConnection implements Runnable {
 						tagWriter.finish();
 						try {
 							while (!tagWriter.finished()) {
-								Log.d(Config.LOGTAG, "not yet finished");
+								Logging.d(Config.LOGTAG, "not yet finished");
 								Thread.sleep(100);
 							}
 							tagWriter.writeTag(Tag.end("stream:stream"));
 							socket.close();
 						} catch (final IOException e) {
-							Log.d(Config.LOGTAG,
+							Logging.d(Config.LOGTAG,
 									"io exception during disconnect");
 						} catch (final InterruptedException e) {
-							Log.d(Config.LOGTAG, "interrupted");
+							Logging.d(Config.LOGTAG, "interrupted");
 						}
 					}
 				}
 			}).start();
 		} catch (final IOException e) {
-			Log.d(Config.LOGTAG, "io exception during disconnect");
+			Logging.d(Config.LOGTAG, "io exception during disconnect");
 		}
 	}