fix group manage issue

Author: imndx

chat/kit/src/main/java/cn/wildfire/chat/kit/group/GroupViewModel.java

@@ -327,6 +327,29 @@ public MutableLiveData<List<UIUserInfo>> getGroupManagerUIUserInfosLiveData(Stri
         return data;
     }
 
+    public List<GroupMember> getGroupManagers(String groupId) {
+        List<GroupMember> members = ChatManager.Instance().getGroupMembers(groupId, false);
+        List<GroupMember> managers = new ArrayList<>();
+        if (members != null) {
+            for (GroupMember member : members) {
+                if (member.type == GroupMember.GroupMemberType.Manager) {
+                    managers.add(member);
+                }
+            }
+        }
+        return managers;
+    }
+
+    public List<String> getGroupManagerIds(String groupId) {
+        List<GroupMember> managers = getGroupManagers(groupId);
+        List<String> mangerIds = new ArrayList<>();
+        if (managers != null) {
+            for (GroupMember manager : managers) {
+                mangerIds.add(manager.memberId);
+            }
+        }
+        return mangerIds;
+    }
 
     private List<UIUserInfo> memberToUIUserInfo(String groupId, List<GroupMember> members) {
         if (members == null || members.isEmpty()) {

chat/kit/src/main/java/cn/wildfire/chat/kit/group/manage/GroupManagerListFragment.java

@@ -11,12 +11,12 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 
 import cn.wildfire.chat.kit.contact.BaseUserListFragment;
 import cn.wildfire.chat.kit.contact.UserListAdapter;
 import cn.wildfire.chat.kit.contact.model.FooterValue;
 import cn.wildfire.chat.kit.contact.model.UIUserInfo;
+import cn.wildfire.chat.kit.group.BasePickGroupMemberActivity;
 import cn.wildfire.chat.kit.group.GroupViewModel;
 import cn.wildfire.chat.kit.user.UserViewModel;
 import cn.wildfirechat.model.GroupInfo;
@@ -27,7 +27,6 @@ public class GroupManagerListFragment extends BaseUserListFragment {
     private GroupViewModel groupViewModel;
     private GroupInfo groupInfo;
     private GroupMember groupMember;
-    private List<GroupMember> managerMembers = new ArrayList<>();
 
     public static GroupManagerListFragment newInstance(GroupInfo groupInfo) {
         Bundle args = new Bundle();
@@ -77,25 +76,25 @@ public void onUserClick(UIUserInfo userInfo) {
         GroupMember groupMember = groupViewModel.getGroupMember(groupInfo.target, userInfo.getUserInfo().uid);
         if (groupMember.type == GroupMember.GroupMemberType.Manager) {
             new MaterialDialog.Builder(getActivity())
-                    .items(Collections.singleton("移除群管理"))
-                    .itemsCallback((dialog, itemView, position, text) -> {
-                        groupViewModel.setGroupManager(groupInfo.target, false, Collections.singletonList(userInfo.getUserInfo().uid), null, Collections.singletonList(0));
-                    })
-                    .cancelable(true)
-                    .build()
-                    .show();
+                .items(Collections.singleton("移除群管理"))
+                .itemsCallback((dialog, itemView, position, text) -> {
+                    groupViewModel.setGroupManager(groupInfo.target, false, Collections.singletonList(userInfo.getUserInfo().uid), null, Collections.singletonList(0));
+                })
+                .cancelable(true)
+                .build()
+                .show();
         }
     }
 
     @Override
     public void onFooterClick(int index) {
         Intent intent = new Intent(getActivity(), AddGroupManagerActivity.class);
-        intent.putExtra("groupInfo", groupInfo);
-        ArrayList<String> memberIds = new ArrayList<>(managerMembers.size());
-        for (GroupMember member : managerMembers) {
-            memberIds.add(member.memberId);
-        }
-        intent.putStringArrayListExtra("unCheckableMemberIds", memberIds);
+        intent.putExtra(BasePickGroupMemberActivity.GROUP_INFO, groupInfo);
+
+        ArrayList<String> uncheckableMemberIds = new ArrayList<>();
+        uncheckableMemberIds.add(groupInfo.owner);
+        uncheckableMemberIds.addAll(groupViewModel.getGroupManagerIds(groupInfo.target));
+        intent.putExtra(BasePickGroupMemberActivity.UNCHECKABLE_MEMBER_IDS, uncheckableMemberIds);
         startActivity(intent);
     }