Fix renaming with files

Fernthedev · Nov 23, 2023 · 4ac5f40 · 4ac5f40
1 parent 66bbd3c
commit 4ac5f40
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/lib/pages/browser.dart b/lib/pages/browser.dart
@@ -454,6 +454,8 @@ class _DeviceBrowserPageState extends State<DeviceBrowserPage> {
   }
 
   void _onNavigate(String newPath) {
+    if (!context.mounted) return;
+
     Trace.verbose("Loading $newPath");
     // final token = ServicesBinding.rootIsolateToken;
     // var future = compute((message) {

diff --git a/lib/utils/adb.dart b/lib/utils/adb.dart
@@ -156,10 +156,10 @@ abstract class Adb {
   static String fixPath(String path, {bool addQuotes = true}) {
     if (!path.startsWith("/")) path = "/$path";
 
-    if (!addQuotes) {
-      return path;
+    if (addQuotes) {
+      path = "\"$path\"";
     }
-    return "\"$path\"";
+    return path;
 
     // return path
     //     .replaceAll('\\', '/')
@@ -324,8 +324,8 @@ drwxrwx--x  2 u0_a140 sdcard_rw   3488 2023-11-01 10:45 mods_old
 
   static Future<String> moveFile(
       String? serialName, String source, String dest) async {
-    source = fixPath(source, addQuotes: false);
-    dest = fixPath(dest, addQuotes: false);
+    source = fixPath(source, addQuotes: true);
+    dest = fixPath(dest, addQuotes: true);
     var result = await runAdbCommand(serialName, ["shell", "mv", source, dest]);
 
     return normalizeOutput(result.stdout);

diff --git a/lib/widgets/browser/file_table.dart b/lib/widgets/browser/file_table.dart
@@ -271,7 +271,7 @@ class _DataRowState extends State<DataRow> {
       e.friendlyFileName,
       overflow: TextOverflow.ellipsis,
     );
-    
+
     return Wrap(
       crossAxisAlignment: WrapCrossAlignment.center,
       children: [
@@ -354,9 +354,9 @@ class _DataRowState extends State<DataRow> {
 
                   // False positive
                   // ignore: use_build_context_synchronously
+                  fileData.browser.refresh();
                   if (!context.mounted) return;
                   Navigator.of(context).pop();
-                  fileData.browser.refresh();
                 },
               ),
             ],