From d9921a810e4dcc5b90cc9ce97eee75fa8afe2dd9 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 31 Oct 2017 17:48:43 +0100 Subject: [PATCH] Group chat room creating ok; started display of events --- .../org/linphone/chat/ChatEventsAdapter.java | 30 ++++++++++- .../org/linphone/chat/ChatListFragment.java | 53 +++++++------------ submodules/linphone | 2 +- 3 files changed, 49 insertions(+), 36 deletions(-) diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java index ff03dca44..4ad8e8bc4 100644 --- a/src/android/org/linphone/chat/ChatEventsAdapter.java +++ b/src/android/org/linphone/chat/ChatEventsAdapter.java @@ -251,7 +251,35 @@ public class ChatEventsAdapter extends BaseAdapter { } else { holder.eventLayout.setVisibility(View.VISIBLE); - holder.eventMessage.setText(""); //TODO + Log.e("Conference event type is " + event.getType().toString()); + //TODO + switch (event.getType()) { + case ConferenceCreated: + holder.eventMessage.setText("Created"); + break; + case ConferenceDestroyed: + holder.eventMessage.setText("Destroyed"); + break; + case ConferenceParticipantAdded: + holder.eventMessage.setText("Participant added"); + break; + case ConferenceParticipantRemoved: + holder.eventMessage.setText("Participant removed"); + break; + case ConferenceSubjectChanged: + holder.eventMessage.setText("Subject changed"); + break; + case ConferenceParticipantSetAdmin: + holder.eventMessage.setText("Admin set"); + break; + case ConferenceParticipantUnsetAdmin: + holder.eventMessage.setText("Admin unset"); + break; + case None: + default: + //TODO + break; + } holder.eventTime.setText(LinphoneUtils.timestampToHumanDate(mContext, event.getTime(), R.string.messages_date_format)); } diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java index 587ab73cb..cd7d78f6c 100644 --- a/src/android/org/linphone/chat/ChatListFragment.java +++ b/src/android/org/linphone/chat/ChatListFragment.java @@ -79,34 +79,34 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte mInflater = inflater; View view = inflater.inflate(R.layout.chatlist, container, false); - chatList = (ListView) view.findViewById(R.id.chatList); + chatList = view.findViewById(R.id.chatList); chatList.setOnItemClickListener(this); registerForContextMenu(chatList); - noChatHistory = (TextView) view.findViewById(R.id.noChatHistory); + noChatHistory = view.findViewById(R.id.noChatHistory); - editList = (LinearLayout) view.findViewById(R.id.edit_list); - topbar = (LinearLayout) view.findViewById(R.id.top_bar); + editList = view.findViewById(R.id.edit_list); + topbar = view.findViewById(R.id.top_bar); - cancel = (ImageView) view.findViewById(R.id.cancel); + cancel = view.findViewById(R.id.cancel); cancel.setOnClickListener(this); - edit = (ImageView) view.findViewById(R.id.edit); + edit = view.findViewById(R.id.edit); edit.setOnClickListener(this); - newDiscussion = (ImageView) view.findViewById(R.id.new_discussion); + newDiscussion = view.findViewById(R.id.new_discussion); newDiscussion.setOnClickListener(this); - selectAll = (ImageView) view.findViewById(R.id.select_all); + selectAll = view.findViewById(R.id.select_all); selectAll.setOnClickListener(this); - deselectAll = (ImageView) view.findViewById(R.id.deselect_all); + deselectAll = view.findViewById(R.id.deselect_all); deselectAll.setOnClickListener(this); - backInCall = (ImageView) view.findViewById(R.id.back_in_call); + backInCall = view.findViewById(R.id.back_in_call); backInCall.setOnClickListener(this); - delete = (ImageView) view.findViewById(R.id.delete); + delete = view.findViewById(R.id.delete); delete.setOnClickListener(this); mListener = new CoreListenerStub() { @@ -310,8 +310,8 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte if (id == R.id.delete) { final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text)); - Button delete = (Button) dialog.findViewById(R.id.delete_button); - Button cancel = (Button) dialog.findViewById(R.id.cancel); + Button delete = dialog.findViewById(R.id.delete_button); + Button cancel = dialog.findViewById(R.id.cancel); delete.setOnClickListener(new OnClickListener() { @Override @@ -341,21 +341,6 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte } else if (id == R.id.new_discussion) { LinphoneActivity.instance().goToChatCreator(null, false); - /*String sipUri = fastNewChat.getText().toString(); - if (sipUri.equals("")) { - LinphoneActivity.instance().displayContacts(true); - } else { - if (!LinphoneUtils.isSipAddress(sipUri)) { - if (LinphoneManager.getLc().getDefaultProxyConfig() == null) { - return; - } - sipUri = sipUri + "@" + LinphoneManager.getLc().getDefaultProxyConfig().getDomain(); - } - if (!LinphoneUtils.isStrictSipAddress(sipUri)) { - sipUri = "sip:" + sipUri; - } - - }*/ } } @@ -383,12 +368,12 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte public ImageView contactPicture; public ViewHolder(View view) { - lastMessageView = (TextView) view.findViewById(R.id.lastMessage); - date = (TextView) view.findViewById(R.id.date); - displayName = (TextView) view.findViewById(R.id.sipUri); - unreadMessages = (TextView) view.findViewById(R.id.unreadMessages); - select = (CheckBox) view.findViewById(R.id.delete_chatroom); - contactPicture = (ImageView) view.findViewById(R.id.contact_picture); + lastMessageView = view.findViewById(R.id.lastMessage); + date = view.findViewById(R.id.date); + displayName = view.findViewById(R.id.sipUri); + unreadMessages = view.findViewById(R.id.unreadMessages); + select = view.findViewById(R.id.delete_chatroom); + contactPicture = view.findViewById(R.id.contact_picture); } } diff --git a/submodules/linphone b/submodules/linphone index 94c08dce7..2a64f69f3 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 94c08dce7f21f9ce03361282cad8ca12b1258d1a +Subproject commit 2a64f69f359745c72dff28f9778eefa712f60cbd