diff --git a/app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java b/app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java index 11666ebfd..8512c9bda 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java +++ b/app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java @@ -1,6 +1,7 @@ package ru.vtosters.lite.utils; import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Globals.getPreferences; import static ru.vtosters.lite.utils.Preferences.BooleanFalse; import android.content.ContentValues; @@ -27,17 +28,15 @@ public class DeletedMessagesHandler { private static List sDeletedMessagesList = new ArrayList<>(); - private static final String DELETED_PREFIX = "[Удалено] "; - private static SQLiteDatabase sVKSQLiteDatabase; private static int sBodyIndex = -1; - private static DeletedMessagesDBHelper sToasterDatabase; + private static DeletedMessagesDBHelper sVTDatabase; public static void reloadMessagesList() { - if (sToasterDatabase == null) { - sToasterDatabase = new DeletedMessagesDBHelper(); + if (sVTDatabase == null) { + sVTDatabase = new DeletedMessagesDBHelper(); } - sDeletedMessagesList = new ArrayList<>(sToasterDatabase.loadAllMessages()); + sDeletedMessagesList = new ArrayList<>(sVTDatabase.loadAllMessages()); } public static void grabVKDatabase(CacheEnvironment storageEnvironment) { @@ -71,11 +70,25 @@ public class DeletedMessagesHandler { } private static void editTextOfMsg(MsgFromUser msgFromUser) { - if (!msgFromUser.e.startsWith(DELETED_PREFIX)) { - msgFromUser.e = DELETED_PREFIX + EncryptProvider.decryptMessage(msgFromUser); + if (!msgFromUser.e.startsWith(getPreifxUndelete())) { + msgFromUser.e = getPreifxUndelete() + EncryptProvider.decryptMessage(msgFromUser); } } + private static String getPreifxUndelete() { + String string = getPreferences().getString("undeletemsg_prefix", ""); + if (string.isEmpty()) { + return "[Удалено] "; + } + if (string.equals("icon")) { + return "\uD83D\uDDD1 "; + } + if (string.equals("icon2")) { + return "❌ "; + } + return "[Удалено] "; + } + public static void updateDialog(MsgDeleteLpTask msgDeleteLpTask) { Cursor c = getMessageFromDatabaseById(msgDeleteLpTask.c); if (c == null) return; @@ -100,7 +113,7 @@ public class DeletedMessagesHandler { } sDeletedMessagesList.add(messageId); - sToasterDatabase.saveDeletedMessage(messageId); + sVTDatabase.saveDeletedMessage(messageId); } public static Cursor getMessageFromDatabaseById(int messageId) { diff --git a/smali/res/values-ru/arrays.xml b/smali/res/values-ru/arrays.xml index 1d0411ab7..7ca955d79 100644 --- a/smali/res/values-ru/arrays.xml +++ b/smali/res/values-ru/arrays.xml @@ -500,4 +500,9 @@ Не обновлять Обновлять мгновенно + + [Удалено] + 🗑 + ❌ + diff --git a/smali/res/values/arrays.xml b/smali/res/values/arrays.xml index 51c7f3bf3..5735b5321 100644 --- a/smali/res/values/arrays.xml +++ b/smali/res/values/arrays.xml @@ -696,4 +696,14 @@ no_update imd_update + + [Deleted] + 🗑 + ❌ + + + default + icon + icon2 + diff --git a/smali/res/xml/preferences_activity.xml b/smali/res/xml/preferences_activity.xml index e482f64fd..cdca0f97e 100644 --- a/smali/res/xml/preferences_activity.xml +++ b/smali/res/xml/preferences_activity.xml @@ -54,6 +54,13 @@ +