aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
diff options
context:
space:
mode:
authorDaniel Ramos <hiperzone@gmail.com>2015-03-15 00:12:26 +0000
committerDaniel Ramos <hiperzone@gmail.com>2015-03-15 00:12:26 +0000
commitd3dd9020f585b8f587d9f2deb377750dbd260db1 (patch)
tree29a54fcbf343be765be52f2ffa6bde0f9601da57 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
parentf1b1ecae20edb40a0c9b48009075daf94af51d20 (diff)
downloadopen-keychain-d3dd9020f585b8f587d9f2deb377750dbd260db1.tar.gz
open-keychain-d3dd9020f585b8f587d9f2deb377750dbd260db1.tar.bz2
open-keychain-d3dd9020f585b8f587d9f2deb377750dbd260db1.zip
-fixed out of bounds crash when retrieving the main profile name with secret keys
-fixed a possible crash when retrieving the main profile contactid
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
index 18f1ef8a7..c3a8d60f8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
@@ -135,7 +135,9 @@ public class ViewKeyFragment extends LoaderFragment implements
if (mIsSecret) {//all secret keys are linked to "me" profile in contacts
contactId = ContactHelper.getMainProfileContactId(resolver);
List<String> mainProfileNames = ContactHelper.getMainProfileContactName(context);
- if (mainProfileNames != null) contactName = mainProfileNames.get(0);
+ if (mainProfileNames != null && mainProfileNames.size() > 0) {
+ contactName = mainProfileNames.get(0);
+ }
} else {
contactId = ContactHelper.findContactId(resolver, masterKeyId);