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

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

@ -77,8 +77,6 @@ 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);
if (room == null) {
room = LinphoneManager.getLc().createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); room = LinphoneManager.getLc().createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject));
room.setListener(new ChatRoomListenerStub() { room.setListener(new ChatRoomListenerStub() {
@Override @Override
@ -94,9 +92,6 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
} }
}); });
room.addParticipant(participant); room.addParticipant(participant);
} else {
LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly());
}
} }
} }
} }

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

@ -176,8 +176,6 @@ 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);
if (room == null) {
room = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); room = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject));
room.setListener(new ChatRoomListenerStub() { room.setListener(new ChatRoomListenerStub() {
@Override @Override
@ -193,9 +191,6 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
} }
}); });
room.addParticipant(participant); room.addParticipant(participant);
} else {
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);