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

Show plain text

This commit is contained in:
M66B 2022-02-13 12:08:45 +01:00
parent f277f5abeb
commit 8c433c4dbf
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5110,8 +5110,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
EntityFolder.INBOX.equals(message.folderType));
popupMenu.getMenu().findItem(R.id.menu_alternative)
.setTitle(message.isPlainOnly()
? R.string.title_alternative_html : R.string.title_alternative_text)
.setEnabled(message.uid != null && message.hasAlt())
.setVisible(BuildConfig.DEBUG);
.setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
popupMenu.insertIcons(context);
@ -5609,11 +5611,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
Bundle args = new Bundle();
args.putLong("id", message.id);
args.putBoolean("plain", message.isPlainOnly());
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id");
boolean plain = args.getBoolean("plain");
DB db = DB.getInstance(context);
try {
@ -5623,7 +5627,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (message == null)
return null;
EntityOperation.queue(context, message, EntityOperation.BODY, !message.isPlainOnly());
EntityOperation.queue(context, message, EntityOperation.BODY, !plain);
db.setTransactionSuccessful();
} finally {
@ -5642,7 +5646,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
}
}.execute(context, owner, args, "message:resync");
}.execute(context, owner, args, "message:alt");
}
private void onMenuNotes(TupleMessageEx message) {

2
app/src/main/res/menu/popup_message_more.xml
View File

@ -158,7 +158,7 @@
<item
android:id="@+id/menu_alternative"
android:icon="@drawable/twotone_sync_alt_24"
android:title="@string/title_alternative" />
android:title="@string/title_alternative_text" />
<item
android:id="@+id/menu_log"

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

@ -1369,7 +1369,8 @@
<string name="title_encrypt">Encrypt</string>
<string name="title_decrypt">Decrypt</string>
<string name="title_resync">Resync</string>
<string name="title_alternative" translatable="false">Alternative</string>
<string name="title_alternative_text">Show plain text</string>
<string name="title_alternative_html">Show HTML</string>
<string name="title_no_openpgp">OpenKeychain not found</string>
<string name="title_user_interaction">Transferring to OpenKeychain</string>
<string name="title_signed_data">Verify the signature to show the message text</string>