antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2026-01-01 01:53:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reformulated the logic of construction of the media URI

Browse source
This commit is contained in:
CappielloAntonio 2022-02-05 23:30:12 +01:00
parent 0df7e69b96
commit cfb8575b4d
1 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,42 +27,50 @@ public class MusicUtil {
Map<String, String> params = App.getSubsonicClientInstance(App.getInstance(), false).getParams(); Map<String, String> params = App.getSubsonicClientInstance(App.getInstance(), false).getParams();
String uri = App.getSubsonicClientInstance(App.getInstance(), false).getUrl() + StringBuilder uri = new StringBuilder();
"stream" +
"?u=" + params.get("u") + uri.append(App.getSubsonicClientInstance(App.getInstance(), false).getUrl());
"&s=" + params.get("s") + uri.append("stream");
"&t=" + params.get("t") +
"&v=" + params.get("v") + if(params.containsKey("u") && params.get("u") != null) uri.append("?u=").append(params.get("u"));
"&c=" + params.get("c") + if(params.containsKey("p") && params.get("p") != null) uri.append("&p=").append(params.get("p"));
"&id=" + id; if(params.containsKey("s") && params.get("s") != null) uri.append("&s=").append(params.get("s"));
if(params.containsKey("t") && params.get("t") != null) uri.append("&t=").append(params.get("t"));
if(params.containsKey("v") && params.get("v") != null) uri.append("&v=").append(params.get("v"));
if(params.containsKey("c") && params.get("c") != null) uri.append("&c=").append(params.get("c"));
uri.append("&id=").append(id);
if (connectivityManager.getActiveNetworkInfo() != null) { if (connectivityManager.getActiveNetworkInfo() != null) {
uri = uri + "&maxBitRate=" uri.append("&maxBitRate=")
+ getBitratePreference(context, connectivityManager.getActiveNetworkInfo().getType()) + "&format=" .append(getBitratePreference(context, connectivityManager.getActiveNetworkInfo().getType()))
+ getTranscodingFormatPreference(context, connectivityManager.getActiveNetworkInfo().getType()); .append("&format=").append(getTranscodingFormatPreference(context, connectivityManager.getActiveNetworkInfo().getType()));
} }
Log.d(TAG, "getSongStreamUri(): " + uri); Log.d(TAG, "getStreamUri(): " + uri);
return Uri.parse(uri); return Uri.parse(uri.toString());
} }
@SuppressLint("UnsafeOptInUsageError") @SuppressLint("UnsafeOptInUsageError")
public static Uri getDownloadUri(String id) { public static Uri getDownloadUri(String id) {
Map<String, String> params = App.getSubsonicClientInstance(App.getInstance(), false).getParams(); Map<String, String> params = App.getSubsonicClientInstance(App.getInstance(), false).getParams();
String uri = App.getSubsonicClientInstance(App.getInstance(), false).getUrl() + StringBuilder uri = new StringBuilder();
"stream" +
"?u=" + params.get("u") +
"&s=" + params.get("s") +
"&t=" + params.get("t") +
"&v=" + params.get("v") +
"&c=" + params.get("c") +
"&id=" + id;
Log.d(TAG, "getSongDownloadUri(): " + uri); uri.append(App.getSubsonicClientInstance(App.getInstance(), false).getUrl());
uri.append("stream");
return Uri.parse(uri); if(params.containsKey("u") && params.get("u") != null) uri.append("?u=").append(params.get("u"));
if(params.containsKey("p") && params.get("p") != null) uri.append("&p=").append(params.get("p"));
if(params.containsKey("s") && params.get("s") != null) uri.append("&s=").append(params.get("s"));
if(params.containsKey("t") && params.get("t") != null) uri.append("&t=").append(params.get("t"));
if(params.containsKey("v") && params.get("v") != null) uri.append("&v=").append(params.get("v"));
if(params.containsKey("c") && params.get("c") != null) uri.append("&c=").append(params.get("c"));
uri.append("&id=").append(id);
Log.d(TAG, "getDownloadUri(): " + uri);
return Uri.parse(uri.toString());
} }
public static String getReadableDurationString(long duration, boolean millis) { public static String getReadableDurationString(long duration, boolean millis) {