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

Fixed check permission + DTMF RFC and SIP can be used at the same time

Browse source
This commit is contained in:
Erwan Croze 2016-09-22 12:21:45 +02:00
parent fdb63fb119
commit 27f1796251
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/org/linphone/CallActivity.java
View file

@ -622,9 +622,8 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
if (camera == PackageManager.PERMISSION_GRANTED) { if (camera == PackageManager.PERMISSION_GRANTED) {
disableVideo(isVideoEnabled(LinphoneManager.getLc().getCurrentCall())); disableVideo(isVideoEnabled(LinphoneManager.getLc().getCurrentCall()));
} else { } 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) { else if (id == R.id.micro) {
@ -634,11 +633,9 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
if (recordAudio == PackageManager.PERMISSION_GRANTED) { if (recordAudio == PackageManager.PERMISSION_GRANTED) {
toggleMicro(); toggleMicro();
} else { } 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) { else if (id == R.id.speaker) {
toggleSpeaker(); toggleSpeaker();
} }