In case of invalid XML in the payloads, at least still load the message

Stephen Paul Weber created 2 years ago

Change summary

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

Detailed changes

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

@@ -271,8 +271,12 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
             final XmlReader xmlReader = new XmlReader();
             xmlReader.setInputStream(ByteSource.wrap(payloadsStr.getBytes()).openStream());
             Tag tag;
-            while ((tag = xmlReader.readTag()) != null) {
-                payloads.add(xmlReader.readElement(tag));
+            try {
+                while ((tag = xmlReader.readTag()) != null) {
+                    payloads.add(xmlReader.readElement(tag));
+                }
+            } catch (IOException e) {
+                Log.e(Config.LOGTAG, "Failed to parse: " + payloadsStr, e);
             }
         }
 

src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java

@@ -1137,7 +1137,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             try {
                 list.add(0, Message.fromCursor(cursor, conversation));
             } catch (Exception e) {
-                Log.e(Config.LOGTAG, "unable to restore message");
+                Log.e(Config.LOGTAG, "unable to restore message", e);
             }
         }
         cursor.close();