From 0b30005272bad82cf9395ba7a59c2c5535f7262e Mon Sep 17 00:00:00 2001
From: Walter Huf <hufman@gmail.com>
Date: Mon, 12 Feb 2024 20:21:17 -0800
Subject: [PATCH] Move gestalt proguard rules to IDriveConnectKit

---
 app/build.gradle                                            | 2 +-
 app/proguard-rules.pro                                      | 6 ------
 .../io/bimmergestalt/reader/carapp/ReadoutController.kt     | 3 +++
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 23a57f8d1..a14c02613 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -202,5 +202,5 @@ dependencies {
 
     // BimmerGestalt
     gestaltImplementation 'io.bimmergestalt:IDriveConnectKit:0.6'
-    gestaltImplementation 'io.bimmergestalt:IDriveConnectKitAndroid:0.5'
+    gestaltImplementation 'io.bimmergestalt:IDriveConnectKitAndroid:0.6'
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index da6cf9278..1bfe52cd3 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -36,9 +36,3 @@
 
 # Provider API
 -keep class me.ash.reader.infrastructure.** { *; }
-
-# Apache Etch and Gestalt
--keep class io.bimmergestalt.idriveconnectkit.rhmi.* { *; }
--keep class io.bimmergestalt.idriveconnectkit.android.security.* { *; }
--keep public class * extends org.apache.etch.bindings.java.transport.FormatFactory
--keep class io.bimmergestalt.reader.carapp.* { *; }
\ No newline at end of file
diff --git a/app/src/gestalt/java/io/bimmergestalt/reader/carapp/ReadoutController.kt b/app/src/gestalt/java/io/bimmergestalt/reader/carapp/ReadoutController.kt
index fd28fa247..298b76e1f 100644
--- a/app/src/gestalt/java/io/bimmergestalt/reader/carapp/ReadoutController.kt
+++ b/app/src/gestalt/java/io/bimmergestalt/reader/carapp/ReadoutController.kt
@@ -1,6 +1,7 @@
 package io.bimmergestalt.reader.carapp
 
 import android.util.Log
+import androidx.annotation.Keep
 import io.bimmergestalt.idriveconnectkit.rhmi.RHMIApplication
 import io.bimmergestalt.idriveconnectkit.rhmi.RHMIEvent
 import io.bimmergestalt.idriveconnectkit.rhmi.RHMIModel
@@ -10,9 +11,11 @@ import kotlin.math.max
 import kotlin.math.min
 
 
+@Keep
 data class HMITTS(  // the json decoder object
 	val TTSState: TTSState
 )
+@Keep
 data class TTSState(    // the actual state
 	val state: Int?,
 	val currentblock: Int?,