Update libsignal-service-java

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / AvatarStore.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/AvatarStore.java b/lib/src/main/java/org/asamk/signal/manager/AvatarStore.java
index de59f2aff598d04aad34ce603ff75bbd70578a03..3ed9919484781a3a36f6e746fdf0656b09411ea4 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/AvatarStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/AvatarStore.java
@@ -74,11 +74,15 @@ public class AvatarStore {
     }
 
     private File getContactAvatarFile(SignalServiceAddress address) {
-        return new File(avatarsPath, "contact-" + address.getLegacyIdentifier());
+        return new File(avatarsPath, "contact-" + getLegacyIdentifier(address));
+    }
+
+    private String getLegacyIdentifier(final SignalServiceAddress address) {
+        return address.getNumber().or(() -> address.getUuid().get().toString());
     }
 
     private File getProfileAvatarFile(SignalServiceAddress address) {
-        return new File(avatarsPath, "profile-" + address.getLegacyIdentifier());
+        return new File(avatarsPath, "profile-" + getLegacyIdentifier(address));
     }
 
     private void createAvatarsDir() throws IOException {