From 9f94aaf450200d1aab1dd7aff43cd8cf58de57a5 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 10 Aug 2018 21:43:50 -0700 Subject: Whitespace cleanup, extra braces, and null checks Thanks to Lubomir for the review. Signed-off-by: Dirk Hohndel --- .../subsurfacedivelog/mobile/SubsurfaceMobileActivity.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'android-mobile/src/org/subsurfacedivelog') 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 -- cgit v1.2.3-70-g09d2