Delete empty message cache directories

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index 61f03f08988b2245e40aaee2a6bae0472c3789d6..dc9799308813938a7110ae34e1b48e704b302939 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -1116,6 +1116,8 @@ class Manager implements Signal {
                     System.err.println("Failed to delete cached message file “" + fileEntry + "”: " + e.getMessage());
                 }
             }
                     System.err.println("Failed to delete cached message file “" + fileEntry + "”: " + e.getMessage());
                 }
             }

+            // Try to delete directory if empty
+            dir.delete();

         }
     }
 
         }
     }
 


@@ -1169,6 +1171,8 @@ class Manager implements Signal {
                     try {
                         cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
                         Files.delete(cacheFile.toPath());
                     try {
                         cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
                         Files.delete(cacheFile.toPath());

+                        // Try to delete directory if empty
+                        new File(getMessageCachePath()).delete();

                     } catch (IOException e) {
                         System.err.println("Failed to delete cached message file “" + cacheFile + "”: " + e.getMessage());
                     }
                     } catch (IOException e) {
                         System.err.println("Failed to delete cached message file “" + cacheFile + "”: " + e.getMessage());
                     }