msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Refactoring

Browse Source
pull/196/head
M66B 5 years ago
parent ac9e9efcbd
commit 9a1ee17165
3 changed files with 154 additions and 154 deletions
Show Stats Download Patch File Download Diff File

129
app/src/main/java/eu/faircode/email/ActivityCompose.java
Unescape View File

@ -211,91 +211,96 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
Intent.ACTION_SEND_MULTIPLE.equals(action)); Intent.ACTION_SEND_MULTIPLE.equals(action));
} }
static void undoSend(long id, final Context context, final LifecycleOwner owner, final FragmentManager manager) { static void undoSend(final long id, final Context context, final LifecycleOwner owner, final FragmentManager manager) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", id); args.putLong("id", id);
new SimpleTask<EntityMessage>() { new SimpleTask<Long>() {
@Override @Override
protected EntityMessage onExecute(Context context, Bundle args) { protected Long onExecute(Context context, Bundle args) {
long id = args.getLong("id"); long id = args.getLong("id");
return undoSend(id, context);
}
DB db = DB.getInstance(context); @Override
protected void onExecuted(Bundle args, Long id) {
if (id == null)
return;
context.startActivity(
new Intent(context, ActivityCompose.class)
.putExtra("action", "edit")
.putExtra("id", id));
}
EntityOperation operation = db.operation().getOperation(id, EntityOperation.SEND); @Override
if (operation != null) protected void onException(Bundle args, Throwable ex) {
if ("executing".equals(operation.state)) { Log.unexpectedError(manager, ex, !(ex instanceof IllegalArgumentException));
// Trigger update }
db.message().setMessageUiBusy(id, new Date().getTime()); }.execute(context, owner, args, "undo:sent");
return null; }
} else
db.operation().deleteOperation(operation.id);
EntityMessage message; static Long undoSend(long id, Context context) {
DB db = DB.getInstance(context);
try { EntityOperation operation = db.operation().getOperation(id, EntityOperation.SEND);
db.beginTransaction(); if (operation != null)
if ("executing".equals(operation.state)) {
// Trigger update
db.message().setMessageUiBusy(id, new Date().getTime());
return null;
} else
db.operation().deleteOperation(operation.id);
message = db.message().getMessage(id); EntityMessage message;
if (message == null)
return null;
db.folder().setFolderError(message.folder, null); try {
if (message.identity != null) db.beginTransaction();
db.identity().setIdentityError(message.identity, null);
File source = message.getFile(context); message = db.message().getMessage(id);
if (message == null)
return null;
// Insert into drafts db.folder().setFolderError(message.folder, null);
EntityFolder drafts = db.folder().getFolderByType(message.account, EntityFolder.DRAFTS); if (message.identity != null)
if (drafts == null) db.identity().setIdentityError(message.identity, null);
throw new IllegalArgumentException(context.getString(R.string.title_no_drafts));
message.id = null; File source = message.getFile(context);
message.folder = drafts.id;
message.fts = false;
message.ui_snoozed = null;
message.error = null;
message.id = db.message().insertMessage(message);
File target = message.getFile(context); // Insert into drafts
source.renameTo(target); EntityFolder drafts = db.folder().getFolderByType(message.account, EntityFolder.DRAFTS);
if (drafts == null)
throw new IllegalArgumentException(context.getString(R.string.title_no_drafts));
List<EntityAttachment> attachments = db.attachment().getAttachments(id); message.id = null;
for (EntityAttachment attachment : attachments) message.folder = drafts.id;
db.attachment().setMessage(attachment.id, message.id); message.fts = false;
message.ui_snoozed = null;
message.error = null;
message.id = db.message().insertMessage(message);
EntityOperation.queue(context, message, EntityOperation.ADD); File target = message.getFile(context);
source.renameTo(target);
// Delete from outbox List<EntityAttachment> attachments = db.attachment().getAttachments(id);
db.message().deleteMessage(id); // will delete operation too for (EntityAttachment attachment : attachments)
db.attachment().setMessage(attachment.id, message.id);
db.setTransactionSuccessful(); EntityOperation.queue(context, message, EntityOperation.ADD);
} finally {
db.endTransaction();
}
ServiceSynchronize.eval(context, "outbox/drafts"); // Delete from outbox
db.message().deleteMessage(id); // will delete operation too
NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); db.setTransactionSuccessful();
nm.cancel("send:" + id, 1); } finally {
db.endTransaction();
}
return message; ServiceSynchronize.eval(context, "outbox/drafts");
}
@Override NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
protected void onExecuted(Bundle args, EntityMessage draft) { nm.cancel("send:" + id, 1);
if (draft != null)
context.startActivity(
new Intent(context, ActivityCompose.class)
.putExtra("action", "edit")
.putExtra("id", draft.id));
}
@Override return message.id;
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(manager, ex, !(ex instanceof IllegalArgumentException));
}
}.execute(context, owner, args, "undo:sent");
} }
} }

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

