Skip to content

Commit

Permalink
Make Sms/MmsDatabase ID's autoincrement.
Browse files Browse the repository at this point in the history
  • Loading branch information
@greyson-signal
greyson-signal committed Jul 15, 2021
1 parent 51a5215 commit 83086a5
Show file tree
Hide file tree
Showing 4 changed files with 221 additions and 27 deletions.
22 changes: 1 addition & 21 deletions app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,44 +126,26 @@ public class MmsDatabase extends MessageDatabase {

public static final String VIEW_ONCE = "reveal_duration";

public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + ID + " INTEGER PRIMARY KEY, " +
public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
THREAD_ID + " INTEGER, " +
DATE_SENT + " INTEGER, " +
DATE_RECEIVED + " INTEGER, " +
DATE_SERVER + " INTEGER DEFAULT -1, " +
MESSAGE_BOX + " INTEGER, " +
READ + " INTEGER DEFAULT 0, " +
"m_id" + " TEXT, " +
"sub" + " TEXT, " +
"sub_cs" + " INTEGER, " +
BODY + " TEXT, " +
PART_COUNT + " INTEGER, " +
"ct_t" + " TEXT, " +
CONTENT_LOCATION + " TEXT, " +
RECIPIENT_ID + " INTEGER, " +
ADDRESS_DEVICE_ID + " INTEGER, " +
EXPIRY + " INTEGER, " +
"m_cls" + " TEXT, " +
MESSAGE_TYPE + " INTEGER, " +
"v" + " INTEGER, " +
MESSAGE_SIZE + " INTEGER, " +
"pri" + " INTEGER, " +
"rr" + " INTEGER, " +
"rpt_a" + " INTEGER, " +
"resp_st" + " INTEGER, " +
STATUS + " INTEGER, " +
TRANSACTION_ID + " TEXT, " +
"retr_st" + " INTEGER, " +
"retr_txt" + " TEXT, " +
"retr_txt_cs" + " INTEGER, " +
"read_status" + " INTEGER, " +
"ct_cls" + " INTEGER, " +
"resp_txt" + " TEXT, " +
"d_tm" + " INTEGER, " +
DELIVERY_RECEIPT_COUNT + " INTEGER DEFAULT 0, " +
MISMATCHED_IDENTITIES + " TEXT DEFAULT NULL, " +
NETWORK_FAILURE + " TEXT DEFAULT NULL," +
"d_rpt" + " INTEGER, " +
SUBSCRIPTION_ID + " INTEGER DEFAULT -1, " +
EXPIRES_IN + " INTEGER DEFAULT 0, " +
EXPIRE_STARTED + " INTEGER DEFAULT 0, " +
Expand All @@ -189,8 +171,6 @@ public class MmsDatabase extends MessageDatabase {
SERVER_GUID + " TEXT DEFAULT NULL);";

public static final String[] CREATE_INDEXS = {
"CREATE INDEX IF NOT EXISTS mms_thread_id_index ON " + TABLE_NAME + " (" + THREAD_ID + ");",
"CREATE INDEX IF NOT EXISTS mms_read_index ON " + TABLE_NAME + " (" + READ + ");",
"CREATE INDEX IF NOT EXISTS mms_read_and_notified_and_thread_id_index ON " + TABLE_NAME + "(" + READ + "," + NOTIFIED + "," + THREAD_ID + ");",
"CREATE INDEX IF NOT EXISTS mms_message_box_index ON " + TABLE_NAME + " (" + MESSAGE_BOX + ");",
"CREATE INDEX IF NOT EXISTS mms_date_sent_index ON " + TABLE_NAME + " (" + DATE_SENT + ", " + RECIPIENT_ID + ", " + THREAD_ID + ");",
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public class SmsDatabase extends MessageDatabase {
public static final String SUBJECT = "subject";
public static final String SERVICE_CENTER = "service_center";

public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + ID + " INTEGER PRIMARY KEY, " +
public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
THREAD_ID + " INTEGER, " +
RECIPIENT_ID + " INTEGER, " +
ADDRESS_DEVICE_ID + " INTEGER DEFAULT 1, " +
Expand Down Expand Up @@ -128,8 +128,6 @@ public class SmsDatabase extends MessageDatabase {
SERVER_GUID + " TEXT DEFAULT NULL);";

public static final String[] CREATE_INDEXS = {
"CREATE INDEX IF NOT EXISTS sms_thread_id_index ON " + TABLE_NAME + " (" + THREAD_ID + ");",
"CREATE INDEX IF NOT EXISTS sms_read_index ON " + TABLE_NAME + " (" + READ + ");",
"CREATE INDEX IF NOT EXISTS sms_read_and_notified_and_thread_id_index ON " + TABLE_NAME + "(" + READ + "," + NOTIFIED + "," + THREAD_ID + ");",
"CREATE INDEX IF NOT EXISTS sms_type_index ON " + TABLE_NAME + " (" + TYPE + ");",
"CREATE INDEX IF NOT EXISTS sms_date_sent_index ON " + TABLE_NAME + " (" + DATE_SENT + ", " + RECIPIENT_ID + ", " + THREAD_ID + ");",
Expand Down

0 comments on commit 83086a5

Please sign in to comment.