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

Merge branch 'fix/comment'

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-14 18:01:13 +01:00
commit 489a99b118
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -423,12 +423,6 @@ public class StatusFragment extends Fragment {
zrtpToRead = token.substring(2); zrtpToRead = token.substring(2);
} }
// Obiane specific dev : display sas notif only if screen locked
KeyguardManager myKM = (KeyguardManager) getActivity().getSystemService(Context.KEYGUARD_SERVICE);
if (myKM.inKeyguardRestrictedInputMode()) {
//Screen is locked
LinphoneService.instance().displaySasNotification(call.getAuthenticationToken());
}
TextView customText = ZRTPdialog.findViewById(R.id.customText); TextView customText = ZRTPdialog.findViewById(R.id.customText);
String newText = getString(R.string.zrtp_dialog1).replace("%s", zrtpToRead) String newText = getString(R.string.zrtp_dialog1).replace("%s", zrtpToRead)
+ getString(R.string.zrtp_dialog2).replace("%s", zrtpToListen); + getString(R.string.zrtp_dialog2).replace("%s", zrtpToListen);