jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Permisions cleaning

Browse Source
This commit is contained in:
Juha Heinanen
2023-02-21 04:15:50 +02:00
parent d9f8da3387
commit bd699ce783
1 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+5 -29
View File
@@ -681,7 +681,7 @@ class MainActivity : AppCompatActivity() {
requestPermissionsLauncher = requestPermissionsLauncher =
registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { isGranted: Map<String, Boolean> -> registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { isGranted: Map<String, Boolean> ->
if (firstRun && isGranted.isEmpty()) if (firstRun && isGranted.isEmpty())
askMicAndBtPermissions() askPermissions(arrayOf(RECORD_AUDIO, BLUETOOTH_CONNECT))
} }
if (Preferences(applicationContext).displayTheme != AppCompatDelegate.getDefaultNightMode()) { if (Preferences(applicationContext).displayTheme != AppCompatDelegate.getDefaultNightMode()) {
@@ -698,7 +698,7 @@ class MainActivity : AppCompatActivity() {
if (!Utils.checkPermissions(this, arrayOf(RECORD_AUDIO, BLUETOOTH_CONNECT))) if (!Utils.checkPermissions(this, arrayOf(RECORD_AUDIO, BLUETOOTH_CONNECT)))
if (ActivityCompat.shouldShowRequestPermissionRationale(this, RECORD_AUDIO) || if (ActivityCompat.shouldShowRequestPermissionRationale(this, RECORD_AUDIO) ||
ActivityCompat.shouldShowRequestPermissionRationale(this, BLUETOOTH_CONNECT)) { ActivityCompat.shouldShowRequestPermissionRationale(this, BLUETOOTH_CONNECT)) {
askMicAndBtPermissions() askPermissions(arrayOf(RECORD_AUDIO, BLUETOOTH_CONNECT))
} else { } else {
requestPermissionsLauncher.launch(arrayOf(RECORD_AUDIO, BLUETOOTH_CONNECT) requestPermissionsLauncher.launch(arrayOf(RECORD_AUDIO, BLUETOOTH_CONNECT)
) )
@@ -816,12 +816,12 @@ class MainActivity : AppCompatActivity() {
} }
} }
private fun askMicAndBtPermissions() { private fun askPermissions(permissions: Array<String>) {
with(MaterialAlertDialogBuilder(this, R.style.AlertDialogTheme)) { with(MaterialAlertDialogBuilder(this, R.style.AlertDialogTheme)) {
setTitle(getString(R.string.permissions_rationale)) setTitle(getString(R.string.permissions_rationale))
setMessage(getString(R.string.mic_and_bt_permissions)) setMessage(getString(R.string.audio_permissions))
setPositiveButton(getString(R.string.ok)) { dialog, _ -> setPositiveButton(getString(R.string.ok)) { dialog, _ ->
requestPermissionsLauncher.launch(arrayOf(RECORD_AUDIO, BLUETOOTH_CONNECT)) requestPermissionsLauncher.launch(permissions)
dialog.dismiss() dialog.dismiss()
} }
show() show()
@@ -1380,30 +1380,6 @@ class MainActivity : AppCompatActivity() {
return true return true
} }
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
when (requestCode) {
MIC_PERMISSION_REQUEST_CODE -> {
if (grantResults.isNotEmpty()) {
if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
if (ActivityCompat.shouldShowRequestPermissionRationale(this,
Manifest.permission.RECORD_AUDIO))
layout.showSnackBar(
binding.root,
getString(R.string.no_calls),
Snackbar.LENGTH_INDEFINITE,
getString(R.string.ok)
) {
ActivityCompat.requestPermissions(this,
arrayOf(Manifest.permission.RECORD_AUDIO),
MIC_PERMISSION_REQUEST_CODE)
}
}
}
}
}
}
@RequiresApi(29) @RequiresApi(29)
private fun pickupFileFromDownloads(action: String) { private fun pickupFileFromDownloads(action: String) {
when (action) { when (action) {