ryan

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '45 14 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java', 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2020 DJI
+Copyright (c) 2021 DJI
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,10 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-====================================================================================
-
-Mobile-UXSDK-Beta-Android uses several unmodified libraries which are listed along
-with their licenses in the `dependencyLicenses.txt` file.
-
-====================================================================================

README.md

@@ -35,3 +35,6 @@ Our long-term plan is for this framework to reach feature parity with the curren
 ## License
 
 Mobile-UXSDK-Beta-Android is available under the the MIT license. Please see the [LICENSE.txt](https://github.com/dji-sdk/Mobile-UXSDK-Beta-Android/blob/master/LICENSE.txt) file for more info.
+
+Mobile-UXSDK-Beta-Android uses several unmodified libraries which are listed along
+with their licenses in the `dependencyLicenses.txt` file.

android-uxsdk-beta-accessory/build.gradle

@@ -28,13 +28,12 @@ android {
     lintOptions {
         abortOnError = false
     }
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 31
     publishNonDefault true
     resourcePrefix "uxsdk_"
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 29
+        minSdkVersion 23
+        targetSdkVersion 31
         versionCode 1
         versionName "5.0"
         vectorDrawables.useSupportLibrary = true
@@ -68,20 +67,7 @@ android {
 
 dependencies {
     api project(path: ':android-uxsdk-beta-core')
-
-    implementation ('com.dji:dji-sdk:4.14', {
-        /**
-         * Comment the "library-anti-distortion" if your app needs Anti Distortion for Mavic 2 Pro
-         * and Mavic 2 Zoom.
-         * Comment the "fly-safe-database" if you don't need a smaller apk for release. When
-         * uncommented, we will download it when DJISDKManager.getInstance().registerApp
-         * is called, and it won't register success without fly-safe-database.
-         * Both will greatly reduce the size of the APK.
-         */
-        exclude module: 'library-anti-distortion'
-        exclude module: 'fly-safe-database'
-    })
-    compileOnly ('com.dji:dji-sdk-provided:4.14')
+    compileOnly ('com.dji:dji-sdk-provided:4.16.4')
 
     implementation 'androidx.multidex:multidex:2.0.0'
     implementation 'androidx.appcompat:appcompat:1.0.0'
@@ -94,5 +80,5 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
-    mavenCentral()
+    mavenLocal()
 }

android-uxsdk-beta-accessory/proguard-test-rules.pro

@@ -95,9 +95,8 @@
 -keep class android.support.** { *; }
 -keep class android.media.** { *; }
 -keep class okio.** { *; }
--keep class com.lmax.disruptor.** {
-    *;
-}
+-keep class com.lmax.disruptor.** { *; }
+-keep class com.qx.wz.dj.rtcm.* { *; }
 
 -dontwarn com.mapbox.services.android.location.LostLocationEngine
 -dontwarn com.mapbox.services.android.location.MockLocationEngine

android-uxsdk-beta-accessory/src/main/java/dji/ux/beta/accessory/widget/rtk/RTKEnabledWidget.kt

@@ -35,10 +35,10 @@ import android.widget.TextView
 import androidx.annotation.*
 import androidx.core.content.res.use
 import dji.log.DJILog
-import dji.thirdparty.io.reactivex.Flowable
-import dji.thirdparty.io.reactivex.disposables.Disposable
-import dji.thirdparty.io.reactivex.functions.Consumer
-import dji.thirdparty.io.reactivex.processors.PublishProcessor
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.processors.PublishProcessor
 import dji.ux.beta.accessory.R
 import dji.ux.beta.accessory.widget.rtk.RTKEnabledWidget.ModelState
 import dji.ux.beta.accessory.widget.rtk.RTKEnabledWidget.ModelState.ProductConnected
@@ -50,6 +50,7 @@ import dji.ux.beta.core.base.widget.ConstraintLayoutWidget
 import dji.ux.beta.core.communication.ObservableInMemoryKeyedStore
 import dji.ux.beta.core.extension.*
 import dji.ux.beta.core.util.DisplayUtil
+import dji.ux.beta.core.util.RxUtil
 
 private const val TAG = "RTKEnabledWidget"
 
@@ -204,7 +205,7 @@ open class RTKEnabledWidget @JvmOverloads constructor(
                     } else {
                         setRTKEnabled(isChecked)
                     }
-                }, logErrorConsumer(TAG, "canEnableRTK: ")))
+                }, RxUtil.logErrorConsumer(TAG, "canEnableRTK: ")))
         uiUpdateStateProcessor.onNext(SwitchChanged(isChecked))
     }
 
