From d9f56cc8857169fae4e0ffc4178ce6a17850e0ee Mon Sep 17 00:00:00 2001
From: HuanCheng65 <609486518@qq.com>
Date: Sun, 5 Dec 2021 15:56:11 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E5=8E=BB=E9=99=A4=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9B=AE=E5=BD=95=E5=90=8D=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/huanchengfly/tieba/post/utils/FileUtil.java    | 10 +++++-----
 .../com/huanchengfly/tieba/post/utils/ImageUtil.java   |  9 +++++----
 app/src/main/res/xml/file_paths_share_img.xml          |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/FileUtil.java b/app/src/main/java/com/huanchengfly/tieba/post/utils/FileUtil.java
index a41a7a7e..396baef5 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/utils/FileUtil.java
+++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/FileUtil.java
@@ -29,6 +29,8 @@ public class FileUtil {
     public static final int FILE_TYPE_VIDEO = 1;
     public static final int FILE_TYPE_AUDIO = 2;
 
+    public static final String FILE_FOLDER = "TiebaLite";
+
     public static void deleteAllFiles(File root) {
         File[] files = root.listFiles();
         if (files != null)
@@ -52,15 +54,13 @@ public class FileUtil {
     }
 
     /**
-     *  
-     *
      * @param context 上下文对象
-     * @param dir      存储目录
+     * @param dir     存储目录
      * @return
      */
     public static String getFilePath(Context context, String dir) {
         String directoryPath = "";
-        //判断SD卡是否可用 
+        //判断SD卡是否可用
         if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
             directoryPath = context.getExternalFilesDir(dir).getAbsolutePath();
         } else {
@@ -183,7 +183,7 @@ public class FileUtil {
                 directory = Environment.DIRECTORY_DOWNLOADS;
                 break;
         }
-        request.setDestinationInExternalPublicDir(directory, "Tieba Lite/" + fileName);
+        request.setDestinationInExternalPublicDir(directory, FILE_FOLDER + File.separator + fileName);
         final DownloadManager downloadManager = (DownloadManager) context.getSystemService(DOWNLOAD_SERVICE);
         // 添加一个下载任务
         if (downloadManager != null) {
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/ImageUtil.java b/app/src/main/java/com/huanchengfly/tieba/post/utils/ImageUtil.java
index 5f154526..e5cb6b9c 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/utils/ImageUtil.java
+++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/ImageUtil.java
@@ -1,5 +1,7 @@
 package com.huanchengfly.tieba.post.utils;
 
+import static com.huanchengfly.tieba.post.utils.FileUtil.FILE_FOLDER;
+
 import android.annotation.SuppressLint;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -233,7 +235,7 @@ public class ImageUtil {
         }
         new DownloadAsyncTask(context, url, file -> {
             String fileName = URLUtil.guessFileName(url, null, MimeType.JPEG.toString());
-            String relativePath = Environment.DIRECTORY_PICTURES + File.separator + "Tieba Lite";
+            String relativePath = Environment.DIRECTORY_PICTURES + File.separator + FILE_FOLDER;
             if (forShare) {
                 relativePath += File.separator + "shareTemp";
             }
@@ -271,15 +273,14 @@ public class ImageUtil {
         downloadAboveQ(context, url, false, null);
     }
 
-    @SuppressLint("StaticFieldLeak")
     private static void downloadBelowQ(Context context, String url, boolean forShare, @Nullable ShareTaskCallback taskCallback) {
         new DownloadAsyncTask(context, url, file -> {
             File pictureFolder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsoluteFile();
             File appDir;
             if (forShare) {
-                appDir = new File(pictureFolder, "Tieba Lite" + File.separator + "shareTemp");
+                appDir = new File(pictureFolder, FILE_FOLDER + File.separator + "shareTemp");
             } else {
-                appDir = new File(pictureFolder, "Tieba Lite");
+                appDir = new File(pictureFolder, FILE_FOLDER);
             }
             if (appDir.exists() || appDir.mkdirs()) {
                 if (forShare) {
diff --git a/app/src/main/res/xml/file_paths_share_img.xml b/app/src/main/res/xml/file_paths_share_img.xml
index fad0c094..31ca5852 100644
--- a/app/src/main/res/xml/file_paths_share_img.xml
+++ b/app/src/main/res/xml/file_paths_share_img.xml
@@ -2,5 +2,5 @@
 <resource>
     <external-path
         name="images"
-        path="Pictures/Tieba Lite/shareTemp" />
+        path="Pictures/TiebaLite/shareTemp" />
 </resource>
\ No newline at end of file