updated dependencies and added cancellation method (npomfret#13)

stvkoch · Sep 1, 2022 · 6242405 · 6242405
1 parent e7e3111
commit 6242405
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -42,7 +42,7 @@ allprojects {
 }
 
 dependencies {
-    provided 'com.google.android.gms:play-services-drive:17.0.0'
+    implementation 'com.google.android.gms:play-services-drive:17.0.0'
     implementation ('com.google.android.gms:play-services-auth:17.0.0') {
         force = true;
     }
@@ -53,5 +53,5 @@ dependencies {
     implementation('com.google.apis:google-api-services-drive:v3-rev136-1.25.0') {
         exclude group: 'org.apache.httpcomponents'
     }
-    provided 'com.facebook.react:react-native:+'
+    implementation 'com.facebook.react:react-native:+'
 }
diff --git a/android/src/main/java/org/rncloudfs/RNCloudFsModule.java b/android/src/main/java/org/rncloudfs/RNCloudFsModule.java
@@ -362,7 +362,12 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
                             }
                         });
                     }
+                } else if (resultCode == Activity.RESULT_CANCELED && mPendingPromise != null) {
+                    mPendingPromise.reject("canceled", "User canceled");
+                } else if (mPendingPromise != null) {
+                    mPendingPromise.reject("unknown error", "Operation failed: " + mPendingOperation + " result code " + resultCode);
                 }
+                break;
         }
 
     }
@@ -448,6 +453,10 @@ private void handleSignInResult(Task<GoogleSignInAccount> completedTask) {
             // The ApiException status code indicates the detailed failure reason.
             // Please refer to the GoogleSignInStatusCodes class reference for more information.
             Log.w(TAG, "signInResult:failed code=" + e.getStatusCode());
+            if(this.signInPromise != null){
+                this.signInPromise.reject("signInResult:" + e.getStatusCode(), e.getMessage());
+                this.signInPromise = null;
+            }
         }
     }