Skip to content

feature/conversationTime #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ozkanbolukbas wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feature/conversationTime #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5b0f4a
Update FireStoreHelper
ozkanbolukbas Jul 12, 2018
af74791
Update Conversation model
ozkanbolukbas Jul 12, 2018
0a93885
Update ConversationAdapter
ozkanbolukbas Jul 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/main/java/com/safaorhan/reunion/FirestoreHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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())
Copy link
Copy Markdown
Contributor

@safaorhan safaorhan Jul 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you don't need to send conversationTime since it's annotated as @ServerTimestamp.

It should get updated everytime you do an update.

Copy link
Copy Markdown
Contributor Author

@ozkanbolukbas ozkanbolukbas Jul 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried it but it didn't update. It creates time stamp when conversation created. Because of that, I added this line. I added it to order last updated conversation. If you prefer I can add a new timestamp and we have created time and last updated time.

.addOnSuccessListener(new OnSuccessListener<Void>() {
@Override
public void onSuccess(Void aVoid) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/safaorhan/reunion/adapter/ConversationAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/safaorhan/reunion/model/Conversation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -9,6 +10,8 @@ public class Conversation {
String id;
DocumentReference lastMessage;
List<DocumentReference> participants;
@ServerTimestamp
Timestamp conversationTime;

public String getId() {
return id;
Expand Down