[BUGFIX 27] Fix service leak by properly close and start service when…

… activity is destroy
trishika · Apr 20, 2013 · 5bf2c55 · 5bf2c55
1 parent fdb369f
commit 5bf2c55
Show file tree

Hide file tree

Showing 12 changed files with 103 additions and 9 deletions.
diff --git a/src/org/droidupnp/Main.java b/src/org/droidupnp/Main.java
@@ -63,15 +63,22 @@ protected void onCreate(Bundle savedInstanceState)
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.main);
 
-		Log.d(TAG, "onCreated");
+		Log.d(TAG, "onCreated : " + savedInstanceState + factory + upnpServiceController);
 
 		// Use cling factory
 		if (factory == null)
 			factory = new org.droidupnp.controller.cling.Factory();
 
 		// Upnp service
 		if (upnpServiceController == null)
+		{
 			upnpServiceController = factory.createUpnpServiceController(this);
+		}
+		else
+		{
+			Log.i(TAG, "upnp service already exist, just resume it");
+			upnpServiceController.resume(this);
+		}
 
 		// Attach listener
 		Fragment contentDirectoryFragment = getFragmentManager().findFragmentById(R.id.ContentDirectoryFragment);
@@ -113,6 +120,7 @@ public void onPause()
 		Log.i(TAG, "onPause");
 		tab = getActionBar().getSelectedNavigationIndex();
 		getActionBar().removeAllTabs(); // Clear tab onPause, to avoid bug due to use of nested fragment
+		upnpServiceController.pause();
 		super.onPause();
 	}
 

diff --git a/src/org/droidupnp/controller/cling/ServiceController.java b/src/org/droidupnp/controller/cling/ServiceController.java
@@ -39,13 +39,32 @@ public ServiceListener getServiceListener()
 		return upnpServiceListener;
 	}
 
-	private final Activity activity;
+	private Activity activity = null;
 
 	public ServiceController(Activity activity)
 	{
 		super();
 
 		upnpServiceListener = new ServiceListener();
+		resume(activity);
+	}
+
+	@Override
+	protected void finalize()
+	{
+		pause();
+	}
+
+	@Override
+	public void pause()
+	{
+		activity.unbindService(upnpServiceListener.getServiceConnexion());
+		activity = null;
+	}
+
+	@Override
+	public void resume(Activity activity)
+	{
 		this.activity = activity;
 
 		// This will start the UPnP service if it wasn't already started
@@ -54,9 +73,4 @@ public ServiceController(Activity activity)
 				Context.BIND_AUTO_CREATE);
 	}
 
-	@Override
-	protected void finalize()
-	{
-		activity.unbindService(upnpServiceListener.getServiceConnexion());
-	}
 }
diff --git a/src/org/droidupnp/controller/cling/ServiceListener.java b/src/org/droidupnp/controller/cling/ServiceListener.java
@@ -55,6 +55,7 @@ public void refresh()
 		upnpService.getControlPoint().search();
 	}
 
+	@Override
 	public Collection<IUpnpDevice> getDeviceList()
 	{
 		ArrayList<IUpnpDevice> deviceList = new ArrayList<IUpnpDevice>();
@@ -65,6 +66,7 @@ public Collection<IUpnpDevice> getDeviceList()
 		return deviceList;
 	}
 
+	@Override
 	public Collection<IUpnpDevice> getFilteredDeviceList(ICallableFilter filter)
 	{
 		ArrayList<IUpnpDevice> deviceList = new ArrayList<IUpnpDevice>();
@@ -161,4 +163,10 @@ private void removeListenerSafe(IRegistryListener registryListener)
 		Log.d(TAG, "remove listener Safe");
 		upnpService.getRegistry().removeListener(new CRegistryListener(registryListener));
 	}
+
+	@Override
+	public void clearListener()
+	{
+		waitingListener.clear();
+	}
 }
diff --git a/src/org/droidupnp/controller/upnp/IUpnpServiceController.java b/src/org/droidupnp/controller/upnp/IUpnpServiceController.java
@@ -24,6 +24,8 @@
 import org.droidupnp.model.upnp.IServiceListener;
 import org.droidupnp.model.upnp.IUpnpDevice;
 
+import android.app.Activity;
+
 public interface IUpnpServiceController {
 	public void setSelectedRenderer(IUpnpDevice renderer);
 
@@ -42,4 +44,11 @@ public interface IUpnpServiceController {
 	public void delSelectedContentDirectoryObserver(Observer o);
 
 	public IServiceListener getServiceListener();
+
+	// Pause the service
+	public void pause();
+
+	// Resume the service
+	public void resume(Activity activity);
+
 }
diff --git a/src/org/droidupnp/model/cling/UpnpService.java b/src/org/droidupnp/model/cling/UpnpService.java
@@ -22,6 +22,9 @@
 import org.fourthline.cling.android.AndroidUpnpServiceConfiguration;
 import org.fourthline.cling.android.AndroidUpnpServiceImpl;
 
+import android.content.Intent;
+import android.util.Log;
+
 public class UpnpService extends AndroidUpnpServiceImpl {
 
 	@Override
@@ -37,4 +40,11 @@ public int getRegistryMaintenanceIntervalMillis()
 
 		};
 	}
