Fix hardcoded android logs dir. Might fix #1134 ?

Author: julian-CStack

lib/utilities/stack_file_system.dart

@@ -10,6 +10,7 @@
 
 import 'dart:io';
 
+import 'package:path/path.dart' as path;
 import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 
@@ -40,14 +41,17 @@ abstract class StackFileSystem {
     if (Util.isArmLinux) {
       appDirectory = await getApplicationDocumentsDirectory();
       appDirectory = Directory(
-        "${appDirectory.path}/.${AppConfig.appDefaultDataDirName}",
+        path.join(appDirectory.path, ".${AppConfig.appDefaultDataDirName}"),
       );
     } else if (Platform.isLinux) {
       if (_overrideDesktopDirPath != null) {
         appDirectory = Directory(_overrideDesktopDirPath!);
       } else {
         appDirectory = Directory(
-          "${Platform.environment['HOME']}/.${AppConfig.appDefaultDataDirName}",
+          path.join(
+            Platform.environment['HOME']!,
+            ".${AppConfig.appDefaultDataDirName}",
+          ),
         );
       }
     } else if (Platform.isWindows) {
@@ -62,7 +66,7 @@ abstract class StackFileSystem {
       } else {
         appDirectory = await getLibraryDirectory();
         appDirectory = Directory(
-          "${appDirectory.path}/${AppConfig.appDefaultDataDirName}",
+          path.join(appDirectory.path, AppConfig.appDefaultDataDirName),
         );
       }
     } else if (Platform.isIOS) {
@@ -86,7 +90,7 @@ abstract class StackFileSystem {
   static Future<Directory> applicationIsarDirectory() async {
     final root = await applicationRootDirectory();
     if (_createSubDirs) {
-      final dir = Directory("${root.path}/isar");
+      final dir = Directory(path.join(root.path, "isar"));
       if (!dir.existsSync()) {
         await dir.create();
       }
@@ -99,7 +103,7 @@ abstract class StackFileSystem {
   static Future<Directory> applicationDriftDirectory() async {
     final root = await applicationRootDirectory();
     if (_createSubDirs) {
-      final dir = Directory("${root.path}/drift");
+      final dir = Directory(path.join(root.path, "drift"));
       if (!dir.existsSync()) {
         await dir.create();
       }
@@ -126,7 +130,7 @@ abstract class StackFileSystem {
   static Future<Directory> applicationTorDirectory() async {
     final root = await applicationRootDirectory();
     if (_createSubDirs) {
-      final dir = Directory("${root.path}/tor");
+      final dir = Directory(path.join(root.path, "tor"));
       if (!dir.existsSync()) {
         await dir.create();
       }
@@ -139,7 +143,7 @@ abstract class StackFileSystem {
   static Future<Directory> applicationFiroCacheSQLiteDirectory() async {
     final root = await applicationRootDirectory();
     if (_createSubDirs) {
-      final dir = Directory("${root.path}/sqlite/firo_cache");
+      final dir = Directory(path.join(root.path, "sqlite", "firo_cache"));
       if (!dir.existsSync()) {
         await dir.create(recursive: true);
       }
@@ -152,7 +156,7 @@ abstract class StackFileSystem {
   static Future<Directory> applicationHiveDirectory() async {
     final root = await applicationRootDirectory();
     if (_createSubDirs) {
-      final dir = Directory("${root.path}/hive");
+      final dir = Directory(path.join(root.path, "hive"));
       if (!dir.existsSync()) {
         await dir.create();
       }
@@ -164,7 +168,7 @@ abstract class StackFileSystem {
 
   static Future<Directory> applicationXelisDirectory() async {
     final root = await applicationRootDirectory();
-    final dir = Directory("${root.path}${Platform.pathSeparator}xelis");
+    final dir = Directory(path.join(root.path, "xelis"));
     if (!dir.existsSync()) {
       await dir.create();
     }
@@ -173,7 +177,7 @@ abstract class StackFileSystem {
 
   static Future<Directory> applicationXelisTableDirectory() async {
     final xelis = await applicationXelisDirectory();
-    final dir = Directory("${xelis.path}${Platform.pathSeparator}table");
+    final dir = Directory(path.join(xelis.path, "table"));
     if (!dir.existsSync()) {
       await dir.create();
     }
@@ -183,7 +187,7 @@ abstract class StackFileSystem {
   static Future<void> initThemesDir() async {
     final root = await applicationRootDirectory();
 
-    final dir = Directory("${root.path}/themes");
+    final dir = Directory(path.join(root.path, "themes"));
     if (!dir.existsSync()) {
       await dir.create();
     }
@@ -206,13 +210,18 @@ abstract class StackFileSystem {
     final Directory logsDir;
 
     if (Platform.isIOS) {
-      logsDir = Directory("${appDocsDir.path}/logs");
+      logsDir = Directory(path.join(appDocsDir.path, "logs"));
     } else if (Platform.isMacOS || Platform.isLinux || Platform.isWindows) {
       // TODO check this is correct for macos
-      logsDir = Directory("${appDocsDir.path}/$logsDirName");
+      logsDir = Directory(path.join(appDocsDir.path, logsDirName));
     } else if (Platform.isAndroid) {
       await Permission.storage.request();
-      logsDir = Directory("/storage/emulated/0/Documents/$logsDirName");
+      final ext = await getExternalStorageDirectory();
+      final rootPath = path.dirname(
+        path.dirname(path.dirname(path.dirname(ext!.path))),
+      );
+      final logsDirPath = path.join(rootPath, "Documents", logsDirName);
+      logsDir = Directory(logsDirPath);
     } else {
       throw Exception("Unsupported Platform");
     }

pubspec.lock

@@ -1574,18 +1574,18 @@ packages:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849"
+      sha256: "2d070d8684b68efb580a5997eb62f675e8a885ef0be6e754fb9ef489c177470f"
       url: "https://pub.dev"
     source: hosted
-    version: "11.4.0"
+    version: "12.0.0+1"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc
+      sha256: "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6"
       url: "https://pub.dev"
     source: hosted
-    version: "12.1.0"
+    version: "13.0.1"
   permission_handler_apple:
     dependency: transitive
     description:

scripts/app_config/templates/pubspec.template

@@ -78,7 +78,7 @@ dependencies:
   # Utility plugins
   http: ^0.13.0
   local_auth: ^2.3.0
-  permission_handler: ^11.0.0
+  permission_handler: ^12.0.0+1
   flutter_local_notifications: ^17.2.2
   rxdart: ^0.27.3
   zxcvbn: ^1.0.0