mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-27 10:17:18 +00:00
Code Issues Releases Wiki Activity

Save/encrypt on back

Browse source
This commit is contained in:
M66B 2024-02-26 08:45:55 +01:00
parent b74cb1bae7
commit fe552fe1a6
1 changed files with 20 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/FragmentCompose.java
View file

@ -4983,10 +4983,17 @@ public class FragmentCompose extends FragmentBase {
if (!saved && isEmpty())
onAction(R.id.action_delete, "empty");
else {
boolean finish = EntityMessage.SMIME_SIGNENCRYPT.equals(encrypt) ||
EntityMessage.PGP_ENCRYPTONLY.equals(encrypt) ||
EntityMessage.PGP_SIGNENCRYPT.equals(encrypt);
Bundle extras = new Bundle();
extras.putBoolean("autosave", true);
extras.putBoolean("finish", finish);
onAction(R.id.action_save, extras, "exit");
finish();
if (!finish)
finish();
}
} else
finish();
@ -7094,7 +7101,8 @@ public class FragmentCompose extends FragmentBase {
(EntityMessage.SMIME_SIGNONLY.equals(draft.ui_encrypt) && action == R.id.action_send);
boolean needsEncryption = (dirty && !encrypted && shouldEncrypt);
boolean autosave = extras.getBoolean("autosave");
if (needsEncryption && !autosave) {
boolean finish = extras.getBoolean("finish");
if (needsEncryption && (!autosave || finish)) {
Log.i("Need encryption id=" + draft.id);
args.putBoolean("needsEncryption", true);
db.setTransactionSuccessful();
@ -7481,11 +7489,16 @@ public class FragmentCompose extends FragmentBase {
} else if (action == R.id.action_save) {
boolean autosave = extras.getBoolean("autosave");
setFocus(
args.getInt("focus"),
args.getInt("start", -1),
args.getInt("end", -1),
args.getBoolean("ime") && !autosave);
boolean finish = extras.getBoolean("finish");
if (finish)
finish();
else
setFocus(
args.getInt("focus"),
args.getInt("start", -1),
args.getInt("end", -1),
args.getBoolean("ime") && !autosave);
} else if (action == R.id.action_check) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());