From 556d071c2acf6c883ee97535912f9887912b2ae2 Mon Sep 17 00:00:00 2001
From: dxl <64101226@qq.com>
Date: Thu, 13 Aug 2020 18:54:25 +0800
Subject: [PATCH] cwd invalid bug fixed.

---
 .../cn/rrg/rdv/fragment/tools/MainSettingsFragment.java  | 6 +++++-
 app_main/src/main/java/cn/rrg/rdv/util/Commons.java      | 9 ++++++---
 app_main/src/main/java/cn/rrg/rdv/util/Paths.java        | 1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app_main/src/main/java/cn/rrg/rdv/fragment/tools/MainSettingsFragment.java b/app_main/src/main/java/cn/rrg/rdv/fragment/tools/MainSettingsFragment.java
index cf66af04..e8d3297a 100644
--- a/app_main/src/main/java/cn/rrg/rdv/fragment/tools/MainSettingsFragment.java
+++ b/app_main/src/main/java/cn/rrg/rdv/fragment/tools/MainSettingsFragment.java
@@ -21,6 +21,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.termux.app.TermuxService;
+
 import cn.dxl.common.util.AppUtil;
 import cn.dxl.common.util.FileUtils;
 import cn.dxl.common.util.LogUtils;
@@ -164,7 +166,9 @@ public class MainSettingsFragment
             @Override
             public void onChange(View view, int pos, boolean checked) {
                 Commons.setPM3ExternalWorkDirectoryEnable(checked);
-                Commons.updatePM3Cwd();
+                setSubTitle(Commons.updatePM3Cwd());
+                setChecked(checked);
+                multiTypeAdapter.notifyDataSetChanged();
             }
         };
         pm3HomePathItem.setSubTitle(Paths.PM3_CWD);
diff --git a/app_main/src/main/java/cn/rrg/rdv/util/Commons.java b/app_main/src/main/java/cn/rrg/rdv/util/Commons.java
index c01223dc..620412dd 100644
--- a/app_main/src/main/java/cn/rrg/rdv/util/Commons.java
+++ b/app_main/src/main/java/cn/rrg/rdv/util/Commons.java
@@ -295,13 +295,16 @@ public class Commons {
                 .getBoolean(Properties.k_pm3_externl_cwd_enable, false);
     }
 
-    public static void updatePM3Cwd() {
+    public static String updatePM3Cwd() {
         // init pm3 cwd
         if (Commons.isPM3ExternalWorkDirectoryEnable()) {
-            TermuxService.PM3_CWD = Paths.PM3_CWD;
-            new File(TermuxService.PM3_CWD).mkdirs();
+            TermuxService.PM3_CWD = Paths.PM3_CWD_FINAL;
+            Paths.PM3_CWD = TermuxService.PM3_CWD;
+            new File(Paths.PM3_CWD).mkdirs();
         } else {
             Paths.PM3_CWD = TermuxService.HOME_PATH;
+            TermuxService.PM3_CWD = null;
         }
+        return Paths.PM3_CWD;
     }
 }
diff --git a/app_main/src/main/java/cn/rrg/rdv/util/Paths.java b/app_main/src/main/java/cn/rrg/rdv/util/Paths.java
index 706c6ab5..51da52fb 100644
--- a/app_main/src/main/java/cn/rrg/rdv/util/Paths.java
+++ b/app_main/src/main/java/cn/rrg/rdv/util/Paths.java
@@ -63,6 +63,7 @@ public class Paths {
     public static String PM3_IMAGE_OS_FILE = TermuxService.HOME_PATH + File.separator + PM3_PATH + File.separator + PM3_OS_FILE_NAME;
     // pm3 cwd -> sdcard
     public static String PM3_CWD = PM3_DIRECTORY + File.separator + "home";
+    public static final String PM3_CWD_FINAL = PM3_DIRECTORY + File.separator + "home";
 
     public static String PN53X_FORWARD_O = PN53X_DIRRECTORY + "/" + "pn53x_forward_o.txt";
     public static String PN53X_FORWARD_E = PN53X_DIRRECTORY + "/" + "pn53x_forward_e.txt";