From 08be6a8510db33e737be02af435b50027429717a Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 25 Aug 2023 10:21:02 +0800 Subject: [PATCH] Fix bug --- app/src/main/java/com/fongmi/android/tv/utils/FileChooser.java | 2 +- .../com/fongmi/android/tv/ui/fragment/SettingFragment.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/utils/FileChooser.java b/app/src/main/java/com/fongmi/android/tv/utils/FileChooser.java index 8ad2ff0d4..9bc98a4f4 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/FileChooser.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/FileChooser.java @@ -58,7 +58,7 @@ public class FileChooser { if (DocumentsContract.isDocumentUri(context, uri)) path = getPathFromDocumentUri(context, uri); else if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) path = getDataColumn(context, uri); else if (ContentResolver.SCHEME_FILE.equalsIgnoreCase(uri.getScheme())) path = uri.getPath(); - return path != null ? path.replace(Path.rootPath(), "") : createFileFromUri(context, uri); + return path != null ? path : createFileFromUri(context, uri); } private static String getPathFromDocumentUri(Context context, Uri uri) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java index 418e0f547..be41cbe07 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java @@ -40,6 +40,7 @@ import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.Utils; import com.github.catvod.bean.Doh; import com.github.catvod.net.OkHttp; +import com.github.catvod.utils.Path; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.permissionx.guolindev.PermissionX; @@ -342,6 +343,6 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); if (resultCode != Activity.RESULT_OK || requestCode != FileChooser.REQUEST_PICK_FILE) return; - setConfig(Config.find("file:/" + FileChooser.getPathFromUri(getContext(), data.getData()), type)); + setConfig(Config.find("file:/" + FileChooser.getPathFromUri(getContext(), data.getData()).replace(Path.rootPath(), ""), type)); } }