From 11fdad2ea724566b64b86ec789c47176bbdf8992 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 16 Nov 2016 00:23:00 +0100 Subject: [PATCH] Show group member list. --- .../messenger/MessagesController.java | 7 - .../main/java/org/telegram/tgnet/TLRPC.java | 62 ------ .../telegram/ui/Adapters/ContactsAdapter.java | 2 +- .../telegram/ui/Adapters/SearchAdapter.java | 2 +- .../org/telegram/ui/BlockedUsersActivity.java | 2 +- .../java/org/telegram/ui/Cells/UserCell.java | 77 +++---- .../telegram/ui/GroupCreateFinalActivity.java | 2 +- .../java/org/telegram/ui/ProfileActivity.java | 206 +++--------------- .../src/main/res/drawable-hdpi/bot_info.png | Bin 1674 -> 0 bytes .../main/res/drawable-hdpi/profile_list.png | Bin 990 -> 0 bytes .../src/main/res/drawable-mdpi/bot_info.png | Bin 1363 -> 0 bytes .../main/res/drawable-mdpi/profile_list.png | Bin 972 -> 0 bytes .../src/main/res/drawable-xhdpi/bot_info.png | Bin 1908 -> 0 bytes .../main/res/drawable-xhdpi/profile_list.png | Bin 1024 -> 0 bytes .../src/main/res/drawable-xxhdpi/bot_info.png | Bin 2461 -> 0 bytes .../main/res/drawable-xxhdpi/profile_list.png | Bin 1072 -> 0 bytes 16 files changed, 66 insertions(+), 294 deletions(-) delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/bot_info.png delete mode 100755 TMessagesProj/src/main/res/drawable-hdpi/profile_list.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/bot_info.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/profile_list.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/bot_info.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/profile_list.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/bot_info.png delete mode 100755 TMessagesProj/src/main/res/drawable-xxhdpi/profile_list.png diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java index ee86ccfb6..0e9db14f2 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java @@ -42,8 +42,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter private ConcurrentHashMap users = new ConcurrentHashMap<>(100, 1.0f, 2); private ConcurrentHashMap usersByUsernames = new ConcurrentHashMap<>(100, 1.0f, 2); - private HashMap exportedChats = new HashMap<>(); - public ArrayList dialogs = new ArrayList<>(); public ArrayList dialogsServerOnly = new ArrayList<>(); public ArrayList dialogsGroupsOnly = new ArrayList<>(); @@ -355,7 +353,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter dialogs_dict.clear(); dialogs_read_inbox_max.clear(); dialogs_read_outbox_max.clear(); - exportedChats.clear(); dialogs.clear(); channelViewsToSend.clear(); channelViewsToReload.clear(); @@ -466,10 +463,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter }); } - public TLRPC.ExportedChatInvite getExportedInvite(int chat_id) { - return exportedChats.get(chat_id); - } - public boolean putUser(TLRPC.User user, boolean fromCache) { if (user == null) { return false; diff --git a/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java b/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java index 57df9ce25..6c2c002fd 100644 --- a/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java +++ b/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java @@ -13,7 +13,6 @@ import java.util.HashMap; public class TLRPC { - public static final int CHAT_FLAG_IS_PUBLIC = 0x00000040; public static final int MESSAGE_FLAG_FWD = 0x00000004; public static final int MESSAGE_FLAG_REPLY = 0x00000008; public static final int MESSAGE_FLAG_HAS_FROM_ID = 0x00000100; @@ -216,14 +215,8 @@ public class TLRPC { public static class ChatFull extends TLObject { public int flags; - public boolean can_view_participants; public int id; public String about; - public int participants_count; - public int admins_count; - public int kicked_count; - public int migrated_from_chat_id; - public int migrated_from_max_id; public int pinned_msg_id; public ChatParticipants participants; } @@ -231,9 +224,6 @@ public class TLRPC { public static class TL_channelFull extends ChatFull { } - public static class TL_chatFull extends ChatFull { - } - public static class TL_topPeerCategoryPeers extends TLObject { public TopPeerCategory category; public int count; @@ -307,8 +297,6 @@ public class TLRPC { public boolean mutual_contact; public boolean deleted; public boolean bot; - public boolean bot_chat_history; - public boolean bot_nochats; public boolean verified; public boolean restricted; public boolean min; @@ -371,17 +359,6 @@ public class TLRPC { public static class TL_messageActionEmpty extends MessageAction { } - public static class DecryptedMessage extends TLObject { - public int ttl; - public String message; - public DecryptedMessageMedia media; - public DecryptedMessageAction action; - public int flags; - } - - public static class TL_decryptedMessage extends DecryptedMessage { - } - public static class Video extends TLObject { public long id; public int user_id; @@ -635,47 +612,15 @@ public class TLRPC { public int version; } - public static class TL_chatParticipantsForbidden extends ChatParticipants { - } - - public static class DecryptedMessageMedia extends TLObject { - public int duration; - public String mime_type; - public int size; - public byte[] key; - public byte[] iv; - public String first_name; - public String last_name; - public int user_id; - public ArrayList attributes = new ArrayList<>(); - public String caption; - public String url; - public int w; - public int h; - public String file_name; - public String title; - public String address; - public String provider; - public long id; - public int date; - public int dc_id; - } - public static class ChatParticipant extends TLObject { public int user_id; - public int inviter_id; public int date; } - public static class TL_chatParticipant extends ChatParticipant { - } - public static class Chat extends TLObject { public int flags; public boolean creator; public boolean kicked; - public boolean admins_enabled; - public boolean admin; public boolean deactivated; public int id; public String title; @@ -684,7 +629,6 @@ public class TLRPC { public int date; public int version; public boolean editor; - public boolean moderator; public boolean broadcast; public boolean verified; public boolean megagroup; @@ -779,9 +723,6 @@ public class TLRPC { public String link; } - public static class TL_chatInviteExported extends ExportedChatInvite { - } - public static class InputFile extends TLObject { public long id; public int parts; @@ -1013,9 +954,6 @@ public class TLRPC { public static class TL_message extends Message { } - public static class TL_message_secret extends TL_message { - } - public static class TL_messageService extends Message { } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java index ade259fc5..474ffed87 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java @@ -246,7 +246,7 @@ public class ContactsAdapter extends BaseSectionsAdapter { ArrayList arr = usersSectionsDict.get(sortedUsersSectionsArray.get(section - (onlyUsers != 0 && !isAdmin ? 0 : 1))); TLRPC.User user = MessagesController.getInstance().getUser(arr.get(position).user_id); - ((UserCell) convertView).setData(user, null, null, 0); + ((UserCell) convertView).setData(123, 0, "ErrUserName2", "ErrUserStatus2", 0); if (checkedMap != null) { ((UserCell) convertView).setChecked(checkedMap.containsKey(user.id), !scrolling); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/SearchAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/SearchAdapter.java index 11a5651b2..266a3b5eb 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/SearchAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/SearchAdapter.java @@ -283,7 +283,7 @@ public class SearchAdapter extends BaseSearchAdapter { } if (useUserCell) { - ((UserCell) view).setData(object, name, username, 0); + ((UserCell) view).setData(123, 0, "ErrUserName", "ErrStatus", 0); if (checkedMap != null) { ((UserCell) view).setChecked(checkedMap.containsKey(id), false); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java index 2d70db9dc..3cf453b1f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java @@ -278,7 +278,7 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe } else { number = LocaleController.getString("NumberUnknown", R.string.NumberUnknown); } - ((UserCell) view).setData(user, null, number, 0); + ((UserCell) view).setData(123, 0, "ErrUserName", "ErrUserStatus", 0); } } else if (type == 1) { if (view == null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java index 544d4a95b..4e85d8944 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java @@ -40,10 +40,11 @@ public class UserCell extends FrameLayout { private ImageView adminImage; private AvatarDrawable avatarDrawable; - private TLObject currentObject; + private int user_id; + private int chat_id; private CharSequence currentName; - private CharSequence currrntStatus; + private CharSequence currentStatus; private int currentDrawable; private String lastName; @@ -64,7 +65,7 @@ public class UserCell extends FrameLayout { nameTextView = new SimpleTextView(context); nameTextView.setTextColor(0xff212121); - nameTextView.setTextSize(17); + nameTextView.setTextSize(16); /*same size as in TextCell */ nameTextView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.TOP); addView(nameTextView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 20, (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.TOP, LocaleController.isRTL ? 28 + (checkbox == 2 ? 18 : 0) : (68 + padding), 11.5f, LocaleController.isRTL ? (68 + padding) : 28 + (checkbox == 2 ? 18 : 0), 0)); @@ -106,19 +107,12 @@ public class UserCell extends FrameLayout { } } - public void setData(TLObject user, CharSequence name, CharSequence status, int resId) { - if (user == null) { - currrntStatus = null; - currentName = null; - currentObject = null; - nameTextView.setText(""); - statusTextView.setText(""); - avatarImageView.setImageDrawable(null); - return; - } - currrntStatus = status; + public void setData(int new_user_id, int new_chat_id, CharSequence name, CharSequence status, int resId) { + currentStatus = null; + currentStatus = status; currentName = name; - currentObject = user; + user_id = new_user_id; + chat_id = new_chat_id; currentDrawable = resId; update(0); } @@ -154,25 +148,13 @@ public class UserCell extends FrameLayout { } public void update(int mask) { - if (currentObject == null) { + if (user_id == 0 && chat_id==0) { return; } TLRPC.FileLocation photo = null; - String newName = null; - TLRPC.User currentUser = null; - TLRPC.Chat currentChat = null; - if (currentObject instanceof TLRPC.User) { - currentUser = (TLRPC.User) currentObject; - if (currentUser.photo != null) { - photo = currentUser.photo.photo_small; - } - } else { - currentChat = (TLRPC.Chat) currentObject; - if (currentChat.photo != null) { - photo = currentChat.photo.photo_small; - } - } + //String newName = null; + /* if (mask != 0) { boolean continueUpdate = false; if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0) { @@ -180,7 +162,8 @@ public class UserCell extends FrameLayout { continueUpdate = true; } } - if (currentUser != null && !continueUpdate && (mask & MessagesController.UPDATE_MASK_STATUS) != 0) { + + if (user_id != 0 && !continueUpdate && (mask & MessagesController.UPDATE_MASK_STATUS) != 0) { int newStatus = 0; if (currentUser.status != null) { newStatus = currentUser.status.expires; @@ -189,6 +172,7 @@ public class UserCell extends FrameLayout { continueUpdate = true; } } + if (!continueUpdate && currentName == null && lastName != null && (mask & MessagesController.UPDATE_MASK_NAME) != 0) { if (currentUser != null) { newName = UserObject.getUserName(currentUser); @@ -203,7 +187,9 @@ public class UserCell extends FrameLayout { return; } } + */ + /* if (currentUser != null) { avatarDrawable.setInfoByUser(currentUser); if (currentUser.status != null) { @@ -214,30 +200,24 @@ public class UserCell extends FrameLayout { } else { avatarDrawable.setInfoByChat(currentChat); } + */ if (currentName != null) { lastName = null; nameTextView.setText(currentName); - } else { + }/* else { if (currentUser != null) { lastName = newName == null ? UserObject.getUserName(currentUser) : newName; } else { lastName = newName == null ? currentChat.title : newName; } nameTextView.setText(lastName); - } - if (currrntStatus != null) { + }*/ + + if (currentStatus != null) { statusTextView.setTextColor(statusColor); - statusTextView.setText(currrntStatus); - } else if (currentUser != null) { - if (currentUser.bot) { - statusTextView.setTextColor(statusColor); - if (currentUser.bot_chat_history || adminImage != null && adminImage.getVisibility() == VISIBLE) { //TODO fix - statusTextView.setText(LocaleController.getString("BotStatusRead", R.string.BotStatusRead)); - } else { - statusTextView.setText(LocaleController.getString("BotStatusCantRead", R.string.BotStatusCantRead)); - } - } else { + statusTextView.setText(currentStatus); + } /* else if (currentUser != null) { if (currentUser.id == UserConfig.getClientUserId() || currentUser.status != null && currentUser.status.expires > ConnectionsManager.getInstance().getCurrentTime() || MessagesController.getInstance().onlinePrivacy.containsKey(currentUser.id)) { statusTextView.setTextColor(statusOnlineColor); statusTextView.setText(LocaleController.getString("Online", R.string.Online)); @@ -245,14 +225,17 @@ public class UserCell extends FrameLayout { statusTextView.setTextColor(statusColor); statusTextView.setText(LocaleController.formatUserStatus(currentUser)); } - } - } + }*/ if (imageView.getVisibility() == VISIBLE && currentDrawable == 0 || imageView.getVisibility() == GONE && currentDrawable != 0) { imageView.setVisibility(currentDrawable == 0 ? GONE : VISIBLE); imageView.setImageResource(currentDrawable); } - avatarImageView.setImage(photo, "50_50", avatarDrawable); + + if( currentName != null ) { + avatarDrawable.setInfoByName(currentName.toString()); + avatarImageView.setImage(photo, "50_50", avatarDrawable); + } } @Override diff --git a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java index 5ce474d08..19eb9fd6d 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java @@ -454,7 +454,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati } TLRPC.User user = MessagesController.getInstance().getUser(selectedContacts.get(i)); - ((UserCell) view).setData(user, null, null, 0); + ((UserCell) view).setData(123, 0, "erruser", "errstatus", 0); return view; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java index 42df36f2e..36dca12cd 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java @@ -51,7 +51,6 @@ import org.telegram.messenger.query.SharedMediaQuery; import org.telegram.messenger.ApplicationLoader; import org.telegram.messenger.support.widget.LinearLayoutManager; import org.telegram.messenger.support.widget.RecyclerView; -import org.telegram.tgnet.ConnectionsManager; import org.telegram.tgnet.TLRPC; import org.telegram.messenger.ContactsController; import org.telegram.messenger.FileLog; @@ -59,8 +58,6 @@ import org.telegram.messenger.MessagesController; import org.telegram.messenger.NotificationCenter; import org.telegram.messenger.R; import org.telegram.messenger.MessageObject; -import org.telegram.messenger.UserConfig; -import org.telegram.messenger.Utilities; import org.telegram.ui.ActionBar.BackDrawable; import org.telegram.ui.ActionBar.SimpleTextView; import org.telegram.ui.Cells.DividerCell; @@ -81,9 +78,7 @@ import org.telegram.ui.Components.RecyclerListView; import org.telegram.ui.ActionBar.Theme; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; + public class ProfileActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, DialogsActivity.DialogsActivityDelegate, PhotoViewer.PhotoViewerProvider { @@ -119,10 +114,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. private float animationProgress; private AvatarUpdater avatarUpdater; - private TLRPC.ChatFull info; private int selectedUser; - private int onlineCount = -1; - private ArrayList sortedUsers; + private int[] sortedUserIds; private final TLRPC.EncryptedChat currentEncryptedChat = null; private TLRPC.Chat currentChat; @@ -143,6 +136,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. private int emptyRowChat2 = -1; private int addMemberRow = -1; private int membersEndRow = -1; + private int membersSectionRow = -1; private int rowCount = 0; @@ -198,8 +192,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. } else if (chat_id != 0) { currentChat = MrMailbox.chatId2chat(chat_id); - sortedUsers = new ArrayList<>(); - updateOnlineCount(); + sortedUserIds = MrMailbox.MrMailboxGetChatContacts(MrMailbox.hMailbox, chat_id); avatarUpdater = new AvatarUpdater(); avatarUpdater.delegate = new AvatarUpdater.AvatarUpdaterDelegate() { @@ -449,18 +442,13 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. builder.setMessage(AndroidUtilities.replaceTags(LocaleController.formatString("AskStartChatWith", R.string.AskStartChatWith, name))); showDialog(builder.create()); } else if (position > emptyRowChat2 && position < membersEndRow) { - int user_id; - if (!sortedUsers.isEmpty()) { - user_id = info.participants.participants.get(sortedUsers.get(position - emptyRowChat2 - 1)).user_id; - } else { - user_id = info.participants.participants.get(position - emptyRowChat2 - 1).user_id; + int curr_user_index = position - emptyRowChat2 - 1; + if(curr_user_index>=0 && curr_user_index emptyRowChat2 && position < membersEndRow) { + /* if (getParentActivity() == null) { return false; } @@ -525,6 +514,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. }); } showDialog(builder.create()); + */ return true; } else { return processOnClickOrPress(position); @@ -661,9 +651,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. return false; } - private void leaveChatPressed() { - } - @Override public void saveSelfArgs(Bundle args) { if (chat_id != 0) { @@ -691,6 +678,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. } private void openAddMember() { + /* Bundle args = new Bundle(); args.putBoolean("onlyUsers", true); args.putBoolean("destroyAfterSelect", true); @@ -718,6 +706,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. fragment.setIgnoreUsers(users); } presentFragment(fragment); + */ } private void checkListViewScroll() { @@ -889,7 +878,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. } } if ((mask & MessagesController.UPDATE_MASK_CHANNEL) != 0 || (mask & MessagesController.UPDATE_MASK_CHAT_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_CHAT_NAME) != 0 || (mask & MessagesController.UPDATE_MASK_CHAT_MEMBERS) != 0 || (mask & MessagesController.UPDATE_MASK_STATUS) != 0) { - updateOnlineCount(); updateProfileData(); } if ((mask & MessagesController.UPDATE_MASK_CHANNEL) != 0) { @@ -1177,140 +1165,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. @Override public int getSelectedCount() { return 0; } - private void updateOnlineCount() { - onlineCount = 0; - int currentTime = ConnectionsManager.getInstance().getCurrentTime(); - sortedUsers.clear(); - if (info instanceof TLRPC.TL_chatFull || info instanceof TLRPC.TL_channelFull && info.participants_count <= 200 && info.participants != null) { - for (int a = 0; a < info.participants.participants.size(); a++) { - TLRPC.ChatParticipant participant = info.participants.participants.get(a); - TLRPC.User user = MessagesController.getInstance().getUser(participant.user_id); - if (user != null && user.status != null && (user.status.expires > currentTime || user.id == UserConfig.getClientUserId()) && user.status.expires > 10000) { - onlineCount++; - } - sortedUsers.add(a); - } - - try { - Collections.sort(sortedUsers, new Comparator() { - @Override - public int compare(Integer lhs, Integer rhs) { - TLRPC.User user1 = MessagesController.getInstance().getUser(info.participants.participants.get(rhs).user_id); - TLRPC.User user2 = MessagesController.getInstance().getUser(info.participants.participants.get(lhs).user_id); - int status1 = 0; - int status2 = 0; - if (user1 != null && user1.status != null) { - if (user1.id == UserConfig.getClientUserId()) { - status1 = ConnectionsManager.getInstance().getCurrentTime() + 50000; - } else { - status1 = user1.status.expires; - } - } - if (user2 != null && user2.status != null) { - if (user2.id == UserConfig.getClientUserId()) { - status2 = ConnectionsManager.getInstance().getCurrentTime() + 50000; - } else { - status2 = user2.status.expires; - } - } - if (status1 > 0 && status2 > 0) { - if (status1 > status2) { - return 1; - } else if (status1 < status2) { - return -1; - } - return 0; - } else if (status1 < 0 && status2 < 0) { - if (status1 > status2) { - return 1; - } else if (status1 < status2) { - return -1; - } - return 0; - } else if (status1 < 0 && status2 > 0 || status1 == 0 && status2 != 0) { - return -1; - } else if (status2 < 0 && status1 > 0 || status2 == 0 && status1 != 0) { - return 1; - } - return 0; - } - }); - } catch (Exception e) { - FileLog.e("tmessages", e); - } - - if (listAdapter != null) { - listAdapter.notifyItemRangeChanged(emptyRowChat2 + 1, sortedUsers.size()); - } - } - } - - /* - public void setChatInfo(TLRPC.ChatFull chatInfo) { - info = chatInfo; - if (info != null && info.migrated_from_chat_id != 0) { - mergeDialogId = -info.migrated_from_chat_id; - } - fetchUsersFromChannelInfo(); - } - */ - - /* - private void fetchUsersFromChannelInfo() { - if (info instanceof TLRPC.TL_channelFull && info.participants != null) { - for (int a = 0; a < info.participants.participants.size(); a++) { - TLRPC.ChatParticipant chatParticipant = info.participants.participants.get(a); - participantsMap.put(chatParticipant.user_id, chatParticipant); - } - } - } - */ - - private void kickUser(int uid) { - if (uid != 0) { - MessagesController.getInstance().deleteUserFromChat(chat_id, MessagesController.getInstance().getUser(uid), info); - if (currentChat.megagroup && info != null && info.participants != null) { - /*boolean changed = false; - for (int a = 0; a < info.participants.participants.size(); a++) { - TLRPC.ChannelParticipant p = ((TLRPC.TL_chatChannelParticipant) info.participants.participants.get(a)).channelParticipant; - if (p.user_id == uid) { - if (info != null) { - info.participants_count--; - } - info.participants.participants.remove(a); - changed = true; - break; - } - } - if (info != null && info.participants != null) { - for (int a = 0; a < info.participants.participants.size(); a++) { - TLRPC.ChatParticipant p = info.participants.participants.get(a); - if (p.user_id == uid) { - info.participants.participants.remove(a); - changed = true; - break; - } - } - } - if (changed) { - updateOnlineCount(); - updateRowsIds(); - listAdapter.notifyDataSetChanged(); - }*/ - } - } else { - NotificationCenter.getInstance().removeObserver(this, NotificationCenter.closeChats); - if (AndroidUtilities.isTablet()) { - NotificationCenter.getInstance().postNotificationName(NotificationCenter.closeChats, -(long) chat_id); - } else { - NotificationCenter.getInstance().postNotificationName(NotificationCenter.closeChats); - } - MessagesController.getInstance().deleteUserFromChat(chat_id, MessagesController.getInstance().getUser(UserConfig.getClientUserId()), info); - playProfileAnimation = false; - finishFragment(); - } - } - public boolean isChat() { return chat_id != 0; } @@ -1332,12 +1186,14 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. addMemberRow = rowCount++; } + //sectionRow = rowCount++; + if( chat_id != 0 ) { - /* + emptyRowChat = rowCount++; + membersSectionRow = rowCount++; emptyRowChat2 = rowCount++; - rowCount += 10; + rowCount += sortedUserIds.length; membersEndRow = rowCount; - */ } @@ -1540,7 +1396,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. if (i == emptyRowChat || i == emptyRowChat2) { ((EmptyCell) holder.itemView).setHeight(AndroidUtilities.dp(8)); } else { - ((EmptyCell) holder.itemView).setHeight(AndroidUtilities.dp(36)); + ((EmptyCell) holder.itemView).setHeight(AndroidUtilities.dp(14)); // was 36 when we used the "writeButton" for taking photos etc. } break; case typeTextDetailCell: @@ -1554,22 +1410,21 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. } else if (i == startChatRow) { textCell.setText(LocaleController.getString("NewChat", R.string.NewChat)); } else if (i == settingsNotificationsRow) { - textCell.setTextAndIcon(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds), R.drawable.profile_list); + textCell.setTextAndIcon(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds), R.drawable.menu_settings); } else if (i == addMemberRow) { textCell.setText(LocaleController.getString("AddMember", R.string.AddMember)); } break; case typeContactCell: UserCell userCell = ((UserCell) holder.itemView); - TLRPC.ChatParticipant part; - if (!sortedUsers.isEmpty()) { - part = info.participants.participants.get(sortedUsers.get(i - emptyRowChat2 - 1)); - } else { - part = info.participants.participants.get(i - emptyRowChat2 - 1); - } - if (part != null) { - userCell.setIsAdmin(0); - userCell.setData(MessagesController.getInstance().getUser(part.user_id), null, null, i == emptyRowChat2 + 1 ? R.drawable.menu_newgroup : 0); + int curr_user_index = i - emptyRowChat2 - 1; + if(curr_user_index>=0 && curr_user_index emptyRowChat2 && i < membersEndRow) { return typeContactCell; } + else if(i==membersSectionRow) { + return typeSection; + } return 0; } } diff --git a/TMessagesProj/src/main/res/drawable-hdpi/bot_info.png b/TMessagesProj/src/main/res/drawable-hdpi/bot_info.png deleted file mode 100644 index 6b5a4a2bad3774f051088c1d66e5c9e3dce7a685..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1674 zcmaJ?c~BE~6kfT+SQHgeD`E%=R3W>YWCIBV3`rK(!bkR1irRJxqW~5N7+pEI!2J!w7x)VNlt$ zie!GYIAl5(WeFImB&p$pU`9p;GlR_}v?(CW+)Ggp@lTp@#F&$ZnV51FMS@4qBl;rppGq7H1y}qV@?S%v15ya@tOf%;R+kt z(nDPXd!rIA>fbJ$To%~#%6vBdRhM1XnB3&sK6+)BshluZ4wYPbus`!umV-W7@0n^E zc4&}21_JGbpN(fPxOTbu$4%G|GY>T>i%JH({N*9qFvK&B&3#6vvS<}g=hcmJ2Z1= zd=ao#C3Gsb9uhzIgyxvxm;RGg9mDI54kLR|XkP#8cY4j?q_0jds<`n>2k@=qv-S5i z!%!~R#fG|H&hM-{qsjJ5xep2U7s*P?CyN(N*x@bGwLL2fcE>xmK5EDh-(411+q9wM zDc8@1hofRUm%+a->1i9P_4TOm@HU4pe>-O+ z_sPnKt-Tz@-lVFi2Eppu;_SlFl-7H0e&?{@6R-1jW+!!5H++|FFSO0`Dm~-z$D%Ce zn=41R4mOL=9AM7>(5Ae=-)C}uHi)){_xlfKRM;T%O{s2PYF^=%>cA(a4FkWWKR(`c zuKsF5Hh16MRYz-F2b(KxPS8w2!9wfqU8=<;%XYdnraI}G4q-X5)$KMuIZwCU#G6VJ zoL(GKIqfT*@O@H~D`jk)tMW2KhBYT!AL{&%yGGkiAR|3$?~{Kbw=TJixg5U#;@H<_ zL$fHd>2YyotKmJ}bhWn6+h$dr$Y;mln1tW2=Q#&&Ig;K!Y0kf1G$C%x z*|atP+@|`Mr_iba;gPg~jx^1C)Aw&~+Pqtu2(S{a2iSA$RhGX)m?T1cGB`2&Z=vRo0_f^0vku*t>;|6%I zTB9}dyy{?IuoH|B`ypdYX$ITm@)hR}w_?*&yeE1-Z00vTZ{?MM&; zMG@e1Mp57-kR>RK68n@ioK`c6D$jt9@yr`>S5(U=b$qd%#@8tgRZ(oUT0(0|z+_c~ zxm+&MkmWQ(q@#_1+HpFF#<~gyiX7sF)WZQt6zyf)q#Dm6-MfMx_GE*olO~ohF}6by z3Q}^VF3>dp5B2>XI-(ZZkN2O#QFS9kqJ<*dBn~Uw%2?tmR0{;z6q72(YuzkX>X_oF zjzdsbRKTevFK}@y8gJuGQ!NJ(wF3v04UK0Cg6Fxao`EG@&dw=WV+z9Jbk2|!Lx*}+ zfl$dx#V*&tPSZyL?Q-3HZlNzXX$3!Io()92E66Po?1T1|Rj+?6xxRWGuG>Ery)Rc} z!H7v=|0;C%h;>i0?6oc1^co)ptlJ4|>t`eP@3ALgl?}ZbfBgC$9=&>I@W89rGvAN= zy76K3@HtbulOBIFvc2=EVWkF{eYy4E-Se9lk6rjNLw>)A9@(RZtjiNmpQ}?ySI}US1v9XkLNC3`vY4=Gx-1j diff --git a/TMessagesProj/src/main/res/drawable-mdpi/bot_info.png b/TMessagesProj/src/main/res/drawable-mdpi/bot_info.png deleted file mode 100644 index d25ea6e3e451b887c53815a430ee1939975b52bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1363 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?TIxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvBDG$-M}euH__U zjxjJW9`kf@45_$vX6kt_Cr6QEyM?Z5tLQGe_UO>JiF#R@F1MIlW=#Ei@c0f_*Fes- zi;u+I^6J>uv?X_k<1fk*`4!=^^L=mRqBi?d^_@Ps%t zCr?&5HN)U|im#Z{{HlG4%`3eAahYv+a7W;?LV~f<9H!q1y~VHRsV7A0&8U$(`M&Ds zga~u)a^_DlKXFgj-5qYIi|e0ykhfHbK~nvVs=KcaM?sfaDPdb6kzgS z@ZzeLP{H&EygCo=?|WPLy|^G%;ckN9>vh(pmzB-*1aD3{ec1a+=ro?&yHxC5-lT2M zo3&JYV(^A8m&&+ByS{Bd5^+l4INy`l51$`+*xyXff0+{WId`v4-Mlk`X6r20*9ZJQ oe|2(X$lTBWZGY`gjA!Cu*gIoWtNoVQd7xs>)78&qol`;+0OW7J{d>HI0tf6(O;X>`a6?vccf5L0z=7Xj0^*HH`E?qKUJT40z0^x7TLvF>UP z_BlJlaH$_sYlc~AOgB*-3xU1<<)BlJXeRSvL#qy9reAXod~V$G~3S3hNHT$ zatkb^8YS=%u|eu@2CQ8Aa=?IaWQ8wQ0zorNIV>XjM47mZK6Y}^f&}R9McBzC`~kBd}@ch$O&0UInc8H z5B2>qIwmc2qW7P~aeELVzJ+4E9XYgcy<+An)antk369zrZ{}HC?qh=EJ`O>BMFCe= zy}-pud~JxgEX@pJVh0W~4INSj&huPNmJGEas)ABBBvEWg)oNX?)g*box~Pz})CZqg@l+cc`}^kete(NU$qPMt42J=mKr?w`8g zHcj(f`Q7)!Ljis>r-k3->(u9G@B7cUgt;?xdT{XMB?I=Edyg((S=;-tmc1{t(KKGv H?mzwmUp+A? diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/bot_info.png b/TMessagesProj/src/main/res/drawable-xhdpi/bot_info.png deleted file mode 100644 index 69c0388ef8ada03e198b8cdea3b5fee7fefa96a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1908 zcmaJ?dstIt96sYFU|te4FoDAX1cB}B3hclpV`s#W0ZoLFS{$}B7_gnO9b^#Vuy};R zE)oh|5S0>1b6QV^P$&Uj8bJ~|FQFBM_Y{X>nRcdP{Slq#Ip_O+-}8Il-|hXLQ2!AkwfK+{1-YD1lO>n|2Sh3&2M48EEEkvKn5wks z7#<4%&VibA1*woFBT7Qcz#KjdlU7fm0U&m%NslQDa1zYHb2T~v^m|7a1Zq?QD3d2+ z%JgD9Pm@??z?YY$q$|q`lzbJmR0zhJ5Q;#HlNe~y7V32-yE@XiK zdX$txmIjIm0}k>SJi3y};(}3p28+kyMzbP7Hj~AHnH-qKp|jWslaH`?;Nu6Pq8U_b zM2;prjzw7lD32ud2n?5$lrTy-48o8Lv-o^I%w)rCHl6aI8%uR0W}@qifl~}9Zd4jH zdQwB^KnEk1Lllz&h|2U)30nOVTAlH6o2Z7tCQJ{r7)(b=Q;ss(|GR3nPrQw!9RDZZ z|0Fi1m+Em?jvI+$gOVDYI?xeHkBAL8MiPc}f+(EoVp<+S62?424~oTLs0>qTbPjvT zLx4<%NOeXM(Z!;mZqTg3RS5<{3qGtF(M+F9 zwj53Us0I5$`bNv#_1jxV#e=VIcnx$4Yh;-#>OOYEo$P`|P^)dPRp+ILYcfJmau#Mw5D7Mt_9 z3s+XhH@k-d`zyI%RYfGN7I-xd9(1(>#{T~Prr%O;7^<;*3%J8^K9(154J>t!mherK$uqyXRG%O0L6zqJ!-@$O=&gGB|&{%UZ)njb^UzU z6u|M`LA%B{W60pUbIUwcWOjH~iN9rrSJ%xe_MC_!^&02Br+0=m=+8YvI~YbJWqj@8 zRdF+BdyaJ=@Ak6T@7-6PY`EaE+%H-6);I?^QDZ8ED9ZvSo z3}ANKYv+2X5ZmHl=23g+T#r%q+PJE?y~}U7r`=}%Rqt8J_;`yvWl?MPckVbo(`|)M zrC%7*8x-$h8if4b{UqWK%cdDO+#1D0-3JRo+vns@)a}Z_>KEA5ZGE(Nk_Qy_h&Df$ z;M~*KqVO#jLe6x$NcM~iuYCH=@liL+A2F?~l=ZJzF4gH$Rux#c{Fwt?j?^|}i#x|@ zwe%4r)%@$`>o0f&>Kfijos&(*8&%p!EKQ=H2 z#s zCK_y2LGgFWH}^b^b0QlGv({F&+Qv$ z-al|c_S4V)i$Vs^v40C!R~!%ZwPozRYu=`}NOWOsCx?XIelz9#gMA(2z^y*@zWmR( z4)Gq8H#9|TTq6p*?oy3f>s;;j??UE$l(oOTC@I11qUfY_kI&_Y*BS#$nL8&AK{WLy%{oji`?a=@L diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/profile_list.png b/TMessagesProj/src/main/res/drawable-xhdpi/profile_list.png deleted file mode 100755 index 1383d6bc616c0700cb5354f8f6e599171618270d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmaJ=&1=*^6i+{>QrjY84+_GNUR2zCHJk3nrgb;jwX3Eq+l4NI+BBJV<2IR?OuK0h zwg^Q;J$MxV058@xK`hjD=<)C^*JEEJ4FszOxNSDXNRM z%N1PFugNBI7$d?kq2m!YMU9S!o?+G?2D5P9b`^T}?K>LSmO@V_bx!wGShXisd^oi- zSvFT{X4<01$G~VP69ETe1BA|k8_1zTH*{sPkIXC$8W3Dl=!2jtdJ(9|hakxeCrpm# zfg~}!n3N>`0uVS}U^z0R1TV@-Nft&x^P`D3-u_v=^y|!HKxWQ1YpuxcOZ4cYX1(BjLix#m$lSmJ);CL-rH)y7bB#aFW zkL4LIx>5|(_5VX1r-cr12_DA#PvM}v>_N5!1GMOyq;PXXkt!6Nza#y#8dcH;GLT*xfnVq@! E2l(DVbN~PV diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/bot_info.png b/TMessagesProj/src/main/res/drawable-xxhdpi/bot_info.png deleted file mode 100644 index c620bbaf6e3f5899fc2e90fd2fea9e1e4b0f0eb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2461 zcmaJ@c{r478z0M{LADvmI%iN3voM31EQ1+Lj4fF@!YnT{AG4SlnGwfQ5v7IbOxfzx zMN``pic-M{<(-OF`7Z((S#zb?cS z0s?__DFLK#_5clSc>O6b>y32nT3PNopV9 z4g#rJvm>HK(bOOUgU3PAmTZt>4qu4|f!w{sd>SJe5W(p{5}WIRc-_&7fU}t%h$tKt zP38LnEOtPK0N9if9Kpy)X5g6!FHg9;n4omP0Yo&on3KX462u;e&wdF?c}a~zz(1Ra zl06V#NJUda;l4Zp0LLM5jtn#g3wOmMF*pp?4dVcJLSvj!XlE40*%9MJK;sD*9Q^Bp zP(~9l6A9rYzpt^BCl3TmB;pfLsPy!7WV$nwCrCnJ@OV55?Syi2a#UJ43ME_-P3*`O zS}%Jb0YZj=%@?tGT=t(RAcK;k`$xz9LK;kjdH~?2fA$cH_8YGj= zB;dSBuHGa!91i2`g29k+Ze*+z*$wZ4Be`ImaX9iamckW^Xj}%cjAj3g#r`9f;41)V zBAy_E$4go6UMPzv;t5$iKHS$AzK%*`u(?ZTyQSKGr3whx+W@AYfX9JZBxq{XY3GSmt*U$2eo~t~jiV5{vsT7NsPETI%fob$VH)9G@le+uSM--zFd6 zD#u-*oap-5ujy<*}Wm zRc7`Nq>rVQk2{R!0)HE3rcVt^UsvIUH-4YoXJ@tKp^lE;lf zs;ly3U0V`yV(rpfHy14?fhzS5`Fa=d8+TM(t`D6szwSQhhT1jFL!HGE*Tbl1rt@m| zHKtTP@w0Xh?TF9m%xjd5?cE>xRGn`yuW?Ue5<7XE7}&*=Z+k=Irvy#Wz+xTul}}#h z5z})Px_%kSQ_r%CNz~Nqc-aDJ(O6s&yS0asWYI?3{I5hzjbWxyX87oaamjp^-fT{i z+>@X4Iz&S_62v!-)*bAvY`8`+v5)Jlz*Ke*wiwYc0-8(4X& zS?wBo{U29;l+D=}>E=2n=(by!x4cN!z^Bwbv&)VSD_6bK=m$PF4N*_Emqeesioc@r zB=Y*@;k_!e&hNTpDv0x`=CBU%D=m}A0{Mb`aK(+d$BRef?fcz{QgXd&R|dzJ zr6}C(*^A%?b+6Dv?ElO@Sf%wmRKI;av4T1>P78&KWcm9<6@I-39-rY?X2ELZkxEu z^+gWxqj}l_4PP77V@$e!f??aIKt5afWNb*albOYV=9=2vo7>V_g)w{>M41ho!kMm6 zA3SRFS4V=U>DkL3y${{3vMO10?`H7qyQV6ml@QV%;i{~LsMCqEq8y$3dao{1p)gK0 z2N8Pqc{LyQls!8XP-9sDemMjSIKO7=+1^Xf(b*3s6OFu*XE(FGn{E3&3mof0WQ~5R zx^4~!98NV99U1t<3!~M{G7A>go52oqAcus}H5G~RWvYEHV~GTZ(BjWBJwIlp_6dte zQmu&bCZaZW;WYHc3B?CP|L$WovN%EGBNAMB4Jd?JTRf|)Cu)c-9$6hXXU@l}7XK#f|+l@jssz8`X{46Qeu zcHI%%>v?h%l3@-h_wnaM1<(sj124o>JjjGK66asVLD3f@{m#LC_RtIEyRyzj?OfdX zAURBMu0%GaSUsQ@qTMY3An5%Chph;5p0)N>ahRaec-RxnqaJfp2t5t{TF4-itKWn3 zU>1ymR|VVU`^hbX?_1}(ds4S21x&S_rdt_lBW}gWy=>=t3u}SevYjWd#OhI|1{>a# zHMW+?{30t(D_f+>ES+T`3}t|JwF4vffd@es@(CD*}*DwzEsQ9cXv? zSp)ScX2AyEuzjulQIrzigfR&*^R9EqVnnaXzWEU}jrw!TDMH)ncOqIu0~lTT&= z;e*zo3vxPTOH-J1px76p!t%}zk<#I&5UW%(NUQz%OR|l%ls^x+cqBZM*0?b*iR$Mt zmGCBW)v{ZC2*>9m9JlkmhiB~t diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/profile_list.png b/TMessagesProj/src/main/res/drawable-xxhdpi/profile_list.png deleted file mode 100755 index b07f5de4dfb10b97e99ebe2810baa851a0d525c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 zcmaJ=O=#3W6i&B`)Y5|0Q&n_G#a8L&Z@XzXcI|FAyX}H0WxJ*8p!+54m*c3H9;@PUU05K@QdBcj)-=03FfuYCfnTWzEb`lni z@f8P7txV*!l?5%T(uqP1#6Jiy3=Az|FUW~5jO2qcJSsGLzcp*ktgUTzDAc-6Z zB1|}>aXb%1k>Lj-qR96Hf#U_1Bd-|Z2c(E734@^a(8Qag&q-N1UGqg&F}jGcEwOB= zRANeD208OAAB{$R4M7MIM95vXu|3gi)fp&2g?#KI2VK=vILpBRtwB%@{aC1GrD_crBP{qi} zA+%V};$#tF*>qKKanf(Fe4{&-utib zHap8)M=-vrm+39_AXK($(#ot~2&tKmktS@f%4&FVfza&I`^-JOUT32hZZH;-f+RYP@su3>- rU+>O#R23`w@jy*KaH>qr-c!mglu+DwyDdKH_wR5fH6cG9y>#Ob%vnqw