From 58a32c11ec34eb241f52922929ab33843adc36e2 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 25 Mar 2021 12:35:58 -0400
Subject: [PATCH] Disable inline message processing for internal users.

---
 .../securesms/crypto/DatabaseSessionLock.java | 42 ++++++++-----------
 .../messages/IncomingMessageProcessor.java    |  6 +--
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSessionLock.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSessionLock.java
index 3d9d70b0cd..99f14e76e4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSessionLock.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSessionLock.java
@@ -1,10 +1,5 @@
 package org.thoughtcrime.securesms.crypto;
 
-import net.sqlcipher.database.SQLiteDatabase;
-
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 
 import java.util.concurrent.locks.ReentrantLock;
@@ -24,26 +19,25 @@ public enum DatabaseSessionLock implements SignalSessionLock {
 
   @Override
   public Lock acquire() {
-    if (FeatureFlags.internalUser()) {
-      SQLiteDatabase db = DatabaseFactory.getInstance(ApplicationDependencies.getApplication()).getRawDatabase();
+    LEGACY_LOCK.lock();
+    return LEGACY_LOCK::unlock;
 
-      if (db.isDbLockedByCurrentThread()) {
-        return () -> {};
-      }
-
-      db.beginTransaction();
-
-      ownerThreadId = Thread.currentThread().getId();
-
-      return () -> {
-        ownerThreadId = -1;
-        db.setTransactionSuccessful();
-        db.endTransaction();
-      };
-    } else {
-      LEGACY_LOCK.lock();
-      return LEGACY_LOCK::unlock;
-    }
+    // TODO [greyson][db] Revisit after improving database locking
+//    SQLiteDatabase db = DatabaseFactory.getInstance(ApplicationDependencies.getApplication()).getRawDatabase();
+//
+//    if (db.isDbLockedByCurrentThread()) {
+//      return () -> {};
+//    }
+//
+//    db.beginTransaction();
+//
+//    ownerThreadId = Thread.currentThread().getId();
+//
+//    return () -> {
+//      ownerThreadId = -1;
+//      db.setTransactionSuccessful();
+//      db.endTransaction();
+//    };
   }
 
   /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageProcessor.java
index 069dfdefd7..cfdaf3b975 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageProcessor.java
@@ -100,11 +100,7 @@ public class IncomingMessageProcessor {
     }
 
     private @Nullable String processMessage(@NonNull SignalServiceEnvelope envelope) {
-      if (FeatureFlags.internalUser()) {
-        return processMessageInline(envelope);
-      } else {
-        return processMessageDeferred(envelope);
-      }
+      return processMessageDeferred(envelope);
     }
 
     private @Nullable String processMessageDeferred(@NonNull SignalServiceEnvelope envelope) {