Merge branch 'firebase-master' into update-database-access-modifiers

Author: SUPERCILEX

.gitignore

@@ -1,5 +1,4 @@
 .gradle
-gradle.properties
 /local.properties
 .idea
 .DS_Store

auth/src/main/java/com/firebase/ui/auth/ui/account_link/SaveCredentialsActivity.java

@@ -79,26 +79,10 @@ protected void onCreate(Bundle savedInstanceState) {
                 .addConnectionCallbacks(this)
                 .addOnConnectionFailedListener(this)
                 .addApi(Auth.CREDENTIALS_API)
+                .enableAutoManage(this, this)
                 .build();
-        mCredentialsApiClient.connect();
     }
 
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        mCredentialsApiClient.connect();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        if (mCredentialsApiClient != null) {
-            mCredentialsApiClient.disconnect();
-        }
-    }
-
-
     @Override
     public void onConnected(@Nullable Bundle bundle) {
         if (mEmail == null) {

auth/src/main/java/com/firebase/ui/auth/ui/email/SignInActivity.java

@@ -126,6 +126,7 @@ public void onFailure(@NonNull Exception e) {
                         TextInputLayout passwordInput =
                                 (TextInputLayout) findViewById(R.id.password_layout);
                         passwordInput.setError(getString(R.string.login_error));
+                        mActivityHelper.dismissDialog();
                     }
                 });
     }

auth/src/main/java/com/firebase/ui/auth/util/FirebaseAuthWrapper.java

@@ -21,6 +21,7 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
 
+import android.support.v4.app.FragmentActivity;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.FirebaseUser;
 
@@ -68,7 +69,7 @@ FirebaseUser linkWithCredential(
 
     boolean isPlayServicesAvailable(Context context);
 
-    PendingIntent getEmailHintIntent(Context context);
+    PendingIntent getEmailHintIntent(FragmentActivity context);
 
     void setTimeOut(long timeoutMs);
 

auth/src/main/java/com/firebase/ui/auth/util/FirebaseAuthWrapperImpl.java

@@ -14,12 +14,14 @@
 
 package com.firebase.ui.auth.util;
 
+import android.app.Fragment;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
+import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 
 import com.firebase.ui.auth.BuildConfig;
@@ -29,6 +31,7 @@
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.auth.AuthCredential;
@@ -153,18 +156,23 @@ protected boolean isPlayServicesAvailable(
     }
 
     @Override
-    public PendingIntent getEmailHintIntent(Context context) {
-        if (!isPlayServicesAvailable(context, GoogleApiAvailability.getInstance())) {
+    public PendingIntent getEmailHintIntent(FragmentActivity fragmentActivity) {
+        if (!isPlayServicesAvailable(fragmentActivity, GoogleApiAvailability.getInstance())) {
             return null;
         }
 
-        GoogleApiClient client = new GoogleApiClient.Builder(context)
+        GoogleApiClient client = new GoogleApiClient.Builder(fragmentActivity)
                 .addConnectionCallbacks(this)
                 .addApi(Auth.CREDENTIALS_API)
+                .enableAutoManage(fragmentActivity, new OnConnectionFailedListener() {
+                    @Override
+                    public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
+                        Log.e(TAG,
+                            "Client connection failed: " + connectionResult.getErrorMessage());
+                    }
+                })
                 .build();
 
-        client.connect();
-
         HintRequest hintRequest = new HintRequest.Builder()
                 .setHintPickerConfig(new CredentialPickerConfig.Builder()
                         .setShowCancelButton(true)

gradle.properties

@@ -0,0 +1,19 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Aug 02 23:08:04 SGT 2016
+#Tue Sep 27 18:02:33 SGT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip

storage/README.md

@@ -2,14 +2,14 @@
 
 ## Using FirebaseUI to download and display images
 
-[Firebase Storage](firebase-storage) provides secure file uploads and downloads for your Firebase apps,
+[Firebase Storage][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,
 and cost-effective object storage service.
 
 FirebaseUI provides bindings to download an image file stored in Firebase 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
+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.
 
 To load an image from a `StorageReference`, simply use the `FirebaseImageLoader` class:
@@ -30,7 +30,7 @@ To load an image from a `StorageReference`, simply use the `FirebaseImageLoader`
 
 Images displayed using `FirebaseImageLoader` are cached by their path in Firebase Storage, so
 repeated loads will be fast and conserve bandwidth. For more information on caching in Glide,
-see [this guide](glide-caching)
+see [this guide][glide-caching].
 
 ## Known Issues