Update Drive sample app

-Use new Auth APIs
-Update library version numbers
-Switch to maven {} instead of mavenLocal()

Change-Id: I65f97bd9215b9b4c0859fbf42d4375ff11bafc78

Author: Caitlin Hurley

app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    buildToolsVersion "26.0.2"
 
     defaultConfig {
         applicationId "com.google.android.gms.drive.sample.conflict"
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:26.0.2'
-    compile 'com.google.android.gms:play-services-auth:11.8.0-SNAPSHOT'
-    compile 'com.google.android.gms:play-services-drive:11.8.0-SNAPSHOT'
+    compile 'com.android.support:support-v4:26.1.0'
+    compile 'com.google.android.gms:play-services-auth:11.6.0'
+    compile 'com.google.android.gms:play-services-drive:11.6.0'
 }

app/src/main/java/com/google/android/gms/drive/sample/conflict/BaseDemoActivity.java

@@ -60,7 +60,7 @@ protected void onStart() {
      * Handles resolution callbacks.
      */
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_CODE_SIGN_IN) {
             if (resultCode != RESULT_OK) {
@@ -71,14 +71,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 return;
             }
 
-            Task<GoogleSignInAccount> getAccountTask =
-                    GoogleSignInClient.getGoogleSignInAccountFromIntent(data);
-            if (getAccountTask.isSuccessful()) {
-                initializeDriveClient(getAccountTask.getResult());
-            } else {
-                Log.e(TAG, "Sign-in failed.");
-                finish();
-            }
+            // We can use last signed in account here because we know the account has Drive scopes
+            initializeDriveClient(GoogleSignIn.getLastSignedInAccount(this));
         }
     }
 
@@ -92,12 +86,7 @@ protected void signIn() {
                         .requestScopes(Drive.SCOPE_APPFOLDER)
                         .build();
         GoogleSignInClient googleSignInClient = GoogleSignIn.getClient(this, signInOptions);
-        GoogleSignInAccount signInAccount = googleSignInClient.getLastSignedInAccount();
-        if (signInAccount != null) {
-            initializeDriveClient(signInAccount);
-        } else {
-            startActivityForResult(googleSignInClient.getSignInIntent(), REQUEST_CODE_SIGN_IN);
-        }
+        startActivityForResult(googleSignInClient.getSignInIntent(), REQUEST_CODE_SIGN_IN);
     }
 
     /**

build.gradle

@@ -3,9 +3,12 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,6 +21,5 @@ allprojects {
         maven {
             url "https://maven.google.com"
         }
-        mavenLocal()
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Aug 21 15:48:43 MDT 2017
+#Tue Oct 31 12:50:02 MDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip