Merge pull request #1679 from smartdevicelink/5.1.1

5.1.1

CHANGELOG.md

@@ -1,4 +1,4 @@
-# 5.1.0 Release Notes
+# 5.1.1 Release Notes
 
 ## Summary:
 ||Version|
@@ -7,93 +7,15 @@
 | **RPC** | 7.1.0
 | **Tested Targeting** | Android 30
 
-## Features:
-
-- [[SDL 0296] Possibility to update video streaming capabilities during ignition cycle](https://github.com/smartdevicelink/sdl_java_suite/issues/1410)
-
-- [[SDL 0282] Screen Manager Alert Manager](https://github.com/smartdevicelink/sdl_java_suite/issues/1304)
-
-- [[SDL 0269] New vehicle data ClimateData ](https://github.com/smartdevicelink/sdl_java_suite/issues/1247)
-
-- [[SDL 0262] New vehicle data SeatOccupancy](https://github.com/smartdevicelink/sdl_java_suite/issues/1240)
-
-- [[SDL 0198] - Media Skip Indicators](https://github.com/smartdevicelink/sdl_java_suite/issues/871)
-
-
-## Enhancements:
-
-- [[SDL 0180] Broaden Choice Uniqueness](https://github.com/smartdevicelink/sdl_java_suite/issues/811)
-
-- [[SDL 0305] Homogenize TextFieldName](https://github.com/smartdevicelink/sdl_java_suite/issues/1367)
-
-- [[SDL 0238] Keyboard Enhancements](https://github.com/smartdevicelink/sdl_java_suite/issues/1121)
-
-- [[SDL 0267] Main Menu UI Updates](https://github.com/smartdevicelink/sdl_java_suite/issues/1246)
-
-- [[SDL 0274] Add preferred FPS to VideoStreamingCapability](https://github.com/smartdevicelink/sdl_java_suite/issues/1268)
-
-- [[SDL 0292] Improve VirtualDisplayEncoder for stable frame rate](https://github.com/smartdevicelink/sdl_java_suite/issues/1361)
-
-- [[SDL 0255] Enhance BodyInformation vehicle data ](https://github.com/smartdevicelink/sdl_java_suite/issues/1234)
-
-- [[SDL 0244] Custom Playback Rates for SetMediaClockTimer](https://github.com/smartdevicelink/sdl_java_suite/issues/1147)
-
-- [Refactor FileManager to use queues ](https://github.com/smartdevicelink/sdl_java_suite/issues/1572)
-
-- [Taskmaster should be updated to the latest version](https://github.com/smartdevicelink/sdl_java_suite/issues/1589)
-
-- [Refactor VoiceCommandManager to use queues](https://github.com/smartdevicelink/sdl_java_suite/issues/1549)
-
-- [[SDL 0323] - Align video streaming parameters with VideoStreamingCapability](https://github.com/smartdevicelink/sdl_java_suite/issues/1569)
-
-- [[SDL 0285] ShowConstantTBT Description Update](https://github.com/smartdevicelink/sdl_java_suite/issues/1573)
-
 
 ## 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)
-
-- [Fix spelling of "auxillary" in StaticIconName.java](https://github.com/smartdevicelink/sdl_java_suite/issues/1632)
-
-- [Main Menu UI Updates Don't Take TextFieldName / ImageFieldName into account](https://github.com/smartdevicelink/sdl_java_suite/issues/1628)
-
-- [Choice set default timeout needs to have the same behavior as the AlertManager and needs to be aligned with iOS](https://github.com/smartdevicelink/sdl_java_suite/issues/1630)
-
-- [@deprecated annotation in class Javadoc makes the whole class marked as deprecated ](https://github.com/smartdevicelink/sdl_java_suite/issues/1626)
-
-- [SDL failed to start video streaming if users enable WiFi on the head unit after the NaviAPP is activated](https://github.com/smartdevicelink/sdl_java_suite/issues/1235)
-
-- [SDL failed to start video streaming if users enable WiFi on the phone later 150s after the NaviAPP is activated](https://github.com/smartdevicelink/sdl_java_suite/issues/1236)
-
-- [Missing permission check in IntegrationValidator](https://github.com/smartdevicelink/sdl_java_suite/issues/1615)
-
-- [OnRPCNotificationListener for ON_Button_Press JavaSE ](https://github.com/smartdevicelink/sdl_java_suite/issues/1397)
-
-- [Remove Refresh Handler from SdlRemoteDisplay](https://github.com/smartdevicelink/sdl_java_suite/issues/858)
-
-- [New thread is started for every decode operation in AudioDecoderCompat](https://github.com/smartdevicelink/sdl_java_suite/issues/1596)
-
-- [Tests fail because current code state doesn't match MOBILE_API](https://github.com/smartdevicelink/sdl_java_suite/issues/1597)
-
-- [Only auto-overwrite non-persistent files on RPC v4.3 and below](https://github.com/smartdevicelink/sdl_java_suite/issues/1580)
-
-- [Avoid re-uploading blank artwork](https://github.com/smartdevicelink/sdl_java_suite/issues/1579)
-
-- [OnServiceError for Nav and PCM is called even if no service from that type is started](https://github.com/smartdevicelink/sdl_java_suite/issues/1574)
-
-- [Setting a `SDLArtwork`'s `overwrite` property to true does not work with screen manager](https://github.com/smartdevicelink/sdl_java_suite/issues/1346)
-
-- [Supporting devices with SDL 2.0.0](https://github.com/smartdevicelink/sdl_java_suite/issues/1541)
+- [Add null checks and synch around session in LCM](https://github.com/smartdevicelink/sdl_java_suite/pull/1659)
 
-- [Gradle 4.1 compatibility issues ](https://github.com/smartdevicelink/sdl_java_suite/issues/1551)
+- [Add NPE check in BaseChoiceSetManager](https://github.com/smartdevicelink/sdl_java_suite/pull/1648)
 
-- [BitConverter NullPointerExeptions](https://github.com/smartdevicelink/sdl_java_suite/issues/193)
+- [Attempt to fix unreproducible ClassCastException](https://github.com/smartdevicelink/sdl_java_suite/pull/1660)
 
-- [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://search.maven.org/artifact/com.smartdevicelink/sdl_android/5.1.0/aar)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.smartdevicelink/sdl_android/badge.png)](https://maven-badges.herokuapp.com/maven-central/com.smartdevicelink/sdl_android/)
 
 ### Installation
 
@@ -42,7 +42,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    implementation 'com.smartdevicelink:sdl_android:5.1.0'
+    implementation 'com.smartdevicelink:sdl_android:5.+'
 }
 ```
 
@@ -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://search.maven.org/artifact/com.smartdevicelink/sdl_java_se/5.1.0/jar)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.smartdevicelink/sdl_java_se/badge.png)](https://maven-badges.herokuapp.com/maven-central/com.smartdevicelink/sdl_java_se/)
 
 The JavaSE project is meant to allow SDL compatibility for embedded applications. 
 
@@ -80,13 +80,13 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    implementation 'com.smartdevicelink:sdl_java_se:5.1.0'
+    implementation 'com.smartdevicelink:sdl_java_se:5.+'
 }
 ```
 
 ### JavaEE
 
-[ ![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)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.smartdevicelink/sdl_java_ee/badge.png)](https://maven-badges.herokuapp.com/maven-central/com.smartdevicelink/sdl_java_ee/)
 
 The JavaEE project is meant to allow SDL compatibility for web applications. 
 
@@ -99,7 +99,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    implementation 'com.smartdevicelink:sdl_java_ee:5.1.0'
+    implementation 'com.smartdevicelink:sdl_java_ee:5.+'
 }
 ```
 

VERSION

@@ -1 +1 @@
-5.1.0
+5.1.1

android/build.gradle

@@ -4,7 +4,7 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.1'
@@ -18,7 +18,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

android/sdl_android/build.gradle

@@ -5,7 +5,7 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 18
+        versionCode 19
         versionName new File(projectDir.path, ('/../../VERSION')).text.trim()
         buildConfigField "String", "VERSION_NAME", '\"' + versionName + '\"'
         resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"'
@@ -59,13 +59,12 @@ dependencies {
 
 buildscript {
     repositories {
-        jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.13.0'
     }
 }
 
-apply from: 'bintray.gradle'
+apply plugin: "com.vanniktech.maven.publish"

android/sdl_android/gradle.properties

@@ -0,0 +1,31 @@
+GROUP=com.smartdevicelink
+POM_ARTIFACT_ID=sdl_android
+VERSION_NAME=5.1.1
+
+POM_NAME=sdl_android
+POM_PACKAGING=aar
+
+POM_DESCRIPTION=The app library component of SDL is meant to run on the end user’s smart-device from within SDL enabled apps, as an embedded app, or connected to the cloud. App libraries allow the apps to connect to SDL enabled head-units and hardware through bluetooth, USB, and TCP for Android, and cloud and embedded apps can connect through web sockets, Java Beans, and other custom transports. Once the library establishes a connection between the smart device and head-unit through the preferred method of transport, the two components are able to communicate using the SDL defined protocol. The app integrating this library project is then able to expose its functionality to the head-unit through text, media, and other interactive elements.
+POM_INCEPTION_YEAR=2014
+
+POM_URL=https://github.com/smartdevicelink/sdl_java_suite
+POM_SCM_URL=https://github.com/smartdevicelink/sdl_java_suite
+POM_SCM_CONNECTION=scm:[email protected]:smartdevicelink/sdl_java_suite.git
+POM_SCM_DEV_CONNECTION=scm:[email protected]:smartdevicelink/sdl_java_suite.git
+
+POM_LICENCE_NAME=BSD 3-Clause
+POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause
+POM_LICENCE_DIST=repo
+
+RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
+SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/
+
+POM_DEVELOPER_ID=
+POM_DEVELOPER_NAME=
+POM_DEVELOPER_URL=
+
+signing.keyId=
+signing.password=
+signing.secretKeyRingFile=
+SONATYPE_NEXUS_USERNAME=
+SONATYPE_NEXUS_PASSWORD=

android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java

@@ -141,7 +141,7 @@ public class SdlRouterService extends Service {
     /**
      * <b> NOTE: DO NOT MODIFY THIS UNLESS YOU KNOW WHAT YOU'RE DOING.</b>
      */
-    protected static final int ROUTER_SERVICE_VERSION_NUMBER = 13;
+    protected static final int ROUTER_SERVICE_VERSION_NUMBER = 14;
 
     private static final String ROUTER_SERVICE_PROCESS = "com.smartdevicelink.router";
 
@@ -3124,7 +3124,9 @@ public boolean removeSession(Long sessionId) {
             int location = sessionIds.indexOf(sessionId);
             if (location >= 0) {
                 Long removedSessionId = sessionIds.remove(location);
-                registeredTransports.remove(sessionId.intValue());
+                synchronized (TRANSPORT_LOCK) {
+                    registeredTransports.remove(sessionId.intValue());
+                }
                 return removedSessionId != null;
             } else {
                 return false;
@@ -3262,11 +3264,21 @@ protected void unregisterAllTransports(int sessionId) {
          * @return
          */
         private TransportType getCompatPrimaryTransport() {
-            if (this.registeredTransports != null && this.registeredTransports.size() > 0) {
-                List<TransportType> transportTypes = this.registeredTransports.valueAt(0);
-                if (transportTypes != null) {
-                    if (transportTypes.get(0) != null) {
-                        return transportTypes.get(0);
+            synchronized (TRANSPORT_LOCK) {
+                if (this.registeredTransports != null && this.registeredTransports.size() > 0) {
+                    Object obj = this.registeredTransports.valueAt(0);
+                    //Lint shows to ignore this call, but there are crash logs that show otherwise
+                    if (obj != null && obj instanceof List) {
+                        try {
+                            List<TransportType> transportTypes = (List<TransportType>) obj;
+                            if (transportTypes != null) {
+                                if (transportTypes.get(0) != null) {
+                                    return transportTypes.get(0);
+                                }
+                            }
+                        } catch (ClassCastException e) {
+                            DebugTool.logError(TAG, "Unable to cast transport list", e);
+                        }
                     }
                 }
             }

android/sdl_android/src/main/res/values/sdl.xml

@@ -2,7 +2,7 @@
 <resources>
     <string name="sdl_router_service_version_name" translatable="false">sdl_router_version</string>
 
-    <integer name="sdl_router_service_version_value">13</integer>
+    <integer name="sdl_router_service_version_value">14</integer>
 
     <string name="sdl_router_service_is_custom_name" translatable="false">sdl_custom_router</string>
 </resources>