From 646fa877ba61dda1be57d11e166cde1d51ee0ab6 Mon Sep 17 00:00:00 2001
From: James Straub <james.straub@gmail.com>
Date: Sun, 22 Apr 2018 10:20:19 -0400
Subject: [PATCH] Update to mobile data limiting - Moved non-key strings from
 string_keys.xml to strings.xml - Code style changes - Replaced a hard coded
 key string with resource constant

---
 .../org/schabi/newpipe/util/ListHelper.java   | 15 ++++------
 app/src/main/res/values/settings_keys.xml     | 23 --------------
 app/src/main/res/values/strings.xml           | 30 +++++++++++++++++--
 3 files changed, 34 insertions(+), 34 deletions(-)

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 name="limit_mobile_data_usage_key" translatable="false">limit_mobile_data_usage</string>
-    <string name="limit_mobile_data_usage_value" translatable="false">@string/limit_data_usage_none_key</string>
-    <string-array name="limit_data_usage_description_list">
-        <item>@string/limit_data_usage_none_description</item>
-        <item>1080p60</item>
-        <item>1080p</item>
-        <item>720p60</item>
-        <item>720p</item>
-        <item>480p</item>
-        <item>360p</item>
-        <item>240p</item>
-        <item>144p</item>
-    </string-array>
-    <string-array name="limit_data_usage_values_list">
-        <item>@string/limit_data_usage_none_key</item>
-        <item>1080p60</item>
-        <item>1080p</item>
-        <item>720p60</item>
-        <item>720p</item>
-        <item>480p</item>
-        <item>360p</item>
-        <item>240p</item>
-        <item>144p</item>
-    </string-array>
     <string name="limit_data_usage_none_key" translatable="false">limit_data_usage_none</string>
 
 </resources>
\ 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 @@
     <string name="default_video_format_title">Default video format</string>
     <string name="webm_description">WebM — free format</string>
     <string name="m4a_description">M4A — better quality</string>
-    <string name="limit_data_usage_none_description">No limit</string>
-    <string name="limit_mobile_data_usage_title">Limit resolution when using mobile data</string>
     <string name="theme_title">Theme</string>
     <string name="light_theme_title">Light</string>
     <string name="dark_theme_title">Dark</string>
@@ -468,4 +466,32 @@
     <string name="unhook_checkbox">Unhook (may cause distortion)</string>
     <string name="playback_nightcore">Nightcore</string>
     <string name="playback_default">Default</string>
+
+    <!-- Limit mobile data usage  -->
+    <string name="limit_data_usage_none_description">No limit</string>
+    <string name="limit_mobile_data_usage_title">Limit resolution when using mobile data</string>
+    <string name="limit_mobile_data_usage_value" translatable="false">@string/limit_data_usage_none_key</string>
+    <string-array name="limit_data_usage_description_list">
+        <item>@string/limit_data_usage_none_description</item>
+        <item>1080p60</item>
+        <item>1080p</item>
+        <item>720p60</item>
+        <item>720p</item>
+        <item>480p</item>
+        <item>360p</item>
+        <item>240p</item>
+        <item>144p</item>
+    </string-array>
+    <string-array name="limit_data_usage_values_list">
+        <item>@string/limit_data_usage_none_key</item>
+        <item>1080p60</item>
+        <item>1080p</item>
+        <item>720p60</item>
+        <item>720p</item>
+        <item>480p</item>
+        <item>360p</item>
+        <item>240p</item>
+        <item>144p</item>
+    </string-array>
+
 </resources>