mirror of https://github.com/M66B/FairEmail.git
Deafult JNI log level
This commit is contained in:
parent
09479f8eb0
commit
6492a7a592
|
@ -415,6 +415,7 @@ public class ApplicationEx extends Application
|
||||||
break;
|
break;
|
||||||
case "debug":
|
case "debug":
|
||||||
case "log_level":
|
case "log_level":
|
||||||
|
Log.setLevel(this);
|
||||||
FairEmailLoggingProvider.setLevel(this);
|
FairEmailLoggingProvider.setLevel(this);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5182,10 +5182,6 @@ class Core {
|
||||||
if (EntityFolder.DRAFTS.equals(folder.type))
|
if (EntityFolder.DRAFTS.equals(folder.type))
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
|
||||||
int level = prefs.getInt("log_level", android.util.Log.INFO);
|
|
||||||
boolean log = (level <= android.util.Log.INFO || BuildConfig.DEBUG);
|
|
||||||
|
|
||||||
List<Address> addresses = new ArrayList<>();
|
List<Address> addresses = new ArrayList<>();
|
||||||
if (folder.isOutgoing()) {
|
if (folder.isOutgoing()) {
|
||||||
if (message.from != null)
|
if (message.from != null)
|
||||||
|
@ -5215,44 +5211,40 @@ class Core {
|
||||||
for (Address address : addresses)
|
for (Address address : addresses)
|
||||||
for (EntityIdentity identity : identities)
|
for (EntityIdentity identity : identities)
|
||||||
if (identity.sameAddress(address)) {
|
if (identity.sameAddress(address)) {
|
||||||
if (log)
|
Log.i("Matched same" +
|
||||||
Log.i("Matched same" +
|
" identity=" + identity.email +
|
||||||
" identity=" + identity.email +
|
" address=" + ((InternetAddress) address).getAddress() +
|
||||||
" address=" + ((InternetAddress) address).getAddress() +
|
" folder=" + folder.name);
|
||||||
" folder=" + folder.name);
|
|
||||||
return identity;
|
return identity;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Address address : addresses)
|
for (Address address : addresses)
|
||||||
for (EntityIdentity identity : identities)
|
for (EntityIdentity identity : identities)
|
||||||
if (identity.similarAddress(address)) {
|
if (identity.similarAddress(address)) {
|
||||||
if (log)
|
Log.i("Matched similar" +
|
||||||
Log.i("Matched similar" +
|
" identity=" + identity.email +
|
||||||
" identity=" + identity.email +
|
" regex=" + identity.sender_extra_regex +
|
||||||
" regex=" + identity.sender_extra_regex +
|
" address=" + ((InternetAddress) address).getAddress() +
|
||||||
" address=" + ((InternetAddress) address).getAddress() +
|
" folder=" + folder.name);
|
||||||
" folder=" + folder.name);
|
|
||||||
return identity;
|
return identity;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (deliveredto != null)
|
if (deliveredto != null)
|
||||||
for (EntityIdentity identity : identities)
|
for (EntityIdentity identity : identities)
|
||||||
if (identity.sameAddress(deliveredto) || identity.similarAddress(deliveredto)) {
|
if (identity.sameAddress(deliveredto) || identity.similarAddress(deliveredto)) {
|
||||||
if (log)
|
Log.i("Matched deliveredto" +
|
||||||
Log.i("Matched deliveredto" +
|
" identity=" + identity.email +
|
||||||
" identity=" + identity.email +
|
" regex=" + identity.sender_extra_regex +
|
||||||
" regex=" + identity.sender_extra_regex +
|
" address=" + ((InternetAddress) deliveredto).getAddress() +
|
||||||
" address=" + ((InternetAddress) deliveredto).getAddress() +
|
" folder=" + folder.name);
|
||||||
" folder=" + folder.name);
|
|
||||||
return identity;
|
return identity;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (log)
|
Log.i("Matched none" +
|
||||||
Log.i("Matched none" +
|
" addresses=" + MessageHelper.formatAddresses(addresses.toArray(new Address[0])) +
|
||||||
" addresses=" + MessageHelper.formatAddresses(addresses.toArray(new Address[0])) +
|
" deliveredto=" + (deliveredto == null ? null : ((InternetAddress) deliveredto).getAddress()) +
|
||||||
" deliveredto=" + (deliveredto == null ? null : ((InternetAddress) deliveredto).getAddress()) +
|
" folder=" + folder.name);
|
||||||
" folder=" + folder.name);
|
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,8 +77,7 @@ public class FairEmailLoggingProvider extends TinylogLoggingProvider {
|
||||||
if (debug)
|
if (debug)
|
||||||
provider.activeLevel = Level.DEBUG;
|
provider.activeLevel = Level.DEBUG;
|
||||||
else {
|
else {
|
||||||
int def = (BuildConfig.DEBUG || BuildConfig.TEST_RELEASE ? android.util.Log.INFO : android.util.Log.WARN);
|
int _level = prefs.getInt("log_level", Log.getDefaultLogLevel());
|
||||||
int _level = prefs.getInt("log_level", def);
|
|
||||||
if (_level == android.util.Log.VERBOSE)
|
if (_level == android.util.Log.VERBOSE)
|
||||||
provider.activeLevel = Level.TRACE;
|
provider.activeLevel = Level.TRACE;
|
||||||
else if (_level == android.util.Log.DEBUG)
|
else if (_level == android.util.Log.DEBUG)
|
||||||
|
|
|
@ -123,6 +123,8 @@ public class Log {
|
||||||
System.loadLibrary("fairemail");
|
System.loadLibrary("fairemail");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static native void jni_set_log_level(int level);
|
||||||
|
|
||||||
public static native long[] jni_safe_runtime_stats();
|
public static native long[] jni_safe_runtime_stats();
|
||||||
|
|
||||||
public static int d(String msg) {
|
public static int d(String msg) {
|
||||||
|
@ -338,9 +340,20 @@ public class Log {
|
||||||
|
|
||||||
static void setup(Context context) {
|
static void setup(Context context) {
|
||||||
ctx = context;
|
ctx = context;
|
||||||
|
setLevel(context);
|
||||||
setupBugsnag(context);
|
setupBugsnag(context);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void setLevel(Context context) {
|
||||||
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
||||||
|
int level = prefs.getInt("log_level", getDefaultLogLevel());
|
||||||
|
jni_set_log_level(level);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int getDefaultLogLevel() {
|
||||||
|
return (BuildConfig.DEBUG || BuildConfig.TEST_RELEASE ? android.util.Log.INFO : android.util.Log.WARN);
|
||||||
|
}
|
||||||
|
|
||||||
private static void setupBugsnag(final Context context) {
|
private static void setupBugsnag(final Context context) {
|
||||||
try {
|
try {
|
||||||
Log.i("Configuring Bugsnag");
|
Log.i("Configuring Bugsnag");
|
||||||
|
|
|
@ -12,8 +12,16 @@
|
||||||
#include "compact_enc_det/compact_enc_det.h"
|
#include "compact_enc_det/compact_enc_det.h"
|
||||||
#include "cld_3/src/nnet_language_identifier.h"
|
#include "cld_3/src/nnet_language_identifier.h"
|
||||||
|
|
||||||
|
int log_level = ANDROID_LOG_DEBUG;
|
||||||
|
|
||||||
|
extern "C"
|
||||||
|
JNIEXPORT void JNICALL
|
||||||
|
Java_eu_faircode_email_Log_jni_1set_1log_1level(JNIEnv *env, jclass clazz, jint level) {
|
||||||
|
log_level = level;
|
||||||
|
}
|
||||||
|
|
||||||
void log_android(int prio, const char *fmt, ...) {
|
void log_android(int prio, const char *fmt, ...) {
|
||||||
if (prio >= ANDROID_LOG_DEBUG) {
|
if (prio >= log_level) {
|
||||||
char line[1024];
|
char line[1024];
|
||||||
va_list argptr;
|
va_list argptr;
|
||||||
va_start(argptr, fmt);
|
va_start(argptr, fmt);
|
||||||
|
|
Loading…
Reference in New Issue