Fix corner cases with LinkPreviewViewModel enabled state.

signalapp · Aug 28, 2020 · 0c332b6 · 0c332b6
1 parent ba712ce
commit 0c332b6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -1903,11 +1903,6 @@ private void initializeResources() {
   private void initializeLinkPreviewObserver() {
     linkPreviewViewModel = ViewModelProviders.of(this, new LinkPreviewViewModel.Factory(new LinkPreviewRepository())).get(LinkPreviewViewModel.class);
 
-    if (!SignalStore.settings().isLinkPreviewsEnabled()) {
-      linkPreviewViewModel.onUserCancel();
-      return;
-    }
-
     linkPreviewViewModel.getLinkPreviewState().observe(this, previewState -> {
       if (previewState == null) return;
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
@@ -25,6 +25,7 @@
 import org.thoughtcrime.securesms.groups.GroupManager;
 import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl;
 import org.thoughtcrime.securesms.jobs.AvatarGroupsV2DownloadJob;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil.OpenGraph;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -84,6 +85,10 @@ public LinkPreviewRepository() {
                                              @NonNull String url,
                                              @NonNull Callback callback)
   {
+    if (!SignalStore.settings().isLinkPreviewsEnabled()) {
+      throw new IllegalStateException();
+    }
+
     CompositeRequestController compositeController = new CompositeRequestController();
 
     if (!LinkPreviewUtil.isValidPreviewUrl(url)) {

diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java
@@ -138,9 +138,9 @@ public void onUserCancel() {
   }
 
   public void onTransportChanged(boolean isSms) {
-    enabled = !isSms;
+    enabled = SignalStore.settings().isLinkPreviewsEnabled() && !isSms;
 
-    if (isSms) {
+    if (!enabled) {
       onUserCancel();
     }
   }
@@ -159,12 +159,8 @@ public void onSend() {
   }
 
   public void onEnabled() {
-    if (!SignalStore.settings().isLinkPreviewsEnabled()) {
-      throw new AssertionError();
-    }
-
     userCanceled = false;
-    enabled      = true;
+    enabled      = SignalStore.settings().isLinkPreviewsEnabled();
   }
 
   @Override