From c5b0f4a498fb6d793cf12b226ba3f4f4cb59a3a7 Mon Sep 17 00:00:00 2001
From: ozkanbolukbas <ozkanbolukbas@gmail.com>
Date: Thu, 12 Jul 2018 23:49:30 +0300
Subject: [PATCH 1/3] Update FireStoreHelper

Added timestamp for new sending message with Timestamp.now()
---
 app/src/main/java/com/safaorhan/reunion/FirestoreHelper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/safaorhan/reunion/FirestoreHelper.java b/app/src/main/java/com/safaorhan/reunion/FirestoreHelper.java
index c2f6134..ad5b904 100644
--- a/app/src/main/java/com/safaorhan/reunion/FirestoreHelper.java
+++ b/app/src/main/java/com/safaorhan/reunion/FirestoreHelper.java
@@ -6,6 +6,7 @@
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.Timestamp;
 import com.google.firebase.firestore.CollectionReference;
 import com.google.firebase.firestore.DocumentReference;
 import com.google.firebase.firestore.DocumentSnapshot;
@@ -102,7 +103,7 @@ public static void sendMessage(final String messageText, final DocumentReference
                     @Override
                     public void onSuccess(DocumentReference documentReference) {
                         conversationRef
-                                .update("lastMessage", documentReference)
+                                .update("lastMessage", documentReference, "conversationTime", Timestamp.now())
                                 .addOnSuccessListener(new OnSuccessListener<Void>() {
                                     @Override
                                     public void onSuccess(Void aVoid) {

From af747913650452a94e4ce46348366724f02c297d Mon Sep 17 00:00:00 2001
From: ozkanbolukbas <ozkanbolukbas@gmail.com>
Date: Thu, 12 Jul 2018 23:51:38 +0300
Subject: [PATCH 2/3] Update Conversation model

Added Timestamp value
---
 .../main/java/com/safaorhan/reunion/model/Conversation.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/com/safaorhan/reunion/model/Conversation.java b/app/src/main/java/com/safaorhan/reunion/model/Conversation.java
index 98eb2fe..96f1e04 100644
--- a/app/src/main/java/com/safaorhan/reunion/model/Conversation.java
+++ b/app/src/main/java/com/safaorhan/reunion/model/Conversation.java
@@ -1,5 +1,6 @@
 package com.safaorhan.reunion.model;
 
+import com.google.firebase.Timestamp;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.firestore.DocumentReference;
 
@@ -9,6 +10,8 @@ public class Conversation {
     String id;
     DocumentReference lastMessage;
     List<DocumentReference> participants;
+    @ServerTimestamp
+    Timestamp conversationTime;
 
     public String getId() {
         return id;

From 0a93885d4355756b12f4200f833a434292dad62d Mon Sep 17 00:00:00 2001
From: ozkanbolukbas <ozkanbolukbas@gmail.com>
Date: Thu, 12 Jul 2018 23:53:21 +0300
Subject: [PATCH 3/3] Update ConversationAdapter

Added sorting option with using conversation time.
---
 .../java/com/safaorhan/reunion/adapter/ConversationAdapter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/safaorhan/reunion/adapter/ConversationAdapter.java b/app/src/main/java/com/safaorhan/reunion/adapter/ConversationAdapter.java
index 7767808..4abae80 100644
--- a/app/src/main/java/com/safaorhan/reunion/adapter/ConversationAdapter.java
+++ b/app/src/main/java/com/safaorhan/reunion/adapter/ConversationAdapter.java
@@ -53,7 +53,7 @@ public void setConversationClickListener(ConversationClickListener conversationC
     public static ConversationAdapter get() {
         Query query = FirebaseFirestore.getInstance()
                 .collection("conversations")
-                //.orderBy("timestamp")
+                .orderBy("conversationTime", Query.Direction.DESCENDING)
                 .whereEqualTo(FirestoreHelper.getMe().getId(), true)
                 .limit(50);