From 2830132b24d580d31c9dcbfcecde995a57a1948a Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Mon, 2 Aug 2021 17:46:56 -0400 Subject: [PATCH] Reduce time to start PushTextSendJob. --- .../securesms/database/MessageDatabase.java | 3 ++- .../securesms/database/MmsSmsDatabase.java | 12 +++++++++++ .../securesms/database/SmsDatabase.java | 20 +++++-------------- .../securesms/database/ThreadDatabase.java | 10 +++------- .../securesms/jobmanager/JobController.java | 15 ++++++-------- 5 files changed, 28 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java index 3dc785083..4b56f2e1c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java @@ -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); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java index 790e32090..413b0f99c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java @@ -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); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index 09e36e4ee..4ae6457ad 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index e69d2f4f5..637bc2e1f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -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)); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java index 51cd4745c..bee8e1f10 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java @@ -16,8 +16,6 @@ import org.thoughtcrime.securesms.jobmanager.persistence.FullSpec; import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec; import org.thoughtcrime.securesms.jobmanager.persistence.JobStorage; import org.thoughtcrime.securesms.util.Debouncer; -import org.thoughtcrime.securesms.util.FeatureFlags; -import org.thoughtcrime.securesms.util.SetUtil; import java.util.ArrayList; import java.util.Collection; @@ -28,7 +26,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.TimeUnit; /** * Manages the queue of jobs. This is the only class that should write to {@link JobStorage} to @@ -98,9 +95,9 @@ class JobController { } insertJobChain(chain); - scheduleJobs(chain.get(0)); triggerOnSubmit(chain); notifyAll(); + scheduleJobs(chain.get(0)); } @WorkerThread @@ -421,11 +418,11 @@ class JobController { @WorkerThread private void scheduleJobs(@NonNull List jobs) { for (Job job : jobs) { - List constraints = Stream.of(job.getParameters().getConstraintKeys()) - .map(key -> new ConstraintSpec(job.getId(), key, job.getParameters().isMemoryOnly())) - .map(ConstraintSpec::getFactoryKey) - .map(constraintInstantiator::instantiate) - .toList(); + List constraintKeys = job.getParameters().getConstraintKeys(); + List constraints = new ArrayList<>(constraintKeys.size()); + for (String key : constraintKeys) { + constraints.add(constraintInstantiator.instantiate(key)); + } scheduler.schedule(0, constraints); }