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

Disable media encryption mandatory setting if media encryption set to None + display security icon on incoming call view if media encryption is mandatory

Browse source
This commit is contained in:
Sylvain Berfini 2019-11-14 10:01:08 +01:00
parent 9cab87e847
commit f96239bcda
3 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/linphone/call/CallStatusBarFragment.java
View file

@ -288,9 +288,19 @@ public class CallStatusBarFragment extends Fragment {
public void refreshStatusItems(final Call call) { public void refreshStatusItems(final Call call) {
if (call != null) { if (call != null) {
MediaEncryption mediaEncryption = call.getCurrentParams().getMediaEncryption(); if (call.getDir() == Call.Dir.Incoming
&& call.getState() == Call.State.IncomingReceived
&& LinphonePreferences.instance().isMediaEncryptionMandatory()) {
// If the incoming call view is displayed while encryption is mandatory,
// we can safely show the security_ok icon
mEncryption.setImageResource(R.drawable.security_ok);
mEncryption.setVisibility(View.VISIBLE); mEncryption.setVisibility(View.VISIBLE);
return;
}
MediaEncryption mediaEncryption = call.getCurrentParams().getMediaEncryption();
mEncryption.setVisibility(View.VISIBLE);
if (mediaEncryption == MediaEncryption.SRTP if (mediaEncryption == MediaEncryption.SRTP
|| (mediaEncryption == MediaEncryption.ZRTP || (mediaEncryption == MediaEncryption.ZRTP
&& call.getAuthenticationTokenVerified()) && call.getAuthenticationTokenVerified())

14
app/src/main/java/org/linphone/settings/CallSettingsFragment.java
View file

@ -167,8 +167,15 @@ public class CallSettingsFragment extends SettingsFragment {
@Override @Override
public void onListValueChanged(int position, String newLabel, String newValue) { public void onListValueChanged(int position, String newLabel, String newValue) {
try { try {
mPrefs.setMediaEncryption( MediaEncryption encryption =
MediaEncryption.fromInt(Integer.parseInt(newValue))); MediaEncryption.fromInt(Integer.parseInt(newValue));
mPrefs.setMediaEncryption(encryption);
if (encryption == MediaEncryption.None) {
mMediaEncryptionMandatory.setChecked(false);
}
mMediaEncryptionMandatory.setEnabled(
encryption != MediaEncryption.None);
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
Log.e(nfe); Log.e(nfe);
} }
@ -248,7 +255,8 @@ public class CallSettingsFragment extends SettingsFragment {
mDndPermissionSettings.setVisibility( mDndPermissionSettings.setVisibility(
Version.sdkAboveOrEqual(Version.API23_MARSHMALLOW_60) ? View.VISIBLE : View.GONE); Version.sdkAboveOrEqual(Version.API23_MARSHMALLOW_60) ? View.VISIBLE : View.GONE);
mMediaEncryptionMandatory.setChecked(mPrefs.acceptMediaEncryptionMandatory()); mMediaEncryptionMandatory.setChecked(mPrefs.isMediaEncryptionMandatory());
mMediaEncryptionMandatory.setEnabled(mPrefs.getMediaEncryption() != MediaEncryption.None);
setListeners(); setListeners();
} }

2
app/src/main/java/org/linphone/settings/LinphonePreferences.java
View file

@ -459,7 +459,7 @@ public class LinphonePreferences {
// End of contact settings // End of contact settings
// Call settings // Call settings
public boolean acceptMediaEncryptionMandatory() { public boolean isMediaEncryptionMandatory() {
return getLc().isMediaEncryptionMandatory(); return getLc().isMediaEncryptionMandatory();
} }