From 7f91075a9275ca8ba795798b4d27a78c17a3732e Mon Sep 17 00:00:00 2001 From: aliveoutside <53598473+aliveoutside@users.noreply.github.com> Date: Wed, 22 Jun 2022 03:54:57 +0300 Subject: [PATCH] hide DeletedMessagesHandler for now --- .../lite/utils/DeletedMessagesHandler.java | 321 +++++++++--------- .../ru/vtosters/lite/utils/Preferences.java | 4 +- 2 files changed, 163 insertions(+), 162 deletions(-) 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 124d25c43..59e6d5c14 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java +++ b/app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java @@ -1,160 +1,161 @@ -package ru.vtosters.lite.utils; - -import static ru.vtosters.lite.utils.Globals.getContext; -import static ru.vtosters.lite.utils.Globals.getPrefsValue; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; - -import android.annotation.SuppressLint; -import android.content.ContentValues; -import android.database.Cursor; -import android.text.TextUtils; - -import com.vk.im.engine.events.OnMsgUpdateEvent; -import com.vk.im.engine.internal.longpoll.tasks.MsgDeleteLpTask; -import com.vk.im.engine.internal.storage.StorageManager; -import com.vk.im.engine.models.messages.Msg; -import com.vk.im.engine.models.messages.MsgFromUser; -import com.vk.im.engine.models.messages.NestedMsg; -import com.vk.libsqliteext.CustomSqliteExtensionsKt; - -import java.util.ArrayList; -import java.util.List; - -import io.requery.android.database.sqlite.SQLiteDatabase; -import io.requery.android.database.sqlite.SQLiteOpenHelper; -import ru.vtosters.lite.encryption.EncryptProvider; - -public class DeletedMessagesHandler { - private static List sDeletedMessagesList = new ArrayList<>(); - - private static SQLiteDatabase sVKSQLiteDatabase; - private static int sBodyIndex = -1; - private static DeletedMessagesDBHelper sVTDatabase; - - public static void reloadMessagesList() { - if (sVTDatabase == null) { - sVTDatabase = new DeletedMessagesDBHelper(); - } - sDeletedMessagesList = new ArrayList<>(sVTDatabase.loadAllMessages()); - } - - public static void grabVKDatabase(StorageManager storageEnvironment) { - sVKSQLiteDatabase = storageEnvironment.D(); - } - - public static boolean hook() { - return getBoolValue("undeletemsg", true); - } - - public static void setBodyDBParser(Msg msg) { - if (!(msg instanceof MsgFromUser)) return; - - for (Integer integer : sDeletedMessagesList) { - MsgFromUser msgFromUser = (MsgFromUser) msg; - checkForNestedMsg(msgFromUser.w0()); - if (integer == msg.C1()) { - editTextOfMsg((MsgFromUser) msg); - break; - } - } - } - - private static void checkForNestedMsg(List nestedMsgs) { - for (NestedMsg nestedMsg : nestedMsgs) { - if (!nestedMsg.w0().isEmpty()) checkForNestedMsg(nestedMsg.w0()); - - nestedMsg.d(EncryptProvider.decryptMessage(nestedMsg.f(), nestedMsg.getFrom().getId())); - } - } - - private static void editTextOfMsg(MsgFromUser msgFromUser) { - if (!msgFromUser.f().startsWith(getPrefixUndelete())) { - msgFromUser.d(getPrefixUndelete() + EncryptProvider.decryptMessage(msgFromUser)); - } - } - - private static String getPrefixUndelete() { - return getPrefsValue("undeletemsg_prefix_value") + " "; - } - - public static void updateDialog(MsgDeleteLpTask msgDeleteLpTask) { - Cursor c = getMessageFromDatabaseById(msgDeleteLpTask.d); - if (c == null) return; - - @SuppressLint("Range") - int localId = c.getInt(c.getColumnIndex("local_id")); - - String str = DeletedMessagesHandler.class.getSimpleName(); - msgDeleteLpTask.b.a(str, new OnMsgUpdateEvent(str, msgDeleteLpTask.c, localId)); - } - - public static void hookDeletedMessageId(MsgDeleteLpTask msgDeleteLpTask) { - if (!hook()) return; - - int messageId = msgDeleteLpTask.c; - - Cursor c = getMessageFromDatabaseById(messageId); - if (c == null) return; - if (sBodyIndex == -1) sBodyIndex = c.getColumnIndex("body"); - if (TextUtils.isEmpty(c.getString(sBodyIndex))) { - deleteMessageFromDB(messageId); - return; - } - - sDeletedMessagesList.add(messageId); - sVTDatabase.saveDeletedMessage(messageId); - } - - public static Cursor getMessageFromDatabaseById(int messageId) { - String query = "SELECT * FROM messages WHERE vk_id = " + messageId; - Cursor c = CustomSqliteExtensionsKt.a(sVKSQLiteDatabase, query); - if (!c.moveToFirst()) return null; - return c; - } - - public static void deleteMessageFromDB(int messageId) { - sVKSQLiteDatabase.execSQL("DELETE FROM messages WHERE vk_id = " + messageId); - } - - public static class DeletedMessagesDBHelper extends SQLiteOpenHelper { - public DeletedMessagesDBHelper() { - super(getContext(), "deleted_msgs", null, 1); - } - - @Override - public void onCreate(SQLiteDatabase db) { - db.execSQL("create table deleted_msgs (id integer primary key, msgId integer)"); - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - - } - - public void saveDeletedMessage(int msgId) { - SQLiteDatabase sqLiteDatabase = getWritableDatabase(); - - ContentValues contentValues = new ContentValues(); - contentValues.put("msgId", msgId); - - sqLiteDatabase.insert("deleted_msgs", null, contentValues); - sqLiteDatabase.close(); - } - - public List loadAllMessages() { - List msgIdsList = new ArrayList<>(); - - Cursor cursor = getReadableDatabase().query("deleted_msgs", null, null, null, null, null, null); - if (cursor.moveToFirst()) { - int msgIdIndex = cursor.getColumnIndex("msgId"); - - do { - msgIdsList.add(cursor.getInt(msgIdIndex)); - } while (cursor.moveToNext()); - cursor.close(); - } - - return msgIdsList; - } - } -} +//package ru.vtosters.lite.utils; +// +//import static ru.vtosters.lite.utils.Globals.getContext; +//import static ru.vtosters.lite.utils.Globals.getPrefsValue; +//import static ru.vtosters.lite.utils.Preferences.getBoolValue; +// +//import android.annotation.SuppressLint; +//import android.content.ContentValues; +//import android.database.Cursor; +//import android.text.TextUtils; +// +//import com.vk.im.engine.events.OnMsgUpdateEvent; +//import com.vk.im.engine.internal.longpoll.tasks.MsgDeleteLpTask; +//import com.vk.im.engine.internal.storage.StorageManager; +//import com.vk.im.engine.models.messages.Msg; +//import com.vk.im.engine.models.messages.MsgFromUser; +//import com.vk.im.engine.models.messages.NestedMsg; +//import com.vk.libsqliteext.CustomSqliteExtensionsKt; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import io.requery.android.database.sqlite.SQLiteDatabase; +//import io.requery.android.database.sqlite.SQLiteOpenHelper; +//import ru.vtosters.lite.encryption.EncryptProvider; +// +//public class DeletedMessagesHandler { +// private static List sDeletedMessagesList = new ArrayList<>(); +// +// private static SQLiteDatabase sVKSQLiteDatabase; +// private static int sBodyIndex = -1; +// private static DeletedMessagesDBHelper sVTDatabase; +// +// public static void reloadMessagesList() { +// if (sVTDatabase == null) { +// sVTDatabase = new DeletedMessagesDBHelper(); +// } +// sDeletedMessagesList = new ArrayList<>(sVTDatabase.loadAllMessages()); +// } +// +// public static void grabVKDatabase(StorageManager storageEnvironment) { +// var sqlite = ReflectionUtils.getMethod(storageEnvironment.getClass(), "D").invoke(); +// sVKSQLiteDatabase = storageEnvironment.D(); +// } +// +// public static boolean hook() { +// return getBoolValue("undeletemsg", true); +// } +// +// public static void setBodyDBParser(Msg msg) { +// if (!(msg instanceof MsgFromUser)) return; +// +// for (Integer integer : sDeletedMessagesList) { +// MsgFromUser msgFromUser = (MsgFromUser) msg; +// checkForNestedMsg(msgFromUser.w0()); +// if (integer == msg.C1()) { +// editTextOfMsg((MsgFromUser) msg); +// break; +// } +// } +// } +// +// private static void checkForNestedMsg(List nestedMsgs) { +// for (NestedMsg nestedMsg : nestedMsgs) { +// if (!nestedMsg.w0().isEmpty()) checkForNestedMsg(nestedMsg.w0()); +// +// nestedMsg.d(EncryptProvider.decryptMessage(nestedMsg.f(), nestedMsg.getFrom().getId())); +// } +// } +// +// private static void editTextOfMsg(MsgFromUser msgFromUser) { +// if (!msgFromUser.f().startsWith(getPrefixUndelete())) { +// msgFromUser.d(getPrefixUndelete() + EncryptProvider.decryptMessage(msgFromUser)); +// } +// } +// +// private static String getPrefixUndelete() { +// return getPrefsValue("undeletemsg_prefix_value") + " "; +// } +// +// public static void updateDialog(MsgDeleteLpTask msgDeleteLpTask) { +// Cursor c = getMessageFromDatabaseById(msgDeleteLpTask.d); +// if (c == null) return; +// +// @SuppressLint("Range") +// int localId = c.getInt(c.getColumnIndex("local_id")); +// +// String str = DeletedMessagesHandler.class.getSimpleName(); +// msgDeleteLpTask.b.a(str, new OnMsgUpdateEvent(str, msgDeleteLpTask.c, localId)); +// } +// +// public static void hookDeletedMessageId(MsgDeleteLpTask msgDeleteLpTask) { +// if (!hook()) return; +// +// int messageId = msgDeleteLpTask.c; +// +// Cursor c = getMessageFromDatabaseById(messageId); +// if (c == null) return; +// if (sBodyIndex == -1) sBodyIndex = c.getColumnIndex("body"); +// if (TextUtils.isEmpty(c.getString(sBodyIndex))) { +// deleteMessageFromDB(messageId); +// return; +// } +// +// sDeletedMessagesList.add(messageId); +// sVTDatabase.saveDeletedMessage(messageId); +// } +// +// public static Cursor getMessageFromDatabaseById(int messageId) { +// String query = "SELECT * FROM messages WHERE vk_id = " + messageId; +// Cursor c = CustomSqliteExtensionsKt.a(sVKSQLiteDatabase, query); +// if (!c.moveToFirst()) return null; +// return c; +// } +// +// public static void deleteMessageFromDB(int messageId) { +// sVKSQLiteDatabase.execSQL("DELETE FROM messages WHERE vk_id = " + messageId); +// } +// +// public static class DeletedMessagesDBHelper extends SQLiteOpenHelper { +// public DeletedMessagesDBHelper() { +// super(getContext(), "deleted_msgs", null, 1); +// } +// +// @Override +// public void onCreate(SQLiteDatabase db) { +// db.execSQL("create table deleted_msgs (id integer primary key, msgId integer)"); +// } +// +// @Override +// public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { +// +// } +// +// public void saveDeletedMessage(int msgId) { +// SQLiteDatabase sqLiteDatabase = getWritableDatabase(); +// +// ContentValues contentValues = new ContentValues(); +// contentValues.put("msgId", msgId); +// +// sqLiteDatabase.insert("deleted_msgs", null, contentValues); +// sqLiteDatabase.close(); +// } +// +// public List loadAllMessages() { +// List msgIdsList = new ArrayList<>(); +// +// Cursor cursor = getReadableDatabase().query("deleted_msgs", null, null, null, null, null, null); +// if (cursor.moveToFirst()) { +// int msgIdIndex = cursor.getColumnIndex("msgId"); +// +// do { +// msgIdsList.add(cursor.getInt(msgIdIndex)); +// } while (cursor.moveToNext()); +// cursor.close(); +// } +// +// return msgIdsList; +// } +// } +//} 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 2ba298223..5ef035af8 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -5,7 +5,7 @@ import static java.lang.Long.MAX_VALUE; import static ru.vtosters.lite.f0x1d.VTVerifications.hasPrometheus; import static ru.vtosters.lite.f0x1d.VTVerifications.isVerified; import static ru.vtosters.lite.utils.CacheUtils.getInstance; -import static ru.vtosters.lite.utils.DeletedMessagesHandler.reloadMessagesList; +//import static ru.vtosters.lite.utils.DeletedMessagesHandler.reloadMessagesList; import static ru.vtosters.lite.utils.Globals.fixGapps; import static ru.vtosters.lite.utils.Globals.getContext; import static ru.vtosters.lite.utils.Globals.getIdentifier; @@ -55,7 +55,7 @@ public class Preferences { setupFilters(); fixGapps(); setProxy(); - reloadMessagesList(); + //reloadMessagesList(); registerActivities(application); if(dev()){ LoadLibrary("vkopustest");