From b5c4837076ee109ed70bcae91fee782279bfff78 Mon Sep 17 00:00:00 2001
From: niuhuan <niuhuancn@outlook.com>
Date: Wed, 22 Mar 2023 16:38:30 +0800
Subject: [PATCH] :recycle: Refactor andoird default folder

---
 android/app/src/main/AndroidManifest.xml        | 16 ++++++++++++----
 .../kotlin/opensource/pikapika/MainActivity.kt  |  5 ++++-
 lib/basic/Method.dart                           |  4 ++++
 lib/basic/config/ChooserRoot.dart               | 17 +++++++----------
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 2f70326..1e6b4a7 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -49,10 +49,8 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data android:scheme="https" />
                 <data android:scheme="http" />
                 <data android:host="pika" />
@@ -63,8 +61,6 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="pika" />
             </intent-filter>
-
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"></action>
                 <category android:name="android.intent.category.DEFAULT"></category>
@@ -78,6 +74,12 @@
                 <data android:pathPattern=".*\..*\..*\..*\.pkz"></data>
                 <data android:pathPattern=".*\..*\..*\..*\..*\.pkz"></data>
                 <data android:pathPattern=".*\..*\..*\..*\..*\..*\.pkz"></data>
+                <data android:pathPattern=".*\.pki"></data>
+                <data android:pathPattern=".*\..*\.pki"></data>
+                <data android:pathPattern=".*\..*\..*\.pki"></data>
+                <data android:pathPattern=".*\..*\..*\..*\.pki"></data>
+                <data android:pathPattern=".*\..*\..*\..*\..*\.pki"></data>
+                <data android:pathPattern=".*\..*\..*\..*\..*\..*\.pki"></data>
                 <data
                     android:host="*"
                     android:mimeType="*/*"
@@ -88,6 +90,12 @@
                 <data android:pathPattern=".*\..*\..*\..*\.pkz"></data>
                 <data android:pathPattern=".*\..*\..*\..*\..*\.pkz"></data>
                 <data android:pathPattern=".*\..*\..*\..*\..*\..*\.pkz"></data>
+                <data android:pathPattern=".*\.pki"></data>
+                <data android:pathPattern=".*\..*\.pki"></data>
+                <data android:pathPattern=".*\..*\..*\.pki"></data>
+                <data android:pathPattern=".*\..*\..*\..*\.pki"></data>
+                <data android:pathPattern=".*\..*\..*\..*\..*\.pki"></data>
+                <data android:pathPattern=".*\..*\..*\..*\..*\..*\.pki"></data>
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/android/app/src/main/kotlin/opensource/pikapika/MainActivity.kt b/android/app/src/main/kotlin/opensource/pikapika/MainActivity.kt
index 6aaa1ec..97d2965 100644
--- a/android/app/src/main/kotlin/opensource/pikapika/MainActivity.kt
+++ b/android/app/src/main/kotlin/opensource/pikapika/MainActivity.kt
@@ -102,6 +102,7 @@ class MainActivity : FlutterActivity() {
                     "androidGetExtendDirs" -> androidGetExtendDirs()
                     "androidSecureFlag" -> androidSecureFlag(call.argument("flag")!!)
                     "verifyAuthentication" -> auth()
+                    "androidStorageRoot" -> storageRoot()
                     else -> {
                         notImplementedToken
                     }
@@ -404,5 +405,7 @@ class MainActivity : FlutterActivity() {
         return queue.poll(5, TimeUnit.MINUTES) ?: false
     }
 
-
+    fun storageRoot(): String {
+        return Environment.getExternalStorageDirectory().absolutePath
+    }
 }
diff --git a/lib/basic/Method.dart b/lib/basic/Method.dart
index e7b1278..0033d99 100644
--- a/lib/basic/Method.dart
+++ b/lib/basic/Method.dart
@@ -972,4 +972,8 @@ class Method {
     String ms = await _flatInvoke("ping", idx);
     return int.parse(ms);
   }
+
+  Future<String> androidStorageRoot() async {
+    return await _channel.invokeMethod("androidStorageRoot");
+  }
 }
diff --git a/lib/basic/config/ChooserRoot.dart b/lib/basic/config/ChooserRoot.dart
index cbf632a..1843276 100644
--- a/lib/basic/config/ChooserRoot.dart
+++ b/lib/basic/config/ChooserRoot.dart
@@ -7,13 +7,16 @@ import 'package:permission_handler/permission_handler.dart';
 
 import '../Common.dart';
 import '../Method.dart';
-import 'Platform.dart';
 
 const _propertyName = "chooserRoot";
 late String _chooserRoot;
+late String _androidDefaultRoot;
 
 Future<dynamic> initChooserRoot() async {
   _chooserRoot = await method.loadProperty(_propertyName, "");
+  if (Platform.isAndroid) {
+    _androidDefaultRoot = await method.androidStorageRoot();
+  }
 }
 
 String _currentChooserRoot() {
@@ -25,7 +28,7 @@ String _currentChooserRoot() {
     } else if (Platform.isLinux) {
       return '/';
     } else if (Platform.isAndroid) {
-      return '/storage/emulated/0';
+      return _androidDefaultRoot;
     } else {
       return '';
     }
@@ -35,14 +38,8 @@ String _currentChooserRoot() {
 
 Future<String> currentChooserRoot() async {
   if (Platform.isAndroid) {
-    if (androidVersion >= 30) {
-      if (!(await Permission.manageExternalStorage.request()).isGranted) {
-        throw Exception("申请权限被拒绝");
-      }
-    } else {
-      if (!(await Permission.storage.request()).isGranted) {
-        throw Exception("申请权限被拒绝");
-      }
+    if (!(await Permission.storage.request()).isGranted) {
+      throw Exception("申请权限被拒绝");
     }
   }
   return _currentChooserRoot();