mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Clear image cache on manual cleanup

This commit is contained in:
M66B 2019-01-27 12:01:59 +00:00
parent 5c98af8cdb
commit 7ff26f06bb
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@ -977,7 +977,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
new SimpleTask<Void>() { new SimpleTask<Void>() {
@Override @Override
protected Void onExecute(Context context, Bundle args) { protected Void onExecute(Context context, Bundle args) {
JobDaily.cleanup(ActivityView.this); JobDaily.cleanup(ActivityView.this, true);
return null; return null;
} }

17
app/src/main/java/eu/faircode/email/JobDaily.java
View File

@ -64,19 +64,19 @@ public class JobDaily extends JobService {
executor.submit(new Runnable() { executor.submit(new Runnable() {
@Override @Override
public void run() { public void run() {
cleanup(getApplicationContext()); cleanup(getApplicationContext(), false);
} }
}); });
return false; return false;
} }
static void cleanup(Context context) { static void cleanup(Context context, boolean manual) {
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
try { try {
db.beginTransaction(); db.beginTransaction();
Log.i("Start daily job"); Log.i("Start daily job manual=" + manual);
// Cleanup folders // Cleanup folders
Log.i("Cleanup kept messages"); Log.i("Cleanup kept messages");
@ -141,11 +141,12 @@ public class JobDaily extends JobService {
File[] images = new File(context.getCacheDir(), "images").listFiles(); File[] images = new File(context.getCacheDir(), "images").listFiles();
if (images != null) if (images != null)
for (File file : images) for (File file : images)
if (file.isFile() && (now - file.lastModified()) > CACHE_IMAGE_DURATION) { if (file.isFile())
Log.i("Deleting " + file); if (manual || now - file.lastModified() > CACHE_IMAGE_DURATION) {
if (!file.delete()) Log.i("Deleting " + file);
Log.w("Error deleting " + file); if (!file.delete())
} Log.w("Error deleting " + file);
}
Log.i("Cleanup log"); Log.i("Cleanup log");
long before = now - KEEP_LOG_DURATION; long before = now - KEEP_LOG_DURATION;