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

Added support for PGPony

Browse Source
master
M66B 3 weeks ago
parent d8d7c5bcd3
commit 716262adf8
9 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File

6
FAQ.md
Unescape View File

@ -1029,8 +1029,10 @@ If you want to undo decryption, you can tap on the "close" padlock icon.
*PGP*
You'll need to install and configure [OpenKeychain](https://f-droid.org/en/packages/org.sufficientlysecure.keychain/) first.
FairEmail was tested with OpenKeychain version 5.4. Later versions will most likely be compatible, but earlier versions might not be.
You'll need to install and configure [OpenKeychain](https://f-droid.org/en/packages/org.sufficientlysecure.keychain/) or [PGPony](https://github.com/norsehorse-dev/PGPonyAndroid) first.
FairEmail was tested with OpenKeychain version 5.4 and PGPony 4.1.1. Later versions will most likely be compatible, but earlier versions might not be.
**Note** that you need to select the correct OpenPGP provider on the encryption settings tab page.
[PGPony for Android](https://github.com/norsehorse-dev/PGPonyAndroid) is reported to work too. You can select the PGP provider on the encryption settings tab page.

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

@ -3285,8 +3285,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
// Check for inline encryption
boolean iencrypted = HtmlHelper.contains(document, new String[]{
Helper.PGP_BEGIN_MESSAGE,
Helper.PGP_END_MESSAGE
PgpHelper.PGP_BEGIN_MESSAGE,
PgpHelper.PGP_END_MESSAGE
});
args.putBoolean("inline_encrypted", iencrypted);

3
app/src/main/java/eu/faircode/email/ApplicationEx.java
Unescape View File

@ -1153,6 +1153,9 @@ public class ApplicationEx extends Application
if ("none".equals(onclose))
editor.remove("onclose");
if (BuildConfig.DEBUG)
editor.remove("openpgp_provider");
editor.apply();
}

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

@ -4432,14 +4432,10 @@ public class FragmentCompose extends FragmentBase {
@Override
protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException
|| ex instanceof GeneralSecurityException /* InvalidKeyException */) {
Log.i(ex);
Helper.setSnackbarOptions(
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
} else if (ex instanceof OperationCanceledException) {
Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_no_openpgp, Snackbar.LENGTH_INDEFINITE));
if (!PgpHelper.isOpenKeychainInstalled(getContext())) {
String text = getString(R.string.title_no_openpgp);
text += "\n" + Log.formatThrowable(ex, false);
Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, text, Snackbar.LENGTH_INDEFINITE));
snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -4447,7 +4443,14 @@ public class FragmentCompose extends FragmentBase {
Helper.viewFAQ(v.getContext(), 12);
}
});
Helper.setSnackbarLines(snackbar, 7);
snackbar.show();
} else if (ex instanceof IllegalArgumentException
|| ex instanceof GeneralSecurityException /* InvalidKeyException */) {
Log.i(ex);
Helper.setSnackbarOptions(
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
} else
Log.unexpectedError(getParentFragmentManager(), ex);
}

23
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -9974,11 +9974,11 @@ public class FragmentMessages extends FragmentBase
// https://tools.ietf.org/html/rfc4880#section-6.2
String html = Helper.readText(file);
String body = HtmlHelper.fromHtml(html, context).toString();
int begin = body.indexOf(Helper.PGP_BEGIN_MESSAGE);
int end = body.indexOf(Helper.PGP_END_MESSAGE);
int begin = body.indexOf(PgpHelper.PGP_BEGIN_MESSAGE);
int end = body.indexOf(PgpHelper.PGP_END_MESSAGE);
if (begin >= 0 && begin < end) {
String[] lines = body
.substring(begin, end + Helper.PGP_END_MESSAGE.length())
.substring(begin, end + PgpHelper.PGP_END_MESSAGE.length())
.split("\\r?\\n");
List<String> disarmored = new ArrayList<>();
@ -10269,13 +10269,10 @@ public class FragmentMessages extends FragmentBase
if (auto)
return;
if (ex instanceof IllegalArgumentException) {
Log.i(ex);
Helper.setSnackbarOptions(
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG))
.show();
} else if (ex instanceof OperationCanceledException) {
Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_no_openpgp, Snackbar.LENGTH_INDEFINITE));
if (!PgpHelper.isOpenKeychainInstalled(getContext())) {
String text = getString(R.string.title_no_openpgp);
text += "\n" + Log.formatThrowable(ex, false);
Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, text, Snackbar.LENGTH_INDEFINITE));
snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -10283,7 +10280,13 @@ public class FragmentMessages extends FragmentBase
Helper.viewFAQ(v.getContext(), 12);
}
});
Helper.setSnackbarLines(snackbar, 7);
snackbar.show();
} else if (ex instanceof IllegalArgumentException) {
Log.i(ex);
Helper.setSnackbarOptions(
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG))
.show();
} else
Log.unexpectedError(getParentFragmentManager(), ex);
}

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

