From f746753b15e79efe89819a64c397d2c086c33c09 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Sat, 21 Jan 2023 17:28:00 +0300
Subject: [PATCH] updated translator

---
 .../ru/vtosters/lite/dnr/DNRInjector.java     | 15 +--------
 .../lite/ui/fragments/MessagesFragment.java   | 31 ++++++-------------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java
index 737588872..0fc098ab8 100644
--- a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java
+++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java
@@ -318,27 +318,14 @@ public class DNRInjector {
 
         if (msg instanceof MsgFromUser) {
             var text = ((MsgFromUser) msg).f();
-            var fullMsg = ((MsgFromUser) msg).j2(); // text + reply
-            var reply = fullMsg.substring(text.length() + 1);
-
             var isTextExist = !text.isEmpty() && !text.equals(" ");
-            var isReplyExist = !reply.isEmpty() && !reply.equals(" ");
-
-
-            if (isReplyExist) {
-                reply = decryptMessage(reply, peerId);
-            }
 
             if (isTextExist) {
                 text = decryptMessage(text, peerId);
             }
 
             if (action == MsgAction.valueOf("TRANSLATE")) {
-                if (isTextExist && isReplyExist) {
-                    Translate.showTranslatedText(context, text + "\n\n" + context.getString(R.string.translator_reply) + "\n" + reply);
-                } else if (isReplyExist) {
-                    Translate.showTranslatedText(context, context.getString(R.string.translator_reply) + "\n" + reply);
-                } else if (isTextExist) {
+                if (isTextExist) {
                     Translate.showTranslatedText(context, text);
                 } else {
                     sendToast(context.getString(R.string.translator_no_text));
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
index dbe35ce78..28e27dd35 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
@@ -1,31 +1,20 @@
 package ru.vtosters.lite.ui.fragments;
 
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import androidx.preference.Preference;
+import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vtosters.lite.R;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
+import ru.vtosters.lite.ui.adapters.ImagineArrayAdapter;
+
+import java.util.Arrays;
+
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
 import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
 import static ru.vtosters.lite.utils.Preferences.autoalltranslate;
 import static ru.vtosters.lite.utils.Preferences.vkme;
-import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-
-import androidx.preference.Preference;
-
-import com.vk.core.dialogs.alert.VkAlertDialog;
-import com.vk.navigation.Navigator;
-import com.vk.stickers.Stickers;
-import com.vtosters.lite.R;
-import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
-
-import java.util.Arrays;
-
-import ru.vtosters.lite.ui.adapters.ImagineArrayAdapter;
-import ru.vtosters.lite.ui.wallpapers.WallpaperMenuFragment;
 
 public class MessagesFragment extends MaterialPreferenceToolbarFragment {
     @Override