webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 02:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix NPE when legacy profile has no capabilities

Browse source 
Fixes #616
This commit is contained in:
AsamK 2021-05-12 20:12:05 +02:00
parent 03a5483791
commit ea11f3b1fd
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
View file

@ -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(),