bugfix request-mulit-permission-error

Author: imfms

rx_easy_runtime_permission/src/main/java/cn/f_ms/rx_easy_runtime_permission/PermissionException.java

@@ -8,7 +8,7 @@ public class PermissionException extends RuntimeException {
     private TYPE mExceptionType;
 
     public enum TYPE {
-        USER_REFUSE, USER_REFUSE_TIPS, REFUSE_NEVER_ASK
+        USER_REFUSE, USER_REFUSE_TIPS, REFUSE_NEVER_ASK, PASS
     }
 
     public PermissionException(TYPE exceptionType) {

rx_easy_runtime_permission/src/main/java/cn/f_ms/rx_easy_runtime_permission/PermissionRequestTransformer.java

@@ -2,7 +2,6 @@
 
 import android.app.Activity;
 
-import com.tbruyelle.rxpermissions2.Permission;
 import com.tbruyelle.rxpermissions2.RxPermissions;
 
 import io.reactivex.Observable;
@@ -15,6 +14,10 @@
 import io.reactivex.functions.Consumer;
 import io.reactivex.functions.Function;
 
+import static cn.f_ms.rx_easy_runtime_permission.PermissionException.TYPE.PASS;
+import static cn.f_ms.rx_easy_runtime_permission.PermissionException.TYPE.REFUSE_NEVER_ASK;
+import static cn.f_ms.rx_easy_runtime_permission.PermissionException.TYPE.USER_REFUSE;
+
 
 class PermissionRequestTransformer<T> implements ObservableTransformer<T, Boolean> {
 
@@ -177,29 +180,44 @@ public void subscribe(@NonNull final ObservableEmitter<Boolean> e) throws Except
      * @param e          Observer
      * @param permission permission
      */
-    private void requestPermission(@NonNull final ObservableEmitter<Boolean> e, String... permission) {
-        rxPermissions.requestEach(permission)
-                .subscribe(new Consumer<Permission>() {
-
-                    @Override
-                    public void accept(@NonNull Permission permission) throws Exception {
+    private void requestPermission(@NonNull final ObservableEmitter<Boolean> e, final String... permission) {
 
-                        if (permission.granted) {
 
-                            e.onNext(true);
-                            e.onComplete();
-                        } else if (permission.shouldShowRequestPermissionRationale) {
+        rxPermissions.request(permission)
+                .zipWith(
+                        rxPermissions.shouldShowRequestPermissionRationale(mActivity, permission),
+                        new BiFunction<Boolean, Boolean, PermissionException.TYPE>() {
+                            @Override
+                            public PermissionException.TYPE apply(@NonNull Boolean requestResult, @NonNull Boolean shouldResult) throws Exception {
 
-                            e.onError(
-                                    new PermissionException(PermissionException.TYPE.USER_REFUSE)
-                            );
-                        } else {
-
-                            e.onError(
-                                    new PermissionException(PermissionException.TYPE.REFUSE_NEVER_ASK)
-                            );
+                                if (requestResult) {
+                                    return PASS;
+                                } else if (shouldResult) {
+                                    return USER_REFUSE;
+                                } else {
+                                    return REFUSE_NEVER_ASK;
+                                }
+                            }
+                        }
+                )
+                .subscribe(new Consumer<PermissionException.TYPE>() {
+                    @Override
+                    public void accept(@NonNull PermissionException.TYPE type) throws Exception {
+                        switch (type) {
+                            case REFUSE_NEVER_ASK:
+                                e.onError(
+                                        new PermissionException(PermissionException.TYPE.REFUSE_NEVER_ASK)
+                                );
+                                break;
+                            case USER_REFUSE:
+                                e.onError(
+                                        new PermissionException(PermissionException.TYPE.USER_REFUSE)
+                                );
+                                break;
+                            case PASS:
+                                e.onNext(true);
+                                break;
                         }
-
                     }
                 });
     }