gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-20 19:25:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs with Android 5

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-06-24 21:41:19 +02:00
parent 75fb4cbea1
commit 8b27286536
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -26,6 +26,7 @@ import android.animation.AnimatorListenerAdapter;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.Color; import android.graphics.Color;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
@ -418,7 +419,11 @@ public class CallController extends BaseController {
if (isVoiceOnlyCall) { if (isVoiceOnlyCall) {
onMicrophoneClick(); onMicrophoneClick();
} else if (getActivity() != null) { } else if (getActivity() != null) {
requestPermissions(PERMISSIONS_CALL, 100); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
requestPermissions(PERMISSIONS_CALL, 100);
} else {
onRequestPermissionsResult(100, PERMISSIONS_CALL, new int[]{1});
}
} }
} }
@ -637,7 +642,11 @@ public class CallController extends BaseController {
R.string.nc_microphone_permission_permanently_denied, R.string.nc_microphone_permission_permanently_denied,
R.string.nc_permissions_settings, (AppCompatActivity) getActivity()); R.string.nc_permissions_settings, (AppCompatActivity) getActivity());
} else { } else {
requestPermissions(PERMISSIONS_MICROPHONE, 100); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
requestPermissions(PERMISSIONS_MICROPHONE, 100);
} else {
onRequestPermissionsResult(100, PERMISSIONS_MICROPHONE, new int[]{1});
}
} }
} }
@ -673,7 +682,12 @@ public class CallController extends BaseController {
R.string.nc_camera_permission_permanently_denied, R.string.nc_camera_permission_permanently_denied,
R.string.nc_permissions_settings, (AppCompatActivity) getActivity()); R.string.nc_permissions_settings, (AppCompatActivity) getActivity());
} else { } else {
requestPermissions(PERMISSIONS_CAMERA, 100);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
requestPermissions(PERMISSIONS_CAMERA, 100);
} else {
onRequestPermissionsResult(100, PERMISSIONS_CAMERA, new int[]{1});
}
} }
} }