mirror of https://github.com/M66B/FairEmail.git
Fixed cleaning up shared files
This commit is contained in:
parent
b2af43438e
commit
d8be370b0b
|
@ -193,7 +193,6 @@ public class WorkerCleanup extends Worker {
|
||||||
File[] references = new File(context.getFilesDir(), "references").listFiles();
|
File[] references = new File(context.getFilesDir(), "references").listFiles();
|
||||||
File[] photos = new File(context.getCacheDir(), "photo").listFiles();
|
File[] photos = new File(context.getCacheDir(), "photo").listFiles();
|
||||||
File[] calendars = new File(context.getCacheDir(), "calendar").listFiles();
|
File[] calendars = new File(context.getCacheDir(), "calendar").listFiles();
|
||||||
File[] shared = new File(context.getCacheDir(), "shared").listFiles();
|
|
||||||
|
|
||||||
if (messages != null)
|
if (messages != null)
|
||||||
files.addAll(Arrays.asList(messages));
|
files.addAll(Arrays.asList(messages));
|
||||||
|
@ -205,8 +204,6 @@ public class WorkerCleanup extends Worker {
|
||||||
files.addAll(Arrays.asList(photos));
|
files.addAll(Arrays.asList(photos));
|
||||||
if (calendars != null)
|
if (calendars != null)
|
||||||
files.addAll(Arrays.asList(calendars));
|
files.addAll(Arrays.asList(calendars));
|
||||||
if (shared != null)
|
|
||||||
files.addAll(Arrays.asList(shared));
|
|
||||||
|
|
||||||
// Cleanup message files
|
// Cleanup message files
|
||||||
Log.i("Cleanup message files");
|
Log.i("Cleanup message files");
|
||||||
|
@ -267,6 +264,16 @@ public class WorkerCleanup extends Worker {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Cleanup shared files
|
||||||
|
File[] shared = new File(context.getCacheDir(), "shared").listFiles();
|
||||||
|
if (shared != null)
|
||||||
|
for (File file : shared)
|
||||||
|
if (manual || file.lastModified() + KEEP_FILES_DURATION < now) {
|
||||||
|
Log.i("Deleting " + file);
|
||||||
|
if (!file.delete())
|
||||||
|
Log.w("Error deleting " + file);
|
||||||
|
}
|
||||||
|
|
||||||
// Cleanup contact info
|
// Cleanup contact info
|
||||||
if (manual)
|
if (manual)
|
||||||
ContactInfo.clearCache(context, true);
|
ContactInfo.clearCache(context, true);
|
||||||
|
|
Loading…
Reference in New Issue