From 80e99986401b635f4eeef5d13740911d10740aef Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Thu, 5 Jun 2014 23:22:21 +0200 Subject: Show keys with android contacts This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. --- .../org/sufficientlysecure/keychain/KeychainApplication.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java index 3ac3a9dee..5d6a62f9c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java @@ -26,6 +26,7 @@ import android.graphics.drawable.Drawable; import android.os.Environment; import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.sufficientlysecure.keychain.helper.ContactHelper; import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.PRNGFixes; @@ -79,14 +80,14 @@ public class KeychainApplication extends Application { brandGlowEffect(getApplicationContext(), getApplicationContext().getResources().getColor(R.color.emphasis)); - setupAccountAsNeeded(); + setupAccountAsNeeded(this); } - private void setupAccountAsNeeded() { - AccountManager manager = AccountManager.get(this); - Account[] accounts = manager.getAccountsByType(getPackageName()); + public static void setupAccountAsNeeded(Context context) { + AccountManager manager = AccountManager.get(context); + Account[] accounts = manager.getAccountsByType(Constants.PACKAGE_NAME); if (accounts == null || accounts.length == 0) { - Account dummy = new Account(getString(R.string.app_name), getPackageName()); + Account dummy = new Account(context.getString(R.string.app_name), Constants.PACKAGE_NAME); manager.addAccountExplicitly(dummy, null, null); } } -- cgit v1.2.3