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

Fix UI in chat

Browse source
This commit is contained in:
Erwan Croze 2017-05-04 14:53:47 +02:00
parent f8a8883b46
commit b2c0ad48c3
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/android/org/linphone/ChatFragment.java
View file

@ -527,16 +527,6 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
LinphoneActivity.instance().selectMenu(FragmentsAvailable.CHAT); LinphoneActivity.instance().selectMenu(FragmentsAvailable.CHAT);
} }
if(LinphoneManager.getLc().isIncall()){
backToCall.setVisibility(View.VISIBLE);
startCall.setVisibility(View.GONE);
} else {
if(!newChatConversation) {
backToCall.setVisibility(View.GONE);
startCall.setVisibility(View.VISIBLE);
}
}
LinphoneManager.addListener(this); LinphoneManager.addListener(this);
// Force hide keyboard // Force hide keyboard
@ -548,9 +538,20 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
if (contact != null) { if (contact != null) {
contactName.setText(contact.getFullName()); contactName.setText(contact.getFullName());
sipUri = getArguments().getString("sipUriDraft"); sipUri = getArguments().getString("sipUriDraft");
newChatConversation = false;
getArguments().clear(); getArguments().clear();
} }
if(LinphoneManager.getLc().isIncall()){
backToCall.setVisibility(View.VISIBLE);
startCall.setVisibility(View.GONE);
} else {
if(!newChatConversation) {
backToCall.setVisibility(View.GONE);
startCall.setVisibility(View.VISIBLE);
}
}
if (!newChatConversation || contact != null) { if (!newChatConversation || contact != null) {
initChatRoom(sipUri); initChatRoom(sipUri);
searchContactField.setVisibility(View.GONE); searchContactField.setVisibility(View.GONE);