diff --git a/android/app/src/main/java/com/lxmusicmobile/cache/Utils.java b/android/app/src/main/java/com/lxmusicmobile/cache/Utils.java index d981ac13..02c120d4 100644 --- a/android/app/src/main/java/com/lxmusicmobile/cache/Utils.java +++ b/android/app/src/main/java/com/lxmusicmobile/cache/Utils.java @@ -13,14 +13,10 @@ public class Utils { * @return */ static public long getDirSize(File dir) { - if (dir == null) { - return 0; - } - if (!dir.isDirectory()) { - return 0; - } + if (dir == null || !dir.isDirectory()) return 0; long dirSize = 0; File[] files = dir.listFiles(); + if (files == null) return dirSize; for (File file : files) { if (file.isFile()) { dirSize += file.length(); @@ -59,21 +55,22 @@ public class Utils { */ static public int clearCacheFolder(File dir, long curTime) { int deletedFiles = 0; - if (dir != null && dir.isDirectory()) { - try { - for (File child : dir.listFiles()) { - if (child.isDirectory()) { - deletedFiles += clearCacheFolder(child, curTime); - } - if (child.lastModified() < curTime) { - if (child.delete()) { - deletedFiles++; - } + if (dir == null || !dir.isDirectory()) return deletedFiles; + File[] files = dir.listFiles(); + if (files == null) return deletedFiles; + try { + for (File child : files) { + if (child.isDirectory()) { + deletedFiles += clearCacheFolder(child, curTime); + } + if (child.lastModified() < curTime) { + if (child.delete()) { + deletedFiles++; } } - } catch (Exception e) { - e.printStackTrace(); } + } catch (Exception e) { + e.printStackTrace(); } return deletedFiles; } diff --git a/publish/changeLog.md b/publish/changeLog.md index 59d5fc0a..cfe9c82f 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,13 +1,3 @@ -### 新增 - -- 添加对通知栏歌曲进度条的支持 - ### 修复 -- 修复某些情况下桌面歌词会导致APP崩溃的问题 -- 修复从电脑浏览器复制的企鹅歌单链接无法打开的问题 - -### 其他 - -- 升级React native到v0.65.1 -- 升级播放模块`react-native-track-player`到v2版本,优化通知栏歌曲信息显示逻辑 +- 修复潜在的获取缓存大小报错问题