From 90bd28196fe5347f4d8c994a12976f926796108c Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Wed, 19 Feb 2025 15:26:02 -0500 Subject: [PATCH] Fix for some webxdc imports This regex can never be perfect, but this one is better --- .../eu/siacs/conversations/services/ImportBackupService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cheogram/java/eu/siacs/conversations/services/ImportBackupService.java b/src/cheogram/java/eu/siacs/conversations/services/ImportBackupService.java index 3ba1c15a0c9bad89fed9d3ae2a7f482b90f3a20b..8aec7df93b4bd54ee678958ad42705832fc0b10a 100644 --- a/src/cheogram/java/eu/siacs/conversations/services/ImportBackupService.java +++ b/src/cheogram/java/eu/siacs/conversations/services/ImportBackupService.java @@ -265,7 +265,7 @@ public class ImportBackupService extends Service { if (count % 2 == 0) { if (line.startsWith("INSERT INTO cheogram.webxdc_updates(serial,")) { // re-number webxdc using autoincrement in the local database - line = line.replaceAll("\\([^,]+,", "("); + line = line.replace("webxdc_updates(serial,", "webxdc_updates(").replaceAll("\\([0-9]+,", "("); } db.execSQL(line); updateImportBackupNotification(fileSize, countingInputStream.getCount());