Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 16:49:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reduce time to start PushTextSendJob.

Browse Source
This commit is contained in:
Cody Henthorne
2021-08-02 17:46:56 -04:00
committed by Alex Hart
parent e374f3afe6
commit 2830132b24
5 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java
View File

@@ -60,7 +60,8 @@ public abstract class MessageDatabase extends Database implements MmsSmsColumns
private static final String TAG = Log.tag(MessageDatabase.class);
protected static final String THREAD_ID_WHERE = THREAD_ID + " = ?";
protected static final String THREAD_ID_WHERE = THREAD_ID + " = ?";
protected static final String[] THREAD_ID_PROJECTION = new String[] { THREAD_ID };
public MessageDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
super(context, databaseHelper);

12
app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
View File

@@ -797,6 +797,18 @@ public class MmsSmsDatabase extends Database {
return databaseHelper.getReadableDatabase().rawQuery(query, null);
}
public static long getType(@NonNull Cursor cursor) {
String transportType = CursorUtil.requireString(cursor, TRANSPORT);
if (MmsSmsDatabase.MMS_TRANSPORT.equals(transportType)) {
return CursorUtil.requireLong(cursor, MmsDatabase.MESSAGE_BOX);
} else if (MmsSmsDatabase.SMS_TRANSPORT.equals(transportType)) {
return CursorUtil.requireLong(cursor, SmsDatabase.TYPE);
} else {
throw new AssertionError("Bad transport type: " + transportType);
}
}
public static Reader readerFor(@NonNull Cursor cursor) {
return new Reader(cursor);
}

20
app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
View File

@@ -210,22 +210,12 @@ public class SmsDatabase extends MessageDatabase {
@Override
public long getThreadIdForMessage(long id) {
String sql = "SELECT " + THREAD_ID + " FROM " + TABLE_NAME + " WHERE " + ID + " = ?";
String[] sqlArgs = new String[] {id+""};
SQLiteDatabase db = databaseHelper.getReadableDatabase();
Cursor cursor = null;
try {
cursor = db.rawQuery(sql, sqlArgs);
if (cursor != null && cursor.moveToFirst())
return cursor.getLong(0);
else
return -1;
} finally {
if (cursor != null)
cursor.close();
try (Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, THREAD_ID_PROJECTION, ID_WHERE, SqlUtil.buildArgs(id), null, null, null)) {
if (cursor.moveToFirst()) {
return CursorUtil.requireLong(cursor, THREAD_ID);
}
}
return -1;
}
@Override

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

@@ -1278,14 +1278,10 @@ public class ThreadDatabase extends Database {
}
public void updateSnippetTypeSilently(long threadId) {
MmsSmsDatabase mmsSmsDatabase = DatabaseFactory.getMmsSmsDatabase(context);
try (MmsSmsDatabase.Reader reader = MmsSmsDatabase.readerFor(mmsSmsDatabase.getConversationSnippet(threadId))) {
MessageRecord record = reader.getNext();
if (record != null) {
try (Cursor cursor = DatabaseFactory.getMmsSmsDatabase(context).getConversationSnippet(threadId)) {
if (cursor.moveToFirst()) {
ContentValues contentValues = new ContentValues(1);
contentValues.put(SNIPPET_TYPE, record.getType());
contentValues.put(SNIPPET_TYPE, MmsSmsDatabase.getType(cursor));
databaseHelper.getWritableDatabase().update(TABLE_NAME, contentValues, ID_WHERE, SqlUtil.buildArgs(threadId));
}