From 2b58dcbe7f02c14024b48e29cfbcbbe478e880c0 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 27 Mar 2020 16:36:24 -0300
Subject: [PATCH] Remove explicit CameraX initialization.

---
 app/src/main/AndroidManifest.xml              |  5 ---
 .../securesms/ApplicationContext.java         | 33 ++++---------------
 .../securesms/mediasend/CameraFragment.java   |  5 ++-
 3 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 519568c409..f6dbdfedfd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -625,11 +625,6 @@
               android:authorities="org.thoughtcrime.securesms.database.stickerpack"
               android:exported="false" />
 
-    <provider android:name="androidx.camera.camera2.impl.Camera2Initializer"
-              android:authorities="${applicationId}.camerax-init"
-              android:exported="false"
-              android:enabled="false" />
-
     <receiver android:name=".service.BootReceiver">
         <intent-filter>
             <action android:name="android.intent.action.BOOT_COMPLETED"/>
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 6ded0a0447..e5f0da4c5a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -17,17 +17,15 @@
 package org.thoughtcrime.securesms;
 
 import android.annotation.SuppressLint;
-
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.camera.camera2.Camera2Config;
-import androidx.camera.core.CameraX;
-import androidx.lifecycle.DefaultLifecycleObserver;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Build;
+
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import androidx.multidex.MultiDexApplication;
 
 import com.google.android.gms.security.ProviderInstaller;
@@ -47,27 +45,23 @@ import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
-import org.thoughtcrime.securesms.jobs.StorageSyncJob;
 import org.thoughtcrime.securesms.logging.AndroidLogger;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
 import org.thoughtcrime.securesms.logging.SignalUncaughtExceptionHandler;
-import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
-import org.thoughtcrime.securesms.migrations.StorageServiceMigrationJob;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager;
 import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.service.IncomingMessageObserver;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
-import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
 import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
@@ -133,7 +127,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     initializePendingMessages();
     initializeBlobProvider();
     initializeCleanup();
-    initializeCameraX();
+
     FeatureFlags.init();
     NotificationChannels.create(this);
     RefreshPreKeysJob.scheduleIfNecessary();
@@ -381,19 +375,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     });
   }
 
-  @SuppressLint("RestrictedApi")
-  private void initializeCameraX() {
-    if (CameraXUtil.isSupported()) {
-      new Thread(() -> {
-        try {
-          CameraX.initialize(this, Camera2Config.defaultConfig());
-        } catch (Throwable t) {
-          Log.w(TAG, "Failed to initialize CameraX.");
-        }
-      }, "signal-camerax-initialization").start();
-    }
-  }
-
   @Override
   protected void attachBaseContext(Context base) {
     super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(base, TextSecurePreferences.getLanguage(base)));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraFragment.java
index 439f061f3f..508ac58faf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraFragment.java
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.mediasend;
 import android.annotation.SuppressLint;
 
 import androidx.annotation.NonNull;
-import androidx.camera.core.CameraX;
 import androidx.fragment.app.Fragment;
 
 import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil;
@@ -14,7 +13,7 @@ public interface CameraFragment {
 
   @SuppressLint("RestrictedApi")
   static Fragment newInstance() {
-    if (CameraXUtil.isSupported() && CameraX.isInitialized()) {
+    if (CameraXUtil.isSupported()) {
       return CameraXFragment.newInstance();
     } else {
       return Camera1Fragment.newInstance();
@@ -23,7 +22,7 @@ public interface CameraFragment {
 
   @SuppressLint("RestrictedApi")
   static Fragment newInstanceForAvatarCapture() {
-    if (CameraXUtil.isSupported() && CameraX.isInitialized()) {
+    if (CameraXUtil.isSupported()) {
       return CameraXFragment.newInstanceForAvatarCapture();
     } else {
       return Camera1Fragment.newInstance();