From: AsamK <asamk@gmx.de>
Date: Wed, 12 May 2021 18:12:05 +0000 (+0200)
Subject: Fix NPE when legacy profile has no capabilities
X-Git-Tag: v0.8.3~7
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/ea11f3b1fd2c1e2ab6ef0eff87416f00f6996e29?ds=inline

Fix NPE when legacy profile has no capabilities

Fixes #616
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index f5ac995c..386d2287 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -552,14 +552,16 @@ public class SignalAccount implements Closeable {
                 final var profile = profileEntry.getProfile();
                 if (profile != null) {
                     final var capabilities = new HashSet<Profile.Capability>();
-                    if (profile.getCapabilities().gv1Migration) {
-                        capabilities.add(Profile.Capability.gv1Migration);
-                    }
-                    if (profile.getCapabilities().gv2) {
-                        capabilities.add(Profile.Capability.gv2);
-                    }
-                    if (profile.getCapabilities().storage) {
-                        capabilities.add(Profile.Capability.storage);
+                    if (profile.getCapabilities() != null) {
+                        if (profile.getCapabilities().gv1Migration) {
+                            capabilities.add(Profile.Capability.gv1Migration);
+                        }
+                        if (profile.getCapabilities().gv2) {
+                            capabilities.add(Profile.Capability.gv2);
+                        }
+                        if (profile.getCapabilities().storage) {
+                            capabilities.add(Profile.Capability.storage);
+                        }
                     }
                     final var newProfile = new Profile(profileEntry.getLastUpdateTimestamp(),
                             profile.getGivenName(),