From 2aa6de188b0a6efed39ca5e0f2ffda5e293dbfa8 Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+nekoinverter@users.noreply.github.com>
Date: Fri, 2 Oct 2020 10:25:02 +0000
Subject: [PATCH] Fix translating albums

---
 .../java/org/telegram/ui/ChatActivity.java    | 30 ++++++++++++++++---
 .../nekomimi/nekogram/parts/MessageTrans.kt   |  1 +
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index e605a7a0e..33b3cba00 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -16448,10 +16448,20 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                                 options.add(90);
                                 icons.add(R.drawable.baseline_schedule_24);
                             }
-                            if ((StrUtil.isNotBlank(selectedObject.messageOwner.message) || selectedObject.isPoll()) && NekoConfig.showTranslate) {
-                                items.add(selectedObject.messageOwner.translated ? LocaleController.getString("UndoTranslate", R.string.UndoTranslate) : LocaleController.getString("Translate", R.string.Translate));
-                                options.add(88);
-                                icons.add(R.drawable.ic_translate);
+                            if (NekoConfig.showTranslate) {
+                                MessageObject messageObject = null;
+                                if (selectedObjectGroup != null && selectedObjectGroup.messages.size() != 0) {
+                                    if (!TextUtils.isEmpty(selectedObjectGroup.messages.get(0).messageOwner.message)) {
+                                        messageObject = selectedObjectGroup.messages.get(0);
+                                    }
+                                } else if (!TextUtils.isEmpty(selectedObject.messageOwner.message) || selectedObject.type == MessageObject.TYPE_POLL) {
+                                    messageObject = selectedObject;
+                                }
+                                if (messageObject != null) {
+                                    items.add(selectedObject.messageOwner.translated ? LocaleController.getString("UndoTranslate", R.string.UndoTranslate) : LocaleController.getString("Translate", R.string.Translate));
+                                    options.add(88);
+                                    icons.add(R.drawable.ic_translate);
+                                }
                             }
                             if (StrUtil.isNotBlank(selectedObject.messageOwner.message) && StrUtil.isNotBlank(NekoConfig.openPGPApp)) {
                                 if (PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(selectedObject.messageOwner.message).matches()) {
@@ -17552,6 +17562,18 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
             }
             case 88: {
 
+                MessageObject messageObject = null;
+                if (selectedObjectGroup != null && selectedObjectGroup.messages.size() != 0) {
+                    if (!TextUtils.isEmpty(selectedObjectGroup.messages.get(0).messageOwner.message)) {
+                        messageObject = selectedObjectGroup.messages.get(0);
+                    }
+                } else if (!TextUtils.isEmpty(selectedObject.messageOwner.message) || selectedObject.type == MessageObject.TYPE_POLL) {
+                    messageObject = selectedObject;
+                }
+                if (messageObject == null) {
+                    return;
+                }
+
                 MessageTransKt.translateMessages(this, new MessageObject[]{selectedObject});
 
                 break;
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/parts/MessageTrans.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/parts/MessageTrans.kt
index e166b056c..251647ac7 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/parts/MessageTrans.kt
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/parts/MessageTrans.kt
@@ -1,5 +1,6 @@
 package tw.nekomimi.nekogram.parts
 
+import android.text.TextUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch