Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-11 19:43:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added send immediately to debug info

Browse Source
This commit is contained in:
M66B
2023-09-04 12:00:05 +02:00
parent 395aed2a98
commit 9ca6034855
4 changed files with 57 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2271,15 +2271,55 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
@Override
protected Long onExecute(Context context, Bundle args) throws IOException, JSONException {
return Log.getDebugInfo(context, "main", R.string.title_debug_info_remark, null, null, args).id;
boolean send = args.getBoolean("send");
long id = Log.getDebugInfo(context, "main", R.string.title_debug_info_remark, null, null, args).id;
if (send) {
boolean sent = false;
DB db = DB.getInstance(context);
try {
db.beginTransaction();
EntityMessage draft = db.message().getMessage(id);
if (draft != null) {
EntityFolder outbox = db.folder().getOutbox();
if (outbox == null) {
Log.w("Outbox missing");
outbox = EntityFolder.getOutbox();
outbox.id = db.folder().insertFolder(outbox);
}
draft.folder = outbox.id;
db.message().updateMessage(draft);
EntityOperation.queue(context, draft, EntityOperation.SEND);
db.setTransactionSuccessful();
sent = true;
}
} finally {
db.endTransaction();
}
if (sent) {
ToastEx.makeText(context, R.string.title_debug_info_send, Toast.LENGTH_LONG).show();
ServiceSend.start(context);
return null;
}
}
return id;
}
@Override
protected void onExecuted(Bundle args, Long id) {
if (id != null)
startActivity(new Intent(ActivityView.this, ActivityCompose.class)
.putExtra("action", "edit")
.putExtra("id", id));
if (id == null)
return;
startActivity(new Intent(ActivityView.this, ActivityCompose.class)
.putExtra("action", "edit")
.putExtra("id", id));
}
@Override

2
app/src/main/java/eu/faircode/email/FragmentDialogDebug.java
View File

@@ -57,6 +57,7 @@ public class FragmentDialogDebug extends FragmentDialogBase {
final EditText etIssue = view.findViewById(R.id.etIssue);
final Spinner spAccount = view.findViewById(R.id.spAccount);
final CheckBox cbContact = view.findViewById(R.id.cbContact);
final CheckBox cbSend = view.findViewById(R.id.cbSend);
final ArrayAdapter<EntityAccount> adapterAccount;
etIssue.addTextChangedListener(new TextWatcher() {
@@ -131,6 +132,7 @@ public class FragmentDialogDebug extends FragmentDialogBase {
Bundle args = getArguments();
args.putString("issue", etIssue.getText().toString());
args.putBoolean("contact", cbContact.isChecked());
args.putBoolean("send", cbSend.isChecked());
EntityAccount account = (EntityAccount) spAccount.getSelectedItem();
if (account != null)