Merge branch 'version-1.1.0-dev' into puf-ondatachange

Author: puf

.gitignore

@@ -1,10 +1,7 @@
 .gradle
+/**/*.iml
 /local.properties
 .idea
 .DS_Store
 /build
-/captures
-/library/target
-/**/*.iml
 google-services.json
-build/

.travis.yml

@@ -9,14 +9,27 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
 android:
   components:
-    - platform-tools
     - tools
-    - build-tools-25.0.1
+    - build-tools-25.0.2
     - android-25
-
-    # Extras
-    - extra-google-m2repository
+    - platform-tools
     - extra-android-m2repository
-script: ./gradlew clean :library:testAll :library:prepareArtifacts
+    - extra-google-m2repository
+before_script: mv library/google-services.json app/google-services.json
+script: ./gradlew clean assembleDebug check
+after_failure:
+  # tests
+  - cat app/build/reports/tests/testDebugUnitTest/index.html
+  - cat auth/build/reports/tests/testDebugUnitTest/index.html
+  - cat database/build/reports/tests/testDebugUnitTest/index.html
+  - cat storage/build/reports/tests/testDebugUnitTest/index.html
+
+  # app
+  - cat app/build/reports/checkstyle.html
+  - cat app/build/reports/lint-results.xml
+  - cat app/build/reports/lint-results.html
+  - cat app/build/reports/findbugs.html
+  - cat app/build/reports/pmd.html

