Fix fail to restore message due to TypeToken error

Stephen Paul Weber created 1 year ago

https://stackoverflow.com/questions/76631086/why-am-i-getting-illegalargumentexception-class-xxxx-isnt-parameterized

Change summary

proguard-rules.pro                                          | 4 ++++
src/main/java/eu/siacs/conversations/entities/Reaction.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)

Detailed changes

proguard-rules.pro

@@ -14,6 +14,10 @@
 -keep class org.openintents.openpgp.*
 -keep class org.webrtc.** { *; }
 
+-keep class com.google.gson.reflect.TypeToken
+-keep class * extends com.google.gson.reflect.TypeToken
+-keep public class * implements java.lang.reflect.Type
+
 -dontwarn javax.mail.internet.MimeMessage
 -dontwarn javax.mail.internet.MimeBodyPart
 -dontwarn javax.mail.internet.SharedInputStream

src/main/java/eu/siacs/conversations/entities/Reaction.java

@@ -10,7 +10,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Ordering;
-import com.google.common.reflect.TypeToken;
+import com.google.gson.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;