diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-10-11 14:27:09 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-10-11 14:27:09 +0200 |
| commit | 9e1393bc1c8903d400e559b3528a0fe5d04bd389 (patch) | |
| tree | 3160571c88265b622fe0d22c2e0c0cd641687937 | |
| parent | b23cb5a9e43d804551dc18f399ffbec991479ee6 (diff) | |
prevent null pointer when trying to display device fingerprints of not existing sessions
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index e3848fe2..94292f7e 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -619,6 +619,9 @@ public abstract class XmppActivity extends Activity { protected boolean addFingerprintRow(LinearLayout keys, final Account account, final String fingerprint, boolean highlight) { final XmppAxolotlSession.Trust trust = account.getAxolotlService() .getFingerprintTrust(fingerprint); + if (trust == null) { + return false; + } return addFingerprintRowWithListeners(keys, account, fingerprint, highlight, trust, true, new CompoundButton.OnCheckedChangeListener() { @Override |