From 65cbc9dc10ae4b4bd872a6d556c446d4c5e6f1b3 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 21 Jun 2016 14:37:01 +0200 Subject: [PATCH] do not crash if there are no cache files to delete java.lang.NullPointerException at org.fdroid.fdroid.Utils.clearOldFiles(Utils.java:347) at org.fdroid.fdroid.CleanCacheService.onHandleIntent(CleanCacheService.java:51) at android.app.IntentService$ServiceHandler.handleMessage(IntentService.java:65) at android.os.Handler.dispatchMessage(Handler.java:107) at android.os.Looper.loop(Looper.java:194) at android.os.HandlerThread.run(HandlerThread.java:60) --- app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java b/app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java index b0dc8b3b8..ce627283b 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java @@ -151,8 +151,12 @@ public class ApkCache { if (dir == null) { return; } + File[] files = dir.listFiles(); + if (files == null) { + return; + } long olderThan = System.currentTimeMillis() - (secondsAgo * 1000L); - for (File f : dir.listFiles()) { + for (File f : files) { if (f.isDirectory()) { clearOldFiles(f, olderThan); f.delete();