@@ -232,14 +233,13 @@ open class RTKEnabledWidget @JvmOverloads constructor(
                     if (rtkEnabled != enabled) {
                         addDisposable(toggleRTK(enabled))
                     }
-                }, logErrorConsumer(TAG, "rtkEnabled: ")))
+                }, RxUtil.logErrorConsumer(TAG, "rtkEnabled: ")))
     }
 
     private fun toggleRTK(enabled: Boolean): Disposable {
         return widgetModel.setRTKEnabled(enabled)
                 .observeOn(SchedulerProvider.ui())
-                .subscribe({}
-                ) { throwable: Throwable ->
+                .subscribe({}) { throwable: Throwable ->
                     setRTKSwitch(!enabled)
                     DJILog.e(TAG, "setRTKEnabled: " + throwable.localizedMessage)
                 }

android-uxsdk-beta-accessory/src/main/java/dji/ux/beta/accessory/widget/rtk/RTKEnabledWidgetModel.kt

@@ -25,12 +25,13 @@ package dji.ux.beta.accessory.widget.rtk
 
 import dji.keysdk.DJIKey
 import dji.keysdk.FlightControllerKey
-import dji.thirdparty.io.reactivex.Completable
-import dji.thirdparty.io.reactivex.Flowable
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
 import dji.ux.beta.core.base.DJISDKModel
 import dji.ux.beta.core.base.WidgetModel
 import dji.ux.beta.core.communication.ObservableInMemoryKeyedStore
 import dji.ux.beta.core.util.DataProcessor
+import io.reactivex.rxjava3.core.Completable
 
 /**
  * Widget Model for the [RTKEnabledWidget] used to define

android-uxsdk-beta-accessory/src/main/java/dji/ux/beta/accessory/widget/rtk/RTKSatelliteStatusWidget.kt

@@ -43,8 +43,8 @@ import dji.common.flightcontroller.PositioningSolution
 import dji.common.flightcontroller.RTKState
 import dji.common.flightcontroller.rtk.NetworkServiceChannelState
 import dji.common.product.Model
-import dji.thirdparty.io.reactivex.Flowable
-import dji.thirdparty.io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.functions.Consumer
 import dji.ux.beta.accessory.R
 import dji.ux.beta.accessory.widget.rtk.RTKSatelliteStatusWidget.ModelState
 import dji.ux.beta.accessory.widget.rtk.RTKSatelliteStatusWidget.ModelState.*
@@ -56,6 +56,7 @@ import dji.ux.beta.core.communication.GlobalPreferencesManager
 import dji.ux.beta.core.communication.ObservableInMemoryKeyedStore
 import dji.ux.beta.core.extension.*
 import dji.ux.beta.core.util.DisplayUtil
+import dji.ux.beta.core.util.RxUtil
 import dji.ux.beta.core.util.UnitConversionUtil
 import java.util.*
 
@@ -867,7 +868,7 @@ open class RTKSatelliteStatusWidget @JvmOverloads constructor(
                     .firstOrError()
                     .observeOn(SchedulerProvider.ui())
                     .subscribe(Consumer { updateOrientationStatus(it.isHeadingValid, it.headingSolution) },
-                            logErrorConsumer(TAG, "updateOrientation")))
+                            RxUtil.logErrorConsumer(TAG, "updateOrientation")))
         }
     }
 
@@ -877,7 +878,7 @@ open class RTKSatelliteStatusWidget @JvmOverloads constructor(
                     .firstOrError()
                     .observeOn(SchedulerProvider.ui())
                     .subscribe(Consumer { updateModel(it) },
-                            logErrorConsumer(TAG, "updateModel")))
+                            RxUtil.logErrorConsumer(TAG, "updateModel")))
         }
     }
 

android-uxsdk-beta-accessory/src/main/java/dji/ux/beta/accessory/widget/rtk/RTKSatelliteStatusWidgetModel.kt

@@ -32,8 +32,8 @@ import dji.keysdk.DJIKey
 import dji.keysdk.FlightControllerKey
 import dji.keysdk.ProductKey
 import dji.sdk.network.RTKNetworkServiceProvider
-import dji.thirdparty.io.reactivex.Flowable
-import dji.thirdparty.io.reactivex.functions.BiFunction
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.functions.BiFunction
 import dji.ux.beta.core.base.DJISDKModel
 import dji.ux.beta.core.base.WidgetModel
 import dji.ux.beta.core.communication.GlobalPreferenceKeys

android-uxsdk-beta-accessory/src/main/java/dji/ux/beta/accessory/widget/rtk/RTKWidget.kt

@@ -34,9 +34,9 @@ import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
 import androidx.annotation.StyleRes
 import androidx.core.content.res.use
-import dji.thirdparty.io.reactivex.Flowable
-import dji.thirdparty.io.reactivex.functions.Consumer
-import dji.thirdparty.io.reactivex.processors.PublishProcessor
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.processors.PublishProcessor
 import dji.ux.beta.accessory.R
 import dji.ux.beta.accessory.widget.rtk.RTKWidget.ModelState
 import dji.ux.beta.accessory.widget.rtk.RTKWidget.ModelState.ProductConnected
@@ -50,6 +50,7 @@ import dji.ux.beta.core.communication.ObservableInMemoryKeyedStore
 import dji.ux.beta.core.communication.OnStateChangeCallback
 import dji.ux.beta.core.extension.*
 import dji.ux.beta.core.util.DisplayUtil
+import dji.ux.beta.core.util.RxUtil
 
 private const val TAG = "RTKWidget"
 
@@ -257,7 +258,7 @@ open class RTKWidget @JvmOverloads constructor(
                         }
                         uiUpdateStateProcessor.onNext(VisibilityUpdated(visibility == View.VISIBLE))
                     }
-                }, logErrorConsumer(TAG, "getRTKSupported: ")))
+                }, RxUtil.logErrorConsumer(TAG, "getRTKSupported: ")))
     }
     //endregion
 

android-uxsdk-beta-accessory/src/main/java/dji/ux/beta/accessory/widget/rtk/RTKWidgetModel.kt

@@ -25,13 +25,14 @@ package dji.ux.beta.accessory.widget.rtk
 
 import dji.keysdk.DJIKey
 import dji.keysdk.FlightControllerKey
-import dji.thirdparty.io.reactivex.Flowable
-import dji.thirdparty.io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.functions.Consumer
 import dji.ux.beta.core.base.DJISDKModel
 import dji.ux.beta.core.base.SchedulerProvider
 import dji.ux.beta.core.base.WidgetModel
 import dji.ux.beta.core.communication.ObservableInMemoryKeyedStore
 import dji.ux.beta.core.util.DataProcessor
+import dji.ux.beta.core.util.RxUtil
 
 private const val TAG = "RTKWidgetModel"
 
@@ -75,7 +76,7 @@ class RTKWidgetModel(djiSdkModel: DJISDKModel,
         bindDataProcessor(isRTKConnectedKey, isRTKConnectedProcessor) {
             addDisposable(djiSdkModel.getValue(rtkEnabledKey)
                     .observeOn(SchedulerProvider.io())
-                    .subscribe(Consumer { }, logErrorConsumer(TAG, "isRTKEnabled: ")))
+                    .subscribe(Consumer { }, RxUtil.logErrorConsumer(TAG, "isRTKEnabled: ")))
         }
     }
 

android-uxsdk-beta-cameracore/build.gradle

@@ -23,18 +23,19 @@
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
     lintOptions {
         abortOnError = false
     }
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 31
     publishNonDefault true
     resourcePrefix "uxsdk_"
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 29
+        minSdkVersion 23
+        targetSdkVersion 31
         versionCode 1
         versionName "4.5"
         vectorDrawables.useSupportLibrary = true
@@ -68,20 +69,7 @@ android {
 
 dependencies {
     api project(path: ':android-uxsdk-beta-core')
-
-    implementation ('com.dji:dji-sdk:4.14', {
-        /**
-         * Comment the "library-anti-distortion" if your app needs Anti Distortion for Mavic 2 Pro
-         * and Mavic 2 Zoom.
-         * Comment the "fly-safe-database" if you don't need a smaller apk for release. When
-         * uncommented, we will download it when DJISDKManager.getInstance().registerApp
-         * is called, and it won't register success without fly-safe-database.
-         * Both will greatly reduce the size of the APK.
-         */
-        exclude module: 'library-anti-distortion'
-        exclude module: 'fly-safe-database'
-    })
-    compileOnly ('com.dji:dji-sdk-provided:4.14')
+    compileOnly ('com.dji:dji-sdk-provided:4.16.4')
 
     implementation 'androidx.multidex:multidex:2.0.0'
     implementation 'androidx.appcompat:appcompat:1.0.0'
@@ -93,5 +81,5 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
-    mavenCentral()
+    mavenLocal()
 }

android-uxsdk-beta-cameracore/proguard-test-rules.pro

@@ -95,9 +95,8 @@
 -keep class android.support.** { *; }
 -keep class android.media.** { *; }
 -keep class okio.** { *; }
--keep class com.lmax.disruptor.** {
-    *;
-}
+-keep class com.lmax.disruptor.** { *; }
+-keep class com.qx.wz.dj.rtcm.* { *; }
 
 -dontwarn com.mapbox.services.android.location.LostLocationEngine
 -dontwarn com.mapbox.services.android.location.MockLocationEngine