@@ -50,7 +50,8 @@ class PermissionManager(val activity: Activity) {
5050 */
5151 @PermissionDispatcherDsl
5252 infix fun buildRequestResultsDispatcher (init : RequestResultsDispatcher .() -> Unit ) {
53- dispatcher = RequestResultsDispatcher (this ).apply (init )
53+ dispatcher = RequestResultsDispatcher (this )
54+ dispatcher.apply (init )
5455 }
5556
5657 /* *
@@ -63,35 +64,11 @@ class PermissionManager(val activity: Activity) {
6364 * [RequestResultsDispatcher] is dispatched.
6465 *
6566 * @param requestCode The request code associated to the permissions
66- * @param comingFromRationale true if the method is called from the rationale, defaults to false
67+ *
68+ * @throws UnhandledRequestCodeException if the request code is not handled by the dispatcher
6769 */
68- fun checkRequestAndDispatch (requestCode : Int , comingFromRationale : Boolean = false) {
69- val permissions =
70- dispatcher.getPermissions(requestCode) ? : throw UnhandledRequestCodeException (
71- requestCode
72- )
73- val permissionsNotGranted = permissions.filter { permission ->
74- ActivityCompat .checkSelfPermission(
75- activity, permission
76- ) != PackageManager .PERMISSION_GRANTED
77-
78- }.toTypedArray()
79-
80- if (permissionsNotGranted.isEmpty()) {
81- // All permissions are granted
82- dispatcher.getOnGranted(requestCode)?.invoke()
83- } else {
84- // Some permissions are not granted
85- val shouldShowRationale = permissionsNotGranted.any { permission ->
86- shouldShowRequestPermissionRationale(activity, permission)
87- }
88-
89- if (shouldShowRationale && ! comingFromRationale) {
90- dispatchRationale(permissionsNotGranted, requestCode)
91- } else {
92- ActivityCompat .requestPermissions(activity, permissionsNotGranted, requestCode)
93- }
94- }
70+ infix fun checkRequestAndDispatch (requestCode : Int ) {
71+ checkRequestAndDispatch(requestCode, false )
9572 }
9673
9774 /* *
@@ -103,41 +80,63 @@ class PermissionManager(val activity: Activity) {
10380 * If all the permissions are already granted, the action associated to onGranted in the
10481 * [RequestResultsDispatcher] is dispatched.
10582 *
106- * @param requestCode The request code associated to the permissions
107- */
108- infix fun checkRequestAndDispatch (requestCode : Int ) {
109- checkRequestAndDispatch(requestCode, false )
110- }
111-
112- /* *
113- * Checks whether a set of permissions is granted or not.
83+ * Note: `comingFromRationale` is used internally to avoid showing the rationale dialog in loop.
11484 *
115- * @param permissions The permissions to be checked
85+ * @param requestCode The request code associated to the permissions
86+ * @param comingFromRationale true if the method is called from the rationale, defaults to false
11687 *
117- * @return true if all permissions are granted, false otherwise
88+ * @throws UnhandledRequestCodeException if the request code is not handled by the dispatcher
11889 */
119- fun checkPermissionsGranted (permissions : Array <out String >): Boolean {
120- for (permission in permissions) {
121- if (! checkPermissionGranted(activity, permission)) return false
90+ internal fun checkRequestAndDispatch (requestCode : Int , comingFromRationale : Boolean = false) {
91+ val permissionsNotGranted = dispatcher.getPermissions(requestCode)?.filter { permission ->
92+ ActivityCompat .checkSelfPermission(
93+ activity, permission
94+ ) != PackageManager .PERMISSION_GRANTED
95+ }?.toTypedArray() ? : throw UnhandledRequestCodeException (requestCode, activity)
96+
97+ if (permissionsNotGranted.isEmpty()) {
98+ // All permissions are granted
99+ dispatcher.dispatchOnGranted(requestCode)
100+ } else {
101+ // Some permissions are not granted
102+ dispatchSomePermissionsNotGranted(
103+ permissionsNotGranted,
104+ requestCode,
105+ comingFromRationale
106+ )
122107 }
123- return true
124108 }
125109
126110 /* *
127- * Checks whether the permissions for a given request code are granted or not.
128- * Throws an [UnhandledRequestCodeException] if the request code is not handled.
111+ * Dispatches the case in which some permissions are not granted
129112 *
130- * @param requestCode The request code associated to the permissions to be checked
131- * @return true if all permissions are granted, false otherwise
113+ * @param permissionsNotGranted
114+ * @param requestCode
115+ * @param comingFromRationale
132116 */
133- fun checkPermissionsGranted (requestCode : Int ): Boolean {
134- val permissions =
135- dispatcher.getPermissions(requestCode) ? : throw UnhandledRequestCodeException (
136- requestCode
137- )
138- return checkPermissionsGranted(permissions)
117+ private fun dispatchSomePermissionsNotGranted (
118+ permissionsNotGranted : Array <out String >,
119+ requestCode : Int ,
120+ comingFromRationale : Boolean
121+ ) {
122+ // if not coming from rationale, gets the list of permissions that require rationale to be shown
123+ val permissionsRequiringRationale =
124+ if (! comingFromRationale) getPermissionsRequiringRationale(permissionsNotGranted) else emptyList()
125+
126+ // if some permissions require rationale, show rationale, otherwise ask for permissions
127+ // Note: if coming from rationale, the list will be empty, so the else branch will be executed
128+ if (permissionsRequiringRationale.isNotEmpty()) {
129+ dispatcher.showRationale(requestCode, permissionsRequiringRationale)
130+ } else {
131+ ActivityCompat .requestPermissions(activity, permissionsNotGranted, requestCode)
132+ }
139133 }
140134
135+ private fun getPermissionsRequiringRationale (permissionsNotGranted : Array <out String >) =
136+ permissionsNotGranted.filter { permission ->
137+ shouldShowRequestPermissionRationale(activity, permission)
138+ }.toList()
139+
141140 /* *
142141 * Checks the result of a permission request, and dispatches the appropriate action.
143142 * The actions can be defined by the user by using the [buildRequestResultsDispatcher] function
@@ -152,42 +151,12 @@ class PermissionManager(val activity: Activity) {
152151 dispatcher.dispatchAction(requestCode, grantResults)?.invoke()
153152 }
154153
155- /* *
156- * Checks whether a permission is granted in the context.
157- *
158- * @param context The context to be used for checking the permission
159- * @param permission The permission to be checked
160- *
161- * @return true if the permission is granted, false otherwise
162- */
163- private fun checkPermissionGranted (context : Context , permission : String ): Boolean {
164- return ActivityCompat .checkSelfPermission(
165- context, permission
166- ) == PackageManager .PERMISSION_GRANTED
167- }
168-
169- /* *
170- * Dispatches the rationale action associated to the request code, if any.
171- *
172- * @param permissionsNotGranted The permissions that are not granted
173- * @param requestCode The request code associated to the permissions
174- */
175- private fun dispatchRationale (permissionsNotGranted : Array <out String >, requestCode : Int ) {
176- /* if a rationale is defined, dispatch it, otherwise it calls checkRequestAndDispatch with
177- * comingFromRationale = true */
178- val toInvoke = dispatcher.getOnShowRationale(requestCode) ? : fun (
179- _: List <String >, requestCode : Int
180- ) {
181- checkRequestAndDispatch(requestCode, true )
182- }
183- toInvoke.invoke(permissionsNotGranted.toList(), requestCode)
184- }
185154}
186155
187156/* *
188157 * Exception thrown when the request code is not handled by the [RequestResultsDispatcher] object.
189158 */
190- class UnhandledRequestCodeException (requestCode : Int ) : Throwable() {
159+ class UnhandledRequestCodeException (requestCode : Int , context : Context ) : Throwable() {
191160 override val message: String =
192- " Request code $requestCode is not handled by the RequestResultsDispatcher object. Please add a withRequestCode block to the buildRequestResultsDispatcher function. "
161+ context.getString( R .string.unhandled_request_code_exception_message, requestCode)
193162}
0 commit comments