moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-30 23:00:09 -05:00
Code Issues Releases Wiki Activity

Decouple K9mail logging

Browse Source
This commit is contained in:
Jan Berkel 2014-12-18 12:48:10 +01:00
parent 714acabf83
commit 043df7e7c5
2 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/fsck/k9/K9.java
View File

@ -542,6 +542,15 @@ public class K9 extends Application {
app = this;
sIsDebuggable = ((getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0);
K9MailLib.setDebugStatus(new K9MailLib.DebugStatus() {
@Override public boolean enabled() {
return DEBUG;
}
@Override public boolean debugSensitive() {
return DEBUG_SENSITIVE;
}
});
checkCachedDatabaseVersion();

46
src/com/fsck/k9/mail/K9MailLib.java
View File

@ -1,9 +1,7 @@
package com.fsck.k9.mail;
import com.fsck.k9.K9;
public class K9MailLib {
private static DebugStatus debugStatus = new DefaultDebugStatus();
private K9MailLib() {}
public static final String LOG_TAG = "k9";
@ -35,10 +33,48 @@ public class K9MailLib {
public static boolean DEBUG_PROTOCOL_WEBDAV = true;
public static boolean isDebug() {
return K9.DEBUG;
return debugStatus.enabled();
}
public static boolean isDebugSensitive() {
return K9.DEBUG_SENSITIVE;
return debugStatus.debugSensitive();
}
public static void setDebugSensitive(boolean b) {
if (debugStatus instanceof WritableDebugStatus) {
((WritableDebugStatus)debugStatus).setSensitive(b);
}
}
public static void setDebug(boolean b) {
if (debugStatus instanceof WritableDebugStatus) {
((WritableDebugStatus)debugStatus).setEnabled(b);
}
}
public static interface DebugStatus {
boolean enabled();
boolean debugSensitive();
}
public static void setDebugStatus(DebugStatus status) {
if (status == null) {
throw new IllegalArgumentException("status cannot be null");
}
debugStatus = status;
}
private static interface WritableDebugStatus extends DebugStatus {
void setEnabled(boolean enabled);
void setSensitive(boolean sensitive);
}
private static class DefaultDebugStatus implements WritableDebugStatus {
private boolean enabled;
private boolean sensitive;
@Override public boolean enabled() { return enabled; }
@Override public boolean debugSensitive() { return sensitive; }
@Override public void setEnabled(boolean enabled) { this.enabled = enabled; }
@Override public void setSensitive(boolean sensitive) { this.sensitive = sensitive; }
}
}