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

Jump to bottom

Add support for PERMISSION_DENIED_APP_OP. #72

Merged
merged 1 commit into from
Jan 17, 2016
Merged

Add support for PERMISSION_DENIED_APP_OP. #72

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions processor/src/main/kotlin/permissions/dispatcher/processor/impl/BaseProcessorUnit.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import javax.lang.model.element.Modifier
public abstract class BaseProcessorUnit : ProcessorUnit {

protected val PERMISSION_UTILS = ClassName.get("permissions.dispatcher", "PermissionUtils")

private val MANIFEST_WRITE_SETTING = "android.permission.WRITE_SETTINGS"
private val MANIFEST_SYSTEM_ALERT_WINDOW = "android.permission.SYSTEM_ALERT_WINDOW"
private val ADD_WITH_CHECK_BODY_MAP = hashMapOf(MANIFEST_SYSTEM_ALERT_WINDOW to SystemAlertWindowHelper(), MANIFEST_WRITE_SETTING to WriteSettingsHelper())
Expand Down Expand Up @@ -268,6 +267,18 @@ public abstract class BaseProcessorUnit : ProcessorUnit {
}

private fun addResultCaseBody(builder: MethodSpec.Builder, needsMethod: ExecutableElement, rpe: RuntimePermissionsElement, targetParam: String, grantResultsParam: String) {

// just workaround, see https://github.com/hotchemi/PermissionsDispatcher/issues/45
val onDenied: ExecutableElement? = rpe.findOnDeniedForNeeds(needsMethod)
val hasDenied = onDenied != null
if (hasDenied) {
builder.beginControlFlow("if (!\$T.hasSelfPermissions(\$N, \$N))",
PERMISSION_UTILS, getActivityName(targetParam), permissionFieldName(needsMethod))
builder.addStatement("\$N.\$N()", targetParam, onDenied!!.simpleString())
builder.addStatement("return")
builder.endControlFlow()
}

val needsPermissionParameter = needsMethod.getAnnotation(NeedsPermission::class.java).value[0]

// Add the conditional for "permission verified"
Expand All @@ -285,8 +296,6 @@ public abstract class BaseProcessorUnit : ProcessorUnit {
}

// Add the conditional for "permission denied" and/or "never ask again", if present
val onDenied: ExecutableElement? = rpe.findOnDeniedForNeeds(needsMethod)
val hasDenied = onDenied != null
val onNeverAsk: ExecutableElement? = rpe.findOnNeverAskForNeeds(needsMethod)
val hasNeverAsk = onNeverAsk != null

Expand Down