From 0b14cf3d6aa599cfe48677ac9b2e9030acc32e7a Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 19 Dec 2019 17:59:42 -0500
Subject: [PATCH] Show sticker install tooltips less often.

---
 .../thoughtcrime/securesms/components/InputPanel.java |  4 ++++
 .../securesms/components/emoji/EmojiToggle.java       |  4 ++++
 .../securesms/conversation/ConversationActivity.java  | 11 +++++++----
 .../thoughtcrime/securesms/jobs/PushDecryptJob.java   |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/src/org/thoughtcrime/securesms/components/InputPanel.java
index 52f6676754a..53245b67044 100644
--- 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
index 15e2e5ef7c5..ad189cd1f8c 100644
--- 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
index 04df4f8e249..2c1d31719ed 100644
--- 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
index b365f46a7e5..12631e3e1c7 100644
--- 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);