From e5ce1ade991a73e541a236ad3af8c453b8ba86b3 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 8 Sep 2021 08:48:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BD=9C=E5=9C=A8=E7=9A=84?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BC=93=E5=AD=98=E5=A4=A7=E5=B0=8F=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lxmusicmobile/cache/Utils.java   | 33 +++++++++----------
 publish/changeLog.md                          | 12 +------
 2 files changed, 16 insertions(+), 29 deletions(-)

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版本，优化通知栏歌曲信息显示逻辑
+- 修复潜在的获取缓存大小报错问题