Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 21:58:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added PGP key import button

Browse Source
This commit is contained in:
M66B
2022-05-14 15:48:14 +02:00
parent 6c4fed8a91
commit 76255b8996
5 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
View File

@@ -94,6 +94,7 @@ public class FragmentOptionsEncryption extends FragmentBase
private SwitchCompat swAutocrypt;
private SwitchCompat swAutocryptMutual;
private SwitchCompat swEncryptSubject;
private Button btnImportPgp;
private Spinner spSignAlgoSmime;
private Spinner spEncryptAlgoSmime;
@@ -142,6 +143,7 @@ public class FragmentOptionsEncryption extends FragmentBase
swAutocrypt = view.findViewById(R.id.swAutocrypt);
swAutocryptMutual = view.findViewById(R.id.swAutocryptMutual);
swEncryptSubject = view.findViewById(R.id.swEncryptSubject);
btnImportPgp = view.findViewById(R.id.btnImportPgp);
spSignAlgoSmime = view.findViewById(R.id.spSignAlgoSmime);
spEncryptAlgoSmime = view.findViewById(R.id.spEncryptAlgoSmime);
@@ -287,6 +289,24 @@ public class FragmentOptionsEncryption extends FragmentBase
}
});
btnImportPgp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String provider = prefs.getString("openpgp_provider", Helper.PGP_OPENKEYCHAIN_PACKAGE);
PackageManager pm = v.getContext().getPackageManager();
Intent intent = pm.getLaunchIntentForPackage(provider);
if (intent == null)
if (TextUtils.isEmpty(BuildConfig.FDROID))
intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + provider));
else
intent = new Intent(Intent.ACTION_VIEW, Uri.parse(String.format(BuildConfig.FDROID, provider)));
else
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
v.getContext().startActivity(intent);
}
});
// S/MIME
spSignAlgoSmime.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@@ -585,7 +605,7 @@ public class FragmentOptionsEncryption extends FragmentBase
swAutoDecrypt.setChecked(prefs.getBoolean("auto_decrypt", false));
swAutoUndoDecrypt.setChecked(prefs.getBoolean("auto_undecrypt", false));
String provider = prefs.getString("openpgp_provider", "org.sufficientlysecure.keychain");
String provider = prefs.getString("openpgp_provider", Helper.PGP_OPENKEYCHAIN_PACKAGE);
spOpenPgp.setTag(provider);
for (int pos = 0; pos < openPgpProvider.size(); pos++)
if (provider.equals(openPgpProvider.get(pos))) {