Skip to content

DLNA library upgrades #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jhavens1566 wants to merge 2 commits into
base: edge
Choose a base branch
from
Open

DLNA library upgrades #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fb4c8e
drop CustomMediaRouteDialog
paroj Aug 10, 2025
5ba8d8f
DLNA Casting fix
jhavens1566 Aug 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ android {

defaultConfig {
applicationId "github.paroj.dsub2000"
minSdkVersion 24
minSdkVersion 26
targetSdkVersion 36
versionCode 211
versionName '5.6.2'
Expand Down Expand Up @@ -88,16 +88,17 @@ dependencies {
implementation 'com.sothree.slidinguppanel:library:3.4.0'
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'com.shehabic.droppy:Droppy:0.6.0@aar'
implementation 'org.eclipse.jetty:jetty-servlet:9.4.14.v20181114'
implementation 'org.eclipse.jetty:jetty-client:9.4.14.v20181114'
implementation 'org.eclipse.jetty:jetty-servlet:9.4.57.v20241219'
implementation 'org.eclipse.jetty:jetty-server:9.4.57.v20241219'
implementation 'org.eclipse.jetty:jetty-client:9.4.57.v20241219'
implementation 'javax.servlet:javax.servlet-api:4.0.1'
implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
implementation 'org.jupnp:org.jupnp:3.0.3'
implementation 'org.jupnp:org.jupnp.support:3.0.3'
implementation 'org.jupnp:org.jupnp.android:3.0.3'
androidTestImplementation "androidx.test:runner:1.6.2"
androidTestImplementation "androidx.test:rules:1.6.1"
androidTestImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '2.1.20'
androidTestImplementation "androidx.test:runner:1.5.2"
androidTestImplementation "androidx.test:rules:1.5.0"
androidTestImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.7.10'
implementation 'com.esotericsoftware:kryo:5.6.2'
implementation 'androidx.fragment:fragment:1.8.8'
debugImplementation 'org.slf4j:slf4j-api:2.0.17' // For jupnp logging in debug builds
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/github/paroj/dsub2000/fragments/NowPlayingFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
import github.paroj.dsub2000.util.Constants;
import github.paroj.dsub2000.util.SilentBackgroundTask;
import github.paroj.dsub2000.adapter.DownloadFileAdapter;
import github.paroj.dsub2000.view.compat.CustomMediaRouteDialogFactory;
import github.paroj.dsub2000.view.FadeOutAnimation;
import github.paroj.dsub2000.view.FastScroller;
import github.paroj.dsub2000.view.UpdateView;
Expand Down Expand Up @@ -519,7 +518,6 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
MenuItem mediaRouteItem = menu.findItem(R.id.menu_mediaroute);
if(mediaRouteItem != null) {
MediaRouteButton mediaRouteButton = (MediaRouteButton) MenuItemCompat.getActionView(mediaRouteItem);
mediaRouteButton.setDialogFactory(new CustomMediaRouteDialogFactory());
mediaRouteButton.setRouteSelector(downloadService.getRemoteSelector());
}

Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/github/paroj/dsub2000/util/MediaRouteManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
package github.paroj.dsub2000.util;

import android.os.Build;

import androidx.annotation.NonNull;
import androidx.mediarouter.media.MediaRouteProvider;
import androidx.mediarouter.media.MediaRouteSelector;
import androidx.mediarouter.media.MediaRouter;
Expand Down Expand Up @@ -62,7 +64,7 @@ public void destroy() {
}

@Override
public void onRouteSelected(MediaRouter router, RouteInfo info) {
public void onRouteSelected(@NonNull MediaRouter router, @NonNull RouteInfo info, int reason) {
if(castAvailable) {
RemoteController controller = GoogleCompat.getController(downloadService, info);
if(controller != null) {
Expand All @@ -75,7 +77,7 @@ public void onRouteSelected(MediaRouter router, RouteInfo info) {
}
}
@Override
public void onRouteUnselected(MediaRouter router, RouteInfo info) {
public void onRouteUnselected(@NonNull MediaRouter router, @NonNull RouteInfo info, int reason) {
if(downloadService.isRemoteEnabled()) {
downloadService.unregisterRoute(router);
}
Expand Down Expand Up @@ -141,7 +143,7 @@ private void addProviders() {
addOnlineProviders();
}

if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && Util.getPreferences(downloadService).getBoolean(Constants.PREFERENCES_KEY_DLNA_CASTING_ENABLED, false)) {
if(Util.getPreferences(downloadService).getBoolean(Constants.PREFERENCES_KEY_DLNA_CASTING_ENABLED, false)) {
addDLNAProvider();
}
}
Expand All @@ -153,10 +155,8 @@ public void buildSelector() {
if(castAvailable) {
builder.addControlCategory(GoogleCompat.getCastControlCategory());
}
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
builder.addControlCategory(DLNARouteProvider.CATEGORY_DLNA);
}
selector = builder.build();
builder.addControlCategory(DLNARouteProvider.CATEGORY_DLNA);
selector = builder.build();
}

public void addDLNAProvider() {
Expand Down
15 changes: 0 additions & 15 deletions ...rc/main/java/github/paroj/dsub2000/view/compat/CustomMediaRouteChooserDialogFragment.java
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...main/java/github/paroj/dsub2000/view/compat/CustomMediaRouteControllerDialogFragment.java
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions app/src/main/java/github/paroj/dsub2000/view/compat/CustomMediaRouteDialogFactory.java
View file
Open in desktop

This file was deleted.