Merge branch 'puf-kill-switches' of github.com:firebase/FirebaseUI-Android into puf-kill-switches

Author: abeisgoat

README.md

@@ -175,10 +175,10 @@ public class MainActivity extends FirebaseLoginBaseActivity {
     protected void onStart() {
         super.onStart();
         // All providers are optional! Remove any you don't want.
-        setEnabledAuthProvider(SocialProvider.facebook);
-        setEnabledAuthProvider(SocialProvider.twitter);
-        setEnabledAuthProvider(SocialProvider.google);
-        setEnabledAuthProvider(SocialProvider.password);
+        setEnabledAuthProvider(AuthProviderType.FACEBOOK);
+        setEnabledAuthProvider(AuthProviderType.TWITTER);
+        setEnabledAuthProvider(AuthProviderType.GOOGLE);
+        setEnabledAuthProvider(AuthProviderType.PASSWORD);
     }
 ```
 
@@ -327,7 +327,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
     mAdapter = new FirebaseListAdapter<ChatMessage>(this, ChatMessage.class, android.R.layout.two_line_list_item, ref) {
         @Override
-        protected void populateView(View view, ChatMessage chatMessage) {
+        protected void populateView(View view, ChatMessage chatMessage, int position) {
             ((TextView)view.findViewById(android.R.id.text1)).setText(chatMessage.getName());
             ((TextView)view.findViewById(android.R.id.text2)).setText(chatMessage.getMessage());
 
@@ -381,7 +381,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
     mAdapter = new FirebaseListAdapter<ChatMessage>(this, ChatMessage.class, android.R.layout.two_line_list_item, ref) {
         @Override
-        protected void populateView(View view, ChatMessage chatMessage) {
+        protected void populateView(View view, ChatMessage chatMessage, int position) {
             ((TextView)view.findViewById(android.R.id.text1)).setText(chatMessage.getName());
             ((TextView)view.findViewById(android.R.id.text2)).setText(chatMessage.getMessage());
         }
@@ -424,7 +424,7 @@ If we use the same layout as before (`android.R.layout.two_line_list_item`), the
 We can wrap that in a ViewHolder with:
 
 ```java
-private static class ChatMessageViewHolder extends RecyclerView.ViewHolder {
+public static class ChatMessageViewHolder extends RecyclerView.ViewHolder {
     TextView messageText;
     TextView nameText;
 
@@ -449,7 +449,7 @@ recycler.setLayoutManager(new LinearLayoutManager(this));
 
 mAdapter = new FirebaseRecyclerViewAdapter<ChatMessage, ChatMessageViewHolder>(ChatMessage.class, android.R.layout.two_line_list_item, ChatMessageViewHolder.class, mRef) {
     @Override
-    public void populateViewHolder(ChatMessageViewHolder chatMessageViewHolder, ChatMessage chatMessage) {
+    public void populateViewHolder(ChatMessageViewHolder chatMessageViewHolder, ChatMessage chatMessage, int position) {
         chatMessageViewHolder.nameText.setText(chatMessage.getName());
         chatMessageViewHolder.messageText.setText(chatMessage.getMessage());
     }

app/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.gms.google-services'
 
 android {
     compileSdkVersion 22
@@ -23,7 +22,7 @@ android {
         exclude 'META-INF/NOTICE'
         exclude 'META-INF/NOTICE.txt'
     }
-
+    
 }
 
 dependencies {
@@ -34,4 +33,4 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:22.2.1'
     compile 'com.facebook.android:facebook-android-sdk:4.6.0'
     compile project(':library')
-}
+}

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

@@ -23,7 +23,7 @@
 import com.firebase.ui.auth.core.FirebaseLoginBaseActivity;
 import com.firebase.ui.FirebaseRecyclerAdapter;
 import com.firebase.ui.auth.core.FirebaseLoginError;
-import com.firebase.ui.auth.core.SocialProvider;
+import com.firebase.ui.auth.core.AuthProviderType;
 
 public class RecyclerViewDemoActivity extends FirebaseLoginBaseActivity {
 
@@ -99,10 +99,10 @@ public void populateViewHolder(ChatHolder chatView, Chat chat, int position) {
     @Override
     protected void onStart() {
         super.onStart();
-        setEnabledAuthProvider(SocialProvider.FACEBOOK);
-        setEnabledAuthProvider(SocialProvider.TWITTER);
-        setEnabledAuthProvider(SocialProvider.GOOGLE);
-        setEnabledAuthProvider(SocialProvider.PASSWORD);
+        setEnabledAuthProvider(AuthProviderType.FACEBOOK);
+        setEnabledAuthProvider(AuthProviderType.TWITTER);
+        setEnabledAuthProvider(AuthProviderType.GOOGLE);
+        setEnabledAuthProvider(AuthProviderType.PASSWORD);
     }
 
     @Override

codelabs/chat/README.md

@@ -282,14 +282,14 @@ Let's take this in chunks: first we'll create a Java class to represent each mes
         mListAdapter = new FirebaseListAdapter<ChatMessage>(this, ChatMessage.class,
                 android.R.layout.two_line_list_item, mFirebaseRef) {
             @Override
-            protected void populateView(View v, ChatMessage model) {
+            protected void populateView(View v, ChatMessage model, int position) {
                 ((TextView)v.findViewById(android.R.id.text1)).setText(model.getName());
                 ((TextView)v.findViewById(android.R.id.text2)).setText(model.getText());
             }
         };
         setListAdapter(mListAdapter);
 
-  The FirebaseListAdapter maps the data from your Firebase database into the ListView that you added to the layout. It creates a new instance of your `two_line_list_item` for each `ChatMessage` and calls the `populateView method`. We override this method and put the name and text in the correct subviews.
+  The FirebaseListAdapter maps the data from your Firebase database into the ListView that you added to the layout. It creates a new instance of your `two_line_list_item` for each `ChatMessage` and calls the `populateView` method. We override this method and put the name and text in the correct subviews.
 
   ![MainActivity code](images/5_6.png)
 

library/src/main/java/com/firebase/ui/FirebaseListAdapter.java

@@ -33,6 +33,7 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
+import com.firebase.client.DataSnapshot;
 import com.firebase.client.Firebase;
 import com.firebase.client.Query;
 
@@ -48,7 +49,7 @@
  *     Firebase ref = new Firebase("https://<yourapp>.firebaseio.com");
  *     ListAdapter adapter = new FirebaseListAdapter<ChatMessage>(this, ChatMessage.class, android.R.layout.two_line_list_item, mRef)
  *     {
- *         protected void populateView(View view, ChatMessage chatMessage)
+ *         protected void populateView(View view, ChatMessage chatMessage, int position)
  *         {
  *             ((TextView)view.findViewById(android.R.id.text1)).setText(chatMessage.getName());
  *             ((TextView)view.findViewById(android.R.id.text2)).setText(chatMessage.getMessage());
@@ -111,7 +112,20 @@ public int getCount() {
     }
 
     @Override
-    public T getItem(int i) { return mSnapshots.getItem(i).getValue(mModelClass); }
+    public T getItem(int position) {
+        return parseSnapshot(mSnapshots.getItem(position));
+    }
+
+    /**
+     * This method parses the DataSnapshot into the requested type. You can override it in subclasses
+     * to do custom parsing.
+     *
+     * @param snapshot the DataSnapshot to extract the model from
+     * @return the model extracted from the DataSnapshot
+     */
+    protected T parseSnapshot(DataSnapshot snapshot) {
+        return snapshot.getValue(mModelClass);
+    }
 
     public Firebase getRef(int position) { return mSnapshots.getItem(position).getRef(); }
 
@@ -127,7 +141,7 @@ public View getView(int position, View view, ViewGroup viewGroup) {
             view = mActivity.getLayoutInflater().inflate(mLayout, viewGroup, false);
         }
 
-        T model = mSnapshots.getItem(position).getValue(mModelClass);
+        T model = getItem(position);
 
         // Call out to subclass to marshall this model into the provided view
         populateView(view, model, position);
@@ -140,30 +154,11 @@ public View getView(int position, View view, ViewGroup viewGroup) {
      * this class. The third argument is the item's position in the list.
      * <p>
      * Your implementation should populate the view using the data contained in the model.
-     * You should implement either this method or the other {@link FirebaseListAdapter#populateView(View, Object)} method
-     * but not both.
      *
      * @param v         The view to populate
      * @param model     The object containing the data used to populate the view
      * @param position  The position in the list of the view being populated
      */
-    protected void populateView(View v, T model, int position) {
-        populateView(v, model);
-    }
-
-    /**
-     * This is a backwards compatible version of populateView.
-     * <p>
-     * You should implement either this method or the other {@link FirebaseListAdapter#populateView(View, Object, int)} method
-     * but not both.
-     *
-     * @see FirebaseListAdapter#populateView(View, Object, int)
-     *
-     * @param v         The view to populate
-     * @param model     The object containing the data used to populate the view
-     */
-    @Deprecated
-    protected void populateView(View v, T model) {
+    abstract protected void populateView(View v, T model, int position);
 
-    }
 }

library/src/main/java/com/firebase/ui/FirebaseRecyclerAdapter.java

@@ -33,6 +33,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.firebase.client.DataSnapshot;
 import com.firebase.client.Firebase;
 import com.firebase.client.Query;
 
@@ -68,7 +69,7 @@
  *     recycler.setLayoutManager(new LinearLayoutManager(this));
  *
  *     adapter = new FirebaseRecyclerAdapter<ChatMessage, ChatMessageViewHolder>(ChatMessage.class, android.R.layout.two_line_list_item, ChatMessageViewHolder.class, mRef) {
- *         public void populateViewHolder(ChatMessageViewHolder chatMessageViewHolder, ChatMessage chatMessage) {
+ *         public void populateViewHolder(ChatMessageViewHolder chatMessageViewHolder, ChatMessage chatMessage, int position) {
  *             chatMessageViewHolder.nameText.setText(chatMessage.getName());
  *             chatMessageViewHolder.messageText.setText(chatMessage.getMessage());
  *         }
@@ -136,7 +137,6 @@ public FirebaseRecyclerAdapter(Class<T> modelClass, int modelLayout, Class<VH> v
         this(modelClass, modelLayout, viewHolderClass, (Query) ref);
     }
 
-
     public void cleanup() {
         mSnapshots.cleanup();
     }
@@ -147,7 +147,18 @@ public int getItemCount() {
     }
 
     public T getItem(int position) {
-        return mSnapshots.getItem(position).getValue(mModelClass);
+        return parseSnapshot(mSnapshots.getItem(position));
+    }
+
+    /**
+     * This method parses the DataSnapshot into the requested type. You can override it in subclasses
+     * to do custom parsing.
+     *
+     * @param snapshot the DataSnapshot to extract the model from
+     * @return the model extracted from the DataSnapshot
+     */
+    protected T parseSnapshot(DataSnapshot snapshot) {
+        return snapshot.getValue(mModelClass);
     }
 
     public Firebase getRef(int position) { return mSnapshots.getItem(position).getRef(); }
@@ -186,29 +197,10 @@ public void onBindViewHolder(VH viewHolder, int position) {
      * this class. The third argument is the item's position in the list.
      * <p>
      * Your implementation should populate the view using the data contained in the model.
-     * You should implement either this method or the other FirebaseRecyclerAdapter#populateViewHolder(VH, Object) method
-     * but not both.
      *
      * @param viewHolder The view to populate
      * @param model      The object containing the data used to populate the view
      * @param position  The position in the list of the view being populated
      */
-    protected void populateViewHolder(VH viewHolder, T model, int position) {
-        populateViewHolder(viewHolder, model);
-    };
-    /**
-     * This is a backwards compatible version of populateViewHolder.
-     * <p>
-     * You should implement either this method or the other FirebaseRecyclerAdapter#populateViewHolder(VH, T, int) method
-     * but not both.
-     *
-     * @see FirebaseListAdapter#populateView(View, Object, int)
-     *
-     * @param viewHolder The view to populate
-     * @param model      The object containing the data used to populate the view
-     */
-    @Deprecated
-    protected void populateViewHolder(VH viewHolder, T model) {
-    };
-
+    abstract protected void populateViewHolder(VH viewHolder, T model, int position);
 }

library/src/main/java/com/firebase/ui/auth/core/SocialProvider.java renamed to library/src/main/java/com/firebase/ui/auth/core/AuthProviderType.java

@@ -11,19 +11,20 @@
 
 import java.lang.reflect.InvocationTargetException;
 
-public enum SocialProvider {
-    GOOGLE  ("google",   GoogleAuthProvider.class,   R.id.google_button),
-    FACEBOOK("facebook", FacebookAuthProvider.class, R.id.facebook_button),
-    TWITTER ("twitter",  TwitterAuthProvider.class,  R.id.twitter_button),
-    PASSWORD("password", PasswordAuthProvider.class, R.id.password_button);
+public enum AuthProviderType {
+    GOOGLE  ("google",   "google.GoogleAuthProvider",     R.id.google_button),
+    FACEBOOK("facebook", "facebook.FacebookAuthProvider", R.id.facebook_button),
+    TWITTER ("twitter",  "twitter.TwitterAuthProvider",   R.id.twitter_button),
+    PASSWORD("password", "password.PasswordAuthProvider", R.id.password_button);
 
+    private final static String AUTH_PACKAGE = "com.firebase.ui.auth.";
     private final String mName;
-    private final Class<? extends FirebaseAuthProvider> mClass;
+    private final String mProviderName;
     private final int mButtonId;
 
-    SocialProvider(String name, Class<? extends FirebaseAuthProvider> clazz, int button_id) {
+    AuthProviderType(String name, String providerName, int button_id) {
         this.mName = name;
-        this.mClass = clazz;
+        this.mProviderName = providerName;
         this.mButtonId = button_id;
     }
 
@@ -36,7 +37,8 @@ public int getButtonId() {
 
     public FirebaseAuthProvider createProvider(Context context, Firebase ref, TokenAuthHandler handler) {
         try {
-            return mClass.getConstructor(Context.class, SocialProvider.class, String.class, Firebase.class, TokenAuthHandler.class).newInstance(context, this, this.getName(), ref, handler);
+            Class<? extends FirebaseAuthProvider> clazz = (Class<? extends FirebaseAuthProvider>) Class.forName(AUTH_PACKAGE+mProviderName);
+            return clazz.getConstructor(Context.class, AuthProviderType.class, String.class, Firebase.class, TokenAuthHandler.class).newInstance(context, this, this.getName(), ref, handler);
         } catch (NoSuchMethodException e) {
             throw new RuntimeException(e);
         } catch (IllegalAccessException e) {
@@ -45,10 +47,12 @@ public FirebaseAuthProvider createProvider(Context context, Firebase ref, TokenA
             throw new RuntimeException(e);
         } catch (InvocationTargetException e) {
             throw new RuntimeException(e);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
         }
     }
-    public static SocialProvider getTypeForProvider(FirebaseAuthProvider provider) {
-        for (SocialProvider type : SocialProvider.values()) {
+    public static AuthProviderType getTypeForProvider(FirebaseAuthProvider provider) {
+        for (AuthProviderType type : AuthProviderType.values()) {
             if (provider.getProviderName() == type.getName()) {
                 return type;
             }

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

@@ -1,6 +1,7 @@
 package com.firebase.ui.auth.core;
 
 import android.content.Context;
+import android.content.Intent;
 import android.util.Log;
 
 import com.firebase.client.AuthData;
@@ -13,37 +14,49 @@
 public abstract class FirebaseAuthProvider {
     private static final String TAG = "FirebaseAuthProvider";
     private final Context mContext;
-    private final SocialProvider mProviderType;
+    private final AuthProviderType mAuthProviderType;
     private final String mProviderName;
     private final Firebase mRef;
     private final TokenAuthHandler mHandler;
 
     public abstract void logout();
     public Context getContext() { return mContext; }
-    public SocialProvider getProviderType() { return mProviderType; }
+    public AuthProviderType getProviderType() { return mAuthProviderType; }
     public String getProviderName() { return mProviderName; }
     public Firebase getFirebaseRef() { return mRef; }
     public TokenAuthHandler getHandler() { return mHandler; }
 
-    protected FirebaseAuthProvider(Context context, SocialProvider providerType, String providerName, Firebase ref, TokenAuthHandler handler) {
+    protected FirebaseAuthProvider(Context context, AuthProviderType providerType, String providerName, Firebase ref, TokenAuthHandler handler) {
         mContext = context;
-        mProviderType = providerType;
+        mAuthProviderType = providerType;
         mProviderName = providerName;
         mRef = ref;
         mHandler = handler;
     }
 
     public void login() {
-        Log.d("FirebaseAuthProvider", "Login() is not supported for provider type " + getProviderName());
+        Log.w("FirebaseAuthProvider", "Login() is not supported for provider type " + getProviderName());
     };
     public void login(String email, String password) {
-        Log.d("FirebaseAuthProvider", "Login(String email, String password) is not supported for provider type " + getProviderName());
+        Log.w("FirebaseAuthProvider", "Login(String email, String password) is not supported for provider type " + getProviderName());
     };
 
     public void onFirebaseTokenReceived(FirebaseOAuthToken token, TokenAuthHandler handler) {
         authenticateRefWithOAuthFirebasetoken(token, handler);
     }
 
+    /**
+     * Override this method in your provider subclass if you start an activity from the login() method.
+     * Receive the result from a previous call to startActivityForResult(Intent, int). This follows
+     * the related Activity API as described there in onActivityResult(int, int, Intent).
+     * @param requestCode The integer request code originally supplied to startActivityForResult(),
+     *                    allowing you to identify who this result came from/
+     * @param resultCode The integer result code returned by the child activity through its setResult().
+     * @param data An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
+     */
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    }
+
     private void authenticateRefWithOAuthFirebasetoken(FirebaseOAuthToken token, final TokenAuthHandler handler) {
         Firebase.AuthResultHandler authResultHandler = new Firebase.AuthResultHandler() {
             @Override