antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check network connection type before choosing the default bitrate and transcoding format

Browse source
This commit is contained in:
CappielloAntonio 2021-09-12 12:14:36 +02:00
parent 695f406bd6
commit 4a6ea47457
5 changed files with 61 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
View file

@ -2,7 +2,6 @@ package com.cappielloantonio.play.util;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.text.Html;
import android.util.Log;
@ -22,9 +21,11 @@ public class MusicUtil {
private static final String TAG = "MusicUtil";
public static String getSongStreamUri(Context context, Song song) {
ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
Map<String, String> params = App.getSubsonicClientInstance(App.getInstance(), false).getParams();
return App.getSubsonicClientInstance(App.getInstance(), false).getUrl() +
String uri = App.getSubsonicClientInstance(App.getInstance(), false).getUrl() +
"stream" +
"?u=" + params.get("u") +
"&s=" + params.get("s") +
@ -32,8 +33,12 @@ public class MusicUtil {
"&v=" + params.get("v") +
"&c=" + params.get("c") +
"&id=" + song.getId() +
"&maxBitRate=" + getBitratePreference(context) +
"&format=" + getFormatPreference(context);
"&maxBitRate=" + getBitratePreference(context, connectivityManager.getActiveNetworkInfo().getType()) +
"&format=" + getTranscodingFormatPreference(context, connectivityManager.getActiveNetworkInfo().getType());
Log.d(TAG, "getSongStreamUri(): " + uri);
return uri;
}
public static MediaItem getSongDownloadItem(Song song) {
@ -131,10 +136,8 @@ public class MusicUtil {
}
}
private static String getBitratePreference(Context context) {
ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
switch (connectivityManager.getActiveNetworkInfo().getType()) {
private static String getBitratePreference(Context context, int connectionType) {
switch (connectionType) {
case ConnectivityManager.TYPE_WIFI:
return PreferenceUtil.getInstance(context).getMaxBitrateWifi();
case ConnectivityManager.TYPE_MOBILE:
@ -144,7 +147,14 @@ public class MusicUtil {
}
}
private static String getFormatPreference(Context context) {
return PreferenceUtil.getInstance(context).getAudioTranscodeFormat();
private static String getTranscodingFormatPreference(Context context, int connectionType) {
switch (connectionType) {
case ConnectivityManager.TYPE_WIFI:
return PreferenceUtil.getInstance(context).getAudioTranscodeFormatWifi();
case ConnectivityManager.TYPE_MOBILE:
return PreferenceUtil.getInstance(context).getAudioTranscodeFormatMobile();
default:
return PreferenceUtil.getInstance(context).getAudioTranscodeFormatWifi();
}
}
}

11
app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java
View file

@ -23,7 +23,8 @@ public class PreferenceUtil {
public static final String MEDIA_CACHE_SIZE = "media_cache_size";
public static final String MAX_BITRATE_WIFI = "max_bitrate_wifi";
public static final String MAX_BITRATE_MOBILE = "max_bitrate_mobile";
public static final String AUDIO_TRANSCODE_FORMAT = "audio_transcode_format";
public static final String AUDIO_TRANSCODE_FORMAT_WIFI = "audio_transcode_format_wifi";
public static final String AUDIO_TRANSCODE_FORMAT_MOBILE = "audio_transcode_format_mobile";
public static final String WIFI_ONLY = "wifi_only";
private static PreferenceUtil sInstance;
@ -145,8 +146,12 @@ public class PreferenceUtil {
return mPreferences.getString(MAX_BITRATE_MOBILE, "0");
}
public final String getAudioTranscodeFormat() {
return mPreferences.getString(AUDIO_TRANSCODE_FORMAT, "raw");
public final String getAudioTranscodeFormatWifi() {
return mPreferences.getString(AUDIO_TRANSCODE_FORMAT_WIFI, "raw");
}
public final String getAudioTranscodeFormatMobile() {
return mPreferences.getString(AUDIO_TRANSCODE_FORMAT_MOBILE, "raw");
}
public final boolean isWifiOnly() {

19
app/src/main/res/values/arrays.xml
View file

@ -109,14 +109,29 @@
<item>320</item>
</string-array>
<string-array name="audio_transcode_format_list_titles">
<string-array name="audio_transcode_format_wifi_list_titles">
<item>Original</item>
<item>Opus</item>
<item>AAC</item>
<item>Mp3</item>
<item>Flac</item>
</string-array>
<string-array name="audio_transcode_format_list_values">
<string-array name="audio_transcode_format_wifi_list_values">
<item>raw</item>
<item>opus</item>
<item>aac</item>
<item>mp3</item>
<item>flac</item>
</string-array>
<string-array name="audio_transcode_format_mobile_list_titles">
<item>Original</item>
<item>Opus</item>
<item>AAC</item>
<item>Mp3</item>
<item>Flac</item>
</string-array>
<string-array name="audio_transcode_format_mobile_list_values">
<item>raw</item>
<item>opus</item>
<item>aac</item>

3
app/src/main/res/values/strings.xml
View file

@ -141,7 +141,8 @@
<string name="server_signup_dialog_title">Add server</string>
<string name="settings_about_summary">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</string>
<string name="settings_about_title">About</string>
<string name="settings_audio_transcode_format">Transcode format</string>
<string name="settings_audio_transcode_format_mobile">Transcode format in Mobile</string>
<string name="settings_audio_transcode_format_wifi">Transcode format in WiFi</string>
<string name="settings_covers_cache">Covers cache</string>
<string name="settings_github_link">https://github.com/CappielloAntonio/play-for-subsonic</string>
<string name="settings_github_summary">Follow the development</string>

19
app/src/main/res/xml/global_preferences.xml
View file

@ -57,11 +57,20 @@
<ListPreference
app:defaultValue="raw"
app:dialogTitle="@string/settings_audio_transcode_format"
app:entries="@array/audio_transcode_format_list_titles"
app:entryValues="@array/audio_transcode_format_list_values"
app:key="audio_transcode_format"
app:title="@string/settings_audio_transcode_format"
app:dialogTitle="@string/settings_audio_transcode_format_wifi"
app:entries="@array/audio_transcode_format_wifi_list_titles"
app:entryValues="@array/audio_transcode_format_wifi_list_values"
app:key="audio_transcode_format_wifi"
app:title="@string/settings_audio_transcode_format_wifi"
app:useSimpleSummaryProvider="true" />
<ListPreference
app:defaultValue="raw"
app:dialogTitle="@string/settings_audio_transcode_format_mobile"
app:entries="@array/audio_transcode_format_mobile_list_titles"
app:entryValues="@array/audio_transcode_format_mobile_list_values"
app:key="audio_transcode_format_mobile"
app:title="@string/settings_audio_transcode_format_mobile"
app:useSimpleSummaryProvider="true" />
<CheckBoxPreference