From 129ae951218d7f81eee6c38803e397cdf6719f09 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Fri, 29 Jul 2022 16:28:49 +0300
Subject: [PATCH] code beautifying

---
 .../common/DialogActionsHelper.java           | 25 ++++++++++++++++---
 .../ui/components/common/MsgActionHelper.java |  7 ++++--
 2 files changed, 27 insertions(+), 5 deletions(-)

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 b470f9e80..43c91320e 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
@@ -26,26 +26,34 @@ public final class DialogActionsHelper{
             ChatSettings z1 = dialog.z1();
             boolean z = false;
             boolean I1 = z1 != null && z1.I1();
-            ArrayList arrayList = new ArrayList();
+            ArrayList<DialogAction> arrayList = new ArrayList<>();
+
             DNRInjector.inject(dialog, arrayList);
+
             arrayList.add(DialogAction.SEARCH);
+
             if (dialog.S1()) {
                 arrayList.add(DialogAction.SHOW_ATTACHES);
             }
+
             if (!I1 && !dialog.W1()) {
                 arrayList.add(DialogAction.CLEAR_HISTORY);
             }
+
             if (I1) {
                 arrayList.add(DialogAction.CHANNEL_INVITE_LINK);
             }
+
             if (dialog.K1() != null) {
                 CollectionExt.a(arrayList, DialogAction.PINNED_MSG_DETACH, !I1);
                 CollectionExt.a(arrayList, DialogAction.PINNED_MSG_SHOW, !dialog.L1());
                 CollectionExt.a(arrayList, DialogAction.PINNED_MSG_HIDE, dialog.L1());
             }
+
             if (dialog.a(MemberType.USER)) {
                 arrayList.add(DialogAction.OPEN_USER_PROFILE);
             }
+
             if (dialog.a(MemberType.GROUP)) {
                 arrayList.add(DialogAction.OPEN_GROUP_PROFILE);
                 Group group = profilesSimpleInfo.w1().get(dialog.I1());
@@ -58,6 +66,7 @@ public final class DialogActionsHelper{
                     }
                 }
             }
+
             if (dialog.W1()) {
                 DialogAction dialogAction = DialogAction.ADD_CHAT_MEMBER;
                 ChatSettings z12 = dialog.z1();
@@ -67,32 +76,39 @@ public final class DialogActionsHelper{
                 CollectionExt.a(arrayList, dialogAction, z);
                 CollectionExt.a(arrayList, DialogAction.CHAT_SETTINGS, DialogPermissionHelper.a.a(dialog));
             }
+
             CollectionExt.a(arrayList, DialogAction.NOTIFICATIONS_ON, !dialog.b(b2));
             CollectionExt.a(arrayList, DialogAction.NOTIFICATIONS_OFF, dialog.b(b2));
             return arrayList;
         }
-        return new ArrayList();
+        return new ArrayList<>();
     }
 
     public final List<DialogAction> a(Dialog dialog, ProfilesSimpleInfo profilesSimpleInfo){
         long b2 = TimeProvider.f.b();
         Profile profile = profilesSimpleInfo.get(dialog.getId());
+
         if (!(profile instanceof Group)) {
             profile = null;
         }
+
         Group group = (Group) profile;
         ChatSettings z1 = dialog.z1();
-        ArrayList arrayList = new ArrayList();
+        ArrayList<DialogAction> arrayList = new ArrayList<>();
+
         DNRInjector.inject(dialog, arrayList);
+
         if (dialog.hasUnread()) {
             arrayList.add(DialogAction.MARK_AS_READ);
         }
+
         if (!dialog.W1()) {
             arrayList.add(DialogAction.CREATE_SHORTCUT);
             arrayList.add(DialogAction.CLEAR_HISTORY);
             CollectionExt.a(arrayList, DialogAction.NOTIFICATIONS_OFF, dialog.b(b2));
             CollectionExt.a(arrayList, DialogAction.NOTIFICATIONS_ON, !dialog.b(b2));
         }
+
         if (dialog.a(MemberType.GROUP) && group != null) {
             if (group.v1()) {
                 arrayList.add(DialogAction.GROUP_RECEIVE_MSGS_DISABLE);
@@ -101,6 +117,7 @@ public final class DialogActionsHelper{
                 CollectionExt.a(arrayList, DialogAction.GROUP_RECEIVE_MSGS_ENABLE, !group.w1());
             }
         }
+
         if (dialog.W1() && z1 != null) {
             if (!z1.L1()) {
                 arrayList.add(DialogAction.CREATE_SHORTCUT);
@@ -117,6 +134,7 @@ public final class DialogActionsHelper{
                 CollectionExt.a(arrayList, DialogAction.CLEAR_HISTORY_AND_LEAVE, !z1.L1());
             }
         }
+
         return arrayList;
     }
 
@@ -124,6 +142,7 @@ public final class DialogActionsHelper{
         if (dialog.V1() || !dialog.y1()) {
             return false;
         }
+
         return !dialog.U1() || !ImBridge7.a().a();
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/vk/im/ui/components/common/MsgActionHelper.java b/app/src/main/java/com/vk/im/ui/components/common/MsgActionHelper.java
index d4b3bc271..9c4b87f0a 100644
--- a/app/src/main/java/com/vk/im/ui/components/common/MsgActionHelper.java
+++ b/app/src/main/java/com/vk/im/ui/components/common/MsgActionHelper.java
@@ -21,7 +21,8 @@ public final class MsgActionHelper{
     public final List<MsgAction> a(ImConfig imConfig, Dialog dialog, Collection<? extends Msg> collection){
         if (imConfig != null && dialog != null && collection != null) {
             MsgPermissionHelper.a aVar = new MsgPermissionHelper.a(imConfig, dialog, collection);
-            ArrayList arrayList = new ArrayList();
+            ArrayList<MsgAction> arrayList = new ArrayList<>();
+
             CollectionExt.a(arrayList, MsgAction.RETRY, MsgPermissionHelper.b.g(aVar));
             CollectionExt.a(arrayList, MsgAction.REPLY, MsgPermissionHelper.b.f(aVar));
             CollectionExt.a(arrayList, MsgAction.FORWARD, MsgPermissionHelper.b.d(aVar));
@@ -31,8 +32,10 @@ public final class MsgActionHelper{
             CollectionExt.a(arrayList, MsgAction.SPAM, MsgPermissionHelper.b.h(aVar));
             CollectionExt.a(arrayList, MsgAction.PIN, MsgPermissionHelper.b.e(aVar));
             CollectionExt.a(arrayList, MsgAction.UNPIN, MsgPermissionHelper.b.i(aVar));
+
             return arrayList;
         }
-        return new ArrayList();
+
+        return new ArrayList<>();
     }
 }
\ No newline at end of file