mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow reporting unexpected errors

This commit is contained in:
M66B 2018-12-01 13:17:33 +01:00
parent 2665c33f68
commit 5099d233e6
4 changed files with 71 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@ -512,9 +512,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
protected Long onLoad(Context context, Bundle args) throws Throwable {
File file = new File(context.getCacheDir(), "crash.log");
if (file.exists()) {
// Get version info
StringBuilder sb = new StringBuilder();
sb.append(context.getString(R.string.title_crash_info_remark)).append("\n\n\n\n");
sb.append(Helper.getAppInfo(context));
@ -576,7 +574,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
new Intent(ActivityView.this, ActivityCompose.class)
.putExtra("action", "edit")
.putExtra("id", id));
}
@Override
@ -836,7 +833,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
@Override
protected Long onLoad(Context context, Bundle args) throws UnsupportedEncodingException {
StringBuilder sb = new StringBuilder();
sb.append(context.getString(R.string.title_debug_info_remark) + "\n\n\n\n");
sb.append(Helper.getAppInfo(context));

7
app/src/main/java/eu/faircode/email/ApplicationEx.java
View File

@ -23,7 +23,6 @@ import android.app.Application;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.Context;
import android.os.Build;
import android.os.DeadSystemException;
import android.os.RemoteException;
@ -47,7 +46,7 @@ public class ApplicationEx extends Application {
public void uncaughtException(Thread thread, Throwable ex) {
if (ownFault(ex)) {
Log.e(Helper.TAG, ex + "\r\n" + Log.getStackTraceString(ex));
writeCrashLog(ApplicationEx.this, ex);
writeCrashLog(ex);
if (prev != null)
prev.uncaughtException(thread, ex);
@ -113,8 +112,8 @@ public class ApplicationEx extends Application {
return false;
}
static void writeCrashLog(Context context, Throwable ex) {
File file = new File(context.getCacheDir(), "crash.log");
private void writeCrashLog(Throwable ex) {
File file = new File(getCacheDir(), "crash.log");
Log.w(Helper.TAG, "Writing exception to " + file);
FileWriter out = null;

77
app/src/main/java/eu/faircode/email/Helper.java
View File

@ -24,6 +24,7 @@ import android.accounts.AccountManager;
import android.app.usage.UsageStatsManager;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
@ -31,6 +32,7 @@ import android.content.res.TypedArray;
import android.net.ConnectivityManager;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.PowerManager;
import android.preference.PreferenceManager;
import android.text.TextUtils;
@ -59,6 +61,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.ThreadFactory;
@ -172,23 +175,77 @@ public class Helper {
return sb.toString();
}
static void unexpectedError(final Context context, LifecycleOwner owner, final Throwable ex) {
static void unexpectedError(final Context context, final LifecycleOwner owner, final Throwable ex) {
Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
if (owner.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
if (owner.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
new DialogBuilderLifecycle(context, owner)
.setTitle(R.string.title_unexpected_error)
.setMessage(ex.toString())
.setPositiveButton(android.R.string.cancel, null)
.show();
.setNeutralButton(R.string.title_report, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
new SimpleTask<Long>() {
@Override
protected Long onLoad(Context context, Bundle args) throws Throwable {
StringBuilder sb = new StringBuilder();
sb.append(context.getString(R.string.title_crash_info_remark)).append("\n\n\n\n");
sb.append(Helper.getAppInfo(context));
sb.append(ex + "\n" + Log.getStackTraceString(ex));
new Thread(new Runnable() {
@Override
public void run() {
ApplicationEx.writeCrashLog(context, ex);
}
}).start();
}
String body = "<pre>" + sb.toString().replaceAll("\\r?\\n", "<br />") + "</pre>";
EntityMessage draft = null;
DB db = DB.getInstance(context);
try {
db.beginTransaction();
EntityFolder drafts = db.folder().getPrimaryDrafts();
if (drafts != null) {
draft = new EntityMessage();
draft.account = drafts.account;
draft.folder = drafts.id;
draft.msgid = EntityMessage.generateMessageId();
draft.to = new Address[]{Helper.myAddress()};
draft.subject = context.getString(R.string.app_name) + " " + BuildConfig.VERSION_NAME + " crash log";
draft.content = true;
draft.received = new Date().getTime();
draft.getAvatar(context);
draft.id = db.message().insertMessage(draft);
draft.write(context, body);
}
EntityOperation.queue(db, draft, EntityOperation.ADD);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
EntityOperation.process(context);
return draft.id;
}
@Override
protected void onLoaded(Bundle args, Long id) {
if (id != null)
context.startActivity(
new Intent(context, ActivityCompose.class)
.putExtra("action", "edit")
.putExtra("id", id));
}
@Override
protected void onException(Bundle args, Throwable ex) {
Toast.makeText(context, ex.toString(), Toast.LENGTH_LONG).show();
}
}.load(context, owner, new Bundle());
}
})
.show();
}
static String humanReadableByteCount(long bytes, boolean si) {

1
app/src/main/res/values/strings.xml
View File

@ -340,6 +340,7 @@
<string name="title_no">No</string>
<string name="title_undo">Undo</string>
<string name="title_add">Add</string>
<string name="title_report">Report</string>
<string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>