Moved build version check from main to utils

This commit is contained in:
Juha Heinanen
2021-11-16 14:43:07 +02:00
parent c6aec9ef4f
commit 8f0f7ca51c
2 changed files with 4 additions and 1 deletions
@@ -311,7 +311,7 @@ class MainActivity : AppCompatActivity() {
if (aorSpinner.selectedItemPosition == -1) if (aorSpinner.selectedItemPosition == -1)
return@setOnClickListener return@setOnClickListener
val permissions = arrayOf(Manifest.permission.RECORD_AUDIO) val permissions = arrayOf(Manifest.permission.RECORD_AUDIO)
if (Build.VERSION.SDK_INT < 23 || Utils.checkPermissions(this, permissions)) if (Utils.checkPermissions(this, permissions))
makeCall() makeCall()
else else
ActivityCompat.requestPermissions(this, permissions, ActivityCompat.requestPermissions(this, permissions,
@@ -9,6 +9,7 @@ import android.graphics.Bitmap.createScaledBitmap
import android.graphics.Color import android.graphics.Color
import android.net.* import android.net.*
import android.net.wifi.WifiManager import android.net.wifi.WifiManager
import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Environment import android.os.Environment
import android.provider.DocumentsContract import android.provider.DocumentsContract
@@ -357,6 +358,8 @@ object Utils {
} }
fun checkPermissions(ctx: Context, permissions: Array<String>) : Boolean { fun checkPermissions(ctx: Context, permissions: Array<String>) : Boolean {
if (Build.VERSION.SDK_INT < 23)
return true
for (p in permissions) { for (p in permissions) {
if (ContextCompat.checkSelfPermission(ctx, p) != PackageManager.PERMISSION_GRANTED) { if (ContextCompat.checkSelfPermission(ctx, p) != PackageManager.PERMISSION_GRANTED) {
Log.d(TAG, "Permission $p is denied") Log.d(TAG, "Permission $p is denied")