Revert "Merge branch 'dev/jupnp' into v6.2"

This reverts commit a0cda46, reversing
changes made to b5e56ee.

build.gradle

@@ -135,19 +135,23 @@ dependencies {
     // version aligned with external dependencies trakt-java tmdb-java (check pom.xml)
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
     implementation 'com.uwetrottmann.tmdb2:tmdb-java:2.10.0'
-    api 'org.jupnp:org.jupnp:3.0.2'
-    api 'org.jupnp:org.jupnp.support:3.0.2'
-    api 'org.jupnp:org.jupnp.android:3.0.2'
-    // jetty required by jupnp and going above 9.4.14 requires minSdkVersion 26
-    implementation ('org.eclipse.jetty:jetty-server:9.4.14.v20181114') {
+    // all below is linked to cling, jetty version locked to latest 8.1
+    api 'com.github.nova-video-player.cling:cling-core:2.1.7'
+    implementation 'com.github.nova-video-player.cling:cling-support:2.1.7'
+    implementation 'com.github.nova-video-player.seamless:seamless-swing:1.1.4'
+    implementation 'com.github.nova-video-player.seamless:seamless-xml:1.1.4'
+    implementation 'com.github.nova-video-player.seamless:seamless-util:1.1.4'
+    implementation 'com.github.nova-video-player.seamless:seamless-http:1.1.4'
+    implementation 'javax.servlet:javax.servlet-api:4.0.1'
+    // version aligned with cling dependencies
+    implementation ('org.eclipse.jetty:jetty-server:8.1.22.v20160922') {
         exclude group: 'org.eclipse.jetty.orbit', module: 'javax.servlet'
     }
-    implementation ('org.eclipse.jetty:jetty-servlet:9.4.14.v20181114') {
+    implementation ('org.eclipse.jetty:jetty-servlet:8.1.22.v20160922')  {
         exclude group: 'org.eclipse.jetty.orbit', module: 'javax.servlet'
     }
-    implementation ('org.eclipse.jetty:jetty-client:9.4.14.v20181114') {
+    implementation ('org.eclipse.jetty:jetty-client:8.1.22.v20160922') {
         exclude group: 'org.eclipse.jetty.orbit', module: 'javax.servlet'
     }
-    implementation 'javax.servlet:javax.servlet-api:4.0.1'
     implementation 'io.sentry:sentry:7.8.0'
 }

src/com/archos/mediacenter/filecoreextension/upnp2/BlockingDeviceRequest.java

@@ -16,7 +16,7 @@
 
 import android.util.Log;
 
-import org.jupnp.model.meta.Device;
+import org.fourthline.cling.model.meta.Device;
 
 import java.util.HashMap;
 

src/com/archos/mediacenter/filecoreextension/upnp2/StreamUriFinder.java

@@ -23,7 +23,7 @@
 import com.archos.filecorelibrary.RawLister;
 import com.archos.filecorelibrary.FileUtils;
 
-import org.jupnp.model.meta.Device;
+import org.fourthline.cling.model.meta.Device;
 
 import java.util.List;
 
@@ -48,6 +48,9 @@ public void onDeviceListUpdate(List<Device> devices) {
                 }
             }
         }
+
+
+
     };
     public StreamUriFinder(Uri uri, Context context){
         this(uri, context, Looper.getMainLooper());

src/com/archos/mediacenter/filecoreextension/upnp2/UpnpFile2.java

@@ -27,7 +27,7 @@
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.SftpException;
 
-import org.jupnp.support.model.item.Item;
+import org.fourthline.cling.support.model.item.Item;
 
 import java.io.IOException;
 import java.util.List;

src/com/archos/mediacenter/filecoreextension/upnp2/UpnpListingEngine.java

@@ -21,17 +21,17 @@
 import com.archos.filecorelibrary.ListingEngine;
 import com.archos.filecorelibrary.MimeUtils;
 
-import org.jupnp.model.action.ActionInvocation;
-import org.jupnp.model.message.UpnpResponse;
-import org.jupnp.model.meta.Device;
-import org.jupnp.model.meta.Service;
-import org.jupnp.model.types.UDAServiceId;
-import org.jupnp.support.contentdirectory.callback.Browse;
-import org.jupnp.support.model.BrowseFlag;
-import org.jupnp.support.model.DIDLContent;
-import org.jupnp.support.model.DIDLObject;
-import org.jupnp.support.model.container.Container;
-import org.jupnp.support.model.item.Item;
+import org.fourthline.cling.model.action.ActionInvocation;
+import org.fourthline.cling.model.message.UpnpResponse;
+import org.fourthline.cling.model.meta.Device;
+import org.fourthline.cling.model.meta.Service;
+import org.fourthline.cling.model.types.UDAServiceId;
+import org.fourthline.cling.support.contentdirectory.callback.Browse;
+import org.fourthline.cling.support.model.BrowseFlag;
+import org.fourthline.cling.support.model.DIDLContent;
+import org.fourthline.cling.support.model.DIDLObject;
+import org.fourthline.cling.support.model.container.Container;
+import org.fourthline.cling.support.model.item.Item;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;

src/com/archos/mediacenter/filecoreextension/upnp2/UpnpRawLister.java

@@ -22,17 +22,17 @@
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.SftpException;
 
-import org.jupnp.model.action.ActionInvocation;
-import org.jupnp.model.message.UpnpResponse;
-import org.jupnp.model.meta.Device;
-import org.jupnp.model.meta.Service;
-import org.jupnp.model.types.UDAServiceId;
-import org.jupnp.support.contentdirectory.callback.Browse;
-import org.jupnp.support.model.BrowseFlag;
-import org.jupnp.support.model.DIDLContent;
-import org.jupnp.support.model.DIDLObject;
-import org.jupnp.support.model.container.Container;
-import org.jupnp.support.model.item.Item;
+import org.fourthline.cling.model.action.ActionInvocation;
+import org.fourthline.cling.model.message.UpnpResponse;
+import org.fourthline.cling.model.meta.Device;
+import org.fourthline.cling.model.meta.Service;
+import org.fourthline.cling.model.types.UDAServiceId;
+import org.fourthline.cling.support.contentdirectory.callback.Browse;
+import org.fourthline.cling.support.model.BrowseFlag;
+import org.fourthline.cling.support.model.DIDLContent;
+import org.fourthline.cling.support.model.DIDLObject;
+import org.fourthline.cling.support.model.container.Container;
+import org.fourthline.cling.support.model.item.Item;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/com/archos/mediacenter/filecoreextension/upnp2/UpnpServiceManager.java

@@ -25,20 +25,20 @@
 
 import com.archos.environment.NetworkState;
 
-import org.jupnp.controlpoint.ActionCallback;
-import org.jupnp.model.message.header.UDADeviceTypeHeader;
-import org.jupnp.model.meta.Action;
-import org.jupnp.model.meta.Device;
-import org.jupnp.model.meta.LocalDevice;
-import org.jupnp.model.meta.RemoteDevice;
-import org.jupnp.model.meta.Service;
-import org.jupnp.model.types.UDADeviceType;
-import org.jupnp.model.types.UDAServiceId;
-import org.jupnp.registry.DefaultRegistryListener;
-import org.jupnp.registry.Registry;
-import org.jupnp.registry.RegistryListener;
-import org.jupnp.android.AndroidUpnpService;
-import org.jupnp.android.AndroidUpnpServiceImpl;
+import org.fourthline.cling.android.AndroidUpnpService;
+import org.fourthline.cling.android.AndroidUpnpServiceImpl;
+import org.fourthline.cling.controlpoint.ActionCallback;
+import org.fourthline.cling.model.message.header.UDADeviceTypeHeader;
+import org.fourthline.cling.model.meta.Action;
+import org.fourthline.cling.model.meta.Device;
+import org.fourthline.cling.model.meta.LocalDevice;
+import org.fourthline.cling.model.meta.RemoteDevice;
+import org.fourthline.cling.model.meta.Service;
+import org.fourthline.cling.model.types.UDADeviceType;
+import org.fourthline.cling.model.types.UDAServiceId;
+import org.fourthline.cling.registry.DefaultRegistryListener;
+import org.fourthline.cling.registry.Registry;
+import org.fourthline.cling.registry.RegistryListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -269,13 +269,9 @@ public void onServiceConnected(ComponentName className, IBinder service) {
             mAndroidUpnpService = (AndroidUpnpService) service;
             mState = State.RUNNING;
             log.debug("State RUNNING");
+
             // Listen for discovery stuff
-            if (mAndroidUpnpService != null) {
-                mAndroidUpnpService.get().startup(); // need to start UpnpService (was not the case with cling)
-                mAndroidUpnpService.getRegistry().addListener(mRegistryListener);
-            } else {
-                log.error("onServiceConnected: mAndroidUpnpService is null!");
-            }
+            mAndroidUpnpService.getRegistry().addListener(mRegistryListener);
 
             // Start searching for servers periodically
             mUiHandler.removeCallbacks(mPeriodicSearchRunnable); // better safe than sorry
@@ -380,8 +376,7 @@ private void deviceAdded(final Device device) {
             Action action = service.getAction("Browse");
             if (action == null) return;
 
-            log.debug("deviceAdded: " + device.getDisplayString() + " " + device.getDetails().getFriendlyName() + " " + device.getDetails().getSerialNumber() + " " + device.getDetails().getManufacturerDetails().getManufacturer());
-            log.debug("deviceAdded: addDevice with hash code " + device.hashCode());
+            log.debug("addDevice with hash code " + device.hashCode());
             synchronized (this) {
                 // Add to list
                 mDevices.put(Integer.valueOf(device.hashCode()), device);

src/com/archos/mediacenter/utils/UpnpItemData.java

@@ -14,9 +14,9 @@
 
 package com.archos.mediacenter.utils;
 
-import org.jupnp.model.meta.Device;
-import org.jupnp.support.model.container.Container;
-import org.jupnp.support.model.item.Item;
+import org.fourthline.cling.model.meta.Device;
+import org.fourthline.cling.support.model.container.Container;
+import org.fourthline.cling.support.model.item.Item;
 
 
 public class UpnpItemData implements Comparable<UpnpItemData> {

src/com/archos/mediaprovider/video/RemoteStateService.java

@@ -41,7 +41,7 @@
 import com.archos.medialib.R;
 import com.archos.mediaprovider.video.VideoStore.MediaColumns;
 
-import org.jupnp.model.meta.Device;
+import org.fourthline.cling.model.meta.Device;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;