TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-08 22:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep pinned chats at the top of the 'recent' chat section.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-08-17 11:12:00 -04:00
parent e96faf31d4
commit 29b8fa5897
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
View File

@ -490,7 +490,7 @@ public class ThreadDatabase extends Database {
query += " AND " + RecipientDatabase.TABLE_NAME + "." + RecipientDatabase.GROUP_ID + " NOT NULL"; query += " AND " + RecipientDatabase.TABLE_NAME + "." + RecipientDatabase.GROUP_ID + " NOT NULL";
} }
return db.rawQuery(createQuery(query, limit), null); return db.rawQuery(createQuery(query, 0, limit, true), null);
} }
public Cursor getRecentPushConversationList(int limit, boolean includeInactiveGroups) { public Cursor getRecentPushConversationList(int limit, boolean includeInactiveGroups) {
@ -505,7 +505,7 @@ public class ThreadDatabase extends Database {
activeGroupQuery + activeGroupQuery +
")" + ")" +
")"; ")";
String query = createQuery(where, limit); String query = createQuery(where, 0, limit, true);
return db.rawQuery(query, null); return db.rawQuery(query, null);
} }
@ -601,7 +601,7 @@ public class ThreadDatabase extends Database {
public Cursor getUnarchivedConversationList(boolean pinned, long offset, long limit) { public Cursor getUnarchivedConversationList(boolean pinned, long offset, long limit) {
SQLiteDatabase db = databaseHelper.getReadableDatabase(); SQLiteDatabase db = databaseHelper.getReadableDatabase();
String query = createQuery(ARCHIVED + " = 0 AND " + MESSAGE_COUNT + " != 0 AND " + PINNED + " = ?", offset, limit); String query = createQuery(ARCHIVED + " = 0 AND " + MESSAGE_COUNT + " != 0 AND " + PINNED + " = ?", offset, limit, false);
Cursor cursor = db.rawQuery(query, new String[]{pinned ? "1" : "0"}); Cursor cursor = db.rawQuery(query, new String[]{pinned ? "1" : "0"});
setNotifyConversationListListeners(cursor); setNotifyConversationListListeners(cursor);
@ -611,7 +611,7 @@ public class ThreadDatabase extends Database {
private Cursor getConversationList(@NonNull String archived, long offset, long limit) { private Cursor getConversationList(@NonNull String archived, long offset, long limit) {
SQLiteDatabase db = databaseHelper.getReadableDatabase(); SQLiteDatabase db = databaseHelper.getReadableDatabase();
String query = createQuery(ARCHIVED + " = ? AND " + MESSAGE_COUNT + " != 0", offset, limit); String query = createQuery(ARCHIVED + " = ? AND " + MESSAGE_COUNT + " != 0", offset, limit, false);
Cursor cursor = db.rawQuery(query, new String[]{archived}); Cursor cursor = db.rawQuery(query, new String[]{archived});
setNotifyConversationListListeners(cursor); setNotifyConversationListListeners(cursor);
@ -1074,11 +1074,13 @@ public class ThreadDatabase extends Database {
} }
private @NonNull String createQuery(@NonNull String where, long limit) { private @NonNull String createQuery(@NonNull String where, long limit) {
return createQuery(where, 0, limit); return createQuery(where, 0, limit, false);
} }
private @NonNull String createQuery(@NonNull String where, long offset, long limit) { private @NonNull String createQuery(@NonNull String where, long offset, long limit, boolean preferPinned) {
String orderBy = (preferPinned ? TABLE_NAME + "." + PINNED + " DESC, " : "") + TABLE_NAME + "." + DATE + " DESC";
String projection = Util.join(COMBINED_THREAD_RECIPIENT_GROUP_PROJECTION, ","); String projection = Util.join(COMBINED_THREAD_RECIPIENT_GROUP_PROJECTION, ",");
String query = String query =
"SELECT " + projection + " FROM " + TABLE_NAME + "SELECT " + projection + " FROM " + TABLE_NAME +
" LEFT OUTER JOIN " + RecipientDatabase.TABLE_NAME + " LEFT OUTER JOIN " + RecipientDatabase.TABLE_NAME +
@ -1086,7 +1088,7 @@ public class ThreadDatabase extends Database {
" LEFT OUTER JOIN " + GroupDatabase.TABLE_NAME + " LEFT OUTER JOIN " + GroupDatabase.TABLE_NAME +
" ON " + TABLE_NAME + "." + RECIPIENT_ID + " = " + GroupDatabase.TABLE_NAME + "." + GroupDatabase.RECIPIENT_ID + " ON " + TABLE_NAME + "." + RECIPIENT_ID + " = " + GroupDatabase.TABLE_NAME + "." + GroupDatabase.RECIPIENT_ID +
" WHERE " + where + " WHERE " + where +
" ORDER BY " + TABLE_NAME + "." + DATE + " DESC"; " ORDER BY " + orderBy;
if (limit > 0) { if (limit > 0) {
query += " LIMIT " + limit; query += " LIMIT " + limit;