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

Hide media encryption none icon in call status fragment if user did not enable it

Browse source
This commit is contained in:
Sylvain Berfini 2018-10-25 19:18:11 +02:00
parent a4ca1c8efe
commit c975235cb1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/android/org/linphone/fragments/StatusFragment.java
View file

@ -39,6 +39,7 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import org.linphone.LinphoneManager; import org.linphone.LinphoneManager;
import org.linphone.LinphonePreferences;
import org.linphone.LinphoneService; import org.linphone.LinphoneService;
import org.linphone.R; import org.linphone.R;
import org.linphone.activities.LinphoneActivity; import org.linphone.activities.LinphoneActivity;
@ -319,7 +320,6 @@ public class StatusFragment extends Fragment {
refreshStatusItems(call, call.getCurrentParams().videoEnabled()); refreshStatusItems(call, call.getCurrentParams().videoEnabled());
} }
menu.setVisibility(View.INVISIBLE); menu.setVisibility(View.INVISIBLE);
encryption.setVisibility(View.VISIBLE);
callQuality.setVisibility(View.VISIBLE); callQuality.setVisibility(View.VISIBLE);
// We are obviously connected // We are obviously connected
@ -363,12 +363,17 @@ public class StatusFragment extends Fragment {
//background.setVisibility(View.VISIBLE); //background.setVisibility(View.VISIBLE);
} }
encryption.setVisibility(View.VISIBLE);
if (mediaEncryption == MediaEncryption.SRTP || (mediaEncryption == MediaEncryption.ZRTP && call.getAuthenticationTokenVerified()) || mediaEncryption == MediaEncryption.DTLS) { if (mediaEncryption == MediaEncryption.SRTP || (mediaEncryption == MediaEncryption.ZRTP && call.getAuthenticationTokenVerified()) || mediaEncryption == MediaEncryption.DTLS) {
encryption.setImageResource(R.drawable.security_ok); encryption.setImageResource(R.drawable.security_ok);
} else if (mediaEncryption == MediaEncryption.ZRTP && !call.getAuthenticationTokenVerified()) { } else if (mediaEncryption == MediaEncryption.ZRTP && !call.getAuthenticationTokenVerified()) {
encryption.setImageResource(R.drawable.security_pending); encryption.setImageResource(R.drawable.security_pending);
} else { } else {
encryption.setImageResource(R.drawable.security_ko); encryption.setImageResource(R.drawable.security_ko);
// Do not show the unsecure icon if user doesn't want to do call encryption
if (LinphonePreferences.instance().getMediaEncryption() == MediaEncryption.None) {
encryption.setVisibility(View.GONE);
}
} }
if (mediaEncryption == MediaEncryption.ZRTP) { if (mediaEncryption == MediaEncryption.ZRTP) {