@ -746,29 +746,21 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
public void undo(String title, Runnable move, Runnable show) { public void undo(String title, final Bundle args, final SimpleTask<Void> move, final SimpleTask<Void> show) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
int undo_timeout = prefs.getInt("undo_timeout", 5000); int undo_timeout = prefs.getInt("undo_timeout", 5000);
if (undo_timeout == 0) if (undo_timeout == 0)
try { move.execute(this, args, "undo:move");
move.run();
} catch (Throwable ex) {
Log.e(ex);
}
else else
undo(undo_timeout, title, move, show); undo(undo_timeout, title, args, move, show);
} }
public void undo(long undo_timeout, String title, final Runnable move, final Runnable show) { public void undo(long undo_timeout, String title, final Bundle args, final SimpleTask move, final SimpleTask show) {
if (drawerLayout == null || drawerLayout.getChildCount() == 0) { if (drawerLayout == null || drawerLayout.getChildCount() == 0) {
Log.e("Undo: drawer missing"); Log.e("Undo: drawer missing");
if (show != null) if (show != null)
try { show.execute(this, args, "undo:show");
show.run();
} catch (Throwable ex) {
Log.e(ex);
}
return; return;
} }
@ -785,11 +777,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
Log.i("Undo timeout"); Log.i("Undo timeout");
snackbar.dismiss(); snackbar.dismiss();
if (move != null) if (move != null)
try { move.execute(ActivityView.this, args, "undo:move");
move.run();
} catch (Throwable ex) {
Log.e(ex);
}
} }
}; };
@ -800,11 +788,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
getMainHandler().removeCallbacks(timeout); getMainHandler().removeCallbacks(timeout);
snackbar.dismiss(); snackbar.dismiss();
if (show != null) if (show != null)
try { show.execute(ActivityView.this, args, "undo:show");
show.run();
} catch (Throwable ex) {
Log.e(ex);
}
} }
}); });
@ -1327,6 +1311,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
} }
private void onUndoSend(Intent intent) { private void onUndoSend(Intent intent) {
long id = intent.getLongExtra("id", -1);
int delayed = intent.getIntExtra("delayed", 0); int delayed = intent.getIntExtra("delayed", 0);
long scheduled = intent.getLongExtra("scheduled", 0); long scheduled = intent.getLongExtra("scheduled", 0);
long now = new Date().getTime(); long now = new Date().getTime();
@ -1338,13 +1323,31 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
if (delayed * 1000L < UNDO_SEND_DELAY * 2 || scheduled - now < UNDO_SEND_DELAY * 2) if (delayed * 1000L < UNDO_SEND_DELAY * 2 || scheduled - now < UNDO_SEND_DELAY * 2)
return; return;
undo(UNDO_SEND_DELAY, getString(R.string.title_sending), null, new Runnable() { SimpleTask<Long> task = new SimpleTask<Long>() {
@Override @Override
public void run() { protected Long onExecute(Context context, Bundle args) {
long id = intent.getLongExtra("id", -1); long id = args.getLong("id");
ActivityCompose.undoSend(id, ActivityView.this, ActivityView.this, getSupportFragmentManager()); return ActivityCompose.undoSend(id, context);
} }
});
@Override
protected void onExecuted(Bundle args, Long id) {
if (id == null)
return;
startActivity(
new Intent(ActivityView.this, ActivityCompose.class)
.putExtra("action", "edit")
.putExtra("id", id));
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getSupportFragmentManager(), ex, !(ex instanceof IllegalArgumentException));
}
};
undo(UNDO_SEND_DELAY, getString(R.string.title_sending), intent.getExtras(), null, task);
} }
private BroadcastReceiver receiver = new BroadcastReceiver() { private BroadcastReceiver receiver = new BroadcastReceiver() {

120
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -5399,82 +5399,74 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
return; return;
} }
String title = getString(R.string.title_move_undo, getDisplay(result, true), result.size()); SimpleTask<Void> move = new SimpleTask<Void>() {
((ActivityView) activity).undo(title, @Override
new Runnable() { protected Void onExecute(Context context, Bundle args) {
@Override ArrayList<MessageTarget> result = args.getParcelableArrayList("result");
public void run() {
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
ArrayList<MessageTarget> result = args.getParcelableArrayList("result");
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
try { try {
db.beginTransaction(); db.beginTransaction();
for (MessageTarget target : result) { for (MessageTarget target : result) {
EntityMessage message = db.message().getMessage(target.id); EntityMessage message = db.message().getMessage(target.id);
if (message == null || !message.ui_hide) if (message == null || !message.ui_hide)
continue; continue;
Log.i("Move id=" + target.id + " target=" + target.targetFolder.name); Log.i("Move id=" + target.id + " target=" + target.targetFolder.name);
db.message().setMessageUiBusy(target.id, null); db.message().setMessageUiBusy(target.id, null);
db.message().setMessageLastAttempt(target.id, new Date().getTime()); db.message().setMessageLastAttempt(target.id, new Date().getTime());
EntityOperation.queue(context, message, EntityOperation.MOVE, target.targetFolder.id); EntityOperation.queue(context, message, EntityOperation.MOVE, target.targetFolder.id);
} }
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {
db.endTransaction(); db.endTransaction();
} }
ServiceSynchronize.eval(context, "move"); ServiceSynchronize.eval(context, "move");
return null; return null;
} }
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
Log.e(ex); Log.e(ex);
} }
}.execute(FragmentMessages.this, args, "undo:move"); };
}
},
new Runnable() {
@Override
public void run() {
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
ArrayList<MessageTarget> result = args.getParcelableArrayList("result");
DB db = DB.getInstance(context); SimpleTask<Void> show = new SimpleTask<Void>() {
try { @Override
db.beginTransaction(); protected Void onExecute(Context context, Bundle args) {
ArrayList<MessageTarget> result = args.getParcelableArrayList("result");
for (MessageTarget target : result) { DB db = DB.getInstance(context);
Log.i("Move undo id=" + target.id); try {
db.message().setMessageUiBusy(target.id, null); db.beginTransaction();
db.message().setMessageUiHide(target.id, false);
db.message().setMessageLastAttempt(target.id, new Date().getTime());
}
db.setTransactionSuccessful(); for (MessageTarget target : result) {
} finally { Log.i("Move undo id=" + target.id);
db.endTransaction(); db.message().setMessageUiBusy(target.id, null);
} db.message().setMessageUiHide(target.id, false);
db.message().setMessageLastAttempt(target.id, new Date().getTime());
}
return null; db.setTransactionSuccessful();
} } finally {
db.endTransaction();
}
@Override return null;
protected void onException(Bundle args, Throwable ex) { }
Log.e(ex);
} @Override
}.execute(FragmentMessages.this, args, "undo:show"); protected void onException(Bundle args, Throwable ex) {
} Log.e(ex);
}); }
};
String title = getString(R.string.title_move_undo, getDisplay(result, true), result.size());
((ActivityView) activity).undo(title, args, move, show);
} }
@Override @Override

Write Preview
Loading…
Cancel
Save