From 695f406bd6b1b48412f0e1f0bd4e66df8966f947 Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Sun, 12 Sep 2021 12:00:27 +0200 Subject: [PATCH] Check network connection type before choosing the default bitrate --- .../cappielloantonio/play/util/MusicUtil.java | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 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 0c0fcadd..c5013573 100644 --- a/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java +++ b/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java @@ -1,6 +1,8 @@ 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; @@ -30,8 +32,8 @@ public class MusicUtil { "&v=" + params.get("v") + "&c=" + params.get("c") + "&id=" + song.getId() + - "&maxBitRate=" + PreferenceUtil.getInstance(context).getMaxBitrateWifi() + - "&format=" + PreferenceUtil.getInstance(context).getAudioTranscodeFormat(); + "&maxBitRate=" + getBitratePreference(context) + + "&format=" + getFormatPreference(context); } public static MediaItem getSongDownloadItem(Song song) { @@ -128,4 +130,21 @@ public class MusicUtil { return R.drawable.default_album_art; } } + + private static String getBitratePreference(Context context) { + ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + + switch (connectivityManager.getActiveNetworkInfo().getType()) { + case ConnectivityManager.TYPE_WIFI: + return PreferenceUtil.getInstance(context).getMaxBitrateWifi(); + case ConnectivityManager.TYPE_MOBILE: + return PreferenceUtil.getInstance(context).getMaxBitrateMobile(); + default: + return PreferenceUtil.getInstance(context).getMaxBitrateWifi(); + } + } + + private static String getFormatPreference(Context context) { + return PreferenceUtil.getInstance(context).getAudioTranscodeFormat(); + } }