From b195b6c636e153f353083f8d92b03876760ef805 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Wed, 29 Mar 2017 21:06:48 -0400 Subject: [PATCH] Fixed android package hierarchy to match package name. Renamed main activity class with a more appropriate name. --- android.pri | 4 +-- android/AndroidManifest.xml | 2 +- .../usbserial/driver/FtdiSerialDriver.java | 34 +++++++++---------- .../qgroundcontrol/QGCActivity.java} | 14 ++++---- .../qgroundcontrol}/UsbIoManager.java | 2 +- .../src/qserialport_android.cpp | 2 +- .../src/qserialportinfo_android.cpp | 2 +- src/GAudioOutput.cc | 2 +- src/MobileScreenMgr.cc | 2 +- 9 files changed, 32 insertions(+), 32 deletions(-) rename android/src/org/{qgroundcontrol/qgchelper/UsbDeviceJNI.java => mavlink/qgroundcontrol/QGCActivity.java} (98%) rename android/src/org/{qgroundcontrol/qgchelper => mavlink/qgroundcontrol}/UsbIoManager.java (99%) diff --git a/android.pri b/android.pri index eef0ae3f9..8179a76f1 100644 --- a/android.pri +++ b/android.pri @@ -14,8 +14,8 @@ OTHER_FILES += \ $$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialDriver.java \ $$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialProber.java \ $$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialRuntimeException.java \ - $$PWD/android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java \ - $$PWD/android/src/org/qgroundcontrol/qgchelper/UsbIoManager.java + $$PWD/android/src/org/mavlink/qgroundcontrol/QGCActivity.java \ + $$PWD/android/src/org/mavlink/qgroundcontrol/UsbIoManager.java DISTFILES += \ $$PWD/android/gradle/wrapper/gradle-wrapper.jar \ diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index f5009b3f4..b95c5ae59 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,7 +1,7 @@ - + diff --git a/android/src/com/hoho/android/usbserial/driver/FtdiSerialDriver.java b/android/src/com/hoho/android/usbserial/driver/FtdiSerialDriver.java index 5ca036074..4d13b5cd8 100644 --- a/android/src/com/hoho/android/usbserial/driver/FtdiSerialDriver.java +++ b/android/src/com/hoho/android/usbserial/driver/FtdiSerialDriver.java @@ -39,7 +39,7 @@ import java.nio.ByteBuffer; import java.util.LinkedHashMap; import java.util.Map; -import org.qgroundcontrol.qgchelper.UsbDeviceJNI; +import org.mavlink.qgroundcontrol.QGCActivity; /** * A {@link CommonUsbSerialDriver} implementation for a variety of FTDI devices @@ -231,35 +231,35 @@ public class FtdiSerialDriver extends CommonUsbSerialDriver { public void open() throws IOException { D2xxManager ftD2xx = null; try { - ftD2xx = D2xxManager.getInstance(UsbDeviceJNI.m_context); + ftD2xx = D2xxManager.getInstance(QGCActivity.m_context); } catch (D2xxManager.D2xxException ex) { - UsbDeviceJNI.qgcLogDebug("D2xxManager.getInstance threw exception: " + ex.getMessage()); + QGCActivity.qgcLogDebug("D2xxManager.getInstance threw exception: " + ex.getMessage()); } if (ftD2xx == null) { String errMsg = "Unable to retrieve D2xxManager instance."; - UsbDeviceJNI.qgcLogWarning(errMsg); + QGCActivity.qgcLogWarning(errMsg); throw new IOException(errMsg); } - UsbDeviceJNI.qgcLogDebug("Opened D2xxManager"); + QGCActivity.qgcLogDebug("Opened D2xxManager"); - int DevCount = ftD2xx.createDeviceInfoList(UsbDeviceJNI.m_context); - UsbDeviceJNI.qgcLogDebug("Found " + DevCount + " ftdi devices."); + int DevCount = ftD2xx.createDeviceInfoList(QGCActivity.m_context); + QGCActivity.qgcLogDebug("Found " + DevCount + " ftdi devices."); if (DevCount < 1) { throw new IOException("No FTDI Devices found"); } m_ftDev = null; try { - m_ftDev = ftD2xx.openByIndex(UsbDeviceJNI.m_context, 0); + m_ftDev = ftD2xx.openByIndex(QGCActivity.m_context, 0); } catch (NullPointerException e) { - UsbDeviceJNI.qgcLogDebug("ftD2xx.openByIndex exception: " + e.getMessage()); + QGCActivity.qgcLogDebug("ftD2xx.openByIndex exception: " + e.getMessage()); } finally { if (m_ftDev == null) { throw new IOException("No FTDI Devices found"); } } - UsbDeviceJNI.qgcLogDebug("Opened FTDI device."); + QGCActivity.qgcLogDebug("Opened FTDI device."); } @Override @@ -268,7 +268,7 @@ public class FtdiSerialDriver extends CommonUsbSerialDriver { try { m_ftDev.close(); } catch (Exception e) { - UsbDeviceJNI.qgcLogWarning("close exception: " + e.getMessage()); + QGCActivity.qgcLogWarning("close exception: " + e.getMessage()); } m_ftDev = null; } @@ -285,7 +285,7 @@ public class FtdiSerialDriver extends CommonUsbSerialDriver { totalBytesRead = m_ftDev.read(dest, bytesAvailable, timeoutMillis); } catch (NullPointerException e) { final String errorMsg = "Error reading: " + e.getMessage(); - UsbDeviceJNI.qgcLogWarning(errorMsg); + QGCActivity.qgcLogWarning(errorMsg); throw new IOException(errorMsg, e); } } @@ -299,7 +299,7 @@ public class FtdiSerialDriver extends CommonUsbSerialDriver { m_ftDev.write(src); return src.length; } catch (Exception e) { - UsbDeviceJNI.qgcLogWarning("Error writing: " + e.getMessage()); + QGCActivity.qgcLogWarning("Error writing: " + e.getMessage()); } return 0; } @@ -309,7 +309,7 @@ public class FtdiSerialDriver extends CommonUsbSerialDriver { m_ftDev.setBaudRate(baudRate); return baudRate; } catch (Exception e) { - UsbDeviceJNI.qgcLogWarning("Error setting baud rate: " + e.getMessage()); + QGCActivity.qgcLogWarning("Error setting baud rate: " + e.getMessage()); } return 0; } @@ -360,7 +360,7 @@ public class FtdiSerialDriver extends CommonUsbSerialDriver { try { m_ftDev.setDataCharacteristics((byte)dataBits, (byte)stopBits, (byte)parity); } catch (Exception e) { - UsbDeviceJNI.qgcLogWarning("Error setDataCharacteristics: " + e.getMessage()); + QGCActivity.qgcLogWarning("Error setDataCharacteristics: " + e.getMessage()); } } @Override @@ -408,7 +408,7 @@ public class FtdiSerialDriver extends CommonUsbSerialDriver { m_ftDev.purge(D2xxManager.FT_PURGE_RX); } catch (Exception e) { String errMsg = "Error purgeHwBuffers(RX): "+ e.getMessage(); - UsbDeviceJNI.qgcLogWarning(errMsg); + QGCActivity.qgcLogWarning(errMsg); throw new IOException(errMsg); } } @@ -418,7 +418,7 @@ public class FtdiSerialDriver extends CommonUsbSerialDriver { m_ftDev.purge(D2xxManager.FT_PURGE_TX); } catch (Exception e) { String errMsg = "Error purgeHwBuffers(TX): " + e.getMessage(); - UsbDeviceJNI.qgcLogWarning(errMsg); + QGCActivity.qgcLogWarning(errMsg); throw new IOException(errMsg); } } diff --git a/android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java b/android/src/org/mavlink/qgroundcontrol/QGCActivity.java similarity index 98% rename from android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java rename to android/src/org/mavlink/qgroundcontrol/QGCActivity.java index 183d5c257..7cd3c63dd 100644 --- a/android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java +++ b/android/src/org/mavlink/qgroundcontrol/QGCActivity.java @@ -1,4 +1,4 @@ -package org.qgroundcontrol.qgchelper; +package org.mavlink.qgroundcontrol; /* Copyright 2013 Google Inc. * @@ -23,7 +23,7 @@ package org.qgroundcontrol.qgchelper; // Written by: Mike Goza April 2014 // // These routines interface with the Android USB Host devices for serial port communication. -// The code uses the usb-serial-for-android software library. The UsbDeviceJNI class is the +// The code uses the usb-serial-for-android software library. The QGCActivity class is the // interface to the C++ routines through jni calls. Do not change the functions without also // changing the corresponding calls in the C++ routines or you will break the interface. // @@ -52,10 +52,10 @@ import com.hoho.android.usbserial.driver.*; import org.qtproject.qt5.android.bindings.QtActivity; import org.qtproject.qt5.android.bindings.QtApplication; -public class UsbDeviceJNI extends QtActivity implements TextToSpeech.OnInitListener +public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListener { public static int BAD_PORT = 0; - private static UsbDeviceJNI m_instance; + private static QGCActivity m_instance; private static UsbManager m_manager; // ANDROID USB HOST CLASS private static List m_devices; // LIST OF CURRENT DEVICES private static HashMap m_openedDevices; // LIST OF OPENED DEVICES @@ -64,7 +64,7 @@ public class UsbDeviceJNI extends QtActivity implements TextToSpeech.OnInitListe // USED TO DETECT WHEN A DEVICE HAS BEEN UNPLUGGED private BroadcastReceiver m_UsbReceiver = null; private final static ExecutorService m_Executor = Executors.newSingleThreadExecutor(); - private static final String TAG = "QGC_UsbDeviceJNI"; + private static final String TAG = "QGC_QGCActivity"; private static TextToSpeech m_tts; private static PowerManager.WakeLock m_wl; @@ -101,7 +101,7 @@ public class UsbDeviceJNI extends QtActivity implements TextToSpeech.OnInitListe // Constructor. Only used once to create the initial instance for the static functions. // //////////////////////////////////////////////////////////////////////////////////////////////// - public UsbDeviceJNI() + public QGCActivity() { m_instance = this; m_openedDevices = new HashMap(); @@ -193,7 +193,7 @@ public class UsbDeviceJNI extends QtActivity implements TextToSpeech.OnInitListe // GET THE LIST OF CURRENT DEVICES if (!getCurrentDevices()) { - Log.e(TAG, "UsbDeviceJNI instance not present"); + Log.e(TAG, "QGCActivity instance not present"); return null; } diff --git a/android/src/org/qgroundcontrol/qgchelper/UsbIoManager.java b/android/src/org/mavlink/qgroundcontrol/UsbIoManager.java similarity index 99% rename from android/src/org/qgroundcontrol/qgchelper/UsbIoManager.java rename to android/src/org/mavlink/qgroundcontrol/UsbIoManager.java index c9dec2408..009237890 100644 --- a/android/src/org/qgroundcontrol/qgchelper/UsbIoManager.java +++ b/android/src/org/mavlink/qgroundcontrol/UsbIoManager.java @@ -1,4 +1,4 @@ -package org.qgroundcontrol.qgchelper; +package org.mavlink.qgroundcontrol; /* Copyright 2011 Google Inc. * diff --git a/libs/qtandroidserialport/src/qserialport_android.cpp b/libs/qtandroidserialport/src/qserialport_android.cpp index 9e8060c03..91668ec70 100644 --- a/libs/qtandroidserialport/src/qserialport_android.cpp +++ b/libs/qtandroidserialport/src/qserialport_android.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE #define BAD_PORT 0 -static const char kJniClassName[] {"org/qgroundcontrol/qgchelper/UsbDeviceJNI"}; +static const char kJniClassName[] {"org/mavlink/qgroundcontrol/QGCActivity"}; static const char kJTag[] {"QGC_QSerialPort"}; static void jniDeviceHasDisconnected(JNIEnv *envA, jobject thizA, jint userDataA) diff --git a/libs/qtandroidserialport/src/qserialportinfo_android.cpp b/libs/qtandroidserialport/src/qserialportinfo_android.cpp index 63fbcb3c4..1580189d4 100644 --- a/libs/qtandroidserialport/src/qserialportinfo_android.cpp +++ b/libs/qtandroidserialport/src/qserialportinfo_android.cpp @@ -45,7 +45,7 @@ #include QT_BEGIN_NAMESPACE -static const char V_jniClassName[] {"org/qgroundcontrol/qgchelper/UsbDeviceJNI"}; +static const char V_jniClassName[] {"org/mavlink/qgroundcontrol/QGCActivity"}; static const char V_TAG[] {"QGC_QSerialPortInfo"}; extern void cleanJavaException(); diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc index 480e04ded..b330e782d 100644 --- a/src/GAudioOutput.cc +++ b/src/GAudioOutput.cc @@ -61,7 +61,7 @@ bool GAudioOutput::say(const QString& inText) if (!muted && !qgcApp()->runningUnitTests()) { #if defined __android__ #if defined QGC_SPEECH_ENABLED - static const char V_jniClassName[] {"org/qgroundcontrol/qgchelper/UsbDeviceJNI"}; + static const char V_jniClassName[] {"org/mavlink/qgroundcontrol/QGCActivity"}; QAndroidJniEnvironment env; if (env->ExceptionCheck()) { env->ExceptionDescribe(); diff --git a/src/MobileScreenMgr.cc b/src/MobileScreenMgr.cc index 8ac1a92af..010929a7a 100644 --- a/src/MobileScreenMgr.cc +++ b/src/MobileScreenMgr.cc @@ -13,7 +13,7 @@ #include #include -static const char* kJniClassName = "org/qgroundcontrol/qgchelper/UsbDeviceJNI"; +static const char* kJniClassName = "org/mavlink/qgroundcontrol/QGCActivity"; void MobileScreenMgr::setKeepScreenOn(bool keepScreenOn) { -- 2.22.0