Android 10+ Support (npomfret#6)

* Fix Android 10+ support * Clean up * Update build.gradle * Update package.json
stvkoch · Oct 5, 2020 · cc7436a · cc7436a
1 parent f80180e
commit cc7436a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -38,8 +38,8 @@ allprojects {
 }
 
 dependencies {
-    provided 'com.google.android.gms:play-services-drive:+'
-    implementation ('com.google.android.gms:play-services-auth:18.1.0') {
+    provided 'com.google.android.gms:play-services-drive:17.0.0'
+    implementation ('com.google.android.gms:play-services-auth:17.0.0') {
         force = true;
     }
     implementation 'com.google.http-client:google-http-client-gson:1.26.0'

diff --git a/android/src/main/java/org/rncloudfs/RNCloudFsModule.java b/android/src/main/java/org/rncloudfs/RNCloudFsModule.java
@@ -28,6 +28,7 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.api.client.extensions.android.http.AndroidHttp;
 import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential;
+import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException;
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.drive.Drive;
 import com.google.api.services.drive.DriveScopes;
@@ -49,6 +50,7 @@ public class RNCloudFsModule extends ReactContextBaseJavaModule implements Googl
     public static final String TAG = "RNCloudFs";
     private static final int REQUEST_CODE_SIGN_IN = 1;
     private static final int REQUEST_CODE_OPEN_DOCUMENT = 2;
+    private static final int REQUEST_AUTHORIZATION = 11;
     private DriveServiceHelper mDriveServiceHelper;
 
     private Promise signInPromise;
@@ -59,7 +61,6 @@ public RNCloudFsModule(ReactApplicationContext reactContext) {
         super(reactContext);
         this.reactContext = reactContext;
 
-
         reactContext.addLifecycleEventListener(this);
         reactContext.addActivityEventListener(this);
     }
@@ -144,7 +145,15 @@ public void listFiles(ReadableMap options, final Promise promise) {
                         result.putArray("files", files);
                         promise.resolve(result);
                     })
-                    .addOnFailureListener(exception -> Log.e(TAG, "Unable to query files.", exception));
+                    .addOnFailureListener(exception -> {
+                        Log.e(TAG, "Unable to query files: " + exception.getCause().getMessage());
+                        try{
+                            UserRecoverableAuthIOException e = (UserRecoverableAuthIOException)exception;
+                            this.reactContext.startActivityForResult(e.getIntent(), REQUEST_AUTHORIZATION, null);
+                        } catch(Exception e){
+                            throw e;
+                        }
+                    });
         }
     }
 
@@ -292,7 +301,7 @@ public void logout(Promise promise) {
 
     /**
      * Handles the {@code result} of a completed sign-in activity initiated from {@link
-     * #requestSignIn()}.
+     * #requestSignIn()} ()}.
      */
     private void handleSignInResult(Intent result) {
         GoogleSignIn.getSignedInAccountFromIntent(result)

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