Merge branch 'develop' into bugfix/issue_1647

Author: Julian Kast

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "generator/rpc_spec"]
 	path = generator/rpc_spec
 	url = https://github.com/smartdevicelink/rpc_spec.git
-	branch = develop
+	branch = master

CHANGELOG.md

@@ -51,6 +51,8 @@
 
 ## Bug Fixes:
 
+- [Multiframe encryption is not implemented correctly](https://github.com/smartdevicelink/sdl_java_suite/issues/1642)
+
 - [Empty string bug with Menu Cell](https://github.com/smartdevicelink/sdl_java_suite/issues/1623)
 
 - [CRC is not set for PutFile in FileManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1622)
@@ -91,5 +93,8 @@
 
 - [BitConverter NullPointerExeptions](https://github.com/smartdevicelink/sdl_java_suite/issues/193)
 
+- [HelloSDL JavaEE 5.1 updates](https://github.com/smartdevicelink/sdl_java_suite/issues/1639)
+
+
 
 

README.md

@@ -29,7 +29,7 @@ Contents and timing for SDL Java Suite releases can be tracked on the [GitHub Pr
 Additional information about recent and upcoming SDL Releases can be found in the [SDL Evolution README](https://github.com/smartdevicelink/sdl_evolution#recent-and-upcoming-releases).
 
 ## SmartDeviceLink Android
-[ ![Download Android](https://api.bintray.com/packages/smartdevicelink/sdl_android/sdl_android/images/download.svg) ](https://bintray.com/smartdevicelink/sdl_android/sdl_android/_latestVersion)
+[ ![Download Android](https://api.bintray.com/packages/smartdevicelink/sdl_android/sdl_android/images/download.svg) ](https://search.maven.org/artifact/com.smartdevicelink/sdl_android/5.1.0/aar)
 
 ### Installation
 
@@ -39,14 +39,14 @@ To compile with the latest release of SDL Android, include the following in your
 
 ```sh
 repositories {
-    jcenter()
+    mavenCentral()
 }
 dependencies {
-    implementation 'com.smartdevicelink:sdl_android:4.+'
+    implementation 'com.smartdevicelink:sdl_android:5.1.0'
 }
 ```
 
-For Maven or Ivy snippets please look at [Bintray](https://bintray.com/smartdevicelink/sdl_android/sdl_android)
+For Maven or Ivy snippets please look at [Maven Central](https://search.maven.org/artifact/com.smartdevicelink/sdl_android)
 
 #### Manually
 
@@ -67,7 +67,7 @@ Developers using Proguard to shrink and obfuscate their code should be sure to i
 
 ### JavaSE
 
-[ ![Download JavaSE](https://api.bintray.com/packages/smartdevicelink/sdl_java_se/sdl_javase/images/download.svg) ](https://bintray.com/smartdevicelink/sdl_java_se/sdl_javase/_latestVersion)
+[ ![Download JavaSE](https://api.bintray.com/packages/smartdevicelink/sdl_java_se/sdl_javase/images/download.svg) ](https://search.maven.org/artifact/com.smartdevicelink/sdl_java_se/5.1.0/jar)
 
 The JavaSE project is meant to allow SDL compatibility for embedded applications. 
 
@@ -77,16 +77,16 @@ To compile with the latest release of SDL JavaSE, include the following in your
 
 ```sh
 repositories {
-    jcenter()
+    mavenCentral()
 }
 dependencies {
-    implementation 'com.smartdevicelink:sdl_java_se:4.+'
+    implementation 'com.smartdevicelink:sdl_java_se:5.1.0'
 }
 ```
 
 ### JavaEE
 
-[ ![Download JavaEE](https://api.bintray.com/packages/smartdevicelink/sdl_java_ee/sdl_javaee/images/download.svg) ](https://bintray.com/smartdevicelink/sdl_java_ee/sdl_javaee/_latestVersion)
+[ ![Download JavaEE](https://api.bintray.com/packages/smartdevicelink/sdl_java_ee/sdl_javaee/images/download.svg) ](https://search.maven.org/artifact/com.smartdevicelink/sdl_java_ee/5.1.0/jar)
 
 The JavaEE project is meant to allow SDL compatibility for web applications. 
 
@@ -96,10 +96,10 @@ To compile with the latest release of SDL JavaEE, include the following in your
 
 ```sh
 repositories {
-    jcenter()
+    mavenCentral()
 }
 dependencies {
-    implementation 'com.smartdevicelink:sdl_java_ee:4.+'
+    implementation 'com.smartdevicelink:sdl_java_ee:5.1.0'
 }
 ```
 

VERSION

@@ -1 +1 @@
-RC_5.1.0
+5.1.0

android/README.md

@@ -10,10 +10,10 @@ To compile with the latest release of SDL Android, include the following in your
 
 ```
 repositories {
-    jcenter()
+    mavenCentral()
 }
 dependencies {
-    implementation 'com.smartdevicelink:sdl_android:4.+'
+    implementation 'com.smartdevicelink:sdl_android:5.1.0'
 }
 ```
 

android/hello_sdl_android/src/main/AndroidManifest.xml

@@ -12,6 +12,16 @@
     <!-- Required to use the USB Accessory mode -->
     <uses-feature android:name="android.hardware.usb.accessory" />
 
+    <!-- Required when targeting Android API 30+ -->
+    <queries>
+        <intent>
+            <action android:name="com.smartdevicelink.router.service" />
+        </intent>
+        <intent>
+            <action android:name="sdl.router.startservice" />
+        </intent>
+    </queries>
+
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"

android/sdl_android/build.gradle

@@ -41,8 +41,9 @@ android {
 }
 
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
     //api 'com.livio.taskmaster:taskmaster:0.4.0'
+    api 'com.smartdevicelink:bson_java_port:1.2.4'
     api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     api 'androidx.annotation:annotation:1.1.0'
     annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.2.0'

android/sdl_android/libs/bson_java_port-release.aar

@@ -117,6 +117,7 @@ public class VideoStreamManager extends BaseVideoStreamManager {
     private String vehicleMake = null;
     private boolean isEncrypted = false;
     private boolean withPendingRestart = false;
+    private boolean wasCapabilityListenerAdded = false;
     private AbstractPacketizer videoPacketizer;
 
     // INTERNAL INTERFACES
@@ -188,7 +189,10 @@ public void onNotified(RPCNotification notification) {
                     if (VideoStreamManager.this.parameters == null) {
                         getVideoStreamingParams();
                     }
-                    internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, systemCapabilityListener);
+                    if (!wasCapabilityListenerAdded) {
+                        wasCapabilityListenerAdded = true;
+                        internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, systemCapabilityListener);
+                    }
                 }
                 checkState();
                 if (hasStarted && (isHMIStateVideoStreamCapable(prevOnHMIStatus)) && (!isHMIStateVideoStreamCapable(currentOnHMIStatus))) {
@@ -872,7 +876,7 @@ private Boolean inRange(VideoStreamingCapability capability, VideoStreamingRange
         if (capability.getDiagonalScreenSize() != null) {
             double diagonal = capability.getDiagonalScreenSize();
             if (range.getMinimumDiagonal() != null) {
-                if (range.getMinimumDiagonal() <= 0.0 || range.getMinimumDiagonal() > diagonal) {
+                if (range.getMinimumDiagonal() < 0.0 || range.getMinimumDiagonal() > diagonal) {
                     return false;
                 }
             }

android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java

@@ -133,14 +133,16 @@ public void resizeView(final int newWidth, final int newHeight) {
             @Override
             public void run() {
                 try {
-                    Constructor<? extends ViewGroup.LayoutParams> ctor =
-                            mainView.getLayoutParams().getClass().getDeclaredConstructor(int.class, int.class);
-                    mainView.setLayoutParams(ctor.newInstance(newWidth, newHeight));
-                    mainView.requestLayout();
-                    invalidate();
-                    onViewResized(newWidth, newHeight);
+                    if (mainView != null) {
+                        Constructor<? extends ViewGroup.LayoutParams> ctor =
+                                mainView.getLayoutParams().getClass().getDeclaredConstructor(int.class, int.class);
+                        mainView.setLayoutParams(ctor.newInstance(newWidth, newHeight));
+                        mainView.requestLayout();
+                        invalidate();
+                        onViewResized(newWidth, newHeight);
+                    }
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    DebugTool.logError(TAG, "Exception thrown during view resize", e);
                 }
             }
         });