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

Revert "Added support for PGP encrypt only"

Browse Source 
This reverts commit 5f1356038e.
pull/212/head
M66B 3 years ago
parent 2c5c958145
commit 27d613810b
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File

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

@ -3643,7 +3643,6 @@ public class FragmentCompose extends FragmentBase {
// Attach key, signed/encrypted data // Attach key, signed/encrypted data
if (OpenPgpApi.ACTION_GET_KEY.equals(data.getAction()) || if (OpenPgpApi.ACTION_GET_KEY.equals(data.getAction()) ||
OpenPgpApi.ACTION_DETACHED_SIGN.equals(data.getAction()) || OpenPgpApi.ACTION_DETACHED_SIGN.equals(data.getAction()) ||
OpenPgpApi.ACTION_ENCRYPT.equals(data.getAction()) ||
OpenPgpApi.ACTION_SIGN_AND_ENCRYPT.equals(data.getAction())) OpenPgpApi.ACTION_SIGN_AND_ENCRYPT.equals(data.getAction()))
try { try {
db.beginTransaction(); db.beginTransaction();
@ -3662,8 +3661,7 @@ public class FragmentCompose extends FragmentBase {
throw new IllegalArgumentException("micalg missing"); throw new IllegalArgumentException("micalg missing");
ct = new ContentType("application/pgp-signature"); ct = new ContentType("application/pgp-signature");
ct.setParameter("micalg", micalg); ct.setParameter("micalg", micalg);
} else if (OpenPgpApi.ACTION_ENCRYPT.equals(data.getAction()) || } else if (OpenPgpApi.ACTION_SIGN_AND_ENCRYPT.equals(data.getAction())) {
OpenPgpApi.ACTION_SIGN_AND_ENCRYPT.equals(data.getAction())) {
name = "encrypted.asc"; name = "encrypted.asc";
encryption = EntityAttachment.PGP_MESSAGE; encryption = EntityAttachment.PGP_MESSAGE;
} else } else
@ -3709,31 +3707,22 @@ public class FragmentCompose extends FragmentBase {
throw new IllegalArgumentException(context.getString(R.string.title_key_missing, throw new IllegalArgumentException(context.getString(R.string.title_key_missing,
TextUtils.join(", ", pgpUserIds))); TextUtils.join(", ", pgpUserIds)));
if (largs.getBoolean("encrypt-only")) { if (identity.sign_key != null) {
// Encrypt message pgpSignKeyId = identity.sign_key;
Intent intent = new Intent(OpenPgpApi.ACTION_ENCRYPT);
intent.putExtra(OpenPgpApi.EXTRA_KEY_IDS, pgpKeyIds); // Get public key
Intent intent = new Intent(OpenPgpApi.ACTION_GET_KEY);
intent.putExtra(OpenPgpApi.EXTRA_KEY_ID, pgpSignKeyId);
intent.putExtra(OpenPgpApi.EXTRA_MINIMIZE, true);
intent.putExtra(OpenPgpApi.EXTRA_MINIMIZE_USER_ID, identity.email);
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true); intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
intent.putExtra(BuildConfig.APPLICATION_ID, largs); intent.putExtra(BuildConfig.APPLICATION_ID, largs);
return intent; return intent;
} else { } else {
if (identity.sign_key != null) { // Get sign key
pgpSignKeyId = identity.sign_key; Intent intent = new Intent(OpenPgpApi.ACTION_GET_SIGN_KEY_ID);
intent.putExtra(BuildConfig.APPLICATION_ID, largs);
// Get public key return intent;
Intent intent = new Intent(OpenPgpApi.ACTION_GET_KEY);
intent.putExtra(OpenPgpApi.EXTRA_KEY_ID, pgpSignKeyId);
intent.putExtra(OpenPgpApi.EXTRA_MINIMIZE, true);
intent.putExtra(OpenPgpApi.EXTRA_MINIMIZE_USER_ID, identity.email);
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
intent.putExtra(BuildConfig.APPLICATION_ID, largs);
return intent;
} else {
// Get sign key
Intent intent = new Intent(OpenPgpApi.ACTION_GET_SIGN_KEY_ID);
intent.putExtra(BuildConfig.APPLICATION_ID, largs);
return intent;
}
} }
} else if (OpenPgpApi.ACTION_GET_SIGN_KEY_ID.equals(data.getAction())) { } else if (OpenPgpApi.ACTION_GET_SIGN_KEY_ID.equals(data.getAction())) {
pgpSignKeyId = result.getLongExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, -1); pgpSignKeyId = result.getLongExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, -1);
@ -3786,8 +3775,7 @@ public class FragmentCompose extends FragmentBase {
args.putInt("action", largs.getInt("action")); args.putInt("action", largs.getInt("action"));
args.putBundle("extras", largs.getBundle("extras")); args.putBundle("extras", largs.getBundle("extras"));
return null; return null;
} else if (OpenPgpApi.ACTION_ENCRYPT.equals(data.getAction()) || } else if (OpenPgpApi.ACTION_SIGN_AND_ENCRYPT.equals(data.getAction())) {
OpenPgpApi.ACTION_SIGN_AND_ENCRYPT.equals(data.getAction())) {
input.delete(); input.delete();
// send message // send message

Write Preview
Loading…
Cancel
Save