Fix reauth pr merge conflicts

README.md

@@ -95,7 +95,19 @@ For convenience, here are some examples:
 
 There is a sample app in the `app/` directory that demonstrates most
 of the features of FirebaseUI. Load the project in Android Studio and
-run it on your Android device to see a demonstration.
+run it on your Android device to see a demonstration. 
+
+Before you can run the sample app, you must create a project in
+the Firebase console. Add an Android app to the project, and copy
+the generated google-services.json file into the `app/` directory.
+Also enable [anonymous authentication](https://firebase.google.com/docs/auth/android/anonymous-auth)
+for the Firebase project, since some components of the sample app
+requires it.
+
+If you encounter a version incompatibility error between Android Studio
+and Gradle while trying to run the sample app, try disabling the Instant
+Run feature of Android Studio. Alternatively, update Android Studio and
+Gradle to their latest versions.
 
 ## Contributing
 

app/src/main/AndroidManifest.xml

@@ -30,6 +30,9 @@
         <activity
             android:name=".database.ChatActivity"
             android:label="@string/name_chat"/>
+        <activity
+            android:name=".database.ChatIndexActivity"
+            android:label="@string/name_chat"/>
 
         <!-- Auth UI demo -->
         <activity

app/src/main/java/com/firebase/uidemo/database/ChatActivity.java

@@ -32,25 +32,23 @@
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.database.DatabaseError;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.Query;
 
-public class ChatActivity extends AppCompatActivity implements FirebaseAuth.AuthStateListener {
+public class ChatActivity extends AppCompatActivity implements FirebaseAuth.AuthStateListener, View.OnClickListener {
     private static final String TAG = "RecyclerViewDemo";
 
     private FirebaseAuth mAuth;
-    private DatabaseReference mRef;
-    private DatabaseReference mChatRef;
+    protected DatabaseReference mChatRef;
     private Button mSendButton;
-    private EditText mMessageEdit;
+    protected EditText mMessageEdit;
 
     private RecyclerView mMessages;
     private LinearLayoutManager mManager;
-    private FirebaseRecyclerAdapter<Chat, ChatHolder> mAdapter;
-    private TextView mEmptyListMessage;
+    protected FirebaseRecyclerAdapter<Chat, ChatHolder> mAdapter;
+    protected TextView mEmptyListMessage;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -64,28 +62,9 @@ protected void onCreate(Bundle savedInstanceState) {
         mMessageEdit = (EditText) findViewById(R.id.messageEdit);
         mEmptyListMessage = (TextView) findViewById(R.id.emptyTextView);
 
-        mRef = FirebaseDatabase.getInstance().getReference();
-        mChatRef = mRef.child("chats");
+        mChatRef = FirebaseDatabase.getInstance().getReference().child("chats");
 
-        mSendButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                String uid = mAuth.getCurrentUser().getUid();
-                String name = "User " + uid.substring(0, 6);
-
-                Chat chat = new Chat(name, mMessageEdit.getText().toString(), uid);
-                mChatRef.push().setValue(chat, new DatabaseReference.CompletionListener() {
-                    @Override
-                    public void onComplete(DatabaseError error, DatabaseReference reference) {
-                        if (error != null) {
-                            Log.e(TAG, "Failed to write message", error.toException());
-                        }
-                    }
-                });
-
-                mMessageEdit.setText("");
-            }
-        });
+        mSendButton.setOnClickListener(this);
 
         mManager = new LinearLayoutManager(this);
         mManager.setReverseLayout(false);
@@ -126,33 +105,30 @@ public void onDestroy() {
     }
 
     @Override
-    public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
-        updateUI();
-    }
+    public void onClick(View v) {
+        String uid = mAuth.getCurrentUser().getUid();
+        String name = "User " + uid.substring(0, 6);
 
-    private void attachRecyclerViewAdapter() {
-        Query lastFifty = mChatRef.limitToLast(50);
-        mAdapter = new FirebaseRecyclerAdapter<Chat, ChatHolder>(
-                Chat.class, R.layout.message, ChatHolder.class, lastFifty) {
+        Chat chat = new Chat(name, mMessageEdit.getText().toString(), uid);
+        mChatRef.push().setValue(chat, new DatabaseReference.CompletionListener() {
             @Override
-            public void populateViewHolder(ChatHolder holder, Chat chat, int position) {
-                holder.setName(chat.getName());
-                holder.setText(chat.getMessage());
-
-                FirebaseUser currentUser = mAuth.getCurrentUser();
-                if (currentUser != null && chat.getUid().equals(currentUser.getUid())) {
-                    holder.setIsSender(true);
-                } else {
-                    holder.setIsSender(false);
+            public void onComplete(DatabaseError error, DatabaseReference reference) {
+                if (error != null) {
+                    Log.e(TAG, "Failed to write message", error.toException());
                 }
             }
+        });
 
-            @Override
-            protected void onDataChanged() {
-                // If there are no chat messages, show a view that invites the user to add a message.
-                mEmptyListMessage.setVisibility(mAdapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
-            }
-        };
+        mMessageEdit.setText("");
+    }
+
+    @Override
+    public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
+        updateUI();
+    }
+
+    private void attachRecyclerViewAdapter() {
+        mAdapter = getAdapter();
 
         // Scroll to bottom on new messages
         mAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
@@ -165,6 +141,26 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
         mMessages.setAdapter(mAdapter);
     }
 
+    protected FirebaseRecyclerAdapter<Chat, ChatHolder> getAdapter() {
+        Query lastFifty = mChatRef.limitToLast(50);
+        return new FirebaseRecyclerAdapter<Chat, ChatHolder>(
+                Chat.class,
+                R.layout.message,
+                ChatHolder.class,
+                lastFifty) {
+            @Override
+            public void populateViewHolder(ChatHolder holder, Chat chat, int position) {
+                holder.bind(chat);
+            }
+
+            @Override
+            public void onDataChanged() {
+                // If there are no chat messages, show a view that invites the user to add a message.
+                mEmptyListMessage.setVisibility(getItemCount() == 0 ? View.VISIBLE : View.GONE);
+            }
+        };
+    }
+
     private void signInAnonymously() {
         Toast.makeText(this, "Signing in...", Toast.LENGTH_SHORT).show();
         mAuth.signInAnonymously()

app/src/main/java/com/firebase/uidemo/database/ChatHolder.java

@@ -13,6 +13,8 @@
 import android.widget.TextView;
 
 import com.firebase.uidemo.R;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
 
 public class ChatHolder extends RecyclerView.ViewHolder {
     private final TextView mNameField;
@@ -36,7 +38,23 @@ public ChatHolder(View itemView) {
         mGray300 = ContextCompat.getColor(itemView.getContext(), R.color.material_gray_300);
     }
 
-    public void setIsSender(boolean isSender) {
+    public void bind(Chat chat) {
+        setName(chat.getName());
+        setText(chat.getMessage());
+
+        FirebaseUser currentUser = FirebaseAuth.getInstance().getCurrentUser();
+        setIsSender(currentUser != null && chat.getUid().equals(currentUser.getUid()));
+    }
+
+    private void setName(String name) {
+        mNameField.setText(name);
+    }
+
+    private void setText(String text) {
+        mTextField.setText(text);
+    }
+
+    private void setIsSender(boolean isSender) {
         final int color;
         if (isSender) {
             color = mGreen300;
@@ -56,12 +74,4 @@ public void setIsSender(boolean isSender) {
         ((RotateDrawable) mRightArrow.getBackground()).getDrawable()
                 .setColorFilter(color, PorterDuff.Mode.SRC);
     }
-
-    public void setName(String name) {
-        mNameField.setText(name);
-    }
-
-    public void setText(String text) {
-        mTextField.setText(text);
-    }
 }

app/src/main/java/com/firebase/uidemo/database/ChatIndexActivity.java

@@ -0,0 +1,67 @@
+package com.firebase.uidemo.database;
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.firebase.ui.database.FirebaseIndexRecyclerAdapter;
+import com.firebase.ui.database.FirebaseRecyclerAdapter;
+import com.firebase.uidemo.R;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+
+public class ChatIndexActivity extends ChatActivity {
+    private DatabaseReference mChatIndicesRef;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mChatIndicesRef = FirebaseDatabase.getInstance().getReference().child("chatIndices");
+    }
+
+    @Override
+    public void onClick(View v) {
+        String uid = FirebaseAuth.getInstance().getCurrentUser().getUid();
+        String name = "User " + uid.substring(0, 6);
+        Chat chat = new Chat(name, mMessageEdit.getText().toString(), uid);
+
+        DatabaseReference chatRef = mChatRef.push();
+        mChatIndicesRef.child(chatRef.getKey()).setValue(true);
+        chatRef.setValue(chat);
+
+        mMessageEdit.setText("");
+    }
+
+    @Override
+    protected FirebaseRecyclerAdapter<Chat, ChatHolder> getAdapter() {
+        return new FirebaseIndexRecyclerAdapter<Chat, ChatHolder>(
+                Chat.class,
+                R.layout.message,
+                ChatHolder.class,
+                mChatIndicesRef.limitToLast(50),
+                mChatRef) {
+            @Override
+            public void populateViewHolder(ChatHolder holder, Chat chat, int position) {
+                holder.bind(chat);
+            }
+
+            @Override
+            public void onChildChanged(EventType type,
+                                       DataSnapshot snapshot,
+                                       int index,
+                                       int oldIndex) {
+                super.onChildChanged(type, snapshot, index, oldIndex);
+
+                // TODO temporary fix for https://github.com/firebase/FirebaseUI-Android/issues/546
+                onDataChanged();
+            }
+
+            @Override
+            public void onDataChanged() {
+                // If there are no chat messages, show a view that invites the user to add a message.
+                mEmptyListMessage.setVisibility(getItemCount() == 0 ? View.VISIBLE : View.GONE);
+            }
+        };
+    }
+}

app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java

@@ -59,7 +59,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_image);
         ButterKnife.bind(this);
 
-        // By default, Firebase Storage files require authentication to read or write.
+        // By default, Cloud Storage files require authentication to read or write.
         // For this sample to function correctly, enable Anonymous Auth in the Firebase console:
         // https://console.firebase.google.com/project/_/authentication/providers
         FirebaseAuth.getInstance()
@@ -102,7 +102,7 @@ private void uploadPhoto(Uri uri) {
         hideDownloadUI();
         Toast.makeText(this, "Uploading...", Toast.LENGTH_SHORT).show();
 
-        // Upload to Firebase Storage
+        // Upload to Cloud Storage
         String uuid = UUID.randomUUID().toString();
         mImageRef = FirebaseStorage.getInstance().getReference(uuid);
         mImageRef.putFile(uri)

app/src/main/res/values/strings.xml

@@ -7,7 +7,7 @@
 
     <string name="desc_chat">Demonstrates using a FirebaseRecyclerAdapter to load data from Firebase Database into a RecyclerView for a basic chat app.</string>
     <string name="desc_auth_ui">Demonstrates the Firebase Auth UI flow, with customization options.</string>
-    <string name="desc_image">Demonstrates displaying an image from Firebase Storage using Glide.</string>
+    <string name="desc_image">Demonstrates displaying an image from Cloud Storage using Glide.</string>
 
     <!-- strings for Auth UI demo activities -->
     <eat-comment/>
@@ -47,7 +47,7 @@
     <string name="configuration_required">Configuration is required - see README.md</string>
     <string name="other_options_header">Other Options:</string>
     <string name="enable_smartlock">Enable SmartLock for Passwords</string>
-    <string name="rational_image_perm">This sample will read an image from local storage to upload to Firebase Storage.</string>
+    <string name="rational_image_perm">This sample will read an image from local storage to upload to Cloud Storage.</string>
     <string name="anonymous_auth_failed_msg">Anonymous authentication failed, various components of the demo will not work. Make sure your device is online and that Anonymous Auth is configured in your Firebase project(https://console.firebase.google.com/project/_/authentication/providers)</string>
     <string name="extra_google_scopes">Example extra Google scopes</string>
     <string name="games">Games</string>