+
+	@Override
+	public boolean onUnbind(Intent intent)
+	{
+		Log.d(this.getClass().getName(), "Unbind");
+		return super.onUnbind(intent);
+	}
 }
diff --git a/src/org/droidupnp/model/upnp/IServiceListener.java b/src/org/droidupnp/model/upnp/IServiceListener.java
@@ -27,6 +27,8 @@ public interface IServiceListener {
 
 	public void removeListener(IRegistryListener registryListener);
 
+	public void clearListener();
+
 	public void refresh();
 
 	public Collection<IUpnpDevice> getDeviceList();

diff --git a/src/org/droidupnp/view/ContentDirectoryDeviceFragment.java b/src/org/droidupnp/view/ContentDirectoryDeviceFragment.java
@@ -58,11 +58,17 @@ protected boolean isSelected(IUpnpDevice device)
 		return false;
 	}
 
+	@Override
+	protected void select(IUpnpDevice device)
+	{
+		Main.upnpServiceController.setSelectedContentDirectory(device);
+	}
+
 	@Override
 	public void onListItemClick(ListView l, View v, int position, long id)
 	{
 		super.onListItemClick(l, v, position, id);
-		Main.upnpServiceController.setSelectedContentDirectory(list.getItem(position).getDevice());
+		select(list.getItem(position).getDevice());
 		Log.d(TAG, "Set contentDirectory to " + list.getItem(position));
 	}
 }
diff --git a/src/org/droidupnp/view/ContentDirectoryFragment.java b/src/org/droidupnp/view/ContentDirectoryFragment.java
@@ -124,6 +124,14 @@ public void onResume()
 		refresh();
 	}
 
+	@Override
+	public void onDestroy()
+	{
+		Log.i(TAG, "Destroy");
+		Main.upnpServiceController.delSelectedContentDirectoryObserver(this);
+		super.onDestroy();
+	}
+
 	public void printCurrentContentDirectoryInfo()
 	{
 		Log.i(TAG, "Device : " + Main.upnpServiceController.getSelectedContentDirectory().getDisplayString());

diff --git a/src/org/droidupnp/view/RendererDeviceFragment.java b/src/org/droidupnp/view/RendererDeviceFragment.java
@@ -51,6 +51,12 @@ protected boolean isSelected(IUpnpDevice device)
 		return false;
 	}
 
+	@Override
+	protected void select(IUpnpDevice device)
+	{
+		Main.upnpServiceController.setSelectedRenderer(device);
+	}
+
 	@Override
 	protected boolean filter(IUpnpDevice device)
 	{
@@ -69,7 +75,7 @@ protected void removed(IUpnpDevice d)
 	public void onListItemClick(ListView l, View v, int position, long id)
 	{
 		super.onListItemClick(l, v, position, id);
-		Main.upnpServiceController.setSelectedRenderer(list.getItem(position).getDevice());
+		select(list.getItem(position).getDevice());
 		Log.d(TAG, "Set renderer to " + list.getItem(position));
 	}
 }
diff --git a/src/org/droidupnp/view/RendererFragment.java b/src/org/droidupnp/view/RendererFragment.java
@@ -115,6 +115,14 @@ public void onPause()
 		super.onPause();
 	}
 
+	@Override
+	public void onDestroy()
+	{
+		Log.i(TAG, "Destroy");
+		Main.upnpServiceController.delSelectedRendererObserver(this);
+		super.onDestroy();
+	}
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
 	{

diff --git a/src/org/droidupnp/view/ServiceDiscoveryFragment.java b/src/org/droidupnp/view/ServiceDiscoveryFragment.java
@@ -52,6 +52,11 @@ protected boolean isSelected(IUpnpDevice device)
 		return false;
 	}
 
+	@Override
+	protected void select(IUpnpDevice device)
+	{
+	}
+
 	@Override
 	protected boolean filter(IUpnpDevice device)
 	{

diff --git a/src/org/droidupnp/view/UpnpDeviceListFragment.java b/src/org/droidupnp/view/UpnpDeviceListFragment.java
@@ -147,6 +147,9 @@ public void run()
 							position = list.getPosition(d);
 							getListView().setItemChecked(position, true);
 
+							// Reselect device to refresh it
+							select(d.getDevice());
+
 							Log.i(TAG, d.toString() + " is selected at position " + position);
 						}
 					}
@@ -190,6 +193,13 @@ public void run()
 	 */
 	protected abstract boolean isSelected(IUpnpDevice d);
 
+	/**
+	 * Select a device
+	 * 
+	 * @param device
+	 */
+	protected abstract void select(IUpnpDevice device);
+
 	/**
 	 * Callback when device removed
 	 *