Remove synchronous download URL calls (firebase#19)

samtstern · web-flow · commit a01dcb3f3c46 · 2018-04-24T09:29:57.000-07:00
Change-Id: Ib39bba883fadd5df257dc3b3c5cb570a29ae199c
diff --git a/storage/app/build.gradle b/storage/app/build.gradle
@@ -22,7 +22,7 @@ android {
 dependencies {
     compile "com.android.support:support-v4:27.1.0"
     compile "com.android.support:appcompat-v7:27.1.0"
-    compile "com.google.firebase:firebase-storage:12.0.1"
+    compile "com.google.firebase:firebase-storage:15.0.0"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/storage/app/src/main/java/com/google/firebase/referencecode/storage/StorageActivity.java b/storage/app/src/main/java/com/google/firebase/referencecode/storage/StorageActivity.java
@@ -23,8 +23,11 @@
 import android.support.v7.app.AppCompatActivity;
 import android.widget.ImageView;
 
+import com.google.android.gms.tasks.Continuation;
+import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.Task;
 import com.google.firebase.storage.FileDownloadTask;
 import com.google.firebase.storage.FirebaseStorage;
 import com.google.firebase.storage.OnPausedListener;
@@ -179,8 +182,8 @@ public void onFailure(@NonNull Exception exception) {
         }).addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
             @Override
             public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
-                // taskSnapshot.getMetadata() contains file metadata such as size, content-type, and download URL.
-                Uri downloadUrl = taskSnapshot.getDownloadUrl();
+                // taskSnapshot.getMetadata() contains file metadata such as size, content-type, etc.
+                // ...
             }
         });
         // [END upload_memory]
@@ -197,8 +200,8 @@ public void onFailure(@NonNull Exception exception) {
         }).addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
             @Override
             public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
-                // taskSnapshot.getMetadata() contains file metadata such as size, content-type, and download URL.
-                Uri downloadUrl = taskSnapshot.getDownloadUrl();
+                // taskSnapshot.getMetadata() contains file metadata such as size, content-type, etc.
+                // ...
             }
         });
         // [END upload_stream]
@@ -217,8 +220,8 @@ public void onFailure(@NonNull Exception exception) {
         }).addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
             @Override
             public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
-                // taskSnapshot.getMetadata() contains file metadata such as size, content-type, and download URL.
-                Uri downloadUrl = taskSnapshot.getDownloadUrl();
+                // taskSnapshot.getMetadata() contains file metadata such as size, content-type, etc.
+                // ...
             }
         });
         // [END upload_file]
@@ -295,10 +298,37 @@ public void onFailure(@NonNull Exception exception) {
             @Override
             public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
                 // Handle successful uploads on complete
-                Uri downloadUrl = taskSnapshot.getMetadata().getDownloadUrl();
+                // ...
             }
         });
         // [END upload_complete_example]
+
+        // [START upload_get_download_url]
+        final StorageReference ref = storageRef.child("images/mountains.jpg");
+        uploadTask = ref.putFile(file);
+
+        Task<Uri> urlTask = uploadTask.continueWithTask(new Continuation<UploadTask.TaskSnapshot, Task<Uri>>() {
+            @Override
+            public Task<Uri> then(@NonNull Task<UploadTask.TaskSnapshot> task) throws Exception {
+                if (!task.isSuccessful()) {
+                    throw task.getException();
+                }
+
+                // Continue with the task to get the download URL
+                return ref.getDownloadUrl();
+            }
+        }).addOnCompleteListener(new OnCompleteListener<Uri>() {
+            @Override
+            public void onComplete(@NonNull Task<Uri> task) {
+                if (task.isSuccessful()) {
+                    Uri downloadUri = task.getResult();
+                } else {
+                    // Handle failures
+                    // ...
+                }
+            }
+        });
+        // [END upload_get_download_url]
     }
 
     private void includesForDownloadFiles() throws IOException {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ android {`
`22`	`22`	`dependencies {`
`23`	`23`	`compile "com.android.support:support-v4:27.1.0"`
`24`	`24`	`compile "com.android.support:appcompat-v7:27.1.0"`
`25`		`- compile "com.google.firebase:firebase-storage:12.0.1"`
	`25`	`+ compile "com.google.firebase:firebase-storage:15.0.0"`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`apply plugin: 'com.google.gms.google-services'`