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

Refactoring

Browse Source
This commit is contained in:
M66B
2023-06-28 12:53:11 +02:00
parent cbad85984f
commit 3f05dc8994
5 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,9 +25,14 @@ import static org.openintents.openpgp.util.OpenPgpApi.RESULT_CODE_USER_INTERACTI
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.OperationCanceledException;
import android.text.TextUtils;
import androidx.preference.PreferenceManager;
import org.openintents.openpgp.IOpenPgpService2;
import org.openintents.openpgp.util.OpenPgpApi;
import org.openintents.openpgp.util.OpenPgpServiceConnection;
@@ -115,7 +120,7 @@ public class PgpHelper {
}
private static OpenPgpServiceConnection getConnection(Context context, long timeout) {
final String pkg = Helper.getOpenKeychainPackage(context);
final String pkg = PgpHelper.getPackageName(context);
Log.i("PGP binding to " + pkg + " timeout=" + timeout);
CountDownLatch latch = new CountDownLatch(1);
@@ -153,4 +158,25 @@ public class PgpHelper {
return pgpService;
}
static String getPackageName(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
return prefs.getString("openpgp_provider", Helper.PGP_OPENKEYCHAIN_PACKAGE);
}
static boolean isOpenKeychainInstalled(Context context) {
String provider = getPackageName(context);
try {
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);
return false;
}
}
}