frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Replace PermissionRequestCallback with direct methods

Browse Source 
These are much cleaner in Kotlin code.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya
2020-03-20 22:22:56 -06:00
committed by Jason A. Donenfeld
parent edb76af820
commit 55849cad65
3 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt
+4 -8
View File
@@ -25,10 +25,10 @@ import java.util.Arrays
* Interface for changing application-global persistent settings.
*/
class SettingsActivity : ThemeChangeAwareActivity() {
private val permissionRequestCallbacks = SparseArray<PermissionRequestCallback>()
private val permissionRequestCallbacks = SparseArray<(permissions: Array<String>, granted: IntArray) -> Unit>()
private var permissionRequestCounter = 0
fun ensurePermissions(permissions: Array<String>, cb: PermissionRequestCallback) {
fun ensurePermissions(permissions: Array<String>, cb: (permissions: Array<String>, granted: IntArray) -> Unit) {
val needPermissions: MutableList<String> = ArrayList(permissions.size)
permissions.forEach {
if (ContextCompat.checkSelfPermission(this, it) != PackageManager.PERMISSION_GRANTED) {
@@ -38,7 +38,7 @@ class SettingsActivity : ThemeChangeAwareActivity() {
if (needPermissions.isEmpty()) {
val granted = IntArray(permissions.size)
Arrays.fill(granted, PackageManager.PERMISSION_GRANTED)
cb.done(permissions, granted)
cb.invoke(permissions, granted)
return
}
val idx = permissionRequestCounter++
@@ -70,14 +70,10 @@ class SettingsActivity : ThemeChangeAwareActivity() {
val f = permissionRequestCallbacks[requestCode]
if (f != null) {
permissionRequestCallbacks.remove(requestCode)
f.done(permissions, grantResults)
f.invoke(permissions, grantResults)
}
}
interface PermissionRequestCallback {
fun done(permissions: Array<String>, grantResults: IntArray)
}
class SettingsFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, key: String?) {
addPreferencesFromResource(R.xml.preferences)