Remove static scope to facilitate mocking

happylinhdn · Mar 18, 2016 · 833b87e · 833b87e
1 parent 4e56153
commit 833b87e
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 62 deletions.
diff --git a/lib/src/main/java/com/tbruyelle/rxpermissions/RxPermissions.java b/lib/src/main/java/com/tbruyelle/rxpermissions/RxPermissions.java
@@ -75,11 +75,11 @@ private void log(String message) {
      * If one or several permissions have never been requested, invoke the related framework method
      * to ask the user if he allows the permissions.
      */
-    public static Observable.Transformer<Object, Boolean> ensure(final Context ctx, final String... permissions) {
+    public Observable.Transformer<Object, Boolean> ensure(final String... permissions) {
         return new Observable.Transformer<Object, Boolean>() {
             @Override
             public Observable<Boolean> call(Observable<Object> o) {
-                return RxPermissions.getInstance(ctx).request(o, permissions)
+                return request(o, permissions)
                         // Transform Observable<Permission> to Observable<Boolean>
                         .buffer(permissions.length)
                         .flatMap(new Func1<List<Permission>, Observable<Boolean>>() {
@@ -111,11 +111,11 @@ public Observable<Boolean> call(List<Permission> permissions) {
      * If one or several permissions have never been requested, invoke the related framework method
      * to ask the user if he allows the permissions.
      */
-    public static Observable.Transformer<Object, Permission> ensureEach(final Context ctx, final String... permissions) {
+    public Observable.Transformer<Object, Permission> ensureEach(final String... permissions) {
         return new Observable.Transformer<Object, Permission>() {
             @Override
             public Observable<Permission> call(Observable<Object> o) {
-                return RxPermissions.getInstance(ctx).request(o, permissions);
+                return request(o, permissions);
             }
         };
     }