From: AsamK <asamk@gmx.de>
Date: Sat, 13 Feb 2021 14:16:54 +0000 (+0100)
Subject: Only attempt to delete profile avatar if it exists
X-Git-Tag: v0.8.0~3
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/3ed776e4ccd7d5420568d67e94b0a808fc2cec35

Only attempt to delete profile avatar if it exists

Fixes #486
---

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 b7244ce2..712e982c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/AvatarStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/AvatarStore.java
@@ -64,7 +64,9 @@ public class AvatarStore {
     }
 
     private void deleteAvatar(final File avatarFile) throws IOException {
-        Files.delete(avatarFile.toPath());
+        if (avatarFile.exists()) {
+            Files.delete(avatarFile.toPath());
+        }
     }
 
     private File getGroupAvatarFile(GroupId groupId) {
diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
index 35190fe8..5455f523 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -40,7 +40,7 @@ public class UpdateProfileCommand implements LocalCommand {
                     : avatarPath == null ? null : Optional.of(new File(avatarPath));
             m.setProfile(name, about, aboutEmoji, avatarFile);
         } catch (IOException e) {
-            System.err.println("UpdateAccount error: " + e.getMessage());
+            System.err.println("Update profile error: " + e.getMessage());
             return 3;
         }