From 3fcc72d49f149ef81f8d2e3a70e03cd15d8f8e0b Mon Sep 17 00:00:00 2001
From: Walter Huf <hufman@gmail.com>
Date: Sun, 11 Feb 2024 15:52:39 -0800
Subject: [PATCH] Simplifies proguard by using IDriveConnectKitAndroid

---
 .idea/androidTestResultsUserPreferences.xml | 22 ++++++++++
 .idea/deploymentTargetDropDown.xml          | 10 +++++
 .idea/kotlinc.xml                           |  6 +++
 app/build.gradle                            |  4 +-
 app/proguard-rules.pro                      | 46 ++++-----------------
 5 files changed, 48 insertions(+), 40 deletions(-)
 create mode 100644 .idea/androidTestResultsUserPreferences.xml
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 .idea/kotlinc.xml

diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
new file mode 100644
index 000000000..23a305e7c
--- /dev/null
+++ b/.idea/androidTestResultsUserPreferences.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidTestResultsUserPreferences">
+    <option name="androidTestResultsTableState">
+      <map>
+        <entry key="28629151">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Nexus_5_API_28" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 000000000..1f556e0c4
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="All Tests">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 000000000..e1eea1d6b
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.7.20" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index fcb4e6f58..68ba21a08 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -304,10 +304,10 @@ dependencies {
     androidTestImplementation 'com.github.tmurakami:dexopener:2.0.5'
     androidTestImplementation 'org.awaitility:awaitility-scala:3.1.5'
     implementation 'io.bimmergestalt:IDriveConnectKit:0.6'
-    implementation 'io.bimmergestalt:IDriveConnectKitAndroid:0.5'
+    implementation 'io.bimmergestalt:IDriveConnectKitAndroid:0.6'
     testImplementation 'io.bimmergestalt:IDriveConnectKit:0.6'
     androidTestImplementation 'io.bimmergestalt:IDriveConnectKit:0.6'
-    androidTestImplementation 'io.bimmergestalt:IDriveConnectKitAndroid:0.2'
+    androidTestImplementation 'io.bimmergestalt:IDriveConnectKitAndroid:0.6'
     androidTestImplementation "org.bouncycastle:bcmail-jdk16:1.46"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlin_coroutines_version"
     testImplementation "org.powermock:powermock-core:2.0.9"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index a38d6256c..4b130dee5 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -24,45 +24,15 @@
 -dontobfuscate
 -optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable
 
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends java.lang.Exception
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
-
 # randomly hardcoding things to make connected tests pass
--keep class kotlin.collections.** { *; }
--keep class kotlin.coroutines.** { *; }
--keep class androidx.drawerlayout.widget.** { *; }
--keep class com.google.** { *; }
+-keep class com.google.maps.** { *; }
+-keep class kotlin.collections.CollectionsKt
+-keep class kotlin.collections.MapsKt
+-keep class kotlin.collections.SetsKt
+-keep class kotlin.coroutines.intrinsics.IntrinsicsKt
 -keep class io.wax911.emojify.model.Emoji { *; }
--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 me.hufman.androidautoidrive.** { *; }
 
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}
\ No newline at end of file
+# Needed only for ConnectedTests
+-keep class androidx.drawerlayout.widget.** { boolean isDrawer*(int); }
+-keep class kotlin.reflect.jvm.internal.** { *; }
\ No newline at end of file