fix merging bugs

FanapSoft · May 2, 2022 · ff1a1d7 · ff1a1d7
1 parent c4380d1
commit ff1a1d7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/podchat/src/main/java/com/fanap/podchat/chat/contact/result_model/ContactSyncedResult.java b/podchat/src/main/java/com/fanap/podchat/chat/contact/result_model/ContactSyncedResult.java
@@ -0,0 +1,14 @@
+package com.fanap.podchat.chat.contact.result_model;
+
+public class ContactSyncedResult {
+
+    private long userId;
+
+    public ContactSyncedResult(long userId) {
+        this.userId = userId;
+    }
+
+    public long getUserId() {
+        return userId;
+    }
+}
diff --git a/podchat/src/main/java/com/fanap/podchat/mainmodel/UserInfo.java b/podchat/src/main/java/com/fanap/podchat/mainmodel/UserInfo.java
@@ -19,9 +19,10 @@ public class UserInfo {
     private String cellphoneNumber;
     private String email;
     private String image;
+    private Boolean contactSynced;
 
     @Ignore
-    ChatProfileVO chatProfileVO;
+    private ChatProfileVO chatProfileVO;
 
 
     public ChatProfileVO getChatProfileVO() {

diff --git a/podchat/src/main/java/com/fanap/podchat/persistance/dao/MessageDao.java b/podchat/src/main/java/com/fanap/podchat/persistance/dao/MessageDao.java
@@ -244,6 +244,9 @@ public interface MessageDao {
     @RawQuery
     List<ThreadVo> getThreadRaw(SupportSQLiteQuery query);
 
+    @RawQuery
+    long getThreadContentCount(SupportSQLiteQuery query);
+
     @RawQuery
     List<Long> getThreadIds(SupportSQLiteQuery query);