app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.neenbedankt.android-apt'
-apply from: "../common/constants.gradle"
+apply from: "../constants.gradle"
+apply from: '../library/quality/quality.gradle'
 
 android {
     compileSdkVersion compileSdk

app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.firebase.uidemo">
 
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -9,9 +10,12 @@
     <application
         android:name=".auth.LeakCatcher"
         android:allowBackup="true"
+        android:fullBackupContent="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:supportsRtl="false"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".ChooserActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

app/src/main/java/com/firebase/uidemo/ChooserActivity.java

@@ -77,22 +77,21 @@ public void onItemClick(int position) {
     public static class MyArrayAdapter extends ArrayAdapter<Class> {
 
         private Context mContext;
-        private Class[] mClasses;
 
-        public MyArrayAdapter(Context context, int resource, Class[] objects) {
+        public MyArrayAdapter(Context context, int resource, Class... objects) {
             super(context, resource, objects);
-
             mContext = context;
-            mClasses = objects;
         }
 
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
-            View view = convertView;
+            View view;
 
             if (convertView == null) {
                 LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(LAYOUT_INFLATER_SERVICE);
                 view = inflater.inflate(android.R.layout.simple_list_item_2, null);
+            } else {
+                view = convertView;
             }
 
             ((TextView) view.findViewById(android.R.id.text1)).setText(DESCRIPTION_NAMES[position]);

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -33,8 +33,9 @@
 
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
+import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.ui.ResultCodes;
+import com.firebase.ui.auth.ResultCodes;
 import com.firebase.uidemo.R;
 import com.google.android.gms.common.Scopes;
 import com.google.firebase.auth.FirebaseAuth;
@@ -50,7 +51,7 @@
 public class AuthUiActivity extends AppCompatActivity {
     private static final String UNCHANGED_CONFIG_VALUE = "CHANGE-ME";
     private static final String GOOGLE_TOS_URL = "https://www.google.com/policies/terms/";
-    private static final String FIREBASE_TOS_URL = "https://www.firebase.com/terms/terms-of-service.html";
+    private static final String FIREBASE_TOS_URL = "https://firebase.google.com/terms/";
     private static final int RC_SIGN_IN = 100;
 
     @BindView(R.id.default_theme)
@@ -86,7 +87,7 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.sign_in)
     Button mSignIn;
 
-    @BindView(android.R.id.content)
+    @BindView(R.id.root)
     View mRootView;
 
     @BindView(R.id.firebase_logo)
@@ -199,20 +200,30 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
     @MainThread
     private void handleSignInResponse(int resultCode, Intent data) {
-        if (resultCode == RESULT_OK) {
-            startActivity(SignedInActivity.createIntent(this, IdpResponse.fromResultIntent(data)));
-            finish();
-            return;
-        }
-
-        if (resultCode == RESULT_CANCELED) {
-            showSnackbar(R.string.sign_in_cancelled);
-            return;
-        }
+        IdpResponse response = IdpResponse.fromResultIntent(data);
 
-        if (resultCode == ResultCodes.RESULT_NO_NETWORK) {
-            showSnackbar(R.string.no_internet_connection);
+        // Successfully signed in
+        if (resultCode == ResultCodes.OK) {
+            startActivity(SignedInActivity.createIntent(this, response));
+            finish();
             return;
+        } else {
+            // Sign in failed
+            if (response == null) {
+                // User pressed back button
+                showSnackbar(R.string.sign_in_cancelled);
+                return;
+            }
+
+            if (response.getErrorCode() == ErrorCodes.NO_NETWORK) {
+                showSnackbar(R.string.no_internet_connection);
+                return;
+            }
+
+            if (response.getErrorCode() == ErrorCodes.UNKNOWN_ERROR) {
+                showSnackbar(R.string.unknown_error);
+                return;
+            }
         }
 
         showSnackbar(R.string.unknown_sign_in_response);
@@ -269,6 +280,10 @@ private List<IdpConfig> getSelectedProviders() {
             selectedProviders.add(new IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build());
         }
 
+        if (mUseTwitterProvider.isChecked()) {
+            selectedProviders.add(new IdpConfig.Builder(AuthUI.TWITTER_PROVIDER).build());
+        }
+
         if (mUseFacebookProvider.isChecked()) {
             selectedProviders.add(
                     new IdpConfig.Builder(AuthUI.FACEBOOK_PROVIDER)
@@ -283,10 +298,6 @@ private List<IdpConfig> getSelectedProviders() {
                             .build());
         }
 
-        if (mUseTwitterProvider.isChecked()) {
-            selectedProviders.add(new IdpConfig.Builder(AuthUI.TWITTER_PROVIDER).build());
-        }
-
         return selectedProviders;
     }
 
@@ -302,20 +313,20 @@ private String getSelectedTosUrl() {
     @MainThread
     private boolean isGoogleConfigured() {
         return !UNCHANGED_CONFIG_VALUE.equals(
-                getResources().getString(R.string.default_web_client_id));
+                getString(R.string.default_web_client_id));
     }
 
     @MainThread
     private boolean isFacebookConfigured() {
         return !UNCHANGED_CONFIG_VALUE.equals(
-                getResources().getString(R.string.facebook_application_id));
+                getString(R.string.facebook_application_id));
     }
 
     @MainThread
     private boolean isTwitterConfigured() {
         List<String> twitterConfigs = Arrays.asList(
-                getResources().getString(R.string.twitter_consumer_key),
-                getResources().getString(R.string.twitter_consumer_secret)
+                getString(R.string.twitter_consumer_key),
+                getString(R.string.twitter_consumer_secret)
         );
 
         return !twitterConfigs.contains(UNCHANGED_CONFIG_VALUE);

app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java

@@ -28,9 +28,7 @@
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+
 import com.bumptech.glide.Glide;
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.IdpResponse;
@@ -42,11 +40,14 @@
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
+
 import java.util.Iterator;
 
-public class SignedInActivity extends AppCompatActivity {
-    private static final String EXTRA_IDP_RESPONSE = "extra_idp_response";
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 
+public class SignedInActivity extends AppCompatActivity {
     @BindView(android.R.id.content)
     View mRootView;
 
@@ -62,6 +63,8 @@ public class SignedInActivity extends AppCompatActivity {
     @BindView(R.id.user_enabled_providers)
     TextView mEnabledProviders;
 
+    private IdpResponse mIdpResponse;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -73,6 +76,8 @@ public void onCreate(Bundle savedInstanceState) {
             return;
         }
 
+        mIdpResponse = IdpResponse.fromResultIntent(getIntent());
+
         setContentView(R.layout.signed_in_layout);
         ButterKnife.bind(this);
         populateProfile();
@@ -144,7 +149,7 @@ private void populateProfile() {
         mUserDisplayName.setText(
                 TextUtils.isEmpty(user.getDisplayName()) ? "No display name" : user.getDisplayName());
 
-        StringBuilder providerList = new StringBuilder();
+        StringBuilder providerList = new StringBuilder(100);
 
         providerList.append("Providers used: ");
 
@@ -174,20 +179,21 @@ private void populateProfile() {
     }
 
     private void populateIdpToken() {
-        IdpResponse idpResponse = getIntent().getParcelableExtra(EXTRA_IDP_RESPONSE);
-        if (idpResponse != null) {
-            String token = idpResponse.getIdpToken();
-            String secret = idpResponse.getIdpSecret();
-            if (token == null) {
-                findViewById(R.id.idp_token_layout).setVisibility(View.GONE);
-            } else {
-                ((TextView) findViewById(R.id.idp_token)).setText(token);
-            }
-            if (secret == null) {
-                findViewById(R.id.idp_secret_layout).setVisibility(View.GONE);
-            } else {
-                ((TextView) findViewById(R.id.idp_secret)).setText(secret);
-            }
+        String token = null;
+        String secret = null;
+        if (mIdpResponse != null) {
+            token = mIdpResponse.getIdpToken();
+            secret = mIdpResponse.getIdpSecret();
+        }
+        if (token == null) {
+            findViewById(R.id.idp_token_layout).setVisibility(View.GONE);
+        } else {
+            ((TextView) findViewById(R.id.idp_token)).setText(token);
+        }
+        if (secret == null) {
+            findViewById(R.id.idp_secret_layout).setVisibility(View.GONE);
+        } else {
+            ((TextView) findViewById(R.id.idp_secret)).setText(secret);
         }
     }
 
@@ -198,9 +204,8 @@ private void showSnackbar(@StringRes int errorMessageRes) {
     }
 
     public static Intent createIntent(Context context, IdpResponse idpResponse) {
-        Intent in = new Intent();
+        Intent in = IdpResponse.getIntent(idpResponse);
         in.setClass(context, SignedInActivity.class);
-        in.putExtra(EXTRA_IDP_RESPONSE, idpResponse);
         return in;
     }
 }