Work fork of an Android Jabber client for bridge users
git.sr.ht/~singpolyma/cheogram-android
sopranica
sgx
xmpp
jabber
undo borked DB query from cherry-pick
authored by
Phillip Davis
and committed by
Stephen Paul Weber
(Apr 21, 2026, 10:21 AM -0500)
37c8d5a8
198b3954
+11
-8
+11
-8
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
+11
-8
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
···
1739
1739
SQLiteDatabase db = this.getReadableDatabase();
1740
1740
1741
1741
String[] selectionArgs = {conversation.getUuid(), uuid, uuid, uuid};
1742
-
Cursor cursor = db.query(Message.TABLENAME, null, Message.CONVERSATION
1743
-
+ "=? and (" + Message.SERVER_MSG_ID + "=? or " + Message.REMOTE_MSG_ID + "=? or " + Message.UUID + "=?)", selectionArgs, null, null, Message.TIME_SENT
1744
-
+ " DESC", String.valueOf(1));
1742
+
Cursor cursor = db.rawQuery(
1743
+
"SELECT * FROM " + Message.TABLENAME + " " +
1744
+
"LEFT JOIN cheogram." + Message.TABLENAME +
1745
+
" USING (" + Message.UUID + ")" +
1746
+
" WHERE " + Message.CONVERSATION + "=? AND (" +
1747
+
Message.SERVER_MSG_ID + "=? OR " + Message.REMOTE_MSG_ID + "=? OR " + Message.UUID + "=?)" +
1748
+
" ORDER BY " + Message.TIME_SENT + " DESC LIMIT 1",
1749
+
selectionArgs);
1745
1750
CursorUtils.upgradeCursorWindowSize(cursor);
1746
1751
Message anchorMessage = null;
1747
1752
while (cursor.moveToNext()) {
···
1828
1833
} else {
1829
1834
String[] selectionArgs = {conversation.getUuid(),
1830
1835
Long.toString(timestamp)};
1831
-
cursor = db.rawQuery(
1832
-
"SELECT * FROM " + Message.TABLENAME + " " +
1836
+
final String query = "SELECT * FROM " + Message.TABLENAME + " " +
1833
1837
"LEFT JOIN cheogram." + Message.TABLENAME +
1834
1838
" USING (" + Message.UUID + ")" +
1835
1839
" WHERE " + Message.UUID + " IN (" +
···
1838
1842
Message.TIME_SENT + comparsionOperation +
1839
1843
"ORDER BY " + Message.TIME_SENT + sorting +
1840
1844
"LIMIT " + String.valueOf(limit) + ") " +
1841
-
"ORDER BY " + Message.TIME_SENT + sorting,
1842
-
selectionArgs
1843
-
);
1845
+
"ORDER BY " + Message.TIME_SENT + sorting;
1846
+
cursor = db.rawQuery(query, selectionArgs);
1844
1847
}
1845
1848
CursorUtils.upgradeCursorWindowSize(cursor);
1846
1849
final Multimap<String, Message> waitingForReplies = HashMultimap.create();