2 files changed, 28 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
index 9390e8a69..0654f0c9a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
@@ -76,8 +76,8 @@ public class ViewKeyAdvActivity extends BaseActivity implements
         mExportHelper = new ExportHelper(this);
         mProviderHelper = new ProviderHelper(this);
 
-        mViewPager = (ViewPager) findViewById(R.id.view_key_pager);
-        mSlidingTabLayout = (PagerSlidingTabStrip) findViewById(R.id.view_key_sliding_tab_layout);
+        mViewPager = (ViewPager) findViewById(R.id.pager);
+        mSlidingTabLayout = (PagerSlidingTabStrip) findViewById(R.id.sliding_tab_layout);
 
         int switchToTab = TAB_MAIN;
         Intent intent = getIntent();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
index c66dc04d0..08c7c02fb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
@@ -43,9 +43,11 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
 
 public class ContactHelper {
 
@@ -54,6 +56,17 @@ public class ContactHelper {
     public static List<String> getPossibleUserEmails(Context context) {
         Set<String> accountMails = getAccountEmails(context);
         accountMails.addAll(getMainProfileContactEmails(context));
+
+        // remove items that are not an email
+        Iterator<String> it = accountMails.iterator();
+        while (it.hasNext()) {
+            String email = it.next();
+            Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(email);
+            if (!emailMatcher.matches()) {
+                it.remove();
+            }
+        }
+
         // now return the Set (without duplicates) as a List
         return new ArrayList<>(accountMails);
     }
@@ -62,6 +75,17 @@ public class ContactHelper {
         Set<String> accountMails = getAccountEmails(context);
         Set<String> names = getContactNamesFromEmails(context, accountMails);
         names.addAll(getMainProfileContactName(context));
+
+        // remove items that are an email
+        Iterator<String> it = names.iterator();
+        while (it.hasNext()) {
+            String email = it.next();
+            Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(email);
+            if (emailMatcher.matches()) {
+                it.remove();
+            }
+        }
+
         return new ArrayList<>(names);
     }
 
@@ -75,9 +99,7 @@ public class ContactHelper {
         final Account[] accounts = AccountManager.get(context).getAccounts();
         final Set<String> emailSet = new HashSet<>();
         for (Account account : accounts) {
-            if (Patterns.EMAIL_ADDRESS.matcher(account.name).matches()) {
-                emailSet.add(account.name);
-            }
+            emailSet.add(account.name);
         }
         return emailSet;
     }
@@ -256,7 +278,7 @@ public class ContactHelper {
     }
 
     public static Bitmap loadPhotoByMasterKeyId(ContentResolver contentResolver, long masterKeyId,
-                                                 boolean highRes) {
+                                                boolean highRes) {
         if (masterKeyId == -1) {
             return null;
         }