Handle account auth (npomfret#7)

* Update RNCloudFsModule.java * Update build.gradle * bump version
stvkoch · Dec 2, 2020 · 0b03ea5 · 0b03ea5
1 parent cc7436a
commit 0b03ea5
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 14 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -28,7 +28,11 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-    }    
+    }
+
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+    }
 }
 
 allprojects {

diff --git a/android/src/main/java/org/rncloudfs/RNCloudFsModule.java b/android/src/main/java/org/rncloudfs/RNCloudFsModule.java
@@ -90,8 +90,13 @@ public void fileExists(ReadableMap options, final Promise promise) {
 
                     })
                     .addOnFailureListener(exception ->{
-                        Log.e(TAG, "Couldn't read file.", exception);
-                        promise.reject(exception);
+                        try{
+                            UserRecoverableAuthIOException e = (UserRecoverableAuthIOException)exception;
+                            this.reactContext.startActivityForResult(e.getIntent(), REQUEST_AUTHORIZATION, null);
+                        } catch(Exception e){
+                            Log.e(TAG, "Couldn't read file.", exception);
+                            promise.reject(exception);
+                        }
                     });
         }
     }
@@ -108,8 +113,13 @@ public void deleteFromCloud(ReadableMap options, final Promise promise) {
 
                     })
                     .addOnFailureListener(exception ->{
-                        Log.e(TAG, "Couldn't delete file.", exception);
-                        promise.reject(exception);
+                        try{
+                            UserRecoverableAuthIOException e = (UserRecoverableAuthIOException)exception;
+                            this.reactContext.startActivityForResult(e.getIntent(), REQUEST_AUTHORIZATION, null);
+                        } catch(Exception e){
+                            Log.e(TAG, "Couldn't delete file.", exception);
+                            promise.reject(exception);
+                        }
                     });
         }
     }
@@ -202,8 +212,13 @@ public void copyToCloud(ReadableMap options, final Promise promise) throws Execu
                         Log.d(TAG, "Saving " + fileId);
                         promise.resolve(fileId);
                     }).addOnFailureListener(exception -> {
-                        Log.e(TAG, "Couldn't create file.", exception);
-                        promise.reject(exception);
+                        try{
+                            UserRecoverableAuthIOException e = (UserRecoverableAuthIOException)exception;
+                            this.reactContext.startActivityForResult(e.getIntent(), REQUEST_AUTHORIZATION, null);
+                        } catch(Exception e){
+                            Log.e(TAG, "Couldn't create file.", exception);
+                            promise.reject(exception);
+                        }
                     });
         }
     }
@@ -329,10 +344,15 @@ private void handleSignInResult(Intent result) {
                     }
                 })
                 .addOnFailureListener(exception -> {
-                    Log.e(TAG, "Unable to sign in.", exception);
-                    if(this.signInPromise != null){
-                        this.signInPromise.reject(exception);
-                        this.signInPromise = null;
+                    try{
+                        UserRecoverableAuthIOException e = (UserRecoverableAuthIOException)exception;
+                        this.reactContext.startActivityForResult(e.getIntent(), REQUEST_AUTHORIZATION, null);
+                    } catch(Exception e){
+                        Log.e(TAG, "Unable to sign in.", exception);
+                        if(this.signInPromise != null){
+                            this.signInPromise.reject(exception);
+                            this.signInPromise = null;
+                        }
                     }
                 });
     }
@@ -351,8 +371,13 @@ public void getGoogleDriveDocument(String fileId, Promise promise) {
 
                     })
                     .addOnFailureListener(exception ->{
-                        Log.e(TAG, "Couldn't read file.", exception);
-                        promise.reject(exception);
+                        try{
+                            UserRecoverableAuthIOException e = (UserRecoverableAuthIOException)exception;
+                            this.reactContext.startActivityForResult(e.getIntent(), REQUEST_AUTHORIZATION, null);
+                        } catch(Exception e){
+                            Log.e(TAG, "Couldn't read file.", exception);
+                            promise.reject(exception);
+                        }
                     });
         }
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-cloud-fs",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "",
   "main": "index.js",
   "scripts": {