Show sticker install tooltips less often.

signalapp · Dec 19, 2019 · 0b14cf3 · 0b14cf3
1 parent c2044b3
commit 0b14cf3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/src/org/thoughtcrime/securesms/components/InputPanel.java
@@ -224,6 +224,10 @@ public void setMediaKeyboardToggleMode(boolean isSticker) {
     mediaKeyboard.setStickerMode(isSticker);
   }
 
+  public boolean isStickerMode() {
+    return mediaKeyboard.isStickerMode();
+  }
+
   public View getMediaKeyboardToggleAnchorView() {
     return mediaKeyboard;
   }

diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
@@ -64,6 +64,10 @@ public void setStickerMode(boolean stickerMode) {
     }
   }
 
+  public boolean isStickerMode() {
+    return this.mediaToggle == stickerToggle;
+  }
+
   @Override public void onShown() {
     setToIme();
   }

diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -1820,10 +1820,13 @@ public void onStickerPackInstalled(final StickerPackInstallEvent event) {
     if (!TextSecurePreferences.hasSeenStickerIntroTooltip(this)) return;
 
     EventBus.getDefault().removeStickyEvent(event);
-    TooltipPopup.forTarget(inputPanel.getMediaKeyboardToggleAnchorView())
-                .setText(R.string.ConversationActivity_sticker_pack_installed)
-                .setIconGlideModel(event.getIconGlideModel())
-                .show(TooltipPopup.POSITION_ABOVE);
+
+    if (!inputPanel.isStickerMode()) {
+      TooltipPopup.forTarget(inputPanel.getMediaKeyboardToggleAnchorView())
+                  .setText(R.string.ConversationActivity_sticker_pack_installed)
+                  .setIconGlideModel(event.getIconGlideModel())
+                  .show(TooltipPopup.POSITION_ABOVE);
+    }
   }
 
   private void initializeReceivers() {

diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
@@ -565,7 +565,7 @@ private void handleSynchronizeStickerPackOperation(@NonNull List<StickerPackOper
 
         switch (operation.getType().get()) {
           case INSTALL:
-            jobManager.add(StickerPackDownloadJob.forInstall(packId, packKey, true));
+            jobManager.add(StickerPackDownloadJob.forInstall(packId, packKey, false));
             break;
           case REMOVE:
             DatabaseFactory.getStickerDatabase(context).uninstallPack(packId);