Merge pull request #156 from mhss1/dev

Fixed proguard missing rules and Gson issues
mhss1 · Sep 24, 2023 · f3c6e42 · f3c6e42
2 parents 09b2e43 + 4f27d6e
commit f3c6e42
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -19,4 +19,14 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--dontobfuscate
+-dontobfuscate
+
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
diff --git a/app/src/main/java/com/mhss/app/mybrain/data/local/converters/DBConverters.kt b/app/src/main/java/com/mhss/app/mybrain/data/local/converters/DBConverters.kt
@@ -11,14 +11,14 @@ class DBConverters {
     @TypeConverter
     fun fromSubTasksList(value: List<SubTask>): String {
         val gson = Gson()
-        val type = object : TypeToken<List<SubTask>>() {}.type
+        val type = TypeToken.getParameterized(List::class.java, SubTask::class.java).type
         return gson.toJson(value, type)
     }
 
     @TypeConverter
     fun toSubTasksList(value: String): List<SubTask> {
         val gson = Gson()
-        val type = object : TypeToken<List<SubTask>>() {}.type
+        val type = TypeToken.getParameterized(List::class.java, SubTask::class.java).type
         return gson.fromJson(value, type)
     }