aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-30 20:29:06 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-30 20:29:06 +0200
commitc86f96e8564a3709136437f88b83b6160e893b37 (patch)
tree4b6bd8fffec980e67a3a7a634ae7c968a3308cca
parent121fb58d5e6892c4fd62ac8da90ba45b28e1aafc (diff)
fixed rare npe in verify otr fingerprint dialog
-rw-r--r--src/eu/siacs/conversations/ui/ConversationFragment.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 0255fc04..1e703b48 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -805,10 +805,12 @@ public class ConversationFragment extends Fragment {
@Override
public void onClick(View v) {
- AlertDialog dialog = UIHelper.getVerifyFingerprintDialog(
- (ConversationActivity) getActivity(), conversation,
- fingerprintWarning);
- dialog.show();
+ if (conversation.getOtrFingerprint() != null) {
+ AlertDialog dialog = UIHelper.getVerifyFingerprintDialog(
+ (ConversationActivity) getActivity(), conversation,
+ fingerprintWarning);
+ dialog.show();
+ }
}
});
} else {