fix sending oversized `WebxdcUpdate`s

Phillip Davis created 1 month ago

manually checked that the delete query works even when the rows  are in
the SqliteBlobTooBigException range

Change summary

src/cheogram/res/raw/webxdc.js                                        |  6 
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java | 56 
2 files changed, 45 insertions(+), 17 deletions(-)

Detailed changes

src/cheogram/res/raw/webxdc.js

@@ -39,7 +39,11 @@ window.webxdc = (() => {
 		},
 
 		sendUpdate: (payload, descr) => {
-			InternalJSApi.sendStatusUpdate(JSON.stringify(payload), descr);
+			var serialized = JSON.stringify(payload);
+			if (serialized.length > 128 * 1024) {
+				throw new Error("sendUpdate() payload too large: " + serialized.length + " bytes (max 128 KB)");
+			}
+			InternalJSApi.sendStatusUpdate(serialized, descr);
 		},
 
 		importFiles: (filters) => {

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

@@ -1496,6 +1496,16 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         db.insertWithOnConflict("cheogram.webxdc_updates", null, update.getContentValues(), SQLiteDatabase.CONFLICT_IGNORE);
     }
 
+    private int deleteOversizedWebxdcUpdates(SQLiteDatabase db, String conversationUuid, String thread) {
+        int deleted = db.delete("cheogram.webxdc_updates",
+                Message.CONVERSATION + "=? AND thread=? AND length(payload) > 131072",
+                new String[]{conversationUuid, thread});
+        if (deleted > 0) {
+            Log.w(Config.LOGTAG, "Deleted " + deleted + " oversized webxdc update(s) for thread " + thread);
+        }
+        return deleted;
+    }
+
     public WebxdcUpdate findLastWebxdcUpdate(Message message) {
         if (message.getThread() == null) {
             Log.w(Config.LOGTAG, "WebXDC message with no thread!");
@@ -1507,12 +1517,19 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         Cursor cursor = db.query("cheogram.webxdc_updates", null,
                 Message.CONVERSATION + "=? AND thread=?",
                 selectionArgs, null, null, "serial ASC");
-        WebxdcUpdate update = null;
-        if (cursor.moveToLast()) {
-            update = new WebxdcUpdate(cursor, cursor.getLong(cursor.getColumnIndex("serial")));
+        try {
+            WebxdcUpdate update = null;
+            if (cursor.moveToLast()) {
+                update = new WebxdcUpdate(cursor, cursor.getLong(cursor.getColumnIndex("serial")));
+            }
+            return update;
+        } catch (final android.database.sqlite.SQLiteBlobTooBigException e) {
+            Log.w(Config.LOGTAG, "findLastWebxdcUpdate: blob too big, deleting oversized rows", e);
+            deleteOversizedWebxdcUpdates(db, message.getConversation().getUuid(), message.getThread().getContent());
+            return findLastWebxdcUpdate(message);
+        } finally {
+            cursor.close();
         }
-        cursor.close();
-        return update;
     }
 
     public List<WebxdcUpdate> findWebxdcUpdates(Message message, long serial) {
@@ -1521,19 +1538,26 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         Cursor cursor = db.query("cheogram.webxdc_updates", null,
                 Message.CONVERSATION + "=? AND thread=? AND serial>?",
                 selectionArgs, null, null, "serial ASC");
-        long maxSerial = 0;
-        if (cursor.moveToLast()) {
-            maxSerial = cursor.getLong(cursor.getColumnIndex("serial"));
-        }
-        cursor.moveToFirst();
-        cursor.moveToPrevious();
+        try {
+            long maxSerial = 0;
+            if (cursor.moveToLast()) {
+                maxSerial = cursor.getLong(cursor.getColumnIndex("serial"));
+            }
+            cursor.moveToFirst();
+            cursor.moveToPrevious();
 
-        List<WebxdcUpdate> updates = new ArrayList<>();
-        while (cursor.moveToNext()) {
-            updates.add(new WebxdcUpdate(cursor, maxSerial));
+            List<WebxdcUpdate> updates = new ArrayList<>();
+            while (cursor.moveToNext()) {
+                updates.add(new WebxdcUpdate(cursor, maxSerial));
+            }
+            return updates;
+        } catch (final android.database.sqlite.SQLiteBlobTooBigException e) {
+            Log.w(Config.LOGTAG, "findWebxdcUpdates: blob too big, deleting oversized rows", e);
+            deleteOversizedWebxdcUpdates(db, message.getConversation().getUuid(), message.getThread().getContent());
+            return findWebxdcUpdates(message, serial);
+        } finally {
+            cursor.close();
         }
-        cursor.close();
-        return updates;
     }
 
     public void createConversation(Conversation conversation) {