diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/src/org/thoughtcrime/securesms/components/InputPanel.java index 52f6676754..53245b6704 100644 --- a/src/org/thoughtcrime/securesms/components/InputPanel.java +++ b/src/org/thoughtcrime/securesms/components/InputPanel.java @@ -224,6 +224,10 @@ public class InputPanel extends LinearLayout 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 15e2e5ef7c..ad189cd1f8 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java @@ -64,6 +64,10 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M } } + 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 04df4f8e24..2c1d31719e 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -1820,10 +1820,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity 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 b365f46a7e..12631e3e1c 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java @@ -565,7 +565,7 @@ public class PushDecryptJob extends BaseJob { 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);