Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't enable SAF on Fire TV #6516

Merged
merged 5 commits into from
Jun 20, 2021
Merged

Don't enable SAF on Fire TV #6516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ac9917
Don't enable SAF on Fire TV
triallax Jun 18, 2021
e7a4976
Make condition more correct
triallax Jun 19, 2021
a63579d
Remove redundant variable
triallax Jun 19, 2021
f61cd77
Combine "negative" conditions
triallax Jun 20, 2021
96fae38
Add clarifying comments
triallax Jun 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import androidx.preference.PreferenceManager;

import org.schabi.newpipe.R;
import org.schabi.newpipe.util.DeviceUtils;

import java.io.File;
import java.util.Set;
Expand Down Expand Up @@ -110,10 +111,12 @@ private static String getNewPipeChildFolderPathForDir(final File dir) {
}

public static boolean useStorageAccessFramework(final Context context) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
return true;
} else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
// There's a FireOS bug which prevents SAF open/close dialogs from being confirmed with a
// remote (see #6455).
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP || DeviceUtils.isFireTv()) {
return false;
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
return true;
}

final String key = context.getString(R.string.storage_use_saf);
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/java/org/schabi/newpipe/settings/SettingMigrations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.schabi.newpipe.error.ErrorActivity;
import org.schabi.newpipe.error.ErrorInfo;
import org.schabi.newpipe.error.UserAction;
import org.schabi.newpipe.util.DeviceUtils;

import static org.schabi.newpipe.MainActivity.DEBUG;

Expand Down Expand Up @@ -63,9 +64,11 @@ protected void migrate(final Context context) {
// We reset the setting to its default value, i.e. "use SAF", since now there are no
// more issues with SAF and users should use that one instead of the old
// NoNonsenseFilePicker. SAF does not work on KitKat and below, though, so the setting
// is set to false in that case.
// is set to false in that case. Also, there's a bug on FireOS in which SAF open/close
// dialogs cannot be confirmed with a remote (see #6455).
sp.edit().putBoolean(context.getString(R.string.storage_use_saf),
Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP).apply();
Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
&& !DeviceUtils.isFireTv()).apply();
}
};

Expand Down
13 changes: 12 additions & 1 deletion app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public final class DeviceUtils {

private static final String AMAZON_FEATURE_FIRE_TV = "amazon.hardware.fire_tv";
private static Boolean isTV = null;
private static Boolean isFireTV = null;

/*
* Devices that do not support media tunneling
Expand All @@ -35,6 +36,16 @@ public final class DeviceUtils {
private DeviceUtils() {
}

public static boolean isFireTv() {
if (isFireTV != null) {
return isFireTV;
}

isFireTV =
App.getApp().getPackageManager().hasSystemFeature(AMAZON_FEATURE_FIRE_TV);
return isFireTV;
}

public static boolean isTv(final Context context) {
if (isTV != null) {
return isTV;
Expand All @@ -45,7 +56,7 @@ public static boolean isTv(final Context context) {
// from doc: https://developer.android.com/training/tv/start/hardware.html#runtime-check
boolean isTv = ContextCompat.getSystemService(context, UiModeManager.class)
.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION
|| pm.hasSystemFeature(AMAZON_FEATURE_FIRE_TV)
|| isFireTv()
|| pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION);

// from https://stackoverflow.com/a/58932366
Expand Down