cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1147 from Hiperzone/development

Browse Source 
-fixed out of bounds crash when retrieving the main profile name with se...
This commit is contained in:
Dominik Schürmann
2015-03-15 15:34:07 +01:00
parent f4cb254404 d3dd9020f5
commit f1dc58ddfd
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
View File

@@ -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);