Show sticker install tooltips less often.
This commit is contained in:
parent
c2044b36b1
commit
0b14cf3d6a
4 changed files with 16 additions and 5 deletions
|
@ -224,6 +224,10 @@ public class InputPanel extends LinearLayout
|
|||
mediaKeyboard.setStickerMode(isSticker);
|
||||
}
|
||||
|
||||
public boolean isStickerMode() {
|
||||
return mediaKeyboard.isStickerMode();
|
||||
}
|
||||
|
||||
public View getMediaKeyboardToggleAnchorView() {
|
||||
return mediaKeyboard;
|
||||
}
|
||||
|
|
|
@ -64,6 +64,10 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
|
|||
}
|
||||
}
|
||||
|
||||
public boolean isStickerMode() {
|
||||
return this.mediaToggle == stickerToggle;
|
||||
}
|
||||
|
||||
@Override public void onShown() {
|
||||
setToIme();
|
||||
}
|
||||
|
|
|
@ -1820,11 +1820,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|||
if (!TextSecurePreferences.hasSeenStickerIntroTooltip(this)) return;
|
||||
|
||||
EventBus.getDefault().removeStickyEvent(event);
|
||||
|
||||
if (!inputPanel.isStickerMode()) {
|
||||
TooltipPopup.forTarget(inputPanel.getMediaKeyboardToggleAnchorView())
|
||||
.setText(R.string.ConversationActivity_sticker_pack_installed)
|
||||
.setIconGlideModel(event.getIconGlideModel())
|
||||
.show(TooltipPopup.POSITION_ABOVE);
|
||||
}
|
||||
}
|
||||
|
||||
private void initializeReceivers() {
|
||||
securityUpdateReceiver = new BroadcastReceiver() {
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Add table
Reference in a new issue