From 27f1796251d0782d2026ecbef3acbee4817d45c8 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 22 Sep 2016 12:21:45 +0200 Subject: [PATCH] Fixed check permission + DTMF RFC and SIP can be used at the same time --- src/org/linphone/CallActivity.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java index f83ec9abb..07ada044d 100644 --- a/src/org/linphone/CallActivity.java +++ b/src/org/linphone/CallActivity.java @@ -622,9 +622,8 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve if (camera == PackageManager.PERMISSION_GRANTED) { disableVideo(isVideoEnabled(LinphoneManager.getLc().getCurrentCall())); } else { - if (LinphonePreferences.instance().firstTimeAskingForPermission(Manifest.permission.CAMERA) || ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.CAMERA)) { - checkAndRequestPermission(Manifest.permission.CAMERA, PERMISSIONS_ENABLED_CAMERA); - } + checkAndRequestPermission(Manifest.permission.CAMERA, PERMISSIONS_ENABLED_CAMERA); + } } else if (id == R.id.micro) { @@ -634,9 +633,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve if (recordAudio == PackageManager.PERMISSION_GRANTED) { toggleMicro(); } else { - if (LinphonePreferences.instance().firstTimeAskingForPermission(Manifest.permission.RECORD_AUDIO) || ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.RECORD_AUDIO)) { - checkAndRequestPermission(Manifest.permission.RECORD_AUDIO, PERMISSIONS_ENABLED_MIC); - } + checkAndRequestPermission(Manifest.permission.RECORD_AUDIO, PERMISSIONS_ENABLED_MIC); } } else if (id == R.id.speaker) {