mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-27 18:27:43 +00:00
Code Issues Releases Wiki Activity

Revert "Refactoring"

Browse source 
This reverts commit de811cbacc.
This commit is contained in:
M66B 2019-10-28 18:46:44 +01:00
parent de811cbacc
commit eca7591988
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
View file

@ -67,7 +67,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
}; };
private final static String[] RESET_QUESTIONS = new String[]{ private final static String[] RESET_QUESTIONS = new String[]{
"welcome", "crash_reports_asked", "crash_report_count", "welcome", "crash_reports_asked",
"print_html_confirmed", "print_html_confirmed",
"identities_asked", "delete_ref_confirmed", "send_dialog" "identities_asked", "delete_ref_confirmed", "send_dialog"
}; };

32
app/src/main/java/eu/faircode/email/Log.java
View file

@ -249,23 +249,9 @@ public class Log {
return false; return false;
Throwable ex = error.getException().getCause(); Throwable ex = error.getException().getCause();
if (shouldReport(ex)) { if (ex == null)
error.addToTab("extra", "installer", installer == null ? "-" : installer);
error.addToTab("extra", "package", BuildConfig.APPLICATION_ID);
error.addToTab("extra", "fingerprint", fingerprint);
error.addToTab("extra", "thread", Thread.currentThread().getId());
error.addToTab("extra", "free", Log.getFreeMemMb());
String theme = prefs.getString("theme", "light");
error.addToTab("extra", "theme", theme);
return true; return true;
}
return false;
}
private boolean shouldReport(Throwable ex) {
if (ex instanceof MessagingException && if (ex instanceof MessagingException &&
(ex.getCause() instanceof IOException || (ex.getCause() instanceof IOException ||
ex.getCause() instanceof ProtocolException)) ex.getCause() instanceof ProtocolException))
@ -294,10 +280,22 @@ public class Log {
return false; return false;
// Rate limit // Rate limit
int count = prefs.getInt("crash_report_count", 0) + 1; int count = prefs.getInt("crash_report_count", 0);
count++;
prefs.edit().putInt("crash_report_count", count).apply(); prefs.edit().putInt("crash_report_count", count).apply();
if (count > MAX_CRASH_REPORTS)
return false;
return (count <= MAX_CRASH_REPORTS); error.addToTab("extra", "installer", installer == null ? "-" : installer);
error.addToTab("extra", "fingerprint", fingerprint);
error.addToTab("extra", "thread", Thread.currentThread().getId());
error.addToTab("extra", "free", Log.getFreeMemMb());
String theme = prefs.getString("theme", "light");
error.addToTab("extra", "theme", theme);
error.addToTab("extra", "package", BuildConfig.APPLICATION_ID);
return true;
} }
}); });
} }