Update quickstart sample apps with new changes in GoogleSignIn and GoogleSignInClient. Correct the play services version.

Change-Id: I6d30f33949a234200712ced71ed8e4be06b32393

Author: Arco Xu

app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.0'
+    compileSdkVersion 26
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         applicationId "com.google.android.gms.drive.sample.quickstart"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -21,8 +21,8 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:26.1.0'
 
-    compile 'com.google.android.gms:play-services-drive:11.4.0'
-    compile 'com.google.android.gms:play-services-auth:11.4.0'
+    compile 'com.google.android.gms:play-services-drive:11.6.0'
+    compile 'com.google.android.gms:play-services-auth:11.6.0'
 }

app/src/main/java/com/google/android/gms/drive/sample/quickstart/MainActivity.java

@@ -16,15 +16,13 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.content.IntentSender;
-import android.content.IntentSender.SendIntentException;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
-import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
 import com.google.android.gms.drive.CreateFileActivityOptions;
@@ -33,8 +31,8 @@
 import com.google.android.gms.drive.DriveContents;
 import com.google.android.gms.drive.DriveResourceClient;
 import com.google.android.gms.drive.MetadataChangeSet;
+import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -87,9 +85,9 @@ private void saveFileToDrive() {
     mDriveResourceClient
         .createContents()
         .continueWithTask(
-            new Continuation<DriveContents, Task<IntentSender>>() {
+            new Continuation<DriveContents, Task<Void>>() {
               @Override
-              public Task<IntentSender> then(@NonNull Task<DriveContents> task) throws Exception {
+              public Task<Void> then(@NonNull Task<DriveContents> task) throws Exception {
                 return createFileIntentSender(task.getResult(), image);
               }
             })
@@ -154,10 +152,14 @@ protected void onActivityResult(final int requestCode, final int resultCode, fin
         // Called after user is signed in.
         if (resultCode == RESULT_OK) {
           Log.i(TAG, "Signed in successfully.");
-          // Execute task to get sign in account.
-          Task<GoogleSignInAccount> task =
-              mGoogleSignInClient.getGoogleSignInAccountFromIntent(data);
-          updateViewWithGoogleSignInAccountTask(task);
+          // Use the last signed in account here since it already have a Drive scope.
+          mDriveClient = Drive.getDriveClient(this, GoogleSignIn.getLastSignedInAccount(this));
+          // Build a drive resource client.
+          mDriveResourceClient =
+              Drive.getDriveResourceClient(this, GoogleSignIn.getLastSignedInAccount(this));
+          // Start camera.
+          startActivityForResult(
+              new Intent(MediaStore.ACTION_IMAGE_CAPTURE), REQUEST_CODE_CAPTURE_IMAGE);
         }
         break;
       case REQUEST_CODE_CAPTURE_IMAGE:
@@ -183,34 +185,4 @@ protected void onActivityResult(final int requestCode, final int resultCode, fin
         break;
     }
   }
-
-  /**
-   * Update view with Google SignIn account task. If task was successful, build the drive client and
-   * drive resource client, then start the camera. Otherwise print out the exception stacktrace.
-   */
-  private void updateViewWithGoogleSignInAccountTask(Task<GoogleSignInAccount> task) {
-    Log.i(TAG, "Update view with sign in account task");
-    task.addOnSuccessListener(
-            new OnSuccessListener<GoogleSignInAccount>() {
-              @Override
-              public void onSuccess(GoogleSignInAccount googleSignInAccount) {
-                Log.i(TAG, "Sign in success");
-                // Build a drive client.
-                mDriveClient = Drive.getDriveClient(getApplicationContext(), googleSignInAccount);
-                // Build a drive resource client.
-                mDriveResourceClient =
-                    Drive.getDriveResourceClient(getApplicationContext(), googleSignInAccount);
-                // Start camera.
-                startActivityForResult(
-                    new Intent(MediaStore.ACTION_IMAGE_CAPTURE), REQUEST_CODE_CAPTURE_IMAGE);
-              }
-            })
-        .addOnFailureListener(
-            new OnFailureListener() {
-              @Override
-              public void onFailure(@NonNull Exception e) {
-                Log.w(TAG, "Sign in failed", e);
-              }
-            });
-  }
 }