Feature: Get rid of Google drive API, startin using Google Drive Rest…

… API
binogure-studio · Dec 23, 2018 · 3d99d39 · 3d99d39
1 parent 16c0d39
commit 3d99d39
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 19 deletions.
diff --git a/android/src/google/GoogleAchievements.java b/android/src/google/GoogleAchievements.java
@@ -27,7 +27,6 @@
 import com.google.android.gms.common.api.ApiException;
 import com.google.android.gms.common.api.ResultCallback;
 import com.google.android.gms.common.api.Status;
-import com.google.android.gms.drive.Drive;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.OnFailureListener;

diff --git a/android/src/google/GoogleAuthentication.java b/android/src/google/GoogleAuthentication.java
@@ -29,10 +29,10 @@
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
 import com.google.android.gms.auth.api.signin.GoogleSignInResult;
-import com.google.android.gms.common.Scopes;
 import com.google.android.gms.common.api.ApiException;
 import com.google.android.gms.common.api.Status;
-import com.google.android.gms.drive.Drive;
+import com.google.android.gms.common.api.Scope;
+import com.google.api.services.drive.DriveScopes;
 import com.google.android.gms.games.Games;
 import com.google.android.gms.games.GamesClient;
 import com.google.android.gms.games.Player;
@@ -85,7 +85,8 @@ public GoogleAuthentication(Activity p_activity) {
 		GoogleSignInOptions options = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_GAMES_SIGN_IN)
 		.requestIdToken(webclientId)
 		// Since we are using SavedGames, we need to add the SCOPE_APPFOLDER to access Google Drive.
-		.requestScopes(Drive.SCOPE_APPFOLDER)
+		.requestScopes(new Scope(DriveScopes.DRIVE_FILE))
+		.requestScopes(new Scope(DriveScopes.DRIVE_APPDATA))
 		.build();
 
 		mGoogleApiClient = new GoogleApiClient.Builder(activity)
@@ -290,6 +291,11 @@ private void silentConnectHandler(GoogleSignInResult result) {
 			Log.i(TAG, "Failed to connect, user cancelled: " + result.getStatus());
 
 			onDisconnected();
+		} else if (result.getStatus().getStatusCode() == GoogleSignInStatusCodes.SIGN_IN_REQUIRED) {
+			Log.i(TAG, "User marked as connected, but google flag it has disconnected: " + result.getStatus());
+
+			updateConnectionStatus(GodotConnectStatus.DISCONNECTED);
+			disconnect();
 		} else {
 			updateConnectionStatus(GodotConnectStatus.DISCONNECTED);
 

diff --git a/android/src/google/GoogleLeaderboard.java b/android/src/google/GoogleLeaderboard.java
@@ -27,7 +27,6 @@
 import com.google.android.gms.common.Scopes;
 import com.google.android.gms.common.api.ApiException;
 import com.google.android.gms.common.api.Status;
-import com.google.android.gms.drive.Drive;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.OnFailureListener;

diff --git a/android/src/google/GooglePlayer.java b/android/src/google/GooglePlayer.java
@@ -37,7 +37,6 @@
 import com.google.android.gms.common.Scopes;
 import com.google.android.gms.common.api.ApiException;
 import com.google.android.gms.common.api.Status;
-import com.google.android.gms.drive.Drive;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.OnFailureListener;

diff --git a/android/src/google/GoogleSnapshot.java b/android/src/google/GoogleSnapshot.java
@@ -24,7 +24,6 @@
 import com.google.android.gms.common.Scopes;
 import com.google.android.gms.common.api.ApiException;
 import com.google.android.gms.common.api.Status;
-import com.google.android.gms.drive.Drive;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.OnFailureListener;

diff --git a/config.py b/config.py
@@ -4,24 +4,28 @@ def can_build(plat):
 
 def configure(env):
     if env["platform"] == "android":
-        env.android_add_maven_repository("url 'https://maven.google.com'")
-
-        gms_version = "12.0.1"
+        env.android_add_maven_repository("url 'https://maven.fabric.io/public'")
 
         # Firebase dependencies
-        env.android_add_dependency("compile 'com.google.firebase:firebase-core:" + gms_version + "'")
-        env.android_add_dependency("compile 'com.google.firebase:firebase-auth:" + gms_version + "'")
-        env.android_add_dependency("compile 'com.google.firebase:firebase-invites:" + gms_version + "'")
-        env.android_add_dependency("compile 'com.google.firebase:firebase-messaging:" + gms_version + "'")
+        env.android_add_dependency("compile 'com.google.firebase:firebase-core:16.0.6'")
+        env.android_add_dependency("compile 'com.google.firebase:firebase-auth:16.1.0'")
+        env.android_add_dependency("compile 'com.google.firebase:firebase-invites:16.0.6'")
+        env.android_add_dependency("compile 'com.google.firebase:firebase-messaging:17.3.4'")
+        env.android_add_dependency("compile 'com.google.firebase:firebase-appindexing:17.1.0'")
 
         # Play service dependencies
-        env.android_add_dependency("compile 'com.google.android.gms:play-services-auth:" + gms_version + "'")
-        env.android_add_dependency("compile 'com.google.android.gms:play-services-games:" + gms_version + "'")
-        env.android_add_dependency("compile 'com.google.android.gms:play-services-drive:" + gms_version + "'")
+        env.android_add_dependency("compile 'com.google.android.gms:play-services-auth:16.0.1'")
+        env.android_add_dependency("compile 'com.google.android.gms:play-services-games:16.0.0'")
+        env.android_add_dependency("compile 'com.google.android.gms:play-services-drive:16.0.0'")
+
+        # Play service google drive
+        env.android_add_dependency("compile('com.google.apis:google-api-services-drive:v3-rev136-1.25.0') { exclude group: 'org.apache.httpcomponents' }")
 
-        env.android_add_gradle_classpath("com.google.gms:google-services:3.1.1")
-        env.android_add_gradle_plugin("com.google.gms.google-services")
+        env.android_add_gradle_classpath('com.google.gms:google-services:4.1.0')
+        env.android_add_gradle_classpath('io.fabric.tools:gradle:1.25.0')
 
+        env.android_add_gradle_plugin('com.google.gms.google-services')
+        env.android_add_gradle_plugin('io.fabric')
         env.android_add_java_dir("android/src")
 
     	env.android_add_res_dir("res")