Reduce time to start PushTextSendJob.

app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java

@@ -61,6 +61,7 @@ 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_PROJECTION = new String[] { THREAD_ID };
 
   public MessageDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
     super(context, databaseHelper);

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);
   }

app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java

@@ -210,23 +210,13 @@ public class SmsDatabase extends MessageDatabase {
 
   @Override
   public long getThreadIdForMessage(long id) {
-    String sql        = "SELECT " + THREAD_ID + " FROM " + TABLE_NAME + " WHERE " + ID + " = ?";
+    try (Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, THREAD_ID_PROJECTION, ID_WHERE, SqlUtil.buildArgs(id), null, null, null)) {
-    String[] sqlArgs  = new String[] {id+""};
+      if (cursor.moveToFirst()) {
-    SQLiteDatabase db = databaseHelper.getReadableDatabase();
+        return CursorUtil.requireLong(cursor, THREAD_ID);
-
-    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();
       }
     }
+    return -1;
+  }
 
   @Override
   int getMessageCountForThreadSummary(long threadId) {

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 (Cursor cursor = DatabaseFactory.getMmsSmsDatabase(context).getConversationSnippet(threadId)) {
-
+      if (cursor.moveToFirst()) {
-    try (MmsSmsDatabase.Reader reader = MmsSmsDatabase.readerFor(mmsSmsDatabase.getConversationSnippet(threadId))) {
-      MessageRecord record = reader.getNext();
-
-      if (record != null) {
         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));
       }

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<Job> jobs) {
     for (Job job : jobs) {
-      List<Constraint> constraints = Stream.of(job.getParameters().getConstraintKeys())
+      List<String>     constraintKeys = job.getParameters().getConstraintKeys();
-                                           .map(key -> new ConstraintSpec(job.getId(), key, job.getParameters().isMemoryOnly()))
+      List<Constraint> constraints    = new ArrayList<>(constraintKeys.size());
-                                           .map(ConstraintSpec::getFactoryKey)
+      for (String key : constraintKeys) {
-                                           .map(constraintInstantiator::instantiate)
+        constraints.add(constraintInstantiator.instantiate(key));
-                                           .toList();
+      }
 
       scheduler.schedule(0, constraints);
     }