Merge pull request #1406 from smartdevicelink/release/4.12-RC

4.12.0 Release Candidate

Author: bilal-alsharifi

.github/workflows/android.yml

@@ -25,7 +25,7 @@ jobs:
         script: ./android/gradlew -p ./android :sdl_android:connectedCheck
 
     - name: Hello Sdl Android Tests
-      run: ./android/gradlew -p ./android :hello_sdl_android:build
+      run: ./android/gradlew -p ./android/hello_sdl_android test
 
     - name: Sdl JavaSE Tests
       run: ./javaSE/gradlew -p ./javaSE test

CHANGELOG.md

@@ -1,12 +1,58 @@
-# 4.11.1 Release Notes
+# 4.12.0 Release Notes
 
 ### Summary:
 ||Version|
 |--|--|
-|**Protocol** |5.2.0
-| **RPC** |6.0.0
-| **Tested Targeting** |Android 29
+| **Protocol** | 5.2.0
+| **RPC** | 6.0.0
+| **Tested Targeting** | Android 29
 
-## Hotfix
+## Features
+- [[SDL 0230] SPP resource management for Android](https://github.com/smartdevicelink/sdl_java_suite/issues/1132)
 
-- [Samsung devices not properly managing notification channels](https://github.com/smartdevicelink/sdl_java_suite/issues/1351)
+- [[SDL 0279] Screen Manager Subscribe Buttons](https://github.com/smartdevicelink/sdl_java_suite/issues/1280)
+
+- [[SDL 0289] Support for Set Language Separately](https://github.com/smartdevicelink/sdl_java_suite/issues/1313)
+
+- [Add a way to set the resumption hash in the managers layer](https://github.com/smartdevicelink/sdl_java_suite/issues/1400)
+
+- [Change lock screen logo and ensure correct contrast](https://github.com/smartdevicelink/sdl_java_suite/issues/1342)
+
+
+## Enhancements
+- [[SDL 0306] Use Taskmaster To Handle Queuing Operations in Managers](https://github.com/smartdevicelink/sdl_java_suite/issues/1368)
+
+- [[SDL 0301] SDL Device Listener](https://github.com/smartdevicelink/sdl_java_suite/issues/1348)
+
+- [Sdl Android should use the new LifecycleManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1365)
+
+- [Deprecate onError for OnRPCResponseListener](https://github.com/smartdevicelink/sdl_java_suite/pull/1404)
+
+- [Add ForegroundServiceType Parameter to HelloSdl Project](https://github.com/smartdevicelink/sdl_java_suite/issues/1374)
+
+- [Update javadocs for PermissionManager.addListener](https://github.com/smartdevicelink/sdl_java_suite/pull/1364)
+
+- [PermissionManager Should send callback when subscribing to listener](https://github.com/smartdevicelink/sdl_java_suite/issues/1353)
+
+- [Move textFields / imageFields == null checking from ScreenManager to SystemCapabilityManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1335)
+
+- [Change Http to Https](https://github.com/smartdevicelink/sdl_java_suite/issues/1333)
+
+- [Move src/java/main/android folder](https://github.com/smartdevicelink/sdl_java_suite/issues/1377)
+
+- [Classes that need to be removed in next major release should be deprecated ](https://github.com/smartdevicelink/sdl_java_suite/issues/1362)
+
+- [OnSdlChoiceChosen contains duplicate class definitions](https://github.com/smartdevicelink/sdl_java_suite/issues/14)
+
+- [The name of setter and getter in OnButtonPress are ambiguous](https://github.com/smartdevicelink/sdl_java_suite/issues/547)
+
+
+## Bug Fixes
+
+- [presentChoiceSet failed with "INVALID_ID, null"](https://github.com/smartdevicelink/sdl_java_suite/issues/1336)
+
+- [ Android app will not receive the notification of HU when the language is switched on the HU side.](https://github.com/smartdevicelink/sdl_java_suite/issues/1372)
+
+- [If an empty array is set for voice commands on the SDLMenuCell the AddCommand is rejected](https://github.com/smartdevicelink/sdl_java_suite/issues/1341)
+
+- [Disconnecting a cloud app doesn't free the port](https://github.com/smartdevicelink/sdl_java_suite/issues/1339)

VERSION

@@ -1 +1 @@
-4.11.1
+4.12.0-RC

android/hello_sdl_android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.sdl.hellosdlandroid"
         minSdkVersion 14

android/hello_sdl_android/src/main/AndroidManifest.xml

@@ -39,12 +39,15 @@
                 android:resource="@xml/accessory_filter" />
         </activity>
 
-        <service android:name="com.sdl.hellosdlandroid.SdlService" >
+        <service
+            android:name="com.sdl.hellosdlandroid.SdlService"
+            android:foregroundServiceType="connectedDevice">
         </service>
         <service
             android:name=".SdlRouterService"
             android:exported="true"
-            android:process="com.smartdevicelink.router">
+            android:process="com.smartdevicelink.router"
+            android:foregroundServiceType="connectedDevice">
             <intent-filter>
                 <action android:name="com.smartdevicelink.router.service"/>
             </intent-filter>

android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java

@@ -3,17 +3,17 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.util.Log;
 
 import com.smartdevicelink.transport.SdlBroadcastReceiver;
 import com.smartdevicelink.transport.SdlRouterService;
+import com.smartdevicelink.util.DebugTool;
 
 public class SdlReceiver  extends SdlBroadcastReceiver {
 	private static final String TAG = "SdlBroadcastReciever";
 
 	@Override
 	public void onSdlEnabled(Context context, Intent intent) {
-		Log.d(TAG, "SDL Enabled");
+		DebugTool.logInfo(TAG, "SDL Enabled");
 		intent.setClass(context, SdlService.class);
 
 		// SdlService needs to be foregrounded in Android O and above

android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java

@@ -12,6 +12,7 @@
 import android.util.Log;
 
 import com.smartdevicelink.managers.CompletionListener;
+import com.smartdevicelink.managers.screen.OnButtonListener;
 import com.smartdevicelink.managers.SdlManager;
 import com.smartdevicelink.managers.SdlManagerListener;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
@@ -27,9 +28,12 @@
 import com.smartdevicelink.proxy.RPCNotification;
 import com.smartdevicelink.proxy.TTSChunkFactory;
 import com.smartdevicelink.proxy.rpc.Alert;
+import com.smartdevicelink.proxy.rpc.OnButtonEvent;
+import com.smartdevicelink.proxy.rpc.OnButtonPress;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.Speak;
 import com.smartdevicelink.proxy.rpc.enums.AppHMIType;
+import com.smartdevicelink.proxy.rpc.enums.ButtonName;
 import com.smartdevicelink.proxy.rpc.enums.FileType;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
 import com.smartdevicelink.proxy.rpc.enums.InteractionMode;
@@ -183,6 +187,7 @@ public void onNotified(RPCNotification notification) {
 								performWelcomeSpeak();
 								performWelcomeShow();
 								preloadChoices();
+								subscribeToButtons();
 							}
 						}
 					});
@@ -198,20 +203,44 @@ public void onError(String info, Exception e) {
 				}
 
 				@Override
-				public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language){
-					String appName;
+				public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language) {
+					return null;
+				}
+
+				@Override
+				public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language, Language hmiLanguage) {
+					boolean isNeedUpdate = false;
+					String appName = APP_NAME;
+					String ttsName = APP_NAME;
 					switch (language) {
 						case ES_MX:
+							isNeedUpdate = true;
+							ttsName = APP_NAME_ES;
+							break;
+						case FR_CA:
+							isNeedUpdate = true;
+							ttsName = APP_NAME_FR;
+							break;
+						default:
+							break;
+					}
+					switch (hmiLanguage) {
+						case ES_MX:
+							isNeedUpdate = true;
 							appName = APP_NAME_ES;
 							break;
 						case FR_CA:
+							isNeedUpdate = true;
 							appName = APP_NAME_FR;
 							break;
 						default:
-							return null;
+							break;
+					}
+					if (isNeedUpdate) {
+						return new LifecycleConfigurationUpdate(appName, null, TTSChunkFactory.createSimpleTTSChunks(ttsName), null);
+					} else {
+						return null;
 					}
-
-					return new LifecycleConfigurationUpdate(appName,null,TTSChunkFactory.createSimpleTTSChunks(appName), null);
 				}
 			};
 
@@ -346,6 +375,36 @@ public void onComplete(boolean success) {
 		});
 	}
 
+	/**
+	 * Attempts to Subscribe to all preset buttons
+	 */
+	private void subscribeToButtons() {
+		ButtonName[] buttonNames = {ButtonName.PLAY_PAUSE, ButtonName.SEEKLEFT, ButtonName.SEEKRIGHT, ButtonName.AC_MAX, ButtonName.AC, ButtonName.RECIRCULATE,
+				ButtonName.FAN_UP, ButtonName.FAN_DOWN, ButtonName.TEMP_UP, ButtonName.TEMP_DOWN, ButtonName.FAN_DOWN, ButtonName.DEFROST_MAX, ButtonName.DEFROST_REAR, ButtonName.DEFROST,
+				ButtonName.UPPER_VENT, ButtonName.LOWER_VENT, ButtonName.VOLUME_UP, ButtonName.VOLUME_DOWN, ButtonName.EJECT, ButtonName.SOURCE, ButtonName.SHUFFLE, ButtonName.REPEAT};
+
+		OnButtonListener onButtonListener = new OnButtonListener() {
+			@Override
+			public void onPress(ButtonName buttonName, OnButtonPress buttonPress) {
+				sdlManager.getScreenManager().setTextField1(buttonName + " pressed");
+			}
+
+			@Override
+			public void onEvent(ButtonName buttonName, OnButtonEvent buttonEvent) {
+				sdlManager.getScreenManager().setTextField2(buttonName + " " + buttonEvent.getButtonEventMode());
+			}
+
+			@Override
+			public void onError(String info) {
+				Log.i(TAG, "onError: " + info);
+			}
+		};
+
+		for (ButtonName buttonName : buttonNames) {
+			sdlManager.getScreenManager().addButtonListener(buttonName, onButtonListener);
+		}
+	}
+
 	/**
 	 * Will show a sample test message on screen as well as speak a sample test message
 	 */

android/sdl_android/build.gradle

@@ -7,7 +7,7 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 29
-        versionCode 13
+        versionCode 14
         versionName new File(projectDir.path, ('/../../VERSION')).text.trim()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"'
@@ -56,6 +56,7 @@ task buildWindowSymLinks(type:Exec){
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     api 'com.smartdevicelink:bson_java_port:1.2.0'
+    api 'com.livio.taskmaster:taskmaster:0.3.0'
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })