lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[FIX] 贴纸包归档时的取消弹窗传入 Fragment 不工作

This commit is contained in:
世界 2020-04-11 03:46:36 +08:00
parent 07dd7769ab
commit e8ac735f7d
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java
View File

@ -1594,7 +1594,7 @@ public class MediaDataController extends BaseController {
}
/** @param toggle 0 - remove, 1 - archive, 2 - add */
public void toggleStickerSet(final Context context, final TLObject stickerSetObject, final int toggle, final BaseFragment baseFragment, final boolean showSettings, boolean showTooltip) {
public void toggleStickerSet(Context context, final TLObject stickerSetObject, final int toggle, final BaseFragment baseFragment, final boolean showSettings, boolean showTooltip) {
final TLRPC.StickerSet stickerSet;
final TLRPC.TL_messages_stickerSet messages_stickerSet;
@ -1640,6 +1640,8 @@ public class MediaDataController extends BaseController {
putStickersToCache(type, stickerSets[type], loadDate[type], loadHash[type]);
getNotificationCenter().postNotificationName(NotificationCenter.stickersDidLoad, type);
if (context == null && baseFragment != null) context = baseFragment.getParentActivity();
if (toggle == 2) {
if (!cancelRemovingStickerSet(stickerSet.id)) {
toggleStickerSetInternal(context, toggle, baseFragment, showSettings, stickerSetObject, stickerSet, type, showTooltip);
@ -1649,6 +1651,7 @@ public class MediaDataController extends BaseController {
} else {
final StickerSetBulletinLayout bulletinLayout = new StickerSetBulletinLayout(context, stickerSetObject, toggle);
final int finalCurrentIndex = currentIndex;
Context finalContext = context;
final Bulletin.UndoButton undoButton = new Bulletin.UndoButton(context).setUndoAction(() -> {
stickerSet.archived = false;
@ -1661,7 +1664,7 @@ public class MediaDataController extends BaseController {
loadHash[type] = calcStickersHash(stickerSets[type]);
putStickersToCache(type, stickerSets[type], loadDate[type], loadHash[type]);
getNotificationCenter().postNotificationName(NotificationCenter.stickersDidLoad, type);
}).setDelayedAction(() -> toggleStickerSetInternal(context, toggle, baseFragment, showSettings, stickerSetObject, stickerSet, type, false));
}).setDelayedAction(() -> toggleStickerSetInternal(finalContext, toggle, baseFragment, showSettings, stickerSetObject, stickerSet, type, false));
bulletinLayout.setButton(undoButton);
removingStickerSetsUndos.put(stickerSet.id, undoButton::undo);
Bulletin.make(baseFragment, bulletinLayout, Bulletin.DURATION_LONG).show();