From 55849cad65b699ff16886085db996fc6ce3dec3e Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Fri, 20 Mar 2020 20:45:47 +0530
Subject: Replace PermissionRequestCallback with direct methods

These are much cleaner in Kotlin code.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 .../java/com/wireguard/android/activity/SettingsActivity.kt  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt')

diff --git a/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt b/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt
index c7453617..a6bdb187 100644
--- a/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt
@@ -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)
-- 
cgit v1.2.3-59-g8ed1b