@ -351,7 +351,7 @@ 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);
String provider = PgpHelper.getPackageName(v.getContext());
PackageManager pm = v.getContext().getPackageManager();
Intent intent = pm.getLaunchIntentForPackage(provider);
@ -689,7 +689,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", Helper.PGP_OPENKEYCHAIN_PACKAGE);
String provider = PgpHelper.getPackageName(getContext());
spOpenPgp.setTag(provider);
for (int pos = 0; pos < openPgpProvider.size(); pos++)
if (provider.equals(openPgpProvider.get(pos))) {

4
app/src/main/java/eu/faircode/email/Helper.java
Unescape View File

@ -220,10 +220,6 @@ public class Helper {
static final String PLAY_PACKAGE_NAME = "com.android.vending";
static final String PGP_OPENKEYCHAIN_PACKAGE = "org.sufficientlysecure.keychain";
static final String PGP_BEGIN_MESSAGE = "-----BEGIN PGP MESSAGE-----";
static final String PGP_END_MESSAGE = "-----END PGP MESSAGE-----";
static final String PACKAGE_WEBVIEW = "https://play.google.com/store/apps/details?id=com.google.android.webview";
static final String PRIVACY_URI = "https://email.faircode.eu/privacy/";
static final String TUTORIALS_URI = "https://github.com/M66B/FairEmail/tree/master/tutorials#main";

20
app/src/main/java/eu/faircode/email/PgpHelper.java
Unescape View File

@ -50,6 +50,11 @@ public class PgpHelper {
private static final long CONNECT_TIMEOUT = 5000L;
private static final long KEY_TIMEOUT = 250L;
static final String PGP_BEGIN_MESSAGE = "-----BEGIN PGP MESSAGE-----";
static final String PGP_END_MESSAGE = "-----END PGP MESSAGE-----";
private static final String PGP_OPENKEYCHAIN_PACKAGE = "org.sufficientlysecure.keychain";
private static final String PGP_PGPONY = "com.pgpony.android";
static Intent execute(Context context, Intent data, InputStream is, OutputStream os) {
return execute(context, data, is, os, CONNECT_TIMEOUT);
}
@ -160,19 +165,26 @@ public class PgpHelper {
}
static String getPackageName(Context context) {
PackageManager pm = context.getPackageManager();
Intent intent = new Intent(OpenPgpApi.SERVICE_INTENT_2);
List<ResolveInfo> ris = pm.queryIntentServices(intent, 0); // package whitelisted
if (ris != null && ris.size() == 1 && ris.get(0).serviceInfo != null) {
String pkg = ris.get(0).serviceInfo.packageName;
if (pkg != null)
return pkg;
}
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
return prefs.getString("openpgp_provider", Helper.PGP_OPENKEYCHAIN_PACKAGE);
return prefs.getString("openpgp_provider", PGP_OPENKEYCHAIN_PACKAGE);
}
static boolean isOpenKeychainInstalled(Context context) {
String provider = getPackageName(context);
try {
String provider = getPackageName(context);
PackageManager pm = context.getPackageManager();
Intent intent = new Intent(OpenPgpApi.SERVICE_INTENT_2);
intent.setPackage(provider);
List<ResolveInfo> ris = pm.queryIntentServices(intent, 0);
return (ris != null && ris.size() > 0);
} catch (Throwable ex) {
Log.e(ex);

4
app/src/main/res/values/strings.xml
Unescape View File

@ -1951,9 +1951,9 @@
<string name="title_charset_auto">Automatic</string>
<string name="title_alternative_text">Load plain text</string>
<string name="title_alternative_html">Load HTML</string>
<string name="title_no_openpgp">OpenKeychain not found</string>
<string name="title_no_openpgp">OpenPGP provider not found</string>
<string name="title_no_openpgp_remark">PGP end-to-end encryption needs to be configured first</string>
<string name="title_user_interaction">Transferring to OpenKeychain</string>
<string name="title_user_interaction">Transferring to OpenPGP provider</string>
<string name="title_padlock">Use the padlock to decrypt the message</string>
<string name="title_signed_data">Verify the signature to show the message text</string>
<string name="title_not_encrypted">Message is not signed or encrypted</string>

Write Preview
Loading…
Cancel
Save