aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-01-02 14:28:03 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-01-02 14:28:03 +0100
commit5057ea1744eac05fc999db1756cf0d739ae41a72 (patch)
tree54c74cc7ccd91eff2d9a60803fbfb6e404a1fd34 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
parent9cf800bcd8870961acc1719fc56f5e8dab21d0a3 (diff)
downloadopen-keychain-5057ea1744eac05fc999db1756cf0d739ae41a72.tar.gz
open-keychain-5057ea1744eac05fc999db1756cf0d739ae41a72.tar.bz2
open-keychain-5057ea1744eac05fc999db1756cf0d739ae41a72.zip
deal with non-existent user ids during import (#994)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
index 854a90713..d60d7757b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
@@ -21,6 +21,7 @@ import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
+import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.pgp.KeyRing;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
@@ -287,7 +288,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
// if there was no user id flagged as primary, use the first one
if (mPrimaryUserId == null) {
- mPrimaryUserId = mUserIds.get(0);
+ mPrimaryUserId = context.getString(R.string.user_id_none);
}
mKeyId = key.getKeyId();