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

Bind PGP files to session

This commit is contained in:
M66B 2021-07-24 09:27:15 +02:00
parent 2b746c0a5e
commit 14b761ea4b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -186,6 +186,7 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Properties; import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -2298,6 +2299,7 @@ public class FragmentCompose extends FragmentBase {
Bundle largs = new Bundle(); Bundle largs = new Bundle();
largs.putLong("id", working); largs.putLong("id", working);
largs.putString("session", UUID.randomUUID().toString());
largs.putInt("action", action); largs.putInt("action", action);
largs.putBundle("extras", extras); largs.putBundle("extras", extras);
largs.putBoolean("interactive", interactive); largs.putBoolean("interactive", interactive);
@ -2710,6 +2712,7 @@ public class FragmentCompose extends FragmentBase {
Intent data = args.getParcelable("data"); Intent data = args.getParcelable("data");
Bundle largs = data.getBundleExtra(BuildConfig.APPLICATION_ID); Bundle largs = data.getBundleExtra(BuildConfig.APPLICATION_ID);
long id = largs.getLong("id", -1); long id = largs.getLong("id", -1);
String session = largs.getString("session");
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
@ -2727,8 +2730,8 @@ public class FragmentCompose extends FragmentBase {
File tmp = new File(context.getFilesDir(), "encryption"); File tmp = new File(context.getFilesDir(), "encryption");
if (!tmp.exists()) if (!tmp.exists())
tmp.mkdir(); tmp.mkdir();
File input = new File(tmp, draft.id + ".pgp_input"); File input = new File(tmp, draft.id + "_" + session + ".pgp_input");
File output = new File(tmp, draft.id + ".pgp_output"); File output = new File(tmp, draft.id + "_" + session + ".pgp_output");
// Serializing messages is NOT reproducible // Serializing messages is NOT reproducible
if ((EntityMessage.PGP_SIGNONLY.equals(draft.ui_encrypt) && if ((EntityMessage.PGP_SIGNONLY.equals(draft.ui_encrypt) &&