From 74f6f607bf7a7cd8a7d4e8c923ff2b37c34a72b9 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 25 Aug 2023 10:11:18 +0800 Subject: [PATCH] Fix bug --- app/src/main/java/com/fongmi/android/tv/utils/FileChooser.java | 2 +- catvod/src/main/java/com/github/catvod/utils/Path.java | 2 +- 2 files changed, 2 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 9bc98a4f4..8ad2ff0d4 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 : createFileFromUri(context, uri); + return path != null ? path.replace(Path.rootPath(), "") : createFileFromUri(context, uri); } private static String getPathFromDocumentUri(Context context, Uri uri) { diff --git a/catvod/src/main/java/com/github/catvod/utils/Path.java b/catvod/src/main/java/com/github/catvod/utils/Path.java index ea4656306..e8d20c25c 100644 --- a/catvod/src/main/java/com/github/catvod/utils/Path.java +++ b/catvod/src/main/java/com/github/catvod/utils/Path.java @@ -113,7 +113,7 @@ public class Path { public static File local(String path) { File file1 = new File(path.replace("file:/", "")); File file2 = new File(path.replace("file:/", rootPath())); - return file1.exists() ? file1 : file2.exists() ? file2 : new File(path); + return file2.exists() ? file2 : file1.exists() ? file1 : new File(path); } public static String asset(String fileName) {