Whitespace cleanup, extra braces, and null checks

Thanks to Lubomir for the review.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 12 insertions, 0 deletions

diff --git a/android-mobile/src/org/subsurfacedivelog/mobile/SubsurfaceMobileActivity.java b/android-mobile/src/org/subsurfacedivelog/mobile/SubsurfaceMobileActivity.java
index 66f5c1b0e..4c5bc576b 100644
--- a/android-mobile/src/org/subsurfacedivelog/mobile/SubsurfaceMobileActivity.java
+++ b/android-mobile/src/org/subsurfacedivelog/mobile/SubsurfaceMobileActivity.java
@@ -53,6 +53,10 @@ public class SubsurfaceMobileActivity extends QtActivity
 	public void onNewIntent(Intent intent) {
 		Log.i(TAG + " onNewIntent", intent.getAction());
 		UsbDevice device = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+		if (device == null) {
+			Log.i(TAG + " onNewIntent", "null device");
+			return;
+		}
 		Log.i(TAG + " onNewIntent toString", device.toString());
 		super.onNewIntent(intent);
 		setIntent(intent);
@@ -78,8 +82,16 @@ public class SubsurfaceMobileActivity extends QtActivity
 
 	private void processIntent() {
 		Intent intent = getIntent();
+		if (intent == null) {
+			Log.i(TAG + " processIntent", "intent is null");
+			return;
+		}
 		Log.i(TAG + " processIntent", intent.getAction());
 		UsbDevice device = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+		if (device == null) {
+			Log.i(TAG + " processIntent", "null device");
+			return;
+		}
 		Log.i(TAG + " processIntent device name", device.getDeviceName());
 		setDeviceString(device.toString());
 	} // processIntent