From 93d6aafbcc8e4b3cd14edf0cdf9cef75d85260b0 Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Mon, 13 Sep 2021 17:32:39 +0200
Subject: [PATCH] Priority given to the transcoding mode. If set to "Direct
 play" the bitrate of the file will not be changed

---
 .../cappielloantonio/play/util/MusicUtil.java |  4 +++
 app/src/main/res/xml/global_preferences.xml   | 36 +++++++++----------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java b/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
index 361ba638..9ced7bcb 100644
--- a/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
+++ b/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
@@ -137,6 +137,10 @@ public class MusicUtil {
     }
 
     private static String getBitratePreference(Context context, int connectionType) {
+        String audioTranscodeFormat = getTranscodingFormatPreference(context, connectionType);
+
+        if(audioTranscodeFormat.equals("0")) return "0";
+
         switch (connectionType) {
             case ConnectivityManager.TYPE_WIFI:
                 return PreferenceUtil.getInstance(context).getMaxBitrateWifi();
diff --git a/app/src/main/res/xml/global_preferences.xml b/app/src/main/res/xml/global_preferences.xml
index d77d1af6..810e6040 100644
--- a/app/src/main/res/xml/global_preferences.xml
+++ b/app/src/main/res/xml/global_preferences.xml
@@ -72,24 +72,6 @@
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/settings_title_transcoding">
-        <ListPreference
-            app:defaultValue="0"
-            app:dialogTitle="@string/settings_max_bitrate_wifi"
-            app:entries="@array/max_bitrate_wifi_list_titles"
-            app:entryValues="@array/max_bitrate_wifi_list_values"
-            app:key="max_bitrate_wifi"
-            app:title="@string/settings_max_bitrate_wifi"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            app:defaultValue="0"
-            app:dialogTitle="@string/settings_max_bitrate_mobile"
-            app:entries="@array/max_bitrate_mobile_list_titles"
-            app:entryValues="@array/max_bitrate_mobile_list_values"
-            app:key="max_bitrate_mobile"
-            app:title="@string/settings_max_bitrate_mobile"
-            app:useSimpleSummaryProvider="true" />
-
         <ListPreference
             app:defaultValue="raw"
             app:dialogTitle="@string/settings_audio_transcode_format_wifi"
@@ -99,6 +81,15 @@
             app:title="@string/settings_audio_transcode_format_wifi"
             app:useSimpleSummaryProvider="true" />
 
+        <ListPreference
+            app:defaultValue="0"
+            app:dialogTitle="@string/settings_max_bitrate_wifi"
+            app:entries="@array/max_bitrate_wifi_list_titles"
+            app:entryValues="@array/max_bitrate_wifi_list_values"
+            app:key="max_bitrate_wifi"
+            app:title="@string/settings_max_bitrate_wifi"
+            app:useSimpleSummaryProvider="true" />
+
         <ListPreference
             app:defaultValue="raw"
             app:dialogTitle="@string/settings_audio_transcode_format_mobile"
@@ -107,6 +98,15 @@
             app:key="audio_transcode_format_mobile"
             app:title="@string/settings_audio_transcode_format_mobile"
             app:useSimpleSummaryProvider="true" />
+
+        <ListPreference
+            app:defaultValue="0"
+            app:dialogTitle="@string/settings_max_bitrate_mobile"
+            app:entries="@array/max_bitrate_mobile_list_titles"
+            app:entryValues="@array/max_bitrate_mobile_list_values"
+            app:key="max_bitrate_mobile"
+            app:title="@string/settings_max_bitrate_mobile"
+            app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/settings_about_title">