Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add the ability to re-order sticker packs.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-01-21 12:34:58 -05:00
parent 7d70ea78cd
commit f7a3bb2ae8
13 changed files with 211 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/org/thoughtcrime/securesms/database/StickerDatabase.java
View File

@@ -5,6 +5,7 @@ import android.content.Context;
import android.database.Cursor;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.Pair;
@@ -29,6 +30,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
public class StickerDatabase extends Database {
@@ -43,6 +45,7 @@ public class StickerDatabase extends Database {
private static final String STICKER_ID = "sticker_id";
private static final String EMOJI = "emoji";
private static final String COVER = "cover";
private static final String PACK_ORDER = "pack_order";
private static final String INSTALLED = "installed";
private static final String LAST_USED = "last_used";
public static final String FILE_PATH = "file_path";
@@ -56,6 +59,7 @@ public class StickerDatabase extends Database {
PACK_AUTHOR + " TEXT NOT NULL, " +
STICKER_ID + " INTEGER, " +
COVER + " INTEGER, " +
PACK_ORDER + " INTEGER, " +
EMOJI + " TEXT NOT NULL, " +
LAST_USED + " INTEGER, " +
INSTALLED + " INTEGER," +
@@ -130,7 +134,7 @@ public class StickerDatabase extends Database {
public @Nullable Cursor getInstalledStickerPacks() {
String selection = COVER + " = ? AND " + INSTALLED + " = ?";
String[] args = new String[] { "1", "1" };
Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, selection, args, null, null, null);
Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, selection, args, null, null, PACK_ORDER + " ASC");
setNotifyStickerPackListeners(cursor);
return cursor;
@@ -153,7 +157,7 @@ public class StickerDatabase extends Database {
public @Nullable Cursor getAllStickerPacks(@Nullable String limit) {
String query = COVER + " = ?";
String[] args = new String[] { "1" };
Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, query, args, null, null, null, limit);
Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, query, args, null, null, PACK_ORDER + " ASC", limit);
setNotifyStickerPackListeners(cursor);
return cursor;
@@ -272,7 +276,6 @@ public class StickerDatabase extends Database {
db.beginTransaction();
try {
updatePackInstalled(db, packId, false, false);
deleteStickersInPackExceptCover(db, packId);
@@ -284,6 +287,29 @@ public class StickerDatabase extends Database {
}
}
public void updatePackOrder(@NonNull List<StickerPackRecord> packsInOrder) {
SQLiteDatabase db = databaseHelper.getWritableDatabase();
db.beginTransaction();
try {
String selection = PACK_ID + " = ? AND " + COVER + " = ?";
for (int i = 0; i < packsInOrder.size(); i++) {
String[] args = new String[]{ packsInOrder.get(i).getPackId(), "1" };
ContentValues values = new ContentValues();
values.put(PACK_ORDER, i);
db.update(TABLE_NAME, values, selection, args);
}
db.setTransactionSuccessful();
notifyStickerPackListeners();
} finally {
db.endTransaction();
}
}
private void updatePackInstalled(@NonNull SQLiteDatabase db, @NonNull String packId, boolean installed, boolean notify) {
StickerPackRecord existing = getStickerPack(packId);

7
app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
View File

@@ -101,8 +101,9 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
private static final int KEY_VALUE_STORE = 41;
private static final int ATTACHMENT_DISPLAY_ORDER = 42;
private static final int SPLIT_PROFILE_NAMES = 43;
private static final int STICKER_PACK_ORDER = 44;
private static final int DATABASE_VERSION = 43;
private static final int DATABASE_VERSION = 44;
private static final String DATABASE_NAME = "signal.db";
private final Context context;
@@ -703,6 +704,10 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
db.execSQL("ALTER TABLE recipient ADD COLUMN profile_joined_name TEXT DEFAULT NULL");
}
if (oldVersion < STICKER_PACK_ORDER) {
db.execSQL("ALTER TABLE sticker ADD COLUMN pack_order INTEGER DEFAULT 0");
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();