From 80b7d2deaa9dee7357bd15466f82aea696b99924 Mon Sep 17 00:00:00 2001
From: Lorenzo Felletti <lorenzo97.felletti@gmail.com>
Date: Tue, 14 Feb 2023 17:36:20 +0100
Subject: [PATCH] refactor and locale support

Changes:
* Refactoring, code cleanup
* Added support to different locales
* Improved docs
---
 .idea/deploymentTargetDropDown.xml            |  17 +++
 .idea/gradle.xml                              |   1 +
 .idea/misc.xml                                |   2 +-
 README.md                                     |  35 ++++-
 build.gradle                                  |   4 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 .../permissions/PermissionManager.kt          | 139 +++++++-----------
 .../permissions/dispatcher/DispatcherEntry.kt |  12 +-
 .../dispatcher/RequestResultsDispatcher.kt    |  21 ++-
 .../dispatcher/dsl/PermissionDispatcherDsl.kt |  34 +++--
 .../src/main/res/values-b+de/strings.xml      |   5 +
 .../src/main/res/values-b+es/strings.xml      |   5 +
 .../src/main/res/values-b+fr/strings.xml      |   5 +
 .../src/main/res/values-b+it/strings.xml      |   5 +
 permissions/src/main/res/values/strings.xml   |   6 +
 .../permissions/DispatcherEntryTest.kt        |  13 +-
 16 files changed, 184 insertions(+), 122 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 permissions/src/main/res/values-b+de/strings.xml
 create mode 100644 permissions/src/main/res/values-b+es/strings.xml
 create mode 100644 permissions/src/main/res/values-b+fr/strings.xml
 create mode 100644 permissions/src/main/res/values-b+it/strings.xml
 create mode 100644 permissions/src/main/res/values/strings.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..b552e59
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_3a_API_32_2.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-02-14T16:30:12.026389Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 95613d8..5d17fda 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bdd9278..54d5acd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/README.md b/README.md
index f870343..a0f2723 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,32 @@
 # Permissions
 [![](https://jitpack.io/v/lorenzofelletti/permissions.svg)](https://jitpack.io/#lorenzofelletti/permissions)
 
-## Easy permissions management library for Android
+## Easy Permissions Management Library for Android
 
-An easy to use permissions management library designed to be used with Kotlin.
+An easy to use permissions management library written in Kotlin.
 
-The library is deployed on JitPack here, follow the steps indicated in the link to add it to your project.
+### Import the Library
+The library is deployed on JitPack [here](https://jitpack.io/#lorenzofelletti/permissions).
+To add it to your project, add to `settings.gradle`:
+```Groovy
+dependencyResolutionManagement {
+  ...
+  repositories {
+    ...
+    maven { url 'https://jitpack.io' }
+  }
+}
+```
+And to your module level build.gradle:
+```Groovy
+dependencies {
+  ...
+  implementation 'com.github.lorenzofelletti:permissions:0.4.2'
+}
+```
 
-To use it in your project, just:
+### Usage
+To use the library in your project, just:
 * Declare the permissions your app will use in your application's Manifest
   * Example: add to the app `AndroidManifest.xml`
   ```xml
@@ -48,9 +67,7 @@ To use it in your project, just:
 * Call `permissionManager.checkRequestAndDispatch` where you want to check for a set of permissions (and ask them if not granted)
   * Example: in your Activity, where you want to check (and request) permissions add
   ```Kotlin
-  permissionManager.checkRequestAndDispatch(
-            POSITION_REQUEST_CODE
-        )
+  permissionManager checkRequestAndDispatch POSITION_REQUEST_CODE
   ```
 * Override `onRequestPermissionsResult` and call `PermissionsUtilities.dispatchOnRequestPermissionsResult` in it
   * Example: inside your `MainActivity`
@@ -64,3 +81,7 @@ To use it in your project, just:
         permissionManager.dispatchOnRequestPermissionsResult(requestCode, grantResults)
     }
   ```
+
+## Contributing
+All kinds of contributions are welcome (bug reports, feature requests, pull requests, etc.).
+Suggestions and improvements on documentation, tests, code quality, translations, etc. are also welcome.
diff --git a/build.gradle b/build.gradle
index 2536974..b2ebb1e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.3.1' apply false
-    id 'com.android.library' version '7.3.1' apply false
+    id 'com.android.application' version '7.4.1' apply false
+    id 'com.android.library' version '7.4.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 171557d..ccd2fd2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Dec 05 12:12:35 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/permissions/src/main/java/com/lorenzofelletti/permissions/PermissionManager.kt b/permissions/src/main/java/com/lorenzofelletti/permissions/PermissionManager.kt
index 900f76b..5f59d76 100644
--- a/permissions/src/main/java/com/lorenzofelletti/permissions/PermissionManager.kt
+++ b/permissions/src/main/java/com/lorenzofelletti/permissions/PermissionManager.kt
@@ -50,7 +50,8 @@ class PermissionManager(val activity: Activity) {
      */
     @PermissionDispatcherDsl
     infix fun buildRequestResultsDispatcher(init: RequestResultsDispatcher.() -> Unit) {
-        dispatcher = RequestResultsDispatcher(this).apply(init)
+        dispatcher = RequestResultsDispatcher(this)
+        dispatcher.apply(init)
     }
 
     /**
@@ -63,35 +64,11 @@ class PermissionManager(val activity: Activity) {
      * [RequestResultsDispatcher] is dispatched.
      *
      * @param requestCode The request code associated to the permissions
-     * @param comingFromRationale true if the method is called from the rationale, defaults to false
+     *
+     * @throws UnhandledRequestCodeException if the request code is not handled by the dispatcher
      */
-    fun checkRequestAndDispatch(requestCode: Int, comingFromRationale: Boolean = false) {
-        val permissions =
-            dispatcher.getPermissions(requestCode) ?: throw UnhandledRequestCodeException(
-                requestCode
-            )
-        val permissionsNotGranted = permissions.filter { permission ->
-            ActivityCompat.checkSelfPermission(
-                activity, permission
-            ) != PackageManager.PERMISSION_GRANTED
-
-        }.toTypedArray()
-
-        if (permissionsNotGranted.isEmpty()) {
-            // All permissions are granted
-            dispatcher.getOnGranted(requestCode)?.invoke()
-        } else {
-            // Some permissions are not granted
-            val shouldShowRationale = permissionsNotGranted.any { permission ->
-                shouldShowRequestPermissionRationale(activity, permission)
-            }
-
-            if (shouldShowRationale && !comingFromRationale) {
-                dispatchRationale(permissionsNotGranted, requestCode)
-            } else {
-                ActivityCompat.requestPermissions(activity, permissionsNotGranted, requestCode)
-            }
-        }
+    infix fun checkRequestAndDispatch(requestCode: Int) {
+        checkRequestAndDispatch(requestCode, false)
     }
 
     /**
@@ -103,41 +80,63 @@ class PermissionManager(val activity: Activity) {
      * If all the permissions are already granted, the action associated to onGranted in the
      * [RequestResultsDispatcher] is dispatched.
      *
-     * @param requestCode The request code associated to the permissions
-     */
-    infix fun checkRequestAndDispatch(requestCode: Int) {
-        checkRequestAndDispatch(requestCode, false)
-    }
-
-    /**
-     * Checks whether a set of permissions is granted or not.
+     * Note: `comingFromRationale` is used internally to avoid showing the rationale dialog in loop.
      *
-     * @param permissions The permissions to be checked
+     * @param requestCode The request code associated to the permissions
+     * @param comingFromRationale true if the method is called from the rationale, defaults to false
      *
-     * @return true if all permissions are granted, false otherwise
+     * @throws UnhandledRequestCodeException if the request code is not handled by the dispatcher
      */
-    fun checkPermissionsGranted(permissions: Array<out String>): Boolean {
-        for (permission in permissions) {
-            if (!checkPermissionGranted(activity, permission)) return false
+    internal fun checkRequestAndDispatch(requestCode: Int, comingFromRationale: Boolean = false) {
+        val permissionsNotGranted = dispatcher.getPermissions(requestCode)?.filter { permission ->
+            ActivityCompat.checkSelfPermission(
+                activity, permission
+            ) != PackageManager.PERMISSION_GRANTED
+        }?.toTypedArray() ?: throw UnhandledRequestCodeException(requestCode, activity)
+
+        if (permissionsNotGranted.isEmpty()) {
+            // All permissions are granted
+            dispatcher.dispatchOnGranted(requestCode)
+        } else {
+            // Some permissions are not granted
+            dispatchSomePermissionsNotGranted(
+                permissionsNotGranted,
+                requestCode,
+                comingFromRationale
+            )
         }
-        return true
     }
 
     /**
-     * Checks whether the permissions for a given request code are granted or not.
-     * Throws an [UnhandledRequestCodeException] if the request code is not handled.
+     * Dispatches the case in which some permissions are not granted
      *
-     * @param requestCode The request code associated to the permissions to be checked
-     * @return true if all permissions are granted, false otherwise
+     * @param permissionsNotGranted
+     * @param requestCode
+     * @param comingFromRationale
      */
-    fun checkPermissionsGranted(requestCode: Int): Boolean {
-        val permissions =
-            dispatcher.getPermissions(requestCode) ?: throw UnhandledRequestCodeException(
-                requestCode
-            )
-        return checkPermissionsGranted(permissions)
+    private fun dispatchSomePermissionsNotGranted(
+        permissionsNotGranted: Array<out String>,
+        requestCode: Int,
+        comingFromRationale: Boolean
+    ) {
+        // if not coming from rationale, gets the list of permissions that require rationale to be shown
+        val permissionsRequiringRationale =
+            if (!comingFromRationale) getPermissionsRequiringRationale(permissionsNotGranted) else emptyList()
+
+        // if some permissions require rationale, show rationale, otherwise ask for permissions
+        // Note: if coming from rationale, the list will be empty, so the else branch will be executed
+        if (permissionsRequiringRationale.isNotEmpty()) {
+            dispatcher.showRationale(requestCode, permissionsRequiringRationale)
+        } else {
+            ActivityCompat.requestPermissions(activity, permissionsNotGranted, requestCode)
+        }
     }
 
+    private fun getPermissionsRequiringRationale(permissionsNotGranted: Array<out String>) =
+        permissionsNotGranted.filter { permission ->
+            shouldShowRequestPermissionRationale(activity, permission)
+        }.toList()
+
     /**
      * Checks the result of a permission request, and dispatches the appropriate action.
      * The actions can be defined by the user by using the [buildRequestResultsDispatcher] function
@@ -152,42 +151,12 @@ class PermissionManager(val activity: Activity) {
         dispatcher.dispatchAction(requestCode, grantResults)?.invoke()
     }
 
-    /**
-     * Checks whether a permission is granted in the context.
-     *
-     * @param context The context to be used for checking the permission
-     * @param permission The permission to be checked
-     *
-     * @return true if the permission is granted, false otherwise
-     */
-    private fun checkPermissionGranted(context: Context, permission: String): Boolean {
-        return ActivityCompat.checkSelfPermission(
-            context, permission
-        ) == PackageManager.PERMISSION_GRANTED
-    }
-
-    /**
-     * Dispatches the rationale action associated to the request code, if any.
-     *
-     * @param permissionsNotGranted The permissions that are not granted
-     * @param requestCode The request code associated to the permissions
-     */
-    private fun dispatchRationale(permissionsNotGranted: Array<out String>, requestCode: Int) {
-        /* if a rationale is defined, dispatch it, otherwise it calls checkRequestAndDispatch with
-         * comingFromRationale = true */
-        val toInvoke = dispatcher.getOnShowRationale(requestCode) ?: fun(
-            _: List<String>, requestCode: Int
-        ) {
-            checkRequestAndDispatch(requestCode, true)
-        }
-        toInvoke.invoke(permissionsNotGranted.toList(), requestCode)
-    }
 }
 
 /**
  * Exception thrown when the request code is not handled by the [RequestResultsDispatcher] object.
  */
-class UnhandledRequestCodeException(requestCode: Int) : Throwable() {
+class UnhandledRequestCodeException(requestCode: Int, context: Context) : Throwable() {
     override val message: String =
-        "Request code $requestCode is not handled by the RequestResultsDispatcher object. Please add a withRequestCode block to the buildRequestResultsDispatcher function."
+        context.getString(R.string.unhandled_request_code_exception_message, requestCode)
 }
diff --git a/permissions/src/main/java/com/lorenzofelletti/permissions/dispatcher/DispatcherEntry.kt b/permissions/src/main/java/com/lorenzofelletti/permissions/dispatcher/DispatcherEntry.kt
index c24474a..1e22b16 100644
--- a/permissions/src/main/java/com/lorenzofelletti/permissions/dispatcher/DispatcherEntry.kt
+++ b/permissions/src/main/java/com/lorenzofelletti/permissions/dispatcher/DispatcherEntry.kt
@@ -1,6 +1,5 @@
 package com.lorenzofelletti.permissions.dispatcher
 
-import com.lorenzofelletti.permissions.PermissionManager
 import com.lorenzofelletti.permissions.dispatcher.dsl.PermissionDispatcher
 
 
@@ -10,13 +9,12 @@ import com.lorenzofelletti.permissions.dispatcher.dsl.PermissionDispatcher
  * in case the permissions are granted or denied.
  */
 class DispatcherEntry(
-    internal val manager: PermissionManager, val requestCode: Int
+    internal val dispatcher: RequestResultsDispatcher, val requestCode: Int
 ) : PermissionDispatcher() {
     /**
      * The permissions associated to this entry
      */
-    lateinit var permissions: Array<out String>
-        internal set
+    private lateinit var permissions: Array<out String>
 
     /**
      * The action to be dispatched if the permissions are granted.
@@ -36,6 +34,12 @@ class DispatcherEntry(
     var onShowRationale: ((List<String>, requestCode: Int) -> Unit)? = null
         internal set
 
+    internal fun setPermissions(permissions: Array<out String>) {
+        this.permissions = permissions
+    }
+
+    internal fun getPermissions(): Array<out String> = permissions
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
diff --git a/permissions/src/main/java/com/lorenzofelletti/permissions/dispatcher/RequestResultsDispatcher.kt b/permissions/src/main/java/com/lorenzofelletti/permissions/dispatcher/RequestResultsDispatcher.kt
index e62fe8c..d46f6f4 100644
--- a/permissions/src/main/java/com/lorenzofelletti/permissions/dispatcher/RequestResultsDispatcher.kt
+++ b/permissions/src/main/java/com/lorenzofelletti/permissions/dispatcher/RequestResultsDispatcher.kt
@@ -18,14 +18,23 @@ class RequestResultsDispatcher(internal val manager: PermissionManager) : Permis
         }
 
     internal fun getPermissions(requestCode: Int): Array<out String>? =
-        entries[requestCode]?.permissions
+        entries[requestCode]?.getPermissions()
 
-    internal fun getOnGranted(requestCode: Int): (() -> Unit)? = entries[requestCode]?.onGranted
-
-    internal fun getOnDenied(requestCode: Int): (() -> Unit)? = entries[requestCode]?.onDenied
+    internal fun dispatchOnGranted(requestCode: Int) {
+        entries[requestCode]?.onGranted?.invoke()
+    }
 
-    internal fun getOnShowRationale(requestCode: Int): ((List<String>, Int) -> Unit)? =
-        entries[requestCode]?.onShowRationale
+    /**
+     * Shows the rationale for the permissions associated to the given request code, otherwise
+     * it calls [PermissionManager.checkRequestAndDispatch] with `comingFromRationale = true`.
+     *
+     * @param requestCode The request code associated to the permissions
+     * @param permissions The permissions requiring a rationale
+     */
+    internal fun showRationale(requestCode: Int, permissions: List<String>) {
+        entries[requestCode]?.onShowRationale?.invoke(permissions, requestCode)
+            ?: manager.checkRequestAndDispatch(requestCode, true)
+    }
 
     /**
      * Checks the results of a permission request
diff --git a/permissions/src/main/java/com/lorenzofelletti/permissions/dispatcher/dsl/PermissionDispatcherDsl.kt b/permissions/src/main/java/com/lorenzofelletti/permissions/dispatcher/dsl/PermissionDispatcherDsl.kt
index 1fb784f..c3afb4e 100644
--- a/permissions/src/main/java/com/lorenzofelletti/permissions/dispatcher/dsl/PermissionDispatcherDsl.kt
+++ b/permissions/src/main/java/com/lorenzofelletti/permissions/dispatcher/dsl/PermissionDispatcherDsl.kt
@@ -4,6 +4,7 @@ package com.lorenzofelletti.permissions.dispatcher.dsl
 
 import android.app.AlertDialog
 import android.app.Dialog
+import com.lorenzofelletti.permissions.R
 import com.lorenzofelletti.permissions.dispatcher.DispatcherEntry
 import com.lorenzofelletti.permissions.dispatcher.RequestResultsDispatcher
 
@@ -18,13 +19,13 @@ abstract class PermissionDispatcher
  */
 @PermissionDispatcherDsl
 infix fun DispatcherEntry.checkPermissions(permissions: Array<out String>) {
-    this.permissions = permissions
+    this.setPermissions(permissions)
 }
 
 @JvmName("checkPermissionsVararg")
 @PermissionDispatcherDsl
 fun DispatcherEntry.checkPermissions(vararg permissions: String) {
-    this.permissions = arrayOf(*permissions)
+    this.setPermissions(arrayOf(*permissions))
 }
 
 /**
@@ -70,16 +71,29 @@ fun DispatcherEntry.rationale(onShowRationale: (List<String>, Int) -> Unit) {
 @PermissionDispatcherDsl
 fun DispatcherEntry.showRationaleDialog(
     message: String,
-    positiveButtonText: String = "OK",
-    negativeButtonText: String = "Cancel",
+    positiveButtonText: String = "",
+    negativeButtonText: String = "",
     onNegativeButtonPressed: (() -> Unit) = {}
 ) {
+    val actualPositiveButtonText =
+        positiveButtonText.ifEmpty {
+            dispatcher.manager.activity.getString(
+                R.string.rationale_dialog_ok
+            )
+        }
+    val actualNegativeButtonText = negativeButtonText.ifEmpty {
+        dispatcher.manager.activity.getString(
+            R.string.rationale_dialog_cancel
+        )
+    }
+
     rationale { _, _ ->
+        val manager = dispatcher.manager
         manager.activity.runOnUiThread {
             AlertDialog.Builder(manager.activity).setMessage(message)
-                .setPositiveButton(positiveButtonText) { _, _ ->
+                .setPositiveButton(actualPositiveButtonText) { _, _ ->
                     manager.checkRequestAndDispatch(requestCode, comingFromRationale = true)
-                }.setNegativeButton(negativeButtonText) { _, _ ->
+                }.setNegativeButton(actualNegativeButtonText) { _, _ ->
                     onNegativeButtonPressed.invoke()
                 }.show()
         }
@@ -109,7 +123,7 @@ fun DispatcherEntry.showRationaleDialog(
     dialog: AlertDialog,
 ) {
     rationale { _, _ ->
-        manager.activity.runOnUiThread {
+        dispatcher.manager.activity.runOnUiThread {
             dialog.show()
         }
     }
@@ -137,7 +151,7 @@ fun DispatcherEntry.showRationaleDialog(
 fun RequestResultsDispatcher.withRequestCode(
     requestCode: Int, init: DispatcherEntry.() -> Unit
 ) {
-    entries[requestCode] = DispatcherEntry(manager, requestCode).apply(init)
+    entries[requestCode] = DispatcherEntry(manager.dispatcher, requestCode).apply(init)
 }
 
 /**
@@ -159,7 +173,7 @@ fun RequestResultsDispatcher.removeEntry(requestCode: Int) {
 @PermissionDispatcherDsl
 fun RequestResultsDispatcher.addEntry(requestCode: Int, init: DispatcherEntry.() -> Unit) {
     if (entries[requestCode] == null) {
-        entries[requestCode] = DispatcherEntry(manager, requestCode).apply(init)
+        entries[requestCode] = DispatcherEntry(manager.dispatcher, requestCode).apply(init)
     }
 }
 
@@ -197,5 +211,5 @@ fun RequestResultsDispatcher.replaceEntryOnDenied(requestCode: Int, onDenied: ()
 fun RequestResultsDispatcher.replaceEntry(
     requestCode: Int, init: DispatcherEntry.() -> Unit
 ) {
-    entries[requestCode] = DispatcherEntry(manager, requestCode).apply(init)
+    entries[requestCode] = DispatcherEntry(manager.dispatcher, requestCode).apply(init)
 }
\ No newline at end of file
diff --git a/permissions/src/main/res/values-b+de/strings.xml b/permissions/src/main/res/values-b+de/strings.xml
new file mode 100644
index 0000000..002edc5
--- /dev/null
+++ b/permissions/src/main/res/values-b+de/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="rationale_dialog_ok">OK</string>
+    <string name="rationale_dialog_cancel">Stornieren</string>
+</resources>
\ No newline at end of file
diff --git a/permissions/src/main/res/values-b+es/strings.xml b/permissions/src/main/res/values-b+es/strings.xml
new file mode 100644
index 0000000..e188853
--- /dev/null
+++ b/permissions/src/main/res/values-b+es/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="rationale_dialog_ok">OK</string>
+    <string name="rationale_dialog_cancel">Cancelar</string>
+</resources>
\ No newline at end of file
diff --git a/permissions/src/main/res/values-b+fr/strings.xml b/permissions/src/main/res/values-b+fr/strings.xml
new file mode 100644
index 0000000..965f7b1
--- /dev/null
+++ b/permissions/src/main/res/values-b+fr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="rationale_dialog_ok">OK</string>
+    <string name="rationale_dialog_cancel">Rejeter</string>
+</resources>
\ No newline at end of file
diff --git a/permissions/src/main/res/values-b+it/strings.xml b/permissions/src/main/res/values-b+it/strings.xml
new file mode 100644
index 0000000..60990cc
--- /dev/null
+++ b/permissions/src/main/res/values-b+it/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="rationale_dialog_ok">OK</string>
+    <string name="rationale_dialog_cancel">Cancella</string>
+</resources>
\ No newline at end of file
diff --git a/permissions/src/main/res/values/strings.xml b/permissions/src/main/res/values/strings.xml
new file mode 100644
index 0000000..179cdca
--- /dev/null
+++ b/permissions/src/main/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="unhandled_request_code_exception_message" translatable="false">Request code %d is not handled by the RequestResultsDispatcher object. Please add a withRequestCode block to the buildRequestResultsDispatcher function.</string>
+    <string name="rationale_dialog_ok">OK</string>
+    <string name="rationale_dialog_cancel">Cancel</string>
+</resources>
\ No newline at end of file
diff --git a/permissions/src/test/java/com/lorenzofelletti/permissions/DispatcherEntryTest.kt b/permissions/src/test/java/com/lorenzofelletti/permissions/DispatcherEntryTest.kt
index adfd728..a07a500 100644
--- a/permissions/src/test/java/com/lorenzofelletti/permissions/DispatcherEntryTest.kt
+++ b/permissions/src/test/java/com/lorenzofelletti/permissions/DispatcherEntryTest.kt
@@ -19,28 +19,29 @@ class DispatcherEntryTest {
     fun setUp() {
         val mockActivity = mock(Activity::class.java)
         permissionManager = PermissionManager(mockActivity)
+        permissionManager buildRequestResultsDispatcher {}
     }
 
     @Test
     fun `test set entry permissions`() {
         val permissionsArray = arrayOf("permission1", "permission2")
-        val entry = DispatcherEntry(permissionManager, 1)
+        val entry = DispatcherEntry(permissionManager.dispatcher, 1)
         entry checkPermissions permissionsArray
-        assert(entry.permissions.contentEquals(permissionsArray))
+        assert(entry.getPermissions().contentEquals(permissionsArray))
     }
 
     @Test
     fun `test set entry permissions with vararg`() {
         val permissionsArray = arrayOf("permission1", "permission2")
-        val entry = DispatcherEntry(permissionManager, 1)
+        val entry = DispatcherEntry(permissionManager.dispatcher, 1)
         entry.checkPermissions(permissionsArray[0], permissionsArray[1])
-        assert(entry.permissions.contentEquals(permissionsArray))
+        assert(entry.getPermissions().contentEquals(permissionsArray))
     }
 
     @Test
     fun `test do on granted`() {
         var testVar = 0
-        val entry = DispatcherEntry(permissionManager, 0)
+        val entry = DispatcherEntry(permissionManager.dispatcher, 0)
 
         entry.doOnGranted { testVar = 1 }
 
@@ -52,7 +53,7 @@ class DispatcherEntryTest {
     @Test
     fun `test do on denied`() {
         var testVar = 0
-        val entry = DispatcherEntry(permissionManager, 0)
+        val entry = DispatcherEntry(permissionManager.dispatcher, 0)
 
         entry.doOnDenied { testVar = 1 }