From ed5f82cbd2362f1c937f9a70538a807601038eca Mon Sep 17 00:00:00 2001
From: aliveoutside <53598473+aliveoutside@users.noreply.github.com>
Date: Tue, 21 Jun 2022 23:38:53 +0300
Subject: [PATCH] fix dnr and dnt

---
 app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java   | 8 ++++----
 app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java     | 6 +++---
 .../im/engine/commands/messages/SetUserActivityCmd.smali  | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

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 80c86be88..69289ab8b 100644
--- a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java
+++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java
@@ -14,7 +14,7 @@ import java.util.List;
 
 public class DNRInjector {
     public static void inject(Dialog dialog, List<DialogAction> list) {
-        int peerId = dialog.a();
+        int peerId = dialog.getId();
 
         if (isDnrEnabledFor(peerId)) {
             list.add(DialogAction.valueOf("DNR_OFF"));
@@ -38,7 +38,7 @@ public class DNRInjector {
     }
 
     public static boolean onClick(Dialog dialog, DialogAction action) {
-        var id = dialog.a();
+        var id = dialog.getId();
 
         if (action == DialogAction.valueOf("DNR_ON")) {
             setDnr(dialog, true);
@@ -60,11 +60,11 @@ public class DNRInjector {
     }
 
     public static void setDnr(Dialog dialog, boolean value) {
-        hookDNR(dialog.a());
+        hookDNR(dialog.getId());
     }
 
     public static void setDnt(Dialog dialog, boolean value) {
-        hookDNT(dialog.a());
+        hookDNT(dialog.getId());
     }
 }
 
diff --git a/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java b/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java
index 0bf82d00d..bfc1728a4 100644
--- a/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java
+++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java
@@ -42,16 +42,16 @@ public class DNRModule {
 
     public static boolean isDnrEnabledFor(Dialog dialog) {
         if (dialog == null) return false;
-        return isDnrEnabledFor(dialog.a());
+        return isDnrEnabledFor(dialog.getId());
     }
 
     public static boolean isDntEnabledFor(Dialog dialog) {
         if (dialog == null) return false;
-        return isDntEnabledFor(dialog.a());
+        return isDntEnabledFor(dialog.getId());
     }
 
     public static void hookRead(Dialog dialog) {
-        makeRequest("https://" + getApiCom() + "/method/messages.markAsRead?start_message_id=" + dialog.lastMsgVkId + "&peer_id=" + dialog.a() + "&v=5.91&access_token=" + getUserToken(), response -> {
+        makeRequest("https://" + getApiCom() + "/method/messages.markAsRead?start_message_id=" + dialog.F1() + "&peer_id=" + dialog.getId() + "&v=5.91&access_token=" + getUserToken(), response -> {
             ToastUtils.a("Чат помечен как прочитанный!");
         });
     }
diff --git a/smali/smali_classes3/com/vk/im/engine/commands/messages/SetUserActivityCmd.smali b/smali/smali_classes3/com/vk/im/engine/commands/messages/SetUserActivityCmd.smali
index 4d1cc4759..8edfac4ae 100644
--- a/smali/smali_classes3/com/vk/im/engine/commands/messages/SetUserActivityCmd.smali
+++ b/smali/smali_classes3/com/vk/im/engine/commands/messages/SetUserActivityCmd.smali
@@ -43,7 +43,7 @@
 
 
 # instance fields
-.field private final b:I
+.field public final b:I
 
 .field private final c:Lcom/vk/im/engine/models/typing/ComposingType;