mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Whitespace cleanup, extra braces, and null checks

Browse source 
Thanks to Lubomir for the review.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-08-10 21:43:50 -07:00
parent fd498a90db
commit 9f94aaf450
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android-mobile/src/org/subsurfacedivelog/mobile/SubsurfaceMobileActivity.java
View file

@ -53,6 +53,10 @@ public class SubsurfaceMobileActivity extends QtActivity
public void onNewIntent(Intent intent) { public void onNewIntent(Intent intent) {
Log.i(TAG + " onNewIntent", intent.getAction()); Log.i(TAG + " onNewIntent", intent.getAction());
UsbDevice device = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); 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()); Log.i(TAG + " onNewIntent toString", device.toString());
super.onNewIntent(intent); super.onNewIntent(intent);
setIntent(intent); setIntent(intent);
@ -78,8 +82,16 @@ public class SubsurfaceMobileActivity extends QtActivity
private void processIntent() { private void processIntent() {
Intent intent = getIntent(); Intent intent = getIntent();
if (intent == null) {
Log.i(TAG + " processIntent", "intent is null");
return;
}
Log.i(TAG + " processIntent", intent.getAction()); Log.i(TAG + " processIntent", intent.getAction());
UsbDevice device = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); 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()); Log.i(TAG + " processIntent device name", device.getDeviceName());
setDeviceString(device.toString()); setDeviceString(device.toString());
} // processIntent } // processIntent

2
core/android.cpp
View file

@ -244,7 +244,7 @@ bool subsurface_user_is_root()
void checkPendingIntents() void checkPendingIntents()
{ {
QAndroidJniObject activity = QtAndroid::androidActivity(); QAndroidJniObject activity = QtAndroid::androidActivity();
if(activity.isValid()) { if (activity.isValid()) {
activity.callMethod<void>("checkPendingIntents"); activity.callMethod<void>("checkPendingIntents");
qDebug() << "checkPendingIntents "; qDebug() << "checkPendingIntents ";
return; return;

5
mobile-widgets/qmlmanager.cpp
View file

@ -1796,16 +1796,17 @@ void QMLManager::showDownloadPage(QString deviceString)
} else if (deviceString.contains("mManufacturerName=ATOMIC AQUATICS") && } else if (deviceString.contains("mManufacturerName=ATOMIC AQUATICS") &&
deviceString.contains("mProductName=COBALT")) { deviceString.contains("mProductName=COBALT")) {
if (deviceString.contains("mVersion=2")) if (deviceString.contains("mVersion=2")) {
name = QString("%1;%2;%3") name = QString("%1;%2;%3")
.arg(vendorList.indexOf("Atomic Aquatics")) .arg(vendorList.indexOf("Atomic Aquatics"))
.arg(productList["Atomic Aquatics"].indexOf("Cobalt 2")) .arg(productList["Atomic Aquatics"].indexOf("Cobalt 2"))
.arg(connectionListModel.indexOf("USB device")); .arg(connectionListModel.indexOf("USB device"));
else } else {
name = QString("%1;%2;%3") name = QString("%1;%2;%3")
.arg(vendorList.indexOf("Atomic Aquatics")) .arg(vendorList.indexOf("Atomic Aquatics"))
.arg(productList["Atomic Aquatics"].indexOf("Cobalt")) .arg(productList["Atomic Aquatics"].indexOf("Cobalt"))
.arg(connectionListModel.indexOf("USB device")); .arg(connectionListModel.indexOf("USB device"));
}
} else if (deviceString.contains("mVendorId=5267") && } else if (deviceString.contains("mVendorId=5267") &&
deviceString.contains("mProductId=48")) { deviceString.contains("mProductId=48")) {
name = QString("%1;%2;%3") name = QString("%1;%2;%3")