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 6bcb30c45..173615d5a 100644 --- a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java +++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java @@ -102,8 +102,9 @@ public class DNRInjector { public static boolean onClickMsg(Context context, MsgAction action, Msg msg) { var text = ((MsgFromUser) msg).f(); - if (action == MsgAction.valueOf("TRANSLATE") && text != null) { - Translate.showTranslatedText(context, text); + if (action == MsgAction.valueOf("TRANSLATE")) { + if (text.isEmpty() || text.equals(" ")) sendToast("Невозможно перевести этот текст"); + else Translate.showTranslatedText(context, text); } return false; diff --git a/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java b/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java index 47254e6cc..7d380fff5 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java @@ -4,6 +4,7 @@ import static ru.vtosters.lite.ui.dialogs.MessageSettings.argDialog; import static ru.vtosters.lite.ui.dialogs.MessageSettings.bombCount; import static ru.vtosters.lite.ui.dialogs.MessageSettings.isSilentEnabled; import static ru.vtosters.lite.utils.Preferences.getBoolValue; +import static ru.vtosters.lite.utils.Preferences.savemsgsett; import android.text.TextUtils; import android.view.View; @@ -31,10 +32,12 @@ public class MessagesHook { if (time > 0) { req.a("expire_ttl", time); + if (!savemsgsett()) bombCount = "0"; } if (isSilentEnabled) { req.a("silent", 1); + if (!savemsgsett()) isSilentEnabled = false; } } diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java index b7ad66b8e..712896e73 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -189,6 +189,10 @@ public class Preferences { return getBoolValue("miniapps", true); } + public static boolean savemsgsett() { + return getBoolValue("savemsgsett", false); + } + public static boolean friendsblock() { return getBoolValue("friendsblock", false); } diff --git a/smali/res/xml/preferences_activity.xml b/smali/res/xml/preferences_activity.xml index f7de4916f..e03dbbe23 100644 --- a/smali/res/xml/preferences_activity.xml +++ b/smali/res/xml/preferences_activity.xml @@ -105,6 +105,11 @@ android:title="Глобальный обход онлайна" /> +