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

Fixed code duplication

Browse source
This commit is contained in:
Sylvain Berfini 2018-02-13 14:02:13 +01:00
parent 528edd5f97
commit 42322ad324
2 changed files with 28 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/android/org/linphone/contacts/ContactDetailsFragment.java
View file

@ -77,26 +77,21 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly()); LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly());
} else { } else {
mWaitLayout.setVisibility(View.VISIBLE); mWaitLayout.setVisibility(View.VISIBLE);
room = lc.findOneToOneChatRoom(lc.getDefaultProxyConfig().getContact(), participant); room = LinphoneManager.getLc().createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject));
if (room == null) { room.setListener(new ChatRoomListenerStub() {
room = LinphoneManager.getLc().createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); @Override
room.setListener(new ChatRoomListenerStub() { public void onStateChanged(ChatRoom cr, ChatRoom.State newState) {
@Override if (newState == ChatRoom.State.Created) {
public void onStateChanged(ChatRoom cr, ChatRoom.State newState) { mWaitLayout.setVisibility(View.GONE);
if (newState == ChatRoom.State.Created) { LinphoneActivity.instance().goToChat(cr.getPeerAddress().asStringUriOnly());
mWaitLayout.setVisibility(View.GONE); } else if (newState == ChatRoom.State.CreationFailed) {
LinphoneActivity.instance().goToChat(cr.getPeerAddress().asStringUriOnly()); mWaitLayout.setVisibility(View.GONE);
} else if (newState == ChatRoom.State.CreationFailed) { LinphoneActivity.instance().displayChatRoomError();
mWaitLayout.setVisibility(View.GONE); Log.e("Group chat room for address " + cr.getPeerAddress() + " has failed !");
LinphoneActivity.instance().displayChatRoomError();
Log.e("Group chat room for address " + cr.getPeerAddress() + " has failed !");
}
} }
}); }
room.addParticipant(participant); });
} else { room.addParticipant(participant);
LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly());
}
} }
} }
} }

33
src/android/org/linphone/fragments/HistoryDetailFragment.java
View file

@ -176,26 +176,21 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly()); LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly());
} else { } else {
mWaitLayout.setVisibility(View.VISIBLE); mWaitLayout.setVisibility(View.VISIBLE);
room = lc.findOneToOneChatRoom(lc.getDefaultProxyConfig().getContact(), participant); room = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject));
if (room == null) { room.setListener(new ChatRoomListenerStub() {
room = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); @Override
room.setListener(new ChatRoomListenerStub() { public void onStateChanged(ChatRoom cr, ChatRoom.State newState) {
@Override if (newState == ChatRoom.State.Created) {
public void onStateChanged(ChatRoom cr, ChatRoom.State newState) { mWaitLayout.setVisibility(View.GONE);
if (newState == ChatRoom.State.Created) { LinphoneActivity.instance().goToChat(cr.getPeerAddress().asStringUriOnly());
mWaitLayout.setVisibility(View.GONE); } else if (newState == ChatRoom.State.CreationFailed) {
LinphoneActivity.instance().goToChat(cr.getPeerAddress().asStringUriOnly()); mWaitLayout.setVisibility(View.GONE);
} else if (newState == ChatRoom.State.CreationFailed) { LinphoneActivity.instance().displayChatRoomError();
mWaitLayout.setVisibility(View.GONE); Log.e("Group chat room for address " + cr.getPeerAddress() + " has failed !");
LinphoneActivity.instance().displayChatRoomError();
Log.e("Group chat room for address " + cr.getPeerAddress() + " has failed !");
}
} }
}); }
room.addParticipant(participant); });
} else { room.addParticipant(participant);
LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly());
}
} }
} else if (id == R.id.add_contact) { } else if (id == R.id.add_contact) {
Address addr = Factory.instance().createAddress(sipUri); Address addr = Factory.instance().createAddress(sipUri);