aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-21 17:58:26 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-21 17:58:26 +0200
commit9bd3383b49c98ed823f5d7df4a26f148bb3c1329 (patch)
treee50898af0169b437d03433f3c23d200307f1c89d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
parent1d38365a61cb3580978238c6768831680673b682 (diff)
downloadopen-keychain-9bd3383b49c98ed823f5d7df4a26f148bb3c1329.tar.gz
open-keychain-9bd3383b49c98ed823f5d7df4a26f148bb3c1329.tar.bz2
open-keychain-9bd3383b49c98ed823f5d7df4a26f148bb3c1329.zip
Merge user ids in import list for better display
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
index 15bcd8576..a8ddd5419 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
@@ -78,6 +78,7 @@ public class ImportKeysList extends ArrayList<ImportKeysListEntry> {
modified = true;
}
}
+ existing.updateMergedUserIds();
return modified;
}