implement messages undeleter (via reflection for now)
This commit is contained in:
aliveoutside
@@ -1,161 +1,168 @@
|
||||
//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<Integer> 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<NestedMsg> 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<Integer> loadAllMessages() {
|
||||
// List<Integer> 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 android.util.Log;
|
||||
|
||||
import com.vk.im.engine.ImEnvironment;
|
||||
import com.vk.im.engine.events.OnMsgUpdateEvent;
|
||||
import com.vk.im.engine.internal.longpoll.tasks.MsgDeleteLpTask;
|
||||
import com.vk.im.engine.internal.storage.StorageEnvironment;
|
||||
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.lang.reflect.InvocationTargetException;
|
||||
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<Integer> 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(StorageEnvironment storageEnvironment) {
|
||||
sVKSQLiteDatabase = storageEnvironment.a();
|
||||
}
|
||||
|
||||
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<NestedMsg> 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) throws NoSuchFieldException, IllegalAccessException {
|
||||
Cursor c = getMessageFromDatabaseById((int )ReflectionUtils.getObjectField(msgDeleteLpTask.getClass(), "d", msgDeleteLpTask));
|
||||
if (c == null) return;
|
||||
|
||||
@SuppressLint("Range")
|
||||
int localId = c.getInt(c.getColumnIndex("local_id"));
|
||||
|
||||
String str = DeletedMessagesHandler.class.getSimpleName();
|
||||
var imEnvironment = (ImEnvironment) ReflectionUtils.getObjectField(msgDeleteLpTask.getClass(), "b", msgDeleteLpTask);
|
||||
var cint = (int) ReflectionUtils.getObjectField(msgDeleteLpTask.getClass(), "c", msgDeleteLpTask);
|
||||
imEnvironment.a(str, new OnMsgUpdateEvent(str, cint, localId));
|
||||
}
|
||||
|
||||
public static void hookDeletedMessageId(MsgDeleteLpTask msgDeleteLpTask) throws NoSuchFieldException, IllegalAccessException {
|
||||
if (!hook()) return;
|
||||
|
||||
var field = msgDeleteLpTask.getClass().getDeclaredField("c");
|
||||
field.setAccessible(true);
|
||||
var messageId = (int) field.get(msgDeleteLpTask);
|
||||
|
||||
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<Integer> loadAllMessages() {
|
||||
List<Integer> 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+35
-3
@@ -4,11 +4,11 @@
|
||||
|
||||
|
||||
# instance fields
|
||||
.field private final b:Lcom/vk/im/engine/ImEnvironment;
|
||||
.field public b:Lcom/vk/im/engine/ImEnvironment;
|
||||
|
||||
.field private final c:I
|
||||
.field public c:I
|
||||
|
||||
.field private final d:I
|
||||
.field public d:I
|
||||
|
||||
|
||||
# direct methods
|
||||
@@ -59,6 +59,15 @@
|
||||
.method protected b(Lcom/vk/im/engine/internal/longpoll/LongPollChanges;)V
|
||||
.locals 2
|
||||
|
||||
invoke-static {}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->hook()Z
|
||||
|
||||
move-result v0
|
||||
|
||||
if-eqz v0, :cond_0
|
||||
|
||||
return-void
|
||||
|
||||
:cond_0
|
||||
const/4 v0, 0x1
|
||||
|
||||
.line 7
|
||||
@@ -77,6 +86,17 @@
|
||||
.method protected b(Lcom/vk/im/engine/internal/longpoll/LongPollEntityInfo;)V
|
||||
.locals 3
|
||||
|
||||
invoke-static {}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->hook()Z
|
||||
|
||||
move-result v0
|
||||
|
||||
if-eqz v0, :cond_a
|
||||
|
||||
invoke-static {p0}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->updateDialog(Lcom/vk/im/engine/internal/longpoll/tasks/MsgDeleteLpTask;)V
|
||||
|
||||
return-void
|
||||
|
||||
:cond_a
|
||||
.line 4
|
||||
iget-object v0, p1, Lcom/vk/im/engine/internal/longpoll/LongPollEntityInfo;->d:Landroid/util/SparseArray;
|
||||
|
||||
@@ -122,6 +142,18 @@
|
||||
.method protected b(Lcom/vk/im/engine/internal/longpoll/LongPollEntityInfo;Lcom/vk/im/engine/internal/longpoll/LongPollEntityMissed;)V
|
||||
.locals 1
|
||||
|
||||
invoke-static {p0}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->hookDeletedMessageId(Lcom/vk/im/engine/internal/longpoll/tasks/MsgDeleteLpTask;)V
|
||||
|
||||
invoke-static {}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->hook()Z
|
||||
|
||||
move-result v0
|
||||
|
||||
if-eqz v0, :cond_a
|
||||
|
||||
return-void
|
||||
|
||||
:cond_a
|
||||
|
||||
.line 2
|
||||
iget-object p1, p1, Lcom/vk/im/engine/internal/longpoll/LongPollEntityInfo;->d:Landroid/util/SparseArray;
|
||||
|
||||
|
||||
+2
@@ -821,6 +821,8 @@
|
||||
|
||||
invoke-virtual {v0, p1}, Lcom/vk/im/engine/models/messages/Msg;->j(I)V
|
||||
|
||||
invoke-static {v0}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->setBodyDBParser(Lcom/vk/im/engine/models/messages/Msg;)V
|
||||
|
||||
return-object v0
|
||||
|
||||
:pswitch_data_0
|
||||
|
||||
+2
@@ -26,6 +26,8 @@
|
||||
|
||||
iput-object p1, p0, Lcom/vk/im/engine/internal/storage/delegates/messages/MsgStorageManager;->b:Lcom/vk/im/engine/internal/storage/StorageEnvironment;
|
||||
|
||||
invoke-static {p1}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->grabVKDatabase(Lcom/vk/im/engine/internal/storage/StorageEnvironment;)V
|
||||
|
||||
.line 2
|
||||
new-instance p1, Lcom/vk/im/engine/internal/storage/memcache/StorageMemCacheByIdHelper;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user