diff options
Diffstat (limited to 'OpenKeychain/src/main/java')
3 files changed, 10 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java index 6e16c8c54..e9ae5f99f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java @@ -20,6 +20,7 @@ package org.sufficientlysecure.keychain.helper; import android.content.Context; import android.content.SharedPreferences; +import android.os.Build; import org.spongycastle.bcpg.CompressionAlgorithmTags; import org.spongycastle.bcpg.HashAlgorithmTags; @@ -51,7 +52,12 @@ public class Preferences { } private Preferences(Context context) { - mSharedPreferences = context.getSharedPreferences("APG.main", Context.MODE_PRIVATE); + // multi-process preferences + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + mSharedPreferences = context.getSharedPreferences("APG.main", Context.MODE_MULTI_PROCESS); + } else { + mSharedPreferences = context.getSharedPreferences("APG.main", Context.MODE_PRIVATE); + } } public String getLanguage() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java index 1218760da..736d46dc9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java @@ -215,8 +215,10 @@ public class PassphraseCacheService extends Service { switch (keyType) { case DIVERT_TO_CARD: if (Preferences.getPreferences(this).useDefaultYubikeyPin()) { + Log.d(Constants.TAG, "PassphraseCacheService: Using default Yubikey PIN: 123456"); return "123456"; // default Yubikey PIN, see http://www.yubico.com/2012/12/yubikey-neo-openpgp/ } else { + Log.d(Constants.TAG, "PassphraseCacheService: NOT using default Yubikey PIN"); break; } case PASSPHRASE_EMPTY: diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java index 2c8fc29d4..6739e8374 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java @@ -160,7 +160,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor message = getString(R.string.passphrase_for, userId); break; case DIVERT_TO_CARD: - message = getString(R.string.yubikey_pin); + message = getString(R.string.yubikey_pin, userId); break; default: message = "This should not happen!"; |