From da069e9d2119dccdee0303ac877aa7837cd51c67 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 27 Feb 2025 09:11:00 +0800 Subject: [PATCH] Force leanback use file activity --- .../com/fongmi/android/tv/utils/FileChooser.java | 8 ++++---- .../main/java/com/fongmi/android/tv/utils/Util.java | 13 +++++++------ 2 files changed, 11 insertions(+), 10 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 d40b1e661..984d6aba8 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 @@ -68,12 +68,12 @@ public class FileChooser { intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, false); intent.putExtra("android.content.extra.SHOW_ADVANCED", true); List resolveInfos = App.get().getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY); - if (!resolveInfos.isEmpty() && !resolveInfos.get(0).activityInfo.packageName.contains("frameworkpackagestubs")) { - if (activity != null) activity.startActivityForResult(Intent.createChooser(intent, ""), code); - if (fragment != null) fragment.startActivityForResult(Intent.createChooser(intent, ""), code); - } else { + if (Util.isLeanback() || resolveInfos.isEmpty() || resolveInfos.get(0).activityInfo.packageName.contains("frameworkpackagestubs")) { if (activity != null) activity.startActivityForResult(new Intent(activity, FileActivity.class), code); if (fragment != null) fragment.startActivityForResult(new Intent(fragment.getActivity(), FileActivity.class), code); + } else { + if (activity != null) activity.startActivityForResult(Intent.createChooser(intent, ""), code); + if (fragment != null) fragment.startActivityForResult(Intent.createChooser(intent, ""), code); } } diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Util.java b/app/src/main/java/com/fongmi/android/tv/utils/Util.java index ee721605d..d4311ddd7 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Util.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Util.java @@ -19,6 +19,7 @@ import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import com.fongmi.android.tv.App; +import com.fongmi.android.tv.BuildConfig; import com.fongmi.android.tv.R; import com.github.catvod.utils.Shell; @@ -145,12 +146,12 @@ public class Util { } } - public static String format(SimpleDateFormat format, long time) { - try { - return format.format(time); - } catch (Exception e) { - return ""; - } + public static boolean isLeanback() { + return "leanback".equals(BuildConfig.FLAVOR_mode); + } + + public static boolean isMobile() { + return "mobile".equals(BuildConfig.FLAVOR_mode); } public static String format(StringBuilder builder, Formatter formatter, long timeMs) {