Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(java): for android examples, use ActivityCompat #75

Merged
merged 1 commit into from
Sep 26, 2023
Merged

refactor(java): for android examples, use ActivityCompat #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions ...es/service/src/main/java/video/api/uploader/service/example/ReadStorePermissionManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import android.content.pm.PackageManager
import android.os.Build
import androidx.activity.ComponentActivity
import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat

class ReadStorePermissionManager(
private val activity: ComponentActivity,
Expand All @@ -18,20 +20,16 @@ class ReadStorePermissionManager(
}

private val hasPermission: Boolean
get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
} else {
true
}
get() = ContextCompat.checkSelfPermission(
activity,
requiredPermission
) == PackageManager.PERMISSION_GRANTED

fun requestPermission() {
if (hasPermission) {
onGranted()
} else {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
throw IllegalStateException("Permission should be granted")
}
if (activity.shouldShowRequestPermissionRationale(requiredPermission)) {
if (ActivityCompat.shouldShowRequestPermissionRationale(activity, requiredPermission)) {
onShowPermissionRationale(requiredPermission) {
requestPermission.launch(requiredPermission)
}
Expand Down
16 changes: 7 additions & 9 deletions ...s/workmanager/src/main/java/video/api/uploader/work/example/ReadStorePermissionManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import android.content.pm.PackageManager
import android.os.Build
import androidx.activity.ComponentActivity
import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat

class ReadStorePermissionManager(
private val activity: ComponentActivity,
Expand All @@ -18,20 +20,16 @@ class ReadStorePermissionManager(
}

private val hasPermission: Boolean
get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
} else {
true
}
get() = ContextCompat.checkSelfPermission(
activity,
requiredPermission
) == PackageManager.PERMISSION_GRANTED

fun requestPermission() {
if (hasPermission) {
onGranted()
} else {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
throw IllegalStateException("Permission should be granted")
}
if (activity.shouldShowRequestPermissionRationale(requiredPermission)) {
if (ActivityCompat.shouldShowRequestPermissionRationale(activity, requiredPermission)) {
onShowPermissionRationale(requiredPermission) {
requestPermission.launch(requiredPermission)
}
Expand Down