The Big Kahuna

README.md

@@ -28,16 +28,16 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI Database only
-    compile 'com.firebaseui:firebase-ui-database:0.6.2'
+    compile 'com.firebaseui:firebase-ui-database:1.0.0'
 
     // FirebaseUI Auth only
-    compile 'com.firebaseui:firebase-ui-auth:0.6.2'
+    compile 'com.firebaseui:firebase-ui-auth:1.0.0'
 
     // FirebaseUI Storage only
-    compile 'com.firebaseui:firebase-ui-storage:0.6.2'
+    compile 'com.firebaseui:firebase-ui-storage:1.0.0'
 
     // Single target that includes all FirebaseUI libraries above
-    compile 'com.firebaseui:firebase-ui:0.6.2'
+    compile 'com.firebaseui:firebase-ui:1.0.0'
 }
 ```
 
@@ -67,6 +67,7 @@ For convenience, here are some examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
+| 1.0.0              | 9.8.0                          |
 | 0.6.2              | 9.8.0                          |
 | 0.6.1              | 9.6.1                          |
 | 0.6.0              | 9.6.0                          |

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

@@ -26,13 +26,22 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.RadioButton;
 
+import android.widget.TextView;
 import com.firebase.ui.auth.AuthUI;
+import com.firebase.ui.auth.AuthUI.IdpConfig;
+import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.ui.ResultCodes;
 import com.firebase.uidemo.R;
+import com.google.android.gms.common.Scopes;
 import com.google.firebase.auth.FirebaseAuth;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -60,6 +69,9 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.purple_theme)
     RadioButton mUsePurpleTheme;
 
+    @BindView(R.id.dark_theme)
+    RadioButton mUseDarkTheme;
+
     @BindView(R.id.email_provider)
     CheckBox mUseEmailProvider;
 
@@ -69,6 +81,9 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.facebook_provider)
     CheckBox mUseFacebookProvider;
 
+    @BindView(R.id.twitter_provider)
+    CheckBox mUseTwitterProvider;
+
     @BindView(R.id.google_tos)
     RadioButton mUseGoogleTos;
 
@@ -93,13 +108,31 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.smartlock_enabled)
     CheckBox mEnableSmartLock;
 
+    @BindView(R.id.facebook_scopes_label)
+    TextView mFacebookScopesLabel;
+
+    @BindView(R.id.facebook_scope_friends)
+    CheckBox mFacebookScopeFriends;
+
+    @BindView(R.id.facebook_scope_photos)
+    CheckBox mFacebookScopePhotos;
+
+    @BindView(R.id.google_scopes_label)
+    TextView mGoogleScopesLabel;
+
+    @BindView(R.id.google_scope_drive_file)
+    CheckBox mGoogleScopeDriveFile;
+
+    @BindView(R.id.google_scope_games)
+    CheckBox mGoogleScopeGames;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         FirebaseAuth auth = FirebaseAuth.getInstance();
         if (auth.getCurrentUser() != null) {
-            startActivity(SignedInActivity.createIntent(this));
+            startActivity(SignedInActivity.createIntent(this, null));
             finish();
         }
 
@@ -110,17 +143,42 @@ public void onCreate(Bundle savedInstanceState) {
             mUseGoogleProvider.setChecked(false);
             mUseGoogleProvider.setEnabled(false);
             mUseGoogleProvider.setText(R.string.google_label_missing_config);
+            setGoogleScopesEnabled(false);
+        } else {
+            setGoogleScopesEnabled(mUseGoogleProvider.isChecked());
+            mUseGoogleProvider.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                    setGoogleScopesEnabled(checked);
+                }
+            });
         }
 
         if (!isFacebookConfigured()) {
             mUseFacebookProvider.setChecked(false);
             mUseFacebookProvider.setEnabled(false);
             mUseFacebookProvider.setText(R.string.facebook_label_missing_config);
+            setFacebookScopesEnabled(false);
+        } else {
+            setFacebookScopesEnabled(mUseFacebookProvider.isChecked());
+            mUseFacebookProvider.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                    setFacebookScopesEnabled(checked);
+                }
+            });
+        }
+
+        if (!isTwitterConfigured()) {
+            mUseTwitterProvider.setChecked(false);
+            mUseTwitterProvider.setEnabled(false);
+            mUseTwitterProvider.setText(R.string.twitter_label_missing_config);
         }
 
-        if (!isGoogleConfigured() || !isFacebookConfigured()) {
+        if (!isGoogleConfigured() || !isFacebookConfigured() || !isTwitterConfigured()) {
             showSnackbar(R.string.configuration_required);
         }
+
     }
 
     @OnClick(R.id.sign_in)
@@ -147,10 +205,25 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         showSnackbar(R.string.unknown_response);
     }
 
+
+    @MainThread
+    private void setGoogleScopesEnabled(boolean enabled) {
+        mGoogleScopesLabel.setEnabled(enabled);
+        mGoogleScopeDriveFile.setEnabled(enabled);
+        mGoogleScopeGames.setEnabled(enabled);
+    }
+
+    @MainThread
+    private void setFacebookScopesEnabled(boolean enabled) {
+        mFacebookScopesLabel.setEnabled(enabled);
+        mFacebookScopeFriends.setEnabled(enabled);
+        mFacebookScopePhotos.setEnabled(enabled);
+    }
+
     @MainThread
     private void handleSignInResponse(int resultCode, Intent data) {
         if (resultCode == RESULT_OK) {
-            startActivity(SignedInActivity.createIntent(this));
+            startActivity(SignedInActivity.createIntent(this, IdpResponse.fromResultIntent(data)));
             finish();
             return;
         }
@@ -160,6 +233,11 @@ private void handleSignInResponse(int resultCode, Intent data) {
             return;
         }
 
+        if (resultCode == ResultCodes.RESULT_NO_NETWORK) {
+            showSnackbar(R.string.no_internet_connection);
+            return;
+        }
+
         showSnackbar(R.string.unknown_sign_in_response);
     }
 
@@ -174,6 +252,10 @@ private int getSelectedTheme() {
             return R.style.PurpleTheme;
         }
 
+        if (mUseDarkTheme.isChecked()) {
+            return R.style.DarkTheme;
+        }
+
         return R.style.GreenTheme;
     }
 
@@ -189,22 +271,32 @@ private int getSelectedLogo() {
     }
 
     @MainThread
-    private String[] getSelectedProviders() {
-        ArrayList<String> selectedProviders = new ArrayList<>();
+    private List<IdpConfig> getSelectedProviders() {
+        List<IdpConfig> selectedProviders = new ArrayList<>();
 
         if (mUseEmailProvider.isChecked()) {
-            selectedProviders.add(AuthUI.EMAIL_PROVIDER);
+            selectedProviders.add(new IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build());
         }
 
         if (mUseFacebookProvider.isChecked()) {
-            selectedProviders.add(AuthUI.FACEBOOK_PROVIDER);
+            selectedProviders.add(
+                    new IdpConfig.Builder(AuthUI.FACEBOOK_PROVIDER)
+                            .setPermissions(getFacebookPermissions())
+                            .build());
         }
 
         if (mUseGoogleProvider.isChecked()) {
-            selectedProviders.add(AuthUI.GOOGLE_PROVIDER);
+            selectedProviders.add(
+                    new IdpConfig.Builder(AuthUI.GOOGLE_PROVIDER)
+                            .setPermissions(getGooglePermissions())
+                            .build());
+        }
+
+        if (mUseTwitterProvider.isChecked()) {
+            selectedProviders.add(new IdpConfig.Builder(AuthUI.TWITTER_PROVIDER).build());
         }
 
-        return selectedProviders.toArray(new String[selectedProviders.size()]);
+        return selectedProviders;
     }
 
     @MainThread
@@ -228,11 +320,45 @@ private boolean isFacebookConfigured() {
                 getResources().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)
+        );
+
+        return !twitterConfigs.contains(UNCHANGED_CONFIG_VALUE);
+    }
+
     @MainThread
     private void showSnackbar(@StringRes int errorMessageRes) {
         Snackbar.make(mRootView, errorMessageRes, Snackbar.LENGTH_LONG).show();
     }
 
+    @MainThread
+    private List<String> getFacebookPermissions() {
+        List<String> result = new ArrayList<>();
+        if (mFacebookScopeFriends.isChecked()) {
+            result.add("user_friends");
+        }
+        if (mFacebookScopePhotos.isChecked()) {
+            result.add("user_photos");
+        }
+        return result;
+    }
+
+    @MainThread
+    private List<String> getGooglePermissions() {
+        List<String> result = new ArrayList<>();
+        if (mGoogleScopeGames.isChecked()) {
+            result.add(Scopes.GAMES);
+        }
+        if (mGoogleScopeDriveFile.isChecked()) {
+            result.add(Scopes.DRIVE_FILE);
+        }
+        return result;
+    }
+
     public static Intent createIntent(Context context) {
         Intent in = new Intent();
         in.setClass(context, AuthUiActivity.class);

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

@@ -28,9 +28,12 @@
 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;
 import com.firebase.uidemo.R;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
@@ -39,14 +42,10 @@
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
-
 import java.util.Iterator;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
 public class SignedInActivity extends AppCompatActivity {
+    private static final String EXTRA_IDP_RESPONSE = "extra_idp_response";
 
     @BindView(android.R.id.content)
     View mRootView;
@@ -77,6 +76,7 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.signed_in_layout);
         ButterKnife.bind(this);
         populateProfile();
+        populateIdpToken();
     }
 
     @OnClick(R.id.sign_out)
@@ -114,9 +114,8 @@ public void onClick(DialogInterface dialogInterface, int i) {
     }
 
     private void deleteAccount() {
-        FirebaseAuth.getInstance()
-                .getCurrentUser()
-                .delete()
+        AuthUI.getInstance()
+                .delete(this)
                 .addOnCompleteListener(new OnCompleteListener<Void>() {
                     @Override
                     public void onComplete(@NonNull Task<Void> task) {
@@ -174,15 +173,34 @@ private void populateProfile() {
         mEnabledProviders.setText(providerList);
     }
 
+    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);
+            }
+        }
+    }
+
     @MainThread
     private void showSnackbar(@StringRes int errorMessageRes) {
         Snackbar.make(mRootView, errorMessageRes, Snackbar.LENGTH_LONG)
                 .show();
     }
 
-    public static Intent createIntent(Context context) {
+    public static Intent createIntent(Context context, IdpResponse idpResponse) {
         Intent in = new Intent();
         in.setClass(context, SignedInActivity.class);
+        in.putExtra(EXTRA_IDP_RESPONSE, idpResponse);
         return in;
     }
 }