aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2019-12-08 15:43:55 +0100
committerChristian Schneppe <christian.schneppe@pix-art.de>2019-12-08 15:43:55 +0100
commit960460e7fe3d070b78dc492fce15b95cf5f66ade (patch)
tree4ff0c785b75a29f7ebec97607262460fc90bb015
parente0e158e5fc2d1d81a756ad15b978431c66bbfb22 (diff)
prevent crash when deleting account on servers that don't support omemo
-rw-r--r--src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
index 53b4e4d69..186629853 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
@@ -844,7 +844,8 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
final String node = AxolotlService.PEP_BUNDLES + ":" + getOwnDeviceId();
final IqPacket deleteBundleNode = mXmppConnectionService.getIqGenerator().deleteNode(node);
mXmppConnectionService.sendIqPacket(account, deleteBundleNode, null);
- publishDeviceIdsAndRefineAccessModel(getOwnDeviceIds());
+ final Set<Integer> ownDeviceIds = getOwnDeviceIds();
+ publishDeviceIdsAndRefineAccessModel(ownDeviceIds == null ? Collections.emptySet() : ownDeviceIds);
}
public List<Jid> getCryptoTargets(Conversation conversation) {