diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index e35614d3ba..d0f77982b3 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -15,7 +15,7 @@ repositories { } def verName = APP_VERSION_NAME -def verCode = 1201 +def verCode = 1202 def officialVer = APP_VERSION_NAME diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java index c83180bfeb..2f13f61755 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java @@ -3263,23 +3263,18 @@ public void onAnimationEnd(Animator animation) { } } - MessageObject captionMessage = getCaptionMessage(); - // --- AyuGram hook - if (AyuFilter.isFiltered(message, null)) { - xyz.nextalone.nagram.helper.MessageHelper.INSTANCE.blurify(message); - if (captionMessage != null) xyz.nextalone.nagram.helper.MessageHelper.INSTANCE.blurify(captionMessage); - } - // --- AyuGram hook - // --- NaGram hook - if (message != null && message.messageOwner != null && message.messageOwner.hide) { - xyz.nextalone.nagram.helper.MessageHelper.INSTANCE.blurify(message); - if (captionMessage != null) xyz.nextalone.nagram.helper.MessageHelper.INSTANCE.blurify(captionMessage); - } - if (NekoConfig.ignoreBlocked.Bool() && message != null && MessagesController.getInstance(currentAccount).blockePeers.indexOfKey(message.getFromChatId()) >= 0) { - xyz.nextalone.nagram.helper.MessageHelper.INSTANCE.blurify(message); - if (captionMessage != null) xyz.nextalone.nagram.helper.MessageHelper.INSTANCE.blurify(captionMessage); - } - // --- NaGram hook + if (message != null) { + MessageObject captionMessage = getCaptionMessage(); + // --- AyuGram hook + boolean isFiltered = AyuFilter.isFiltered(message, null) || (captionMessage != null && AyuFilter.isFiltered(captionMessage, null)); + // --- NaGram hook + isFiltered = isFiltered || (message.messageOwner != null && message.messageOwner.hide); + isFiltered = isFiltered || (NekoConfig.ignoreBlocked.Bool() && MessagesController.getInstance(currentAccount).blockePeers.indexOfKey(message.getFromChatId()) >= 0); + if (isFiltered) { + xyz.nextalone.nagram.helper.MessageHelper.INSTANCE.blurify(message); + if (captionMessage != null) xyz.nextalone.nagram.helper.MessageHelper.INSTANCE.blurify(captionMessage); + } + } if (!animated) { dialogMutedProgress = (dialogMuted || drawUnmute) ? 1f : 0f; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ThanosEffect.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ThanosEffect.java index d873f23229..25bf78c94a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ThanosEffect.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ThanosEffect.java @@ -666,9 +666,11 @@ public void animateGroup(ArrayList views, Runnable whenDone) { } return; } - Animation animation = new Animation(views, whenDone); - running = true; - postRunnable(() -> addAnimationInternal(animation)); + try { + Animation animation = new Animation(views, whenDone); + running = true; + postRunnable(() -> addAnimationInternal(animation)); + } catch (IllegalArgumentException ignored) {} } public void animate(View view, float durationMultipier, Runnable whenDone) { if (!alive.get()) { @@ -684,10 +686,12 @@ public void animate(View view, float durationMultipier, Runnable whenDone) { } return; } - Animation animation = new Animation(view, durationMultipier, whenDone); - Handler handler = getHandler(); - running = true; - postRunnable(() -> addAnimationInternal(animation)); + try { + Animation animation = new Animation(view, durationMultipier, whenDone); + Handler handler = getHandler(); + running = true; + postRunnable(() -> addAnimationInternal(animation)); + } catch (IllegalArgumentException ignored) {} } public void cancel(View view) { diff --git a/TMessagesProj/src/main/kotlin/xyz/nextalone/nagram/helper/MessageHelper.kt b/TMessagesProj/src/main/kotlin/xyz/nextalone/nagram/helper/MessageHelper.kt index 4665ba8855..c93d03b223 100644 --- a/TMessagesProj/src/main/kotlin/xyz/nextalone/nagram/helper/MessageHelper.kt +++ b/TMessagesProj/src/main/kotlin/xyz/nextalone/nagram/helper/MessageHelper.kt @@ -327,6 +327,10 @@ object MessageHelper { return } + if (!TextUtils.isEmpty(messageObject.messageText)) { + messageObject.messageText = blurify(messageObject.messageText) + } + if (!TextUtils.isEmpty(messageObject.messageOwner.message)) { messageObject.messageOwner.message = blurify(messageObject.messageOwner.message).toString() }