Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Group chat room creating ok; started display of events

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-31 17:48:43 +01:00
parent de0fee9306
commit d9921a810e
3 changed files with 49 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/android/org/linphone/chat/ChatEventsAdapter.java
View file

@ -251,7 +251,35 @@ public class ChatEventsAdapter extends BaseAdapter {
} else { } else {
holder.eventLayout.setVisibility(View.VISIBLE); 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)); holder.eventTime.setText(LinphoneUtils.timestampToHumanDate(mContext, event.getTime(), R.string.messages_date_format));
} }

53
src/android/org/linphone/chat/ChatListFragment.java
View file

@ -79,34 +79,34 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
mInflater = inflater; mInflater = inflater;
View view = inflater.inflate(R.layout.chatlist, container, false); 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); chatList.setOnItemClickListener(this);
registerForContextMenu(chatList); registerForContextMenu(chatList);
noChatHistory = (TextView) view.findViewById(R.id.noChatHistory); noChatHistory = view.findViewById(R.id.noChatHistory);
editList = (LinearLayout) view.findViewById(R.id.edit_list); editList = view.findViewById(R.id.edit_list);
topbar = (LinearLayout) view.findViewById(R.id.top_bar); topbar = view.findViewById(R.id.top_bar);
cancel = (ImageView) view.findViewById(R.id.cancel); cancel = view.findViewById(R.id.cancel);
cancel.setOnClickListener(this); cancel.setOnClickListener(this);
edit = (ImageView) view.findViewById(R.id.edit); edit = view.findViewById(R.id.edit);
edit.setOnClickListener(this); edit.setOnClickListener(this);
newDiscussion = (ImageView) view.findViewById(R.id.new_discussion); newDiscussion = view.findViewById(R.id.new_discussion);
newDiscussion.setOnClickListener(this); newDiscussion.setOnClickListener(this);
selectAll = (ImageView) view.findViewById(R.id.select_all); selectAll = view.findViewById(R.id.select_all);
selectAll.setOnClickListener(this); selectAll.setOnClickListener(this);
deselectAll = (ImageView) view.findViewById(R.id.deselect_all); deselectAll = view.findViewById(R.id.deselect_all);
deselectAll.setOnClickListener(this); deselectAll.setOnClickListener(this);
backInCall = (ImageView) view.findViewById(R.id.back_in_call); backInCall = view.findViewById(R.id.back_in_call);
backInCall.setOnClickListener(this); backInCall.setOnClickListener(this);
delete = (ImageView) view.findViewById(R.id.delete); delete = view.findViewById(R.id.delete);
delete.setOnClickListener(this); delete.setOnClickListener(this);
mListener = new CoreListenerStub() { mListener = new CoreListenerStub() {
@ -310,8 +310,8 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
if (id == R.id.delete) { if (id == R.id.delete) {
final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text)); final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
Button delete = (Button) dialog.findViewById(R.id.delete_button); Button delete = dialog.findViewById(R.id.delete_button);
Button cancel = (Button) dialog.findViewById(R.id.cancel); Button cancel = dialog.findViewById(R.id.cancel);
delete.setOnClickListener(new OnClickListener() { delete.setOnClickListener(new OnClickListener() {
@Override @Override
@ -341,21 +341,6 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
} }
else if (id == R.id.new_discussion) { else if (id == R.id.new_discussion) {
LinphoneActivity.instance().goToChatCreator(null, false); 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 ImageView contactPicture;
public ViewHolder(View view) { public ViewHolder(View view) {
lastMessageView = (TextView) view.findViewById(R.id.lastMessage); lastMessageView = view.findViewById(R.id.lastMessage);
date = (TextView) view.findViewById(R.id.date); date = view.findViewById(R.id.date);
displayName = (TextView) view.findViewById(R.id.sipUri); displayName = view.findViewById(R.id.sipUri);
unreadMessages = (TextView) view.findViewById(R.id.unreadMessages); unreadMessages = view.findViewById(R.id.unreadMessages);
select = (CheckBox) view.findViewById(R.id.delete_chatroom); select = view.findViewById(R.id.delete_chatroom);
contactPicture = (ImageView) view.findViewById(R.id.contact_picture); contactPicture = view.findViewById(R.id.contact_picture);
} }
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 94c08dce7f21f9ce03361282cad8ca12b1258d1a Subproject commit 2a64f69f359745c72dff28f9778eefa712f60cbd