Upgrade to Cling 2.0.1, up min SDK to 4.0+

1 files changed, 109 insertions, 20 deletions

diff --git a/src/github/daneren2005/dsub/provider/DLNARouteProvider.java b/src/github/daneren2005/dsub/provider/DLNARouteProvider.java
index 44cde0ef..3601e696 100644
--- a/src/github/daneren2005/dsub/provider/DLNARouteProvider.java
+++ b/src/github/daneren2005/dsub/provider/DLNARouteProvider.java
@@ -33,19 +33,20 @@ import android.support.v7.media.MediaRouteProvider;
 import android.support.v7.media.MediaRouteProviderDescriptor;
 import android.util.Log;
 
-import org.teleal.cling.android.AndroidUpnpService;
-import org.teleal.cling.android.AndroidUpnpServiceImpl;
-import org.teleal.cling.model.action.ActionInvocation;
-import org.teleal.cling.model.message.UpnpResponse;
-import org.teleal.cling.model.meta.Device;
-import org.teleal.cling.model.meta.LocalDevice;
-import org.teleal.cling.model.meta.RemoteDevice;
-import org.teleal.cling.model.meta.StateVariable;
-import org.teleal.cling.model.meta.StateVariableAllowedValueRange;
-import org.teleal.cling.model.types.ServiceType;
-import org.teleal.cling.registry.Registry;
-import org.teleal.cling.registry.RegistryListener;
-import org.teleal.cling.support.renderingcontrol.callback.GetVolume;
+import org.eclipse.jetty.util.log.Logger;
+import org.fourthline.cling.android.AndroidUpnpService;
+import org.fourthline.cling.android.AndroidUpnpServiceImpl;
+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.LocalDevice;
+import org.fourthline.cling.model.meta.RemoteDevice;
+import org.fourthline.cling.model.meta.StateVariable;
+import org.fourthline.cling.model.meta.StateVariableAllowedValueRange;
+import org.fourthline.cling.model.types.ServiceType;
+import org.fourthline.cling.registry.Registry;
+import org.fourthline.cling.registry.RegistryListener;
+import org.fourthline.cling.support.renderingcontrol.callback.GetVolume;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -58,9 +59,6 @@ import github.daneren2005.dsub.service.DLNAController;
 import github.daneren2005.dsub.service.DownloadService;
 import github.daneren2005.dsub.service.RemoteController;
 
-/**
- * Created by Scott on 11/28/13.
- */
 public class DLNARouteProvider extends MediaRouteProvider {
 	private static final String TAG = DLNARouteProvider.class.getSimpleName();
 	public static final String CATEGORY_DLNA = "github.daneren2005.dsub.DLNA";
@@ -75,6 +73,10 @@ public class DLNARouteProvider extends MediaRouteProvider {
 
 	public DLNARouteProvider(Context context) {
 		super(context);
+
+		// Use custom logger
+		org.eclipse.jetty.util.log.Log.setLog(new JettyAndroidLog());
+
 		this.downloadService = (DownloadService) context;
 		dlnaServiceConnection = new ServiceConnection() {
 			@Override
@@ -83,12 +85,12 @@ public class DLNARouteProvider extends MediaRouteProvider {
 				dlnaService.getRegistry().addListener(new RegistryListener() {
 					@Override
 					public void remoteDeviceDiscoveryStarted(Registry registry, RemoteDevice remoteDevice) {
-
+						Log.i(TAG, "Stared DLNA discovery");
 					}
 
 					@Override
 					public void remoteDeviceDiscoveryFailed(Registry registry, RemoteDevice remoteDevice, Exception e) {
-
+						Log.w(TAG, "Failed to discover DLNA devices");
 					}
 
 					@Override
@@ -138,7 +140,10 @@ public class DLNARouteProvider extends MediaRouteProvider {
 				dlnaService = null;
 			}
 		};
-		context.bindService(new Intent(context, AndroidUpnpServiceImpl.class), dlnaServiceConnection, Context.BIND_AUTO_CREATE);
+
+		if(!context.getApplicationContext().bindService(new Intent(context, AndroidUpnpServiceImpl.class), dlnaServiceConnection, Context.BIND_AUTO_CREATE)) {
+			Log.e(TAG, "Failed to bind to DLNA service");
+		}
 	}
 
 	private void broadcastDescriptors() {
@@ -189,7 +194,7 @@ public class DLNARouteProvider extends MediaRouteProvider {
 	}
 
 	private void deviceAdded(final Device device) {
-		final org.teleal.cling.model.meta.Service renderingControl = device.findService(new ServiceType("schemas-upnp-org", "RenderingControl"));
+		final org.fourthline.cling.model.meta.Service renderingControl = device.findService(new ServiceType("schemas-upnp-org", "RenderingControl"));
 		if(renderingControl == null) {
 			return;
 		}
@@ -235,6 +240,8 @@ public class DLNARouteProvider extends MediaRouteProvider {
 					adding.remove(id);
 				}
 			});
+		} else {
+			adding.remove(id);
 		}
 	}
 	private void deviceRemoved(Device device) {
@@ -302,4 +309,86 @@ public class DLNARouteProvider extends MediaRouteProvider {
 			broadcastDescriptors();
 		}
 	}
+
+	public static class JettyAndroidLog implements Logger {
+		final private static java.util.logging.Logger log = java.util.logging.Logger.getLogger("Jetty");
+
+		public static boolean __isIgnoredEnabled = false;
+		public String _name;
+
+		public JettyAndroidLog() {
+			this (JettyAndroidLog.class.getName());
+		}
+
+		public JettyAndroidLog(String name) {
+			_name = name;
+		}
+
+		public String getName () {
+			return  _name;
+		}
+
+		public void debug(Throwable th) {
+			// Log.d(TAG, "", th);
+		}
+
+		public void debug(String msg, Throwable th) {
+			// Log.d(TAG, msg, th);
+		}
+
+		public void debug(String msg, Object... args) {
+			// Log.d(TAG, msg);
+		}
+
+		public Logger getLogger(String name) {
+			return new JettyAndroidLog(name);
+		}
+
+		public void info(String msg, Object... args) {
+			Log.i(TAG, msg);
+		}
+
+		public void info(Throwable th) {
+			Log.i(TAG, "", th);
+		}
+
+		public void info(String msg, Throwable th) {
+			Log.i(TAG, msg, th);
+		}
+
+		public boolean isDebugEnabled() {
+			return false;
+		}
+
+		public void warn(Throwable th) {
+			Log.w(TAG, "", th);
+		}
+
+		public void warn(String msg, Object... args) {
+			Log.w(TAG, msg);
+		}
+
+		public void warn(String msg, Throwable th) {
+			Log.w(TAG, msg, th);
+		}
+
+		public boolean isIgnoredEnabled () {
+			return __isIgnoredEnabled;
+		}
+
+
+		public void ignore(Throwable ignored) {
+			if (__isIgnoredEnabled) {
+				warn("IGNORED", ignored);
+			}
+		}
+
+		public void setIgnoredEnabled(boolean enabled) {
+			__isIgnoredEnabled = enabled;
+		}
+
+		public void setDebugEnabled(boolean enabled) {
+
+		}
+	}
 }