From 2bba4e4ca3bc75f8a45674ce6486a591bdafc6aa Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 2 Oct 2024 19:04:59 +0200
Subject: [PATCH] improve logging for message/reactions restore

---
 src/main/java/eu/siacs/conversations/entities/Message.java  | 2 +-
 src/main/java/eu/siacs/conversations/entities/Reaction.java | 6 +++++-
 .../eu/siacs/conversations/persistance/DatabaseBackend.java | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 7fae1b9b4ba9608dd12786048e2080012f3f95d4..237525a0859ba010d807f8e9d7f2db746451e378 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -227,7 +227,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         this.reactions = reactions;
     }
 
-    public static Message fromCursor(Cursor cursor, Conversation conversation) {
+    public static Message fromCursor(final Cursor cursor, final Conversation conversation) {
         return new Message(conversation,
                 cursor.getString(cursor.getColumnIndexOrThrow(UUID)),
                 cursor.getString(cursor.getColumnIndexOrThrow(CONVERSATION)),
diff --git a/src/main/java/eu/siacs/conversations/entities/Reaction.java b/src/main/java/eu/siacs/conversations/entities/Reaction.java
index eff7be74b096c1acc7c6020a992d452e025009b4..28e0dbd85ebcca3a364bebd3e141a8271b15e72f 100644
--- a/src/main/java/eu/siacs/conversations/entities/Reaction.java
+++ b/src/main/java/eu/siacs/conversations/entities/Reaction.java
@@ -1,5 +1,7 @@
 package eu.siacs.conversations.entities;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 
 import com.google.common.base.MoreObjects;
@@ -19,6 +21,7 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.xmpp.Jid;
 
 import java.io.IOException;
@@ -76,8 +79,9 @@ public class Reaction {
             return Collections.emptyList();
         }
         try {
-            return GSON.fromJson(asString, new TypeToken<ArrayList<Reaction>>() {}.getType());
+            return GSON.fromJson(asString, new TypeToken<List<Reaction>>() {}.getType());
         } catch (final JsonSyntaxException e) {
+            Log.e(Config.LOGTAG,"could not restore reactions", e);
             return Collections.emptyList();
         }
     }
diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
index 40ee39e2f3e6c856876eb1ffb12dea0d51b742a7..f21a7af9e7b5b79e5fe10c2eeb426348aef53281 100644
--- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
@@ -820,8 +820,8 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         while (cursor.moveToNext()) {
             try {
                 list.add(0, Message.fromCursor(cursor, conversation));
-            } catch (Exception e) {
-                Log.e(Config.LOGTAG, "unable to restore message");
+            } catch (final Exception e) {
+                Log.e(Config.LOGTAG, "unable to restore message", e);
             }
         }
         cursor.close();