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

Refactoring

Browse Source
pull/146/head
M66B 7 years ago
parent 1882a5fa7d
commit d8587bdb8c
2 changed files with 186 additions and 186 deletions
Show Stats Download Patch File Download Diff File

310
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -784,54 +784,49 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
} }
} }
private void onMore(final ActionData data) { private void onJunk(final ActionData data) {
boolean inOutbox = EntityFolder.OUTBOX.equals(data.message.folderType); new DialogBuilderLifecycle(context, owner)
boolean show_headers = properties.showHeaders(data.message.id); .setMessage(R.string.title_ask_spam)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Bundle args = new Bundle();
args.putLong("id", data.message.id);
View anchor = bnvActions.findViewById(R.id.action_more); new SimpleTask<Void>() {
PopupMenu popupMenu = new PopupMenu(context, anchor); @Override
popupMenu.inflate(R.menu.menu_message); protected Void onLoad(Context context, Bundle args) {
popupMenu.getMenu().findItem(R.id.menu_forward).setVisible(data.message.content && !inOutbox); long id = args.getLong("id");
popupMenu.getMenu().findItem(R.id.menu_show_headers).setChecked(show_headers);
popupMenu.getMenu().findItem(R.id.menu_show_headers).setEnabled(data.message.uid != null); DB db = DB.getInstance(context);
popupMenu.getMenu().findItem(R.id.menu_show_html).setEnabled(data.message.content && Helper.classExists("android.webkit.WebView")); try {
popupMenu.getMenu().findItem(R.id.menu_flag).setChecked(data.message.uid != null && data.message.unflagged != 1); db.beginTransaction();
popupMenu.getMenu().findItem(R.id.menu_reply_all).setVisible(data.message.content && !inOutbox);
db.message().setMessageUiHide(id, true);
EntityMessage message = db.message().getMessage(id);
EntityFolder spam = db.folder().getFolderByType(message.account, EntityFolder.JUNK);
EntityOperation.queue(db, message, EntityOperation.MOVE, spam.id);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
EntityOperation.process(context);
return null;
}
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override @Override
public boolean onMenuItemClick(MenuItem target) { protected void onException(Bundle args, Throwable ex) {
switch (target.getItemId()) { Helper.unexpectedError(context, ex);
case R.id.menu_junk:
onJunk(data);
return true;
case R.id.menu_forward:
onForward(data);
return true;
case R.id.menu_reply_all:
onReplyAll(data);
return true;
case R.id.menu_show_headers:
onShowHeaders(data);
return true;
case R.id.menu_show_html:
onShowHtml(data);
return true;
case R.id.menu_flag:
onFlag(data);
return true;
case R.id.menu_unseen:
onUnseen(data);
return true;
case R.id.menu_answer:
onAnswer(data);
return true;
default:
return false;
} }
}.load(context, owner, args);
} }
}); })
popupMenu.show(); .setNegativeButton(android.R.string.cancel, null)
.show();
} }
private void onForward(final ActionData data) { private void onForward(final ActionData data) {
@ -882,68 +877,49 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
.putExtra("reference", data.message.id)); .putExtra("reference", data.message.id));
} }
private void onShowHeaders(ActionData data) { private void onAnswer(final ActionData data) {
boolean show_headers = !properties.showHeaders(data.message.id); final DB db = DB.getInstance(context);
properties.setHeaders(data.message.id, show_headers); db.answer().liveAnswers().observe(owner, new Observer<List<EntityAnswer>>() {
if (show_headers) {
grpHeaders.setVisibility(View.VISIBLE);
pbHeaders.setVisibility(View.VISIBLE);
Bundle args = new Bundle();
args.putLong("id", data.message.id);
new SimpleTask<Void>() {
@Override @Override
protected Void onLoad(Context context, Bundle args) { public void onChanged(List<EntityAnswer> answers) {
Long id = args.getLong("id"); final Collator collator = Collator.getInstance(Locale.getDefault());
DB db = DB.getInstance(context); collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
EntityMessage message = db.message().getMessage(id);
EntityOperation.queue(db, message, EntityOperation.HEADERS);
EntityOperation.process(context);
return null;
}
Collections.sort(answers, new Comparator<EntityAnswer>() {
@Override @Override
protected void onException(Bundle args, Throwable ex) { public int compare(EntityAnswer a1, EntityAnswer a2) {
Helper.unexpectedError(context, ex); return collator.compare(a1.name, a2.name);
}
}.load(context, owner, args);
} else
notifyDataSetChanged();
} }
});
private void onShowHtml(ActionData data) { View anchor = bnvActions.findViewById(R.id.action_more);
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context); PopupMenu popupMenu = new PopupMenu(context, anchor);
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_FULL)
.putExtra("id", data.message.id)
.putExtra("from", MessageHelper.getFormattedAddresses(data.message.from, true)));
}
private void onFlag(ActionData data) { int order = 0;
Bundle args = new Bundle(); for (EntityAnswer answer : answers)
args.putLong("id", data.message.id); popupMenu.getMenu().add(Menu.NONE, answer.id.intValue(), order++, answer.name);
args.putBoolean("flagged", !data.message.ui_flagged);
Log.i(Helper.TAG, "Set message id=" + data.message.id + " flagged=" + !data.message.ui_flagged);
new SimpleTask<Void>() { popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override @Override
protected Void onLoad(Context context, Bundle args) throws Throwable { public boolean onMenuItemClick(MenuItem target) {
long id = args.getLong("id"); if (Helper.isPro(context))
boolean flagged = args.getBoolean("flagged"); context.startActivity(new Intent(context, ActivityCompose.class)
DB db = DB.getInstance(context); .putExtra("action", "reply")
EntityMessage message = db.message().getMessage(id); .putExtra("reference", data.message.id)
db.message().setMessageUiFlagged(message.id, flagged); .putExtra("answer", (long) target.getItemId()));
EntityOperation.queue(db, message, EntityOperation.FLAG, flagged); else {
EntityOperation.process(context); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
return null; lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO));
}
return true;
} }
});
@Override popupMenu.show();
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(context, ex); db.answer().liveAnswers().removeObservers(owner);
} }
}.load(context, owner, args); });
} }
private void onUnseen(final ActionData data) { private void onUnseen(final ActionData data) {
@ -981,82 +957,50 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
}.load(context, owner, args); }.load(context, owner, args);
} }
private void onAnswer(final ActionData data) { private void onFlag(ActionData data) {
final DB db = DB.getInstance(context); Bundle args = new Bundle();
db.answer().liveAnswers().observe(owner, new Observer<List<EntityAnswer>>() { args.putLong("id", data.message.id);
@Override args.putBoolean("flagged", !data.message.ui_flagged);
public void onChanged(List<EntityAnswer> answers) { Log.i(Helper.TAG, "Set message id=" + data.message.id + " flagged=" + !data.message.ui_flagged);
final Collator collator = Collator.getInstance(Locale.getDefault());
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
Collections.sort(answers, new Comparator<EntityAnswer>() { new SimpleTask<Void>() {
@Override @Override
public int compare(EntityAnswer a1, EntityAnswer a2) { protected Void onLoad(Context context, Bundle args) throws Throwable {
return collator.compare(a1.name, a2.name); long id = args.getLong("id");
boolean flagged = args.getBoolean("flagged");
DB db = DB.getInstance(context);
EntityMessage message = db.message().getMessage(id);
db.message().setMessageUiFlagged(message.id, flagged);
EntityOperation.queue(db, message, EntityOperation.FLAG, flagged);
EntityOperation.process(context);
return null;
} }
});
View anchor = bnvActions.findViewById(R.id.action_more);
PopupMenu popupMenu = new PopupMenu(context, anchor);
int order = 0;
for (EntityAnswer answer : answers)
popupMenu.getMenu().add(Menu.NONE, answer.id.intValue(), order++, answer.name);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override @Override
public boolean onMenuItemClick(MenuItem target) { protected void onException(Bundle args, Throwable ex) {
if (Helper.isPro(context)) Helper.unexpectedError(context, ex);
context.startActivity(new Intent(context, ActivityCompose.class)
.putExtra("action", "reply")
.putExtra("reference", data.message.id)
.putExtra("answer", (long) target.getItemId()));
else {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO));
} }
return true; }.load(context, owner, args);
} }
});
popupMenu.show();
db.answer().liveAnswers().removeObservers(owner); private void onShowHeaders(ActionData data) {
} boolean show_headers = !properties.showHeaders(data.message.id);
}); properties.setHeaders(data.message.id, show_headers);
} if (show_headers) {
grpHeaders.setVisibility(View.VISIBLE);
pbHeaders.setVisibility(View.VISIBLE);
private void onJunk(final ActionData data) {
new DialogBuilderLifecycle(context, owner)
.setMessage(R.string.title_ask_spam)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", data.message.id); args.putLong("id", data.message.id);
new SimpleTask<Void>() { new SimpleTask<Void>() {
@Override @Override
protected Void onLoad(Context context, Bundle args) { protected Void onLoad(Context context, Bundle args) {
long id = args.getLong("id"); Long id = args.getLong("id");
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
try {
db.beginTransaction();
db.message().setMessageUiHide(id, true);
EntityMessage message = db.message().getMessage(id); EntityMessage message = db.message().getMessage(id);
EntityFolder spam = db.folder().getFolderByType(message.account, EntityFolder.JUNK); EntityOperation.queue(db, message, EntityOperation.HEADERS);
EntityOperation.queue(db, message, EntityOperation.MOVE, spam.id);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
EntityOperation.process(context); EntityOperation.process(context);
return null; return null;
} }
@ -1065,10 +1009,66 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
Helper.unexpectedError(context, ex); Helper.unexpectedError(context, ex);
} }
}.load(context, owner, args); }.load(context, owner, args);
} else
notifyDataSetChanged();
} }
})
.setNegativeButton(android.R.string.cancel, null) private void onShowHtml(ActionData data) {
.show(); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_FULL)
.putExtra("id", data.message.id)
.putExtra("from", MessageHelper.getFormattedAddresses(data.message.from, true)));
}
private void onMore(final ActionData data) {
boolean inOutbox = EntityFolder.OUTBOX.equals(data.message.folderType);
boolean show_headers = properties.showHeaders(data.message.id);
View anchor = bnvActions.findViewById(R.id.action_more);
PopupMenu popupMenu = new PopupMenu(context, anchor);
popupMenu.inflate(R.menu.menu_message);
popupMenu.getMenu().findItem(R.id.menu_forward).setVisible(data.message.content && !inOutbox);
popupMenu.getMenu().findItem(R.id.menu_show_headers).setChecked(show_headers);
popupMenu.getMenu().findItem(R.id.menu_show_headers).setEnabled(data.message.uid != null);
popupMenu.getMenu().findItem(R.id.menu_show_html).setEnabled(data.message.content && Helper.classExists("android.webkit.WebView"));
popupMenu.getMenu().findItem(R.id.menu_flag).setChecked(data.message.uid != null && data.message.unflagged != 1);
popupMenu.getMenu().findItem(R.id.menu_reply_all).setVisible(data.message.content && !inOutbox);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem target) {
switch (target.getItemId()) {
case R.id.menu_junk:
onJunk(data);
return true;
case R.id.menu_forward:
onForward(data);
return true;
case R.id.menu_reply_all:
onReplyAll(data);
return true;
case R.id.menu_show_headers:
onShowHeaders(data);
return true;
case R.id.menu_show_html:
onShowHtml(data);
return true;
case R.id.menu_flag:
onFlag(data);
return true;
case R.id.menu_unseen:
onUnseen(data);
return true;
case R.id.menu_answer:
onAnswer(data);
return true;
default:
return false;
}
}
});
popupMenu.show();
} }
private void onDelete(final ActionData data) { private void onDelete(final ActionData data) {

18
app/src/main/res/menu/menu_message.xml
Unescape View File

@ -13,13 +13,8 @@
android:title="@string/title_reply_all" /> android:title="@string/title_reply_all" />
<item <item
android:id="@+id/menu_show_headers" android:id="@+id/menu_answer"
android:checkable="true" android:title="@string/title_answer_reply" />
android:title="@string/title_show_headers" />
<item
android:id="@+id/menu_show_html"
android:title="@string/title_show_html" />
<item <item
android:id="@+id/menu_unseen" android:id="@+id/menu_unseen"
@ -31,6 +26,11 @@
android:title="@string/title_flag" /> android:title="@string/title_flag" />
<item <item
android:id="@+id/menu_answer" android:id="@+id/menu_show_headers"
android:title="@string/title_answer_reply" /> android:checkable="true"
android:title="@string/title_show_headers" />
<item
android:id="@+id/menu_show_html"
android:title="@string/title_show_html" />
</menu> </menu>

Write Preview
Loading…
Cancel
Save