Merge branch 'master' into version-2.0.0-dev

Author: samtstern

README.md

@@ -95,7 +95,19 @@ For convenience, here are some examples:
 
 There is a sample app in the `app/` directory that demonstrates most
 of the features of FirebaseUI. Load the project in Android Studio and
-run it on your Android device to see a demonstration.
+run it on your Android device to see a demonstration. 
+
+Before you can run the sample app, you must create a project in
+the Firebase console. Add an Android app to the project, and copy
+the generated google-services.json file into the `app/` directory.
+Also enable [anonymous authentication](https://firebase.google.com/docs/auth/android/anonymous-auth)
+for the Firebase project, since some components of the sample app
+requires it.
+
+If you encounter a version incompatibility error between Android Studio
+and Gradle while trying to run the sample app, try disabling the Instant
+Run feature of Android Studio. Alternatively, update Android Studio and
+Gradle to their latest versions.
 
 ## Contributing
 

app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java

@@ -59,7 +59,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_image);
         ButterKnife.bind(this);
 
-        // By default, Firebase Storage files require authentication to read or write.
+        // By default, Cloud Storage files require authentication to read or write.
         // For this sample to function correctly, enable Anonymous Auth in the Firebase console:
         // https://console.firebase.google.com/project/_/authentication/providers
         FirebaseAuth.getInstance()
@@ -102,7 +102,7 @@ private void uploadPhoto(Uri uri) {
         hideDownloadUI();
         Toast.makeText(this, "Uploading...", Toast.LENGTH_SHORT).show();
 
-        // Upload to Firebase Storage
+        // Upload to Cloud Storage
         String uuid = UUID.randomUUID().toString();
         mImageRef = FirebaseStorage.getInstance().getReference(uuid);
         mImageRef.putFile(uri)

app/src/main/res/values/strings.xml

@@ -7,7 +7,7 @@
 
     <string name="desc_chat">Demonstrates using a FirebaseRecyclerAdapter to load data from Firebase Database into a RecyclerView for a basic chat app.</string>
     <string name="desc_auth_ui">Demonstrates the Firebase Auth UI flow, with customization options.</string>
-    <string name="desc_image">Demonstrates displaying an image from Firebase Storage using Glide.</string>
+    <string name="desc_image">Demonstrates displaying an image from Cloud Storage using Glide.</string>
 
     <!-- strings for Auth UI demo activities -->
     <eat-comment/>
@@ -47,7 +47,7 @@
     <string name="configuration_required">Configuration is required - see README.md</string>
     <string name="other_options_header">Other Options:</string>
     <string name="enable_smartlock">Enable SmartLock for Passwords</string>
-    <string name="rational_image_perm">This sample will read an image from local storage to upload to Firebase Storage.</string>
+    <string name="rational_image_perm">This sample will read an image from local storage to upload to Cloud Storage.</string>
     <string name="anonymous_auth_failed_msg">Anonymous authentication failed, various components of the demo will not work. Make sure your device is online and that Anonymous Auth is configured in your Firebase project(https://console.firebase.google.com/project/_/authentication/providers)</string>
     <string name="extra_google_scopes">Example extra Google scopes</string>
     <string name="games">Games</string>

auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java

@@ -158,7 +158,7 @@ public void onSuccess(AuthResult result) {
                                 result.getUser()
                                         .linkWithCredential(mPrevCredential)
                                         .addOnFailureListener(new TaskFailureLogger(
-                                                TAG, "Error signing in with previous credential"))
+                                                TAG, "Error signing in with previous credential " + idpResponse.getProviderType()))
                                         .addOnCompleteListener(new FinishListener(idpResponse));
                             } else {
                                 finish(ResultCodes.OK, IdpResponse.getIntent(idpResponse));
@@ -172,12 +172,12 @@ public void onFailure(@NonNull Exception e) {
                         }
                     })
                     .addOnFailureListener(
-                            new TaskFailureLogger(TAG, "Error signing in with new credential"));
+                            new TaskFailureLogger(TAG, "Error signing in with new credential " + idpResponse.getProviderType()));
         } else {
             currentUser
                     .linkWithCredential(newCredential)
                     .addOnFailureListener(
-                            new TaskFailureLogger(TAG, "Error linking with credential"))
+                            new TaskFailureLogger(TAG, "Error linking with credential " + idpResponse.getProviderType()))
                     .addOnCompleteListener(new FinishListener(idpResponse));
         }
     }

auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java

@@ -152,7 +152,7 @@ public void onSuccess(AuthResult authResult) {
                             authResult.getUser()
                                     .linkWithCredential(authCredential)
                                     .addOnFailureListener(new TaskFailureLogger(
-                                            TAG, "Error signing in with credential"))
+                                            TAG, "Error signing in with credential " + authCredential.getProvider()))
                                     .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                                         @Override
                                         public void onSuccess(AuthResult authResult) {

auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java

@@ -167,7 +167,7 @@ public void onSuccess(final IdpResponse response) {
         mActivityHelper.getFirebaseAuth()
                 .signInWithCredential(credential)
                 .addOnFailureListener(
-                        new TaskFailureLogger(TAG, "Firebase sign in with credential unsuccessful"))
+                        new TaskFailureLogger(TAG, "Firebase sign in with credential " + credential.getProvider() + " unsuccessful. Visit https://console.firebase.google.com to enable it."))
                 .addOnCompleteListener(new CredentialSignInHandler(
                         this,
                         mActivityHelper,

auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java

@@ -90,7 +90,7 @@ public void onFailure(@NonNull Exception e) {
                     return;
                 }
             } else {
-                Log.e(TAG, "Unexpected exception when signing in with credential",
+                Log.e(TAG, "Unexpected exception when signing in with credential " + mResponse.getProviderType() + " unsuccessful. Visit https://console.firebase.google.com to enable it.",
                       task.getException());
             }
             mHelper.dismissDialog();

auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java

@@ -134,7 +134,7 @@ public void onSuccess(final IdpResponse response) {
         mHelper.getFirebaseAuth()
                 .signInWithCredential(credential)
                 .addOnFailureListener(
-                        new TaskFailureLogger(TAG, "Failure authenticating with credential"))
+                        new TaskFailureLogger(TAG, "Failure authenticating with credential " + credential.getProvider()))
                 .addOnCompleteListener(new CredentialSignInHandler(
                         getActivity(),
                         mHelper,

build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-rc1'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.google.gms:google-services:3.0.0'
         classpath 'io.fabric.tools:gradle:1.+'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Tue Feb 21 17:40:47 PST 2017
+#Sat Mar 04 16:24:17 SGT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -2,20 +2,20 @@
 
 ## Using FirebaseUI to download and display images
 
-[Firebase Storage][firebase-storage] provides secure file uploads and downloads for your Firebase apps,
+[Cloud Storage for Firebase][firebase-storage] provides secure file uploads and downloads for your Firebase apps,
 regardless of network quality. You can use it to store images, audio, video, or other
-user-generated content. Firebase Storage is backed by Google Cloud Storage, a powerful, simple,
+user-generated content. Cloud Storage is a powerful, simple,
 and cost-effective object storage service.
 
-FirebaseUI provides bindings to download an image file stored in Firebase Storage
+FirebaseUI provides bindings to download an image file stored in Cloud Storage
 from a [`StorageReference`][storage-reference] and display it using the popular
 [Glide][glide] library. This technique allows you to get all of Glide's performance
-benefits while leveraging Firebase Storage's authenticated storage capabilities.
+benefits while leveraging Cloud Storage's authenticated storage capabilities.
 
 To load an image from a `StorageReference`, simply use the `FirebaseImageLoader` class:
 
 ```java
-// Reference to an image file in Firebase Storage
+// Reference to an image file in Cloud Storage
 StorageReference storageReference = ...;
 
 // ImageView in your Activity
@@ -28,7 +28,7 @@ Glide.with(this /* context */)
         .into(imageView);
 ```
 
-Images displayed using `FirebaseImageLoader` are cached by their path in Firebase Storage, so
+Images displayed using `FirebaseImageLoader` are cached by their path in Cloud Storage, so
 repeated loads will be fast and conserve bandwidth. For more information on caching in Glide,
 see [this guide][glide-caching].