aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-06-16 15:41:23 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-06-17 18:53:02 +0200
commit3755bce9cee32041a236e0d4d66474eaf4e18386 (patch)
tree8f5c05c7022f93fdb7ae4fb16561d6f8f200365d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
parent7d371d8a39caebfa663ba26d491c5eacd904a19b (diff)
downloadopen-keychain-3755bce9cee32041a236e0d4d66474eaf4e18386.tar.gz
open-keychain-3755bce9cee32041a236e0d4d66474eaf4e18386.tar.bz2
open-keychain-3755bce9cee32041a236e0d4d66474eaf4e18386.zip
fix nullpointer in ViewKeyFragment
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.java2
1 files changed, 1 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 b92163b59..a929d52f0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
@@ -300,7 +300,7 @@ public class ViewKeyFragment extends LoaderFragment implements
* because the notification triggers faster than the activity closes.
*/
// Avoid NullPointerExceptions...
- if (data.getCount() == 0) {
+ if (data == null || data.getCount() == 0) {
return;
}
// Swap the new cursor in. (The framework will take care of closing the