mirror of
https://github.com/antebudimir/tempus.git
synced 2026-01-01 09:53:33 +00:00
Code decontextualization
This commit is contained in:
parent
f16650a74b
commit
a4b31a9c02
108 changed files with 569 additions and 952 deletions
|
|
@ -30,7 +30,6 @@ public final class DownloadUtil {
|
|||
|
||||
public static final String DOWNLOAD_NOTIFICATION_CHANNEL_ID = "download_channel";
|
||||
|
||||
private static final String TAG = "DemoUtil";
|
||||
private static final String DOWNLOAD_CONTENT_DIRECTORY = "downloads";
|
||||
|
||||
private static DataSource.Factory dataSourceFactory;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package com.cappielloantonio.play.util;
|
||||
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
|
||||
|
|
@ -10,6 +9,7 @@ import androidx.media3.common.MediaMetadata;
|
|||
import androidx.media3.common.MimeTypes;
|
||||
import androidx.media3.common.util.UnstableApi;
|
||||
|
||||
import com.cappielloantonio.play.App;
|
||||
import com.cappielloantonio.play.subsonic.models.Child;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -17,18 +17,18 @@ import java.util.List;
|
|||
|
||||
@OptIn(markerClass = UnstableApi.class)
|
||||
public class MappingUtil {
|
||||
public static ArrayList<MediaItem> mapMediaItems(Context context, List<Child> items, boolean stream) {
|
||||
public static ArrayList<MediaItem> mapMediaItems(List<Child> items, boolean stream) {
|
||||
ArrayList<MediaItem> mediaItems = new ArrayList();
|
||||
|
||||
for (int i = 0; i < items.size(); i++) {
|
||||
mediaItems.add(mapMediaItem(context, items.get(i), stream));
|
||||
mediaItems.add(mapMediaItem(items.get(i), stream));
|
||||
}
|
||||
|
||||
return mediaItems;
|
||||
}
|
||||
|
||||
public static MediaItem mapMediaItem(Context context, Child media, boolean stream) {
|
||||
boolean isDownloaded = DownloadUtil.getDownloadTracker(context).isDownloaded(MusicUtil.getDownloadUri(media.getId()));
|
||||
public static MediaItem mapMediaItem(Child media, boolean stream) {
|
||||
boolean isDownloaded = DownloadUtil.getDownloadTracker(App.getContext()).isDownloaded(MusicUtil.getDownloadUri(media.getId()));
|
||||
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putString("id", media.getId());
|
||||
|
|
@ -78,18 +78,18 @@ public class MappingUtil {
|
|||
)
|
||||
.setRequestMetadata(
|
||||
new MediaItem.RequestMetadata.Builder()
|
||||
.setMediaUri(getUri(context, media, stream && !isDownloaded))
|
||||
.setMediaUri(getUri(media, stream && !isDownloaded))
|
||||
.setExtras(bundle)
|
||||
.build()
|
||||
)
|
||||
.setMimeType(MimeTypes.BASE_TYPE_AUDIO)
|
||||
.setUri(getUri(context, media, stream && !isDownloaded))
|
||||
.setUri(getUri(media, stream && !isDownloaded))
|
||||
.build();
|
||||
}
|
||||
|
||||
private static Uri getUri(Context context, Child media, boolean stream) {
|
||||
private static Uri getUri(Child media, boolean stream) {
|
||||
if (stream) {
|
||||
return MusicUtil.getStreamUri(context, media.getId());
|
||||
return MusicUtil.getStreamUri(media.getId());
|
||||
} else {
|
||||
return MusicUtil.getDownloadUri(media.getId());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,12 +21,12 @@ import java.util.stream.Collectors;
|
|||
public class MusicUtil {
|
||||
private static final String TAG = "MusicUtil";
|
||||
|
||||
public static Uri getStreamUri(Context context, String id) {
|
||||
Map<String, String> params = App.getSubsonicClientInstance(App.getInstance(), false).getParams();
|
||||
public static Uri getStreamUri(String id) {
|
||||
Map<String, String> params = App.getSubsonicClientInstance(false).getParams();
|
||||
|
||||
StringBuilder uri = new StringBuilder();
|
||||
|
||||
uri.append(App.getSubsonicClientInstance(App.getInstance(), false).getUrl());
|
||||
uri.append(App.getSubsonicClientInstance(false).getUrl());
|
||||
uri.append("stream");
|
||||
|
||||
if (params.containsKey("u") && params.get("u") != null)
|
||||
|
|
@ -42,19 +42,19 @@ public class MusicUtil {
|
|||
if (params.containsKey("c") && params.get("c") != null)
|
||||
uri.append("&c=").append(params.get("c"));
|
||||
|
||||
uri.append("&maxBitRate=").append(getBitratePreference(context));
|
||||
uri.append("&format=").append(getTranscodingFormatPreference(context));
|
||||
uri.append("&maxBitRate=").append(getBitratePreference());
|
||||
uri.append("&format=").append(getTranscodingFormatPreference());
|
||||
uri.append("&id=").append(id);
|
||||
|
||||
return Uri.parse(uri.toString());
|
||||
}
|
||||
|
||||
public static Uri getDownloadUri(String id) {
|
||||
Map<String, String> params = App.getSubsonicClientInstance(App.getInstance(), false).getParams();
|
||||
Map<String, String> params = App.getSubsonicClientInstance(false).getParams();
|
||||
|
||||
StringBuilder uri = new StringBuilder();
|
||||
|
||||
uri.append(App.getSubsonicClientInstance(App.getInstance(), false).getUrl());
|
||||
uri.append(App.getSubsonicClientInstance(false).getUrl());
|
||||
uri.append("download");
|
||||
|
||||
if (params.containsKey("u") && params.get("u") != null)
|
||||
|
|
@ -185,10 +185,10 @@ public class MusicUtil {
|
|||
}
|
||||
}
|
||||
|
||||
public static String getBitratePreference(Context context) {
|
||||
Network network = getConnectivityManager(context).getActiveNetwork();
|
||||
NetworkCapabilities networkCapabilities = getConnectivityManager(context).getNetworkCapabilities(network);
|
||||
String audioTranscodeFormat = getTranscodingFormatPreference(context);
|
||||
public static String getBitratePreference() {
|
||||
Network network = getConnectivityManager().getActiveNetwork();
|
||||
NetworkCapabilities networkCapabilities = getConnectivityManager().getNetworkCapabilities(network);
|
||||
String audioTranscodeFormat = getTranscodingFormatPreference();
|
||||
|
||||
if (audioTranscodeFormat.equals("raw") || network == null || networkCapabilities == null)
|
||||
return "0";
|
||||
|
|
@ -202,9 +202,9 @@ public class MusicUtil {
|
|||
}
|
||||
}
|
||||
|
||||
public static String getTranscodingFormatPreference(Context context) {
|
||||
Network network = getConnectivityManager(context).getActiveNetwork();
|
||||
NetworkCapabilities networkCapabilities = getConnectivityManager(context).getNetworkCapabilities(network);
|
||||
public static String getTranscodingFormatPreference() {
|
||||
Network network = getConnectivityManager().getActiveNetwork();
|
||||
NetworkCapabilities networkCapabilities = getConnectivityManager().getNetworkCapabilities(network);
|
||||
|
||||
if (network == null || networkCapabilities == null) return "raw";
|
||||
|
||||
|
|
@ -217,7 +217,7 @@ public class MusicUtil {
|
|||
}
|
||||
}
|
||||
|
||||
private static ConnectivityManager getConnectivityManager(Context context) {
|
||||
return (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
private static ConnectivityManager getConnectivityManager() {
|
||||
return (ConnectivityManager) App.getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue