diff --git a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
index 93d20e22e..4f607b581 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
@@ -71,15 +71,11 @@ public final class ListHelper {
// If the user has chosen to limit resolution to conserve mobile data
// usage then we should also limit our audio usage.
- int result;
if (isLimitingDataUsage(context)) {
- result = getMostCompactAudioIndex(defaultFormat, audioStreams);
+ return getMostCompactAudioIndex(defaultFormat, audioStreams);
+ } else {
+ return getHighestQualityAudioIndex(defaultFormat, audioStreams);
}
- else {
- result = getHighestQualityAudioIndex(defaultFormat, audioStreams);
- }
-
- return result;
}
/**
@@ -109,8 +105,9 @@ public final class ListHelper {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
// Load the prefered resolution otherwise the best available
- String resolution = preferences != null ? preferences.getString(context.getString(key),
- context.getString(value)) : context.getString(R.string.best_resolution_key);
+ String resolution = preferences != null
+ ? preferences.getString(context.getString(key), context.getString(value))
+ : context.getString(R.string.best_resolution_key);
String maxResolution = getResolutionLimit(context);
if (maxResolution != null && compareVideoStreamResolution(maxResolution, resolution) < 1){
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 03be62431..2fadeb756 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -854,29 +854,6 @@
limit_mobile_data_usage
- @string/limit_data_usage_none_key
-
- - @string/limit_data_usage_none_description
- - 1080p60
- - 1080p
- - 720p60
- - 720p
- - 480p
- - 360p
- - 240p
- - 144p
-
-
- - @string/limit_data_usage_none_key
- - 1080p60
- - 1080p
- - 720p60
- - 720p
- - 480p
- - 360p
- - 240p
- - 144p
-
limit_data_usage_none
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9fa5c7eda..ab9718a0c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,8 +66,6 @@
Default video format
WebM — free format
M4A — better quality
- No limit
- Limit resolution when using mobile data
Theme
Light
Dark
@@ -468,4 +466,32 @@
Unhook (may cause distortion)
Nightcore
Default
+
+
+ No limit
+ Limit resolution when using mobile data
+ @string/limit_data_usage_none_key
+
+ - @string/limit_data_usage_none_description
+ - 1080p60
+ - 1080p
+ - 720p60
+ - 720p
+ - 480p
+ - 360p
+ - 240p
+ - 144p
+
+
+ - @string/limit_data_usage_none_key
+ - 1080p60
+ - 1080p
+ - 720p60
+ - 720p
+ - 480p
+ - 360p
+ - 240p
+ - 144p
+
+