From 146793d97fa7b0a928a3ba7cadd0460df9077b11 Mon Sep 17 00:00:00 2001 From: thermatk Date: Thu, 30 Dec 2021 15:50:41 +0100 Subject: [PATCH] [TF][KILL] Google Translate without MLKit --- TMessagesProj/build.gradle | 1 - .../telegram/messenger/LanguageDetector.java | 21 ------------------- .../java/org/telegram/ui/ChatActivity.java | 7 +++---- .../ui/Components/TranslateAlert.java | 2 -- .../telegram/ui/LanguageSelectActivity.java | 9 ++++---- 5 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 TMessagesProj/src/main/java/org/telegram/messenger/LanguageDetector.java diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 6cb3f91c7e..9ea9f908ea 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -27,7 +27,6 @@ dependencies { compileOnly 'org.checkerframework:checker-compat-qual:2.5.0' implementation 'com.googlecode.mp4parser:isoparser:1.0.6' implementation 'com.stripe:stripe-android:2.0.2' - implementation 'com.google.mlkit:language-id:16.1.1' implementation 'org.osmdroid:osmdroid-android:6.1.10' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/LanguageDetector.java b/TMessagesProj/src/main/java/org/telegram/messenger/LanguageDetector.java deleted file mode 100644 index 3431753360..0000000000 --- a/TMessagesProj/src/main/java/org/telegram/messenger/LanguageDetector.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.telegram.messenger; - -public class LanguageDetector { - public interface StringCallback { - void run(String str); - } - public interface ExceptionCallback { - void run(Exception e); - } - - public static boolean hasSupport() { - return true; - } - - public static void detectLanguage(String text, StringCallback onSuccess, ExceptionCallback onFail) { - com.google.mlkit.nl.languageid.LanguageIdentification.getClient() - .identifyLanguage(text) - .addOnSuccessListener(onSuccess::run) - .addOnFailureListener(onFail::run); - } -} diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 540be0bbe7..9f509a4ca4 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -122,7 +122,6 @@ import org.telegram.messenger.ForwardingMessagesParams; import org.telegram.messenger.ImageLocation; import org.telegram.messenger.ImageReceiver; -import org.telegram.messenger.LanguageDetector; import org.telegram.messenger.LocaleController; import org.telegram.messenger.MediaController; import org.telegram.messenger.MediaDataController; @@ -20876,7 +20875,7 @@ public void onClick(View view) { // "Translate" button String toLang = LocaleController.getInstance().getCurrentLocale().getLanguage(); final CharSequence finalMessageText = messageText; - if (LanguageDetector.hasSupport()) { + /*if (LanguageDetector.hasSupport()) { final String[] fromLang = { null }; cell.setVisibility(View.GONE); waitForLangDetection.set(true); @@ -20922,7 +20921,7 @@ public void onClick(View view) { onLangDetectionDone.set(null); } }, 250); - } else { + } else {*/ cell.setOnClickListener(e -> { if (selectedObject == null || i >= options.size() || getParentActivity() == null) { return; @@ -20936,7 +20935,7 @@ public void onClick(View view) { scrimPopupWindow.dismiss(); } }); - } + //} } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/TranslateAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/TranslateAlert.java index 0ecb5c733a..6314c5a2ff 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/TranslateAlert.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/TranslateAlert.java @@ -63,8 +63,6 @@ import androidx.core.graphics.ColorUtils; import androidx.core.widget.NestedScrollView; -import com.google.android.gms.vision.Frame; - import org.json.JSONArray; import org.json.JSONObject; import org.json.JSONTokener; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java index 747e0238a1..e7d25d4c9a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java @@ -25,7 +25,6 @@ import org.telegram.messenger.AndroidUtilities; import org.telegram.messenger.FileLog; -import org.telegram.messenger.LanguageDetector; import org.telegram.messenger.LocaleController; import org.telegram.messenger.MessagesController; import org.telegram.messenger.NotificationCenter; @@ -438,8 +437,8 @@ public TranslateSettings(Context context) { presentFragment(new RestrictedLanguagesSelectActivity()); update(); }); - doNotTranslateCell.setClickable(value && LanguageDetector.hasSupport()); - doNotTranslateCell.setAlpha(value && LanguageDetector.hasSupport() ? 1f : 0f); + doNotTranslateCell.setClickable(value && false); + doNotTranslateCell.setAlpha(value && false ? 1f : 0f); addView(doNotTranslateCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT)); info = new TextInfoPrivacyCell(context); @@ -451,7 +450,7 @@ public TranslateSettings(Context context) { info2 = new TextInfoPrivacyCell(context); info2.setTopPadding(0); info2.setBottomPadding(16); - info2.setText(LocaleController.getString("TranslateMessagesInfo2", R.string.TranslateMessagesInfo2)); + info2.setText("Telegram-FOSS does not support automatic detection of message language via Google MLKit. Google may have access to the messages you translate."); info2.setAlpha(value ? 0f : 1f); addView(info2, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT)); @@ -478,7 +477,7 @@ private ArrayList getRestrictedLanguages() { } public void update() { - boolean value = getValue() && LanguageDetector.hasSupport(); + boolean value = getValue() && false; showButtonCheck.setChecked(getValue());