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

Added secured chat shortcut in history detail view

Browse source
This commit is contained in:
Sylvain Berfini 2019-04-11 10:54:21 +02:00
parent fa5922bb72
commit e85e55f676
3 changed files with 50 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/src/main/java/org/linphone/history/HistoryDetailFragment.java
View file

@ -40,6 +40,7 @@ import org.linphone.core.ChatRoomListenerStub;
import org.linphone.core.ChatRoomParams;
import org.linphone.core.Core;
import org.linphone.core.Factory;
import org.linphone.core.FriendCapability;
import org.linphone.core.ProxyConfig;
import org.linphone.core.tools.Log;
import org.linphone.fragments.FragmentsAvailable;
@ -53,7 +54,7 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
private ImageView mCallDirection;
private TextView mContactName, mContactAddress, mTime, mDate;
private String mSipUri, mDisplayName;
private RelativeLayout mWaitLayout, mAvatarLayout;
private RelativeLayout mWaitLayout, mAvatarLayout, mChatSecured;
private LinphoneContact mContact;
private ChatRoom mChatRoom;
private ChatRoomListenerStub mChatRoomCreationListener;
@ -84,8 +85,14 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
mChat = mView.findViewById(R.id.chat);
mChat.setOnClickListener(this);
if (getResources().getBoolean(R.bool.disable_chat))
mView.findViewById(R.id.chat).setVisibility(View.GONE);
mChatSecured = mView.findViewById(R.id.chat_secured);
mChatSecured.setOnClickListener(this);
if (getResources().getBoolean(R.bool.disable_chat)) {
mChat.setVisibility(View.GONE);
mChatSecured.setVisibility(View.GONE);
}
mAddToContacts = mView.findViewById(R.id.add_contact);
mAddToContacts.setOnClickListener(this);
@ -146,6 +153,7 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
} else if (status.equals(getResources().getString(R.string.outgoing))) {
mCallDirection.setImageResource(R.drawable.call_outgoing);
}
mChatSecured.setVisibility(View.GONE);
mTime.setText(callTime == null ? "" : callTime);
Long longDate = Long.parseLong(callDate);
@ -164,6 +172,12 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
ContactAvatar.displayAvatar(mContact, mAvatarLayout);
mAddToContacts.setVisibility(View.GONE);
mGoToContact.setVisibility(View.VISIBLE);
if (!getResources().getBoolean(R.bool.disable_chat)
&& mContact.hasPresenceModelForUriOrTelCapability(
mSipUri, FriendCapability.LimeX3Dh)) {
mChatSecured.setVisibility(View.VISIBLE);
}
} else {
mContactName.setText(
mDisplayName == null
@ -212,12 +226,13 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
}
if (id == R.id.call) {
LinphoneActivity.instance().setAddresGoToDialerAndCall(mSipUri, mDisplayName);
} else if (id == R.id.chat) {
} else if (id == R.id.chat || id == R.id.chat_secured) {
boolean isSecured = id == R.id.chat_secured;
Core lc = LinphoneManager.getLc();
Address participant = Factory.instance().createAddress(mSipUri);
ChatRoom room =
lc.findOneToOneChatRoom(
lc.getDefaultProxyConfig().getContact(), participant, false);
lc.getDefaultProxyConfig().getContact(), participant, isSecured);
if (room != null) {
LinphoneActivity.instance()
.goToChat(
@ -228,11 +243,12 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
ProxyConfig lpc = lc.getDefaultProxyConfig();
if (lpc != null
&& lpc.getConferenceFactoryUri() != null
&& !LinphonePreferences.instance().useBasicChatRoomFor1To1()) {
&& (isSecured
|| !LinphonePreferences.instance().useBasicChatRoomFor1To1())) {
mWaitLayout.setVisibility(View.VISIBLE);
ChatRoomParams params = lc.createDefaultChatRoomParams();
params.enableEncryption(false);
params.enableEncryption(isSecured);
params.enableGroup(false);
// We don't want a basic chat room
params.setBackend(ChatRoomBackend.FlexisipChat);

4
app/src/main/res/layout-land/about.xml
View file

@ -97,7 +97,7 @@
<TextView
android:id="@+id/privaci_policy_link"
style="@style/about_license_font"
style="@style/link_font"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -109,7 +109,7 @@
<TextView
android:id="@+id/about_text"
style="@style/link_font"
style="@style/about_license_font"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"

25
app/src/main/res/layout/history_detail.xml
View file

@ -112,6 +112,31 @@
android:contentDescription="@string/content_description_chat"
android:src="@drawable/chat_start_default" />
<RelativeLayout
android:id="@+id/chat_secured"
android:layout_width="65dp"
android:layout_height="60dp"
android:layout_margin="10dp">
<ImageView
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:background="@drawable/round_orange_button_background"
android:contentDescription="@string/content_description_chat"
android:src="@drawable/chat_start_default" />
<ImageView
android:id="@+id/security_level"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:src="@drawable/security_toogle_icon_green" />
</RelativeLayout>
</LinearLayout>
<LinearLayout