Reduce application verbosity

trishika · Mar 9, 2014 · 61c5c82 · 61c5c82
1 parent fc7f98f
commit 61c5c82
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 32 deletions.
diff --git a/src/main/java/org/droidupnp/Main.java b/src/main/java/org/droidupnp/Main.java
@@ -136,15 +136,15 @@ public void onDestroy()
 	@Override
 	public void onResume()
 	{
-		Log.i(TAG, "onResume");
+		Log.v(TAG, "Resume activity");
 		upnpServiceController.resume(this);
 		super.onResume();
 	}
 
 	@Override
 	public void onPause()
 	{
-		Log.i(TAG, "onPause");
+		Log.v(TAG, "Pause activity");
 		upnpServiceController.pause();
 		upnpServiceController.getServiceListener().getServiceConnexion().onServiceDisconnected(null);
 		super.onPause();

diff --git a/src/main/java/org/droidupnp/controller/cling/ContentDirectoryCommand.java b/src/main/java/org/droidupnp/controller/cling/ContentDirectoryCommand.java
@@ -135,7 +135,7 @@ public void received(ActionInvocation actionInvocation, final DIDLContent didl)
 			@Override
 			public void updateStatus(Status status)
 			{
-				Log.i(TAG, "updateStatus ! ");
+				Log.v(TAG, "updateStatus ! ");
 			}
 
 			@Override
@@ -185,7 +185,7 @@ public void received(ActionInvocation actionInvocation, final DIDLContent didl)
 			@Override
 			public void updateStatus(Status status)
 			{
-				Log.i(TAG, "updateStatus ! ");
+				Log.v(TAG, "updateStatus ! ");
 			}
 
 			@Override

diff --git a/src/main/java/org/droidupnp/controller/cling/ServiceListener.java b/src/main/java/org/droidupnp/controller/cling/ServiceListener.java
@@ -73,9 +73,10 @@ public void refresh()
 	public Collection<IUpnpDevice> getDeviceList()
 	{
 		ArrayList<IUpnpDevice> deviceList = new ArrayList<IUpnpDevice>();
-		for (Device device : upnpService.getRegistry().getDevices())
-		{
-			deviceList.add(new CDevice(device));
+		if(upnpService != null && upnpService.getRegistry() != null) {
+			for (Device device : upnpService.getRegistry().getDevices()) {
+				deviceList.add(new CDevice(device));
+			}
 		}
 		return deviceList;
 	}
@@ -86,13 +87,14 @@ public Collection<IUpnpDevice> getFilteredDeviceList(ICallableFilter filter)
 		ArrayList<IUpnpDevice> deviceList = new ArrayList<IUpnpDevice>();
 		try
 		{
-			for (Device device : upnpService.getRegistry().getDevices())
-			{
-				IUpnpDevice upnpDevice = new CDevice(device);
-				filter.setDevice(upnpDevice);
+			if(upnpService != null && upnpService.getRegistry() != null) {
+				for (Device device : upnpService.getRegistry().getDevices()) {
+					IUpnpDevice upnpDevice = new CDevice(device);
+					filter.setDevice(upnpDevice);
 
-				if (filter.call())
-					deviceList.add(upnpDevice);
+					if (filter.call())
+						deviceList.add(upnpDevice);
+				}
 			}
 		}
 		catch (Exception e)

diff --git a/src/main/java/org/droidupnp/model/cling/TrackMetadata.java b/src/main/java/org/droidupnp/model/cling/TrackMetadata.java
@@ -84,8 +84,8 @@ public void parseTrackMetadata(String xml)
 		catch (Exception e)
 		{
 			// e.printStackTrace();
-			Log.e(TAG, "Error while parsing metadata !");
-			Log.e(TAG, "XML : " + xml);
+			Log.w(TAG, "Error while parsing metadata !");
+			Log.w(TAG, "XML : " + xml);
 		}
 	}
 

diff --git a/src/main/java/org/droidupnp/view/ContentDirectoryFragment.java b/src/main/java/org/droidupnp/view/ContentDirectoryFragment.java
@@ -192,17 +192,14 @@ public void onActivityCreated(Bundle savedInstanceState)
 			contentDirectoryCommand = Main.factory.createContentDirectoryCommand();
 		}
 
-		Log.i(TAG, "Force refresh");
+		Log.d(TAG, "Force refresh");
 		refresh();
-
-		Log.d(TAG, "Activity created");
 	}
 
 	@Override
 	public void onDestroy()
 	{
 		super.onDestroy();
-		Log.i(TAG, "onDestroy");
 		Main.upnpServiceController.delSelectedContentDirectoryObserver(this);
 		Main.upnpServiceController.getContentDirectoryDiscovery().removeObserver(deviceObserver);
 	}
@@ -270,19 +267,11 @@ public void onSaveInstanceState(Bundle savedInstanceState)
 	@Override
 	public void onResume()
 	{
-		Log.i(TAG, "onResume");
 		super.onResume();
 		contentList.clear();
 		refresh();
 	}
 
-	@Override
-	public void onPause()
-	{
-		Log.i(TAG, "onPause");
-		super.onPause();
-	}
-
 	public Boolean goBack()
 	{
 		if(tree == null || tree.isEmpty())

diff --git a/src/main/java/org/droidupnp/view/RendererFragment.java b/src/main/java/org/droidupnp/view/RendererFragment.java
@@ -105,8 +105,6 @@ public void onActivityCreated(Bundle savedInstanceState)
 
 		// Initially hide renderer
 		hide();
-
-		Log.d(TAG, "Activity created");
 	}
 
 	@Override
@@ -131,7 +129,6 @@ public void onResume()
 	@Override
 	public void onPause()
 	{
-		Log.d(TAG, "Pause Renderer");
 		device = null;
 		if (rendererCommand != null)
 			rendererCommand.pause();
@@ -141,7 +138,6 @@ public void onPause()
 	@Override
 	public void onDestroy()
 	{
-		Log.i(TAG, "Destroy");
 		Main.upnpServiceController.delSelectedRendererObserver(this);
 		super.onDestroy();
 	}
@@ -267,7 +263,6 @@ public void run()
 	@Override
 	public void update(Observable observable, Object data)
 	{
-		Log.d(TAG, "Renderer have changed");
 		startControlPoint();
 	}