diff --git a/app/src/main/java/com/vk/im/ui/components/common/DialogActionsHelper.java b/app/src/main/java/com/vk/im/ui/components/common/DialogActionsHelper.java index d2849a2e3..facb5c17d 100644 --- a/app/src/main/java/com/vk/im/ui/components/common/DialogActionsHelper.java +++ b/app/src/main/java/com/vk/im/ui/components/common/DialogActionsHelper.java @@ -81,6 +81,7 @@ public final class DialogActionsHelper { CollectionExt.a(arrayList, DialogAction.NOTIFICATIONS_OFF, dialog.b(b2)); return arrayList; } + return new ArrayList<>(); } 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 47d319032..e153c2dba 100644 --- a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java +++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java @@ -49,7 +49,11 @@ import ru.vtosters.lite.utils.AndroidUtils; public class DNRInjector { public static void inject(Dialog dialog, List list) { - int peerId = dialog.getId(); + int peerId = 0; + + if (dialog != null) { + peerId = dialog.getId(); + } list.add(DialogAction.pinmsg); list.add(DialogAction.unpinmsg); @@ -111,8 +115,12 @@ public class DNRInjector { ImEngine1.a().a(new OnDialogUpdateEvent(null, map)); } - public static List injectToListAccess(List actions, Dialog dialog, ProfilesSimpleInfo profilesSimpleInfo) { - var peerId = dialog.getId(); + public static List injectToListAccess(List actions, Dialog dialog) { + int peerId = 0; + + if (dialog != null) { + peerId = dialog.getId(); + } if (isDnrEnabledFor(peerId)) { actions.add(DialogAction.DNR_OFF); @@ -137,7 +145,11 @@ public class DNRInjector { } public static boolean onClickHeader(DialogAction action, Dialog dialog) { - var id = dialog.getId(); + int peerId = 0; + + if (dialog != null) { + peerId = dialog.getId(); + } if (action == DialogAction.MARK_AS_READ) { DNRModule.hookRead(dialog); @@ -165,10 +177,10 @@ public class DNRInjector { } if (action == DialogAction.ENCRYPT_SETT) { - CryptImHook.hookPref(id); + CryptImHook.hookPref(peerId); return true; } else if (action == DialogAction.ENCRYPT) { - CryptImHook.hook(id, dialog); + CryptImHook.hook(peerId, dialog); return true; } @@ -176,7 +188,11 @@ public class DNRInjector { } public static boolean onClick(Dialog dialog, DialogAction action) { - var id = dialog.getId(); + int peerId = 0; + + if (dialog != null) { + peerId = dialog.getId(); + } if (action == DialogAction.MARK_AS_READ) { DNRModule.hookRead(dialog); @@ -199,18 +215,18 @@ public class DNRInjector { } if (action == DialogAction.pinmsg) { - pinnedMsg(id, true); + pinnedMsg(peerId, true); return true; } else if (action == DialogAction.unpinmsg) { - pinnedMsg(id, false); + pinnedMsg(peerId, false); return true; } if (action == DialogAction.ENCRYPT_SETT) { - CryptImHook.hookPref(id); + CryptImHook.hookPref(peerId); return true; } else if (action == DialogAction.ENCRYPT) { - CryptImHook.hook(id, dialog); + CryptImHook.hook(peerId, dialog); return true; } @@ -286,11 +302,23 @@ public class DNRInjector { } public static void setDnr(Dialog dialog, boolean value) { - hookDNR(dialog.getId()); + int peerId = 0; + + if (dialog != null) { + peerId = dialog.getId(); + } + + hookDNR(peerId); } public static void setDnt(Dialog dialog, boolean value) { - hookDNT(dialog.getId()); + int peerId = 0; + + if (dialog != null) { + peerId = dialog.getId(); + } + + hookDNT(peerId); } } diff --git a/smali/smali_classes3/com/vk/im/ui/components/dialog_header/info/DialogHeaderInfoComponent.smali b/smali/smali_classes3/com/vk/im/ui/components/dialog_header/info/DialogHeaderInfoComponent.smali index 85fc308f8..a675188d4 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/dialog_header/info/DialogHeaderInfoComponent.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/dialog_header/info/DialogHeaderInfoComponent.smali @@ -440,17 +440,7 @@ move-result-object v3 - iget-object v2, p0, Lcom/vk/im/ui/components/dialog_header/info/DialogHeaderInfoComponent;->G:Lcom/vk/im/ui/components/dialog_header/info/State; - - invoke-virtual {v2}, Lcom/vk/im/ui/components/dialog_header/info/State;->h()Lcom/vk/im/engine/models/ProfilesInfo; - - move-result-object v2 - - invoke-virtual {v2}, Lcom/vk/im/engine/models/ProfilesInfo;->A1()Lcom/vk/im/engine/models/ProfilesSimpleInfo; - - move-result-object v2 - - invoke-static {v0, v3, v2}, Lru/vtosters/lite/dnr/DNRInjector;->injectToListAccess(Ljava/util/List;Lcom/vk/im/engine/models/dialogs/Dialog;Lcom/vk/im/engine/models/ProfilesSimpleInfo;)Ljava/util/List; + invoke-static {v0, v3}, Lru/vtosters/lite/dnr/DNRInjector;->injectToListAccess(Ljava/util/List;Lcom/vk/im/engine/models/dialogs/Dialog;)Ljava/util/List; move-result-object v0