wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix concatenation in Timber logging

Browse source
This commit is contained in:
Philip Whitehouse 2017-03-18 17:40:19 +00:00 committed by Vincent Breitmoser
parent 62a8bae494
commit 5e4068de45
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java
View file

@ -175,13 +175,13 @@ class ImapConnection {
try {
Security.setProperty("networkaddress.cache.ttl", "0");
} catch (Exception e) {
Timber.w(e, "Could not set DNS ttl to 0 for " + getLogId());
Timber.w(e, "Could not set DNS ttl to 0 for %s", getLogId());
}
try {
Security.setProperty("networkaddress.cache.negative.ttl", "0");
} catch (Exception e) {
Timber.w(e, "Could not set DNS negative ttl to 0 for " + getLogId());
Timber.w(e, "Could not set DNS negative ttl to 0 for %s", getLogId());
}
}
@ -193,7 +193,7 @@ class ImapConnection {
try {
return connectToAddress(address);
} catch (IOException e) {
Timber.w(e, "Could not connect to " + address);
Timber.w(e, "Could not connect to %s", address);
connectException = e;
}
}
@ -209,7 +209,7 @@ class ImapConnection {
String clientCertificateAlias = settings.getClientCertificateAlias();
if (K9MailLib.isDebug() && DEBUG_PROTOCOL_IMAP) {
Timber.d("Connecting to " + host + " as " + address);
Timber.d("Connecting to %s as %s", host, address);
}
SocketAddress socketAddress = new InetSocketAddress(address, port);
@ -244,7 +244,7 @@ class ImapConnection {
ImapResponse initialResponse = responseParser.readResponse();
if (K9MailLib.isDebug() && DEBUG_PROTOCOL_IMAP) {
Timber.v(getLogId() + "<<<" + initialResponse);
Timber.v("%s <<< %s", getLogId(), initialResponse);
}
extractCapabilities(Collections.singletonList(initialResponse));
@ -257,7 +257,7 @@ class ImapConnection {
Set<String> receivedCapabilities = capabilityResponse.getCapabilities();
if (K9MailLib.isDebug()) {
Timber.d("Saving " + receivedCapabilities + " capabilities for " + getLogId());
Timber.d("Saving %s capabilities for %s", receivedCapabilities, getLogId());
}
capabilities = receivedCapabilities;
@ -272,7 +272,7 @@ class ImapConnection {
}
if (K9MailLib.isDebug()) {
Timber.i("Did not get capabilities in banner, requesting CAPABILITY for " + getLogId());
Timber.i("Did not get capabilities in banner, requesting CAPABILITY for %s", getLogId());
}
requestCapabilities();
@ -319,7 +319,7 @@ class ImapConnection {
// Per RFC 2595 (3.1): Once TLS has been started, reissue CAPABILITY command
if (K9MailLib.isDebug()) {
Timber.i("Updating capabilities after STARTTLS for " + getLogId());
Timber.i("Updating capabilities after STARTTLS for %s", getLogId());
}
requestCapabilities();
@ -547,7 +547,7 @@ class ImapConnection {
if (networkInfo != null) {
int type = networkInfo.getType();
if (K9MailLib.isDebug()) {
Timber.d("On network type " + type);
Timber.d("On network type %s", type);
}
NetworkType networkType = NetworkType.fromConnectivityManagerType(type);
@ -565,7 +565,7 @@ class ImapConnection {
try {
executeSimpleCommand(Commands.COMPRESS_DEFLATE);
} catch (NegativeImapResponseException e) {
Timber.d(e, "Unable to negotiate compression: " + e.getMessage());
Timber.d(e, "Unable to negotiate compression: ");
return;
}
@ -577,7 +577,7 @@ class ImapConnection {
setUpStreamsAndParser(input, output);
if (K9MailLib.isDebug()) {
Timber.i("Compression enabled for " + getLogId());
Timber.i("Compression enabled for %s", getLogId());
}
} catch (IOException e) {
close();
@ -616,7 +616,7 @@ class ImapConnection {
settings.setCombinedPrefix(null);
if (K9MailLib.isDebug()) {
Timber.d("Got path '" + prefix + "' and separator '" + hierarchyDelimiter + "'");
Timber.d("Got path '%s' and separator '%s'", prefix, hierarchyDelimiter);
}
}
}
@ -643,7 +643,7 @@ class ImapConnection {
settings.setCombinedPrefix(null);
if (K9MailLib.isDebug()) {
Timber.d("Got path delimiter '" + settings.getPathDelimiter() + "' for " + getLogId());
Timber.d("Got path delimiter '%s' for %s", settings.getPathDelimiter(), getLogId());
}
break;
@ -669,7 +669,7 @@ class ImapConnection {
protected boolean isIdleCapable() {
if (K9MailLib.isDebug()) {
Timber.v("Connection " + getLogId() + " has " + capabilities.size() + " capabilities");
Timber.v("Connection %s has %d capabilities", getLogId(), capabilities.size());
}
return capabilities.contains(Capabilities.IDLE);
@ -735,9 +735,9 @@ class ImapConnection {
if (K9MailLib.isDebug() && DEBUG_PROTOCOL_IMAP) {
if (sensitive && !K9MailLib.isDebugSensitive()) {
Timber.v(getLogId() + ">>> [Command Hidden, Enable Sensitive Debug Logging To Show]");
Timber.v("%s>>> [Command Hidden, Enable Sensitive Debug Logging To Show]", getLogId());
} else {
Timber.v(getLogId() + ">>> " + tag + " " + command + " " + initialClientResponse);
Timber.v("%s>>> %s %s %s", getLogId(), tag, command, initialClientResponse);
}
}
@ -759,9 +759,9 @@ class ImapConnection {
if (K9MailLib.isDebug() && DEBUG_PROTOCOL_IMAP) {
if (sensitive && !K9MailLib.isDebugSensitive()) {
Timber.v(getLogId() + ">>> [Command Hidden, Enable Sensitive Debug Logging To Show]");
Timber.v("%s>>> [Command Hidden, Enable Sensitive Debug Logging To Show]", getLogId());
} else {
Timber.v(getLogId() + ">>> " + tag + " " + command);
Timber.v("%s>>> %s %s", getLogId(), tag, command);
}
}
@ -779,7 +779,7 @@ class ImapConnection {
outputStream.flush();
if (K9MailLib.isDebug() && DEBUG_PROTOCOL_IMAP) {
Timber.v(getLogId() + ">>> " + continuation);
Timber.v("%s>>> %s", getLogId(), continuation);
}
}
@ -792,7 +792,7 @@ class ImapConnection {
ImapResponse response = responseParser.readResponse(callback);
if (K9MailLib.isDebug() && DEBUG_PROTOCOL_IMAP) {
Timber.v(getLogId() + "<<<" + response);
Timber.v("%s<<<%s", getLogId(), response);
}
return response;
@ -819,8 +819,8 @@ class ImapConnection {
if (responseTag.equalsIgnoreCase(tag)) {
throw new MessagingException("Command continuation aborted: " + response);
} else {
Timber.w("After sending tag " + tag + ", got tag response from previous command " +
response + " for " + getLogId());
Timber.w("After sending tag %s, got tag response from previous command %s for %s",
tag, response, getLogId());
}
}
} while (!response.isContinuationRequested());