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 b7244ce2193d8ec8a88dd63a3a9329b82b319b61..712e982cadc9c86a6d886a0c477b08ad19091413 100644 (file)
--- 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 {
     }
 
     private void deleteAvatar(final File avatarFile) throws IOException {

-        Files.delete(avatarFile.toPath());
+        if (avatarFile.exists()) {
+            Files.delete(avatarFile.toPath());
+        }

     }
 
     private File getGroupAvatarFile(GroupId groupId) {
     }
 
     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 35190fe8066dc15fcbbf8a50fa8208e81b23403c..5455f523ab58ac99a16b0c0d04734feea5876df3 100644 (file)
--- 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) {
                     : 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;
         }
 
             return 3;
         }