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

Added LIME security dialog on security level icon click

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-08 16:03:17 +01:00
parent 1e1b9628e2
commit b5362bbee3
3 changed files with 83 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/values/strings.xml
View file

@ -225,6 +225,7 @@
<string name="chat_room_devices">%s\'s devices</string>
<string name="group_chat_room_devices">Conversation\'s devices</string>
<string name="add_to_contacts">Add to contacts</string>
<string name="lime_security_popup">Instant messages are end-to-end encrypted in secured conversations. It is possible to upgrade the security level of a conversation by authenticating participants. To do so, call the contact and follow the authentification process.</string>
<!-- Status Bar -->
<string name="status_connected">Registered</string>

8
src/android/org/linphone/LinphonePreferences.java
View file

@ -1540,6 +1540,14 @@ public class LinphonePreferences {
getConfig().setBool("app", "link_popup_enabled", enable);
}
public boolean isLimeSecurityPopupEnabled() {
return getConfig().getBool("app", "lime_security_popup_enabled", true);
}
public void enableLimeSecurityPopup(boolean enable) {
getConfig().setBool("app", "lime_security_popup_enabled", enable);
}
public String getDebugPopupAddress() {
return getConfig().getString("app", "debug_popup_magic", null);
}

79
src/android/org/linphone/chat/GroupChatFragment.java
View file

@ -49,16 +49,19 @@ import android.view.ViewTreeObserver;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import org.linphone.LinphoneManager;
import org.linphone.LinphonePreferences;
import org.linphone.LinphoneService;
import org.linphone.LinphoneUtils;
import org.linphone.R;
import org.linphone.activities.LinphoneActivity;
import org.linphone.assistant.AssistantActivity;
import org.linphone.compatibility.Compatibility;
import org.linphone.contacts.ContactAddress;
import org.linphone.contacts.ContactsManager;
@ -76,6 +79,7 @@ import org.linphone.core.EventLog;
import org.linphone.core.Factory;
import org.linphone.core.LimeState;
import org.linphone.core.Participant;
import org.linphone.core.ParticipantDevice;
import org.linphone.core.Reason;
import org.linphone.mediastream.Log;
import org.linphone.ui.SelectableHelper;
@ -106,7 +110,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
private Uri mImageToUploadUri;
private ChatEventsAdapter mEventsAdapter;
private String mRemoteSipUri;
private Address mRemoteSipAddress, mRemoteParticipantAddress, mLocalIdentityAddress;
private Address mRemoteSipAddress, mRemoteParticipantAddress;
private ChatRoom mChatRoom;
private ArrayList<LinphoneContact> mParticipants;
private LinearLayoutManager layoutManager;
@ -126,10 +130,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
mRemoteSipUri = getArguments().getString("SipUri");
mRemoteSipAddress = LinphoneManager.getLc().createAddress(mRemoteSipUri);
}
if (getArguments().getString("LocalIdentity") != null) {
String localIdentity = getArguments().getString("LocalIdentity");
mLocalIdentityAddress = LinphoneManager.getLc().createAddress(localIdentity);
}
}
mContext = getActivity().getApplicationContext();
@ -142,8 +142,25 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
mChatRoomSecurityLevel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
boolean oneParticipantOneDevice = false;
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
ParticipantDevice[] devices = mChatRoom.getParticipants()[0].getDevices();
if (devices.length == 1) {
oneParticipantOneDevice = true;
}
}
if (LinphonePreferences.instance().isLimeSecurityPopupEnabled()) {
showSecurityDialog(oneParticipantOneDevice);
} else {
if (oneParticipantOneDevice) {
ParticipantDevice device = mChatRoom.getParticipants()[0].getDevices()[0];
LinphoneManager.getLc().inviteAddress(device.getAddress());
} else {
LinphoneActivity.instance().goToContactDevicesInfos(getRemoteSipUri());
}
}
}
});
mBackButton = view.findViewById(R.id.back);
@ -435,7 +452,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
@Override
public boolean onContextItemSelected(MenuItem item) {
EventLog event = (EventLog) mEventsAdapter.getItem(mContextMenuMessagePosition);
if (event.getType() != EventLog.Type.ConferenceChatMessage) {
@ -662,6 +678,57 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
scrollToBottom();
}
private void showSecurityDialog(boolean oneParticipantOneDevice) {
final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.lime_security_popup));
Button delete = dialog.findViewById(R.id.delete_button);
delete.setVisibility(View.GONE);
Button ok = dialog.findViewById(R.id.ok_button);
ok.setText(oneParticipantOneDevice ? getString(R.string.call) : getString(R.string.ok));
ok.setVisibility(View.VISIBLE);
Button cancel = dialog.findViewById(R.id.cancel);
cancel.setText(getString(R.string.cancel));
dialog.findViewById(R.id.doNotAskAgainLayout).setVisibility(View.VISIBLE);
final CheckBox doNotAskAgain = dialog.findViewById(R.id.doNotAskAgain);
dialog.findViewById(R.id.doNotAskAgainLabel).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
doNotAskAgain.setChecked(!doNotAskAgain.isChecked());
}
});
ok.setTag(oneParticipantOneDevice);
ok.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
boolean oneParticipantOneDevice = (boolean) view.getTag();
if (doNotAskAgain.isChecked()) {
LinphonePreferences.instance().enableLimeSecurityPopup(false);
}
if (oneParticipantOneDevice) {
ParticipantDevice device = mChatRoom.getParticipants()[0].getDevices()[0];
LinphoneManager.getLc().inviteAddress(device.getAddress());
} else {
LinphoneActivity.instance().goToContactDevicesInfos(getRemoteSipUri());
}
dialog.dismiss();
}
});
cancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (doNotAskAgain.isChecked()) {
LinphonePreferences.instance().enableLimeSecurityPopup(false);
}
dialog.dismiss();
}
});
dialog.show();
}
public void scrollToBottom() {
mChatEventsList.getLayoutManager().scrollToPosition(0);
}