Show sticker install tooltips less often.

This commit is contained in:
Greyson Parrelli 2019-12-19 17:59:42 -05:00
parent c2044b36b1
commit 0b14cf3d6a
4 changed files with 16 additions and 5 deletions

View file

@ -224,6 +224,10 @@ public class InputPanel extends LinearLayout
mediaKeyboard.setStickerMode(isSticker); mediaKeyboard.setStickerMode(isSticker);
} }
public boolean isStickerMode() {
return mediaKeyboard.isStickerMode();
}
public View getMediaKeyboardToggleAnchorView() { public View getMediaKeyboardToggleAnchorView() {
return mediaKeyboard; return mediaKeyboard;
} }

View file

@ -64,6 +64,10 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
} }
} }
public boolean isStickerMode() {
return this.mediaToggle == stickerToggle;
}
@Override public void onShown() { @Override public void onShown() {
setToIme(); setToIme();
} }

View file

@ -1820,10 +1820,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if (!TextSecurePreferences.hasSeenStickerIntroTooltip(this)) return; if (!TextSecurePreferences.hasSeenStickerIntroTooltip(this)) return;
EventBus.getDefault().removeStickyEvent(event); EventBus.getDefault().removeStickyEvent(event);
TooltipPopup.forTarget(inputPanel.getMediaKeyboardToggleAnchorView())
.setText(R.string.ConversationActivity_sticker_pack_installed) if (!inputPanel.isStickerMode()) {
.setIconGlideModel(event.getIconGlideModel()) TooltipPopup.forTarget(inputPanel.getMediaKeyboardToggleAnchorView())
.show(TooltipPopup.POSITION_ABOVE); .setText(R.string.ConversationActivity_sticker_pack_installed)
.setIconGlideModel(event.getIconGlideModel())
.show(TooltipPopup.POSITION_ABOVE);
}
} }
private void initializeReceivers() { private void initializeReceivers() {

View file

@ -565,7 +565,7 @@ public class PushDecryptJob extends BaseJob {
switch (operation.getType().get()) { switch (operation.getType().get()) {
case INSTALL: case INSTALL:
jobManager.add(StickerPackDownloadJob.forInstall(packId, packKey, true)); jobManager.add(StickerPackDownloadJob.forInstall(packId, packKey, false));
break; break;
case REMOVE: case REMOVE:
DatabaseFactory.getStickerDatabase(context).uninstallPack(packId); DatabaseFactory.getStickerDatabase(context).uninstallPack(packId);