mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-24 23:12:55 +00:00
Code Issues Releases Wiki Activity

Confirm showing original message

Browse source
This commit is contained in:
M66B 2018-11-11 11:24:34 +00:00
parent 4cd719b5dc
commit ef54df79bc
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/java/eu/faircode/email/AdapterMessage.java
View file

@ -525,13 +525,9 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
else if (viewType == ViewType.THREAD) { else if (viewType == ViewType.THREAD) {
if (view.getId() == R.id.ivExpanderAddress) if (view.getId() == R.id.ivExpanderAddress)
onToggleAddresses(pos, message); onToggleAddresses(pos, message);
else if (view.getId() == R.id.btnHtml) { else if (view.getId() == R.id.btnHtml)
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context); onShowHtml(message);
lbm.sendBroadcast( else if (view.getId() == R.id.btnImages)
new Intent(ActivityView.ACTION_VIEW_FULL)
.putExtra("id", message.id)
.putExtra("from", MessageHelper.getFormattedAddresses(message.from, true)));
} else if (view.getId() == R.id.btnImages)
onShowImages(message); onShowImages(message);
else else
onToggleMessage(pos, message); onToggleMessage(pos, message);
@ -611,6 +607,23 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
notifyItemChanged(pos); notifyItemChanged(pos);
} }
private void onShowHtml(final EntityMessage message) {
new DialogBuilderLifecycle(context, owner)
.setMessage(R.string.title_ask_show_html)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_FULL)
.putExtra("id", message.id)
.putExtra("from", MessageHelper.getFormattedAddresses(message.from, true)));
}
})
.setNegativeButton(android.R.string.cancel, null)
.show();
}
private void onShowImages(EntityMessage message) { private void onShowImages(EntityMessage message) {
properties.setImages(message.id, true); properties.setImages(message.id, true);
btnImages.setEnabled(false); btnImages.setEnabled(false);

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

@ -223,6 +223,7 @@
<string name="title_ask_delete_answer">Delete reply template permanently?</string> <string name="title_ask_delete_answer">Delete reply template permanently?</string>
<string name="title_ask_discard">Discard draft?</string> <string name="title_ask_discard">Discard draft?</string>
<string name="title_ask_spam">Report message as spam?</string> <string name="title_ask_spam">Report message as spam?</string>
<string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
<string name="title_fix">Fix</string> <string name="title_fix">Fix</string>
<string name="title_compose">Compose %1$s</string> <string name="title_compose">Compose %1$s</string>