From: AsamK <asamk@gmx.de>
Date: Thu, 15 Jun 2017 21:47:00 +0000 (+0200)
Subject: Delete empty message cache directories
X-Git-Tag: v0.5.6~1
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/24ab58cc1405344dedbf67eaf5f4314bdae747eb

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 61f03f08..dc979930 100644
--- 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());
                 }
             }
+            // 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 to delete directory if empty
+                        new File(getMessageCachePath()).delete();
                     } catch (IOException e) {
                         System.err.println("Failed to delete cached message file “" + cacheFile + "”: " + e.getMessage());
                     }