Merge branch 'rhmi_custom_resources'

.gitignore

@@ -13,7 +13,6 @@
 /build
 /captures
 /external
-/app/src/main/assets/carapplications
 /app/src/test/resources/*.xml
 .externalNativeBuild
 sentry.properties

app/build.gradle

@@ -68,6 +68,10 @@ android {
         // enable async RHMI data updates
         // big performance improvement, and seemingly doesn't even cause bugs!
         buildConfigField "boolean", "ASYNC_RHMI_APPLICATION", "true"
+
+        // with custom hackery, the car HMI can accept unsigned resources
+        // if your car has this, set this option to attempt to send these unsigned resources
+        buildConfigField "boolean", "SEND_UNSIGNED_RESOURCES", (System.env.AndroidAutoIdrive_SendUnsignedResources ? System.env.AndroidAutoIdrive_SendUnsignedResources : AndroidAutoIdrive_SendUnsignedResources)
     }
 
     signingConfigs {

app/src/main/assets/.gitignore

@@ -0,0 +1,9 @@
+
+basecoreOnlineServices
+bmwone
+calendar
+cdsbaseapp
+multimedia
+news
+smartthings
+spotify

app/src/main/java/me/hufman/androidautoidrive/carapp/notifications/ID5StatusbarApp.kt

@@ -11,6 +11,7 @@ import io.bimmergestalt.idriveconnectkit.android.IDriveConnectionStatus
 import io.bimmergestalt.idriveconnectkit.android.security.SecurityAccess
 import io.bimmergestalt.idriveconnectkit.rhmi.*
 import io.bimmergestalt.idriveconnectkit.rhmi.deserialization.loadFromXML
+import me.hufman.androidautoidrive.BuildConfig
 import me.hufman.androidautoidrive.CarAppWidgetAssetResources
 import me.hufman.androidautoidrive.carapp.FocusTriggerController
 import me.hufman.androidautoidrive.carapp.L
@@ -19,7 +20,7 @@ import me.hufman.androidautoidrive.carapp.notifications.views.ID5PopupView
 import me.hufman.androidautoidrive.utils.GraphicsHelpers
 import java.util.zip.ZipInputStream
 
-class ID5StatusbarApp(val iDriveConnectionStatus: IDriveConnectionStatus, val securityAccess: SecurityAccess, carAppAssets: CarAppWidgetAssetResources, graphicsHelpers: GraphicsHelpers) {
+class ID5StatusbarApp(val iDriveConnectionStatus: IDriveConnectionStatus, val securityAccess: SecurityAccess, carAppAssets: CarAppWidgetAssetResources, unsignedcarAppAssets: CarAppWidgetAssetResources, graphicsHelpers: GraphicsHelpers) {
 	val carConnection: BMWRemotingServer
 	val carApp: RHMIApplication
 	val infoState: RHMIState.PlainState
@@ -45,7 +46,16 @@ class ID5StatusbarApp(val iDriveConnectionStatus: IDriveConnectionStatus, val se
 		carConnection.rhmi_setResourceCached(rhmiHandle, BMWRemoting.RHMIResourceType.IMAGEDB, carAppAssets.getImagesDB(iDriveConnectionStatus.brand ?: "common"))
 		carConnection.rhmi_setResourceCached(rhmiHandle, BMWRemoting.RHMIResourceType.WIDGETDB, carAppAssets.getWidgetsDB(iDriveConnectionStatus.brand ?: "common"))
 
-		// no text, so sneaky
+		if (BuildConfig.SEND_UNSIGNED_RESOURCES) {
+			try {
+				carConnection.rhmi_setResourceCached(rhmiHandle, BMWRemoting.RHMIResourceType.TEXTDB, unsignedcarAppAssets.getTextsDB(iDriveConnectionStatus.brand ?: "common"))
+			} catch (e: Exception) {
+				Log.w(TAG, "Unsigned resources were not accepted by car")
+			}
+		} else {
+			// no text, so sneaky
+		}
+
 		carConnection.rhmi_initialize(rhmiHandle)
 
 		carApp = RHMIApplicationSynchronized(RHMIApplicationIdempotent(RHMIApplicationEtch(carConnection, rhmiHandle)), carConnection)

app/src/main/java/me/hufman/androidautoidrive/carapp/notifications/NotificationAppService.kt

@@ -49,6 +49,7 @@ class NotificationAppService: CarAppService() {
 				// using a handler to automatically handle shutting down during init
 				val carappReadout = ReadoutApp(iDriveConnectionStatus, securityAccess,
 						CarAppAssetResources(applicationContext, "news"),
+						CarAppAssetResources(applicationContext, "carinfo_unsigned"),
 						handler, applicationContext.resources, AppSettingsViewer())
 				carappNotifications?.readoutInteractions?.readoutController = carappReadout.readoutController
 				this.carappReadout = carappReadout
@@ -60,7 +61,9 @@ class NotificationAppService: CarAppService() {
 				// start up the id5 statusbar app
 				// using a handler to automatically handle shutting down during init
 				val carappStatusbar = ID5StatusbarApp(iDriveConnectionStatus, securityAccess,
-						CarAppWidgetAssetResources(applicationContext, "bmwone"), GraphicsHelpersAndroid())
+						CarAppWidgetAssetResources(applicationContext, "bmwone"),
+						CarAppWidgetAssetResources(applicationContext, "id5statusbar_unsigned"),
+						GraphicsHelpersAndroid())
 				carappNotifications?.id5Upgrade(carappStatusbar)
 				this.carappStatusbar = carappStatusbar
 				Log.i(MainService.TAG, "Finished initializing id5 statusbar")

app/src/main/java/me/hufman/androidautoidrive/carapp/notifications/ReadoutApp.kt

@@ -19,6 +19,7 @@ import io.bimmergestalt.idriveconnectkit.rhmi.*
 import io.bimmergestalt.idriveconnectkit.rhmi.deserialization.loadFromXML
 import kotlinx.coroutines.android.asCoroutineDispatcher
 import me.hufman.androidautoidrive.AppSettings
+import me.hufman.androidautoidrive.BuildConfig
 import me.hufman.androidautoidrive.CarInformation
 import me.hufman.androidautoidrive.R
 import me.hufman.androidautoidrive.carapp.*
@@ -28,7 +29,7 @@ import me.hufman.androidautoidrive.carapp.carinfo.views.CategoryView
 import me.hufman.androidautoidrive.cds.*
 import me.hufman.androidautoidrive.utils.Utils
 
-class ReadoutApp(val iDriveConnectionStatus: IDriveConnectionStatus, val securityAccess: SecurityAccess, val carAppAssets: CarAppResources, val handler: Handler, val resources: Resources, val appSettings: AppSettings) {
+class ReadoutApp(val iDriveConnectionStatus: IDriveConnectionStatus, val securityAccess: SecurityAccess, val carAppAssets: CarAppResources, val unsignedCarAppAssets: CarAppResources, val handler: Handler, val resources: Resources, val appSettings: AppSettings) {
 	private val coroutineContext = handler.asCoroutineDispatcher()
 	val carConnection: BMWRemotingServer
 	var rhmiHandle: Int = -1
@@ -98,7 +99,17 @@ class ReadoutApp(val iDriveConnectionStatus: IDriveConnectionStatus, val securit
 		rhmiHandle = carConnection.rhmi_create(null, BMWRemoting.RHMIMetaData("me.hufman.androidautoidrive.notification.readout", BMWRemoting.VersionInfo(0, 1, 0),
 				"me.hufman.androidautoidrive.notification.readout", "me.hufman"))
 		carConnection.rhmi_setResourceCached(rhmiHandle, BMWRemoting.RHMIResourceType.DESCRIPTION, carAppAssets.getUiDescription())
-		// no icons or text, so sneaky
+		if (BuildConfig.SEND_UNSIGNED_RESOURCES) {
+			try {
+				carConnection.rhmi_setResourceCached(rhmiHandle, BMWRemoting.RHMIResourceType.TEXTDB, unsignedCarAppAssets.getTextsDB(iDriveConnectionStatus.brand ?: "common"))
+				carConnection.rhmi_setResourceCached(rhmiHandle, BMWRemoting.RHMIResourceType.IMAGEDB, unsignedCarAppAssets.getImagesDB(iDriveConnectionStatus.brand ?: "common"))
+			} catch (e: Exception) {
+				Log.w(TAG, "Unsigned resources were not accepted by car")
+			}
+		} else {
+			// no icons or text, so sneaky
+		}
+
 		carConnection.rhmi_initialize(rhmiHandle)
 		carConnection.rhmi_addActionEventHandler(rhmiHandle, "me.hufman.androidautoidrive.notification.readout", -1)
 		carConnection.rhmi_addHmiEventHandler(rhmiHandle, "me.hufman.androidautoidrive.notification.readout", -1, -1)

app/src/test/java/me/hufman/androidautoidrive/notifications/ReadoutAppTest.kt

@@ -37,7 +37,7 @@ class ReadoutAppTest {
 	fun testAppInit() {
 		val mockServer = MockBMWRemotingServer()
 		IDriveConnection.mockRemotingServer = mockServer
-		val app = ReadoutApp(iDriveConnectionStatus, securityAccess, carAppResources, mock(), resources, AppSettingsViewer())
+		val app = ReadoutApp(iDriveConnectionStatus, securityAccess, carAppResources, mock(), mock(), resources, AppSettingsViewer())
 
 		val labelComponent = app.infoState.state.componentsList.filterIsInstance<RHMIComponent.Button>().first()
 		assertEquals(L.CARINFO_TITLE, mockServer.data[labelComponent.model])
@@ -53,7 +53,7 @@ class ReadoutAppTest {
 	fun testTTSCallback() {
 		val mockServer = MockBMWRemotingServer()
 		IDriveConnection.mockRemotingServer = mockServer
-		val app = ReadoutApp(iDriveConnectionStatus, securityAccess, carAppResources, mock(), resources, AppSettingsViewer())
+		val app = ReadoutApp(iDriveConnectionStatus, securityAccess, carAppResources, mock(), mock(), resources, AppSettingsViewer())
 
 		IDriveConnection.mockRemotingClient?.cds_onPropertyChangedEvent(1, "113", "hmi.tts",
 				"{\"TTSState\": {\"state\": 0, \"type\": \"app\", \"currentblock\": 0}}" )
@@ -69,7 +69,7 @@ class ReadoutAppTest {
 	fun testTTSTrigger() {
 		val mockServer = MockBMWRemotingServer()
 		IDriveConnection.mockRemotingServer = mockServer
-		val app = ReadoutApp(iDriveConnectionStatus, securityAccess, carAppResources, mock(), resources, AppSettingsViewer())
+		val app = ReadoutApp(iDriveConnectionStatus, securityAccess, carAppResources, mock(), mock(), resources, AppSettingsViewer())
 
 		app.readoutController.readout(listOf("Test Output"))
 		val speechList = mockServer.data[app.readoutController.speechList.id] as BMWRemoting.RHMIDataTable

app/src/test/java/me/hufman/androidautoidrive/notifications/StatusbarAppTest.kt

@@ -55,7 +55,7 @@ class StatusbarAppTest {
 	fun testAppInit() {
 		val mockServer = MockBMWRemotingServer()
 		IDriveConnection.mockRemotingServer = mockServer
-		val app = ID5StatusbarApp(iDriveConnectionStatus, securityAccess, carAppResources, graphicsHelpers)
+		val app = ID5StatusbarApp(iDriveConnectionStatus, securityAccess, carAppResources, mock(), graphicsHelpers)
 
 		assertEquals(null, mockServer.resources[BMWRemoting.RHMIResourceType.TEXTDB])
 		assertArrayEquals(carAppResources.getImagesDB("")?.readBytes(), mockServer.resources[BMWRemoting.RHMIResourceType.IMAGEDB])
@@ -80,7 +80,7 @@ class StatusbarAppTest {
 	fun testAppEntrybutton() {
 		val mockServer = MockBMWRemotingServer()
 		IDriveConnection.mockRemotingServer = mockServer
-		val app = ID5StatusbarApp(iDriveConnectionStatus, securityAccess, carAppResources, graphicsHelpers)
+		val app = ID5StatusbarApp(iDriveConnectionStatus, securityAccess, carAppResources, mock(), graphicsHelpers)
 
 		val button = app.carApp.components.values.filterIsInstance<RHMIComponent.EntryButton>().first()
 		button.getAction()?.asRAAction()?.rhmiActionCallback?.onActionEvent(mapOf(0.toByte() to 0))
@@ -91,7 +91,7 @@ class StatusbarAppTest {
 	fun testNotificationCenterController() {
 		val mockServer = MockBMWRemotingServer()
 		IDriveConnection.mockRemotingServer = mockServer
-		val app = ID5StatusbarApp(iDriveConnectionStatus, securityAccess, carAppResources, graphicsHelpers)
+		val app = ID5StatusbarApp(iDriveConnectionStatus, securityAccess, carAppResources, mock(), graphicsHelpers)
 		val controller = app.statusbarController
 		val event = app.notificationEvent
 
@@ -143,7 +143,7 @@ class StatusbarAppTest {
 	fun testID5Popup() {
 		val mockServer = MockBMWRemotingServer()
 		IDriveConnection.mockRemotingServer = mockServer
-		val app = ID5StatusbarApp(iDriveConnectionStatus, securityAccess, carAppResources, graphicsHelpers)
+		val app = ID5StatusbarApp(iDriveConnectionStatus, securityAccess, carAppResources, mock(), graphicsHelpers)
 		app.showNotificationController = showNotificationController
 		val popupState = app.carApp.states.values.filterIsInstance<RHMIState.PopupState>().first()
 		val popupView = app.popupView

gradle.properties

@@ -34,4 +34,5 @@ AndroidAutoIdrive_GmapsApiKey=unset
 AndroidAutoIdrive_MapboxAccessToken=unset
 AndroidAutoIdrive_MapboxDownloadToken=unset
 AndroidAutoIdrive_SentryDsn=unset
-AndroidAutoIdrive_SpotifyApiKey=invalid
+AndroidAutoIdrive_SpotifyApiKey=invalid
+AndroidAutoIdrive_SendUnsignedResources=false