Add getAuth() to base activity, re-order methods

Fixes #39
Fixes #40
Also fixed a naming issue and cleanup in the sample app.

Author: puf

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

@@ -30,9 +30,7 @@ public class RecyclerViewDemoActivity extends FirebaseLoginBaseActivity {
     public static String TAG = "FirebaseUI.chat";
     private Firebase mRef;
     private Query mChatRef;
-    private AuthData mAuthData;
-    private String name;
-    private String uid;
+    private String mName;
     private Button mSendButton;
     private EditText mMessageEdit;
 
@@ -60,7 +58,7 @@ public void onClick(View view) {
         mSendButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-            Chat chat = new Chat(name, mAuthData.getUid(), mMessageEdit.getText().toString());
+            Chat chat = new Chat(mName, getAuth().getUid(), mMessageEdit.getText().toString());
             mRef.push().setValue(chat, new Firebase.CompletionListener() {
                 @Override
                 public void onComplete(FirebaseError firebaseError, Firebase firebase) {
@@ -83,11 +81,11 @@ public void onComplete(FirebaseError firebaseError, Firebase firebase) {
 
         mRecycleViewAdapter = new FirebaseRecyclerAdapter<Chat, ChatHolder>(Chat.class, R.layout.message, ChatHolder.class, mChatRef) {
             @Override
-            public void populateViewHolder(ChatHolder chatView, Chat chat) {
+            public void populateViewHolder(ChatHolder chatView, Chat chat, int position) {
                 chatView.setName(chat.getName());
                 chatView.setText(chat.getText());
 
-                if (mAuthData != null && chat.getUid().equals(mAuthData.getUid())) {
+                if (getAuth() != null && chat.getUid().equals(getAuth().getUid())) {
                     chatView.setIsSender(true);
                 } else {
                     chatView.setIsSender(false);
@@ -101,9 +99,9 @@ public void populateViewHolder(ChatHolder chatView, Chat chat) {
     @Override
     protected void onStart() {
         super.onStart();
-//        setEnabledAuthProvider(SocialProvider.facebook);
-//        setEnabledAuthProvider(SocialProvider.twitter);
-//        setEnabledAuthProvider(SocialProvider.google);
+        setEnabledAuthProvider(SocialProvider.facebook);
+        setEnabledAuthProvider(SocialProvider.twitter);
+        setEnabledAuthProvider(SocialProvider.google);
         setEnabledAuthProvider(SocialProvider.password);
     }
 
@@ -116,10 +114,10 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        menu.findItem(R.id.login_menu_item).setVisible(mAuthData == null);
-        menu.findItem(R.id.logout_menu_item).setVisible(mAuthData != null);
-        mSendButton.setEnabled(mAuthData != null);
-        mMessageEdit.setEnabled(mAuthData != null);
+        menu.findItem(R.id.login_menu_item).setVisible(getAuth() == null);
+        menu.findItem(R.id.logout_menu_item).setVisible(getAuth() != null);
+        mSendButton.setEnabled(getAuth() != null);
+        mMessageEdit.setEnabled(getAuth() != null);
 
         return true;
     }
@@ -140,14 +138,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     public void onFirebaseLoggedIn(AuthData authData) {
         Log.i(TAG, "Logged in to " + authData.getProvider().toString());
-        mAuthData = authData;
 
-        switch (mAuthData.getProvider()) {
+        switch (authData.getProvider()) {
             case "password":
-                name = (String) mAuthData.getProviderData().get("email");
+                mName = (String) authData.getProviderData().get("email");
                 break;
             default:
-                name = (String) mAuthData.getProviderData().get("displayName");
+                mName = (String) authData.getProviderData().get("displayName");
                 break;
         }
 
@@ -158,8 +155,7 @@ public void onFirebaseLoggedIn(AuthData authData) {
     @Override
     public void onFirebaseLoggedOut() {
         Log.i(TAG, "Logged out");
-        mAuthData = null;
-        name = "";
+        mName = "";
         invalidateOptionsMenu();
         mRecycleViewAdapter.notifyDataSetChanged();
     }

library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginBaseActivity.java

@@ -12,22 +12,44 @@ public abstract class FirebaseLoginBaseActivity extends AppCompatActivity {
     private final String TAG = "FirebaseLoginBaseAct";
 
     private Firebase.AuthStateListener mAuthStateListener;
+    private AuthData mAuthData;
     private FirebaseLoginDialog mDialog;
     private TokenAuthHandler mHandler;
 
+
+    /**
+     * Subclasses of this activity must implement this method and return a valid Firebase reference that
+     * can be used to call authentication related methods on. The method is guaranteed *not* to be called
+     * before onCreate() has finished.
+     *
+     * @return a Firebase reference that can be used to call authentication related methods on
+     */
+    protected abstract Firebase getFirebaseRef();
+
+    /**
+     * Returns the data for the currently authenticated users, or null if no user is authenticated.
+     *
+     * @return the data for the currently authenticated users, or null if no user is authenticated.
+     */
+    public AuthData getAuth() {
+        return mAuthData;
+    }
+
     /**
      * Subclasses of this activity may implement this method to handle when a user logs in.
      *
      * @return void
      */
-    protected abstract void onFirebaseLoggedIn(AuthData authData);
+    protected void onFirebaseLoggedIn(AuthData authData) {
+    }
 
     /**
      * Subclasses of this activity may implement this method to handle when a user logs out.
      *
      * @return void
      */
-    protected abstract void onFirebaseLoggedOut();
+    protected void onFirebaseLoggedOut() {
+    }
 
     /**
      * Subclasses of this activity may implement this method to handle any potential provider errors
@@ -45,14 +67,6 @@ public abstract class FirebaseLoginBaseActivity extends AppCompatActivity {
      */
     protected abstract void onFirebaseLoginUserError(FirebaseLoginError firebaseError);
 
-    /**
-     * Subclasses of this activity must implement this method and return a valid Firebase reference that
-     * can be used to call authentication related methods on.
-     *
-     * @return a Firebase reference that can be used to call authentication related methods on
-     */
-    protected abstract Firebase getFirebaseRef();
-
     public void logout() {
         mDialog.logout();
     }
@@ -102,8 +116,10 @@ public void onProviderError(FirebaseLoginError err) {
             @Override
             public void onAuthStateChanged(AuthData authData) {
                 if (authData != null) {
+                    mAuthData = authData;
                     onFirebaseLoggedIn(authData);
                 } else {
+                    mAuthData = null;
                     onFirebaseLoggedOut();
                 }
             }