Merge remote-tracking branch 'origin/master'

FanapSoft · May 2, 2022 · c4380d1 · c4380d1
2 parents 3744bee + ee9d562
commit c4380d1
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 34 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -114,11 +114,13 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1'
 //    implementation project(path: ':podotp')
 
+
     implementation 'com.github.bumptech.glide:glide:4.8.0'
     //placeholderview
 //    implementation 'com.mindorks:placeholderview:0.7.1'
     implementation('com.mindorks:placeholderview:0.7.1') {
         exclude group: 'com.android.support', module: 'recyclerview-v7'
     }
 
+
 }
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
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,10 +19,9 @@ public class UserInfo {
     private String cellphoneNumber;
     private String email;
     private String image;
-    private Boolean contactSynced;
 
     @Ignore
-    private ChatProfileVO chatProfileVO;
+    ChatProfileVO chatProfileVO;
 
 
     public ChatProfileVO getChatProfileVO() {
@@ -120,4 +119,5 @@ public String getEmail() {
     public void setEmail(String email) {
         this.email = email;
     }
+
 }
diff --git a/podchat/src/main/java/com/fanap/podchat/networking/ProgressResponseBody.java b/podchat/src/main/java/com/fanap/podchat/networking/ProgressResponseBody.java
@@ -10,13 +10,11 @@
 import com.google.gson.GsonBuilder;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.Interceptor;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 import okhttp3.logging.HttpLoggingInterceptor;

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,9 +244,6 @@ public interface MessageDao {
     @RawQuery
     List<ThreadVo> getThreadRaw(SupportSQLiteQuery query);
 
-    @RawQuery
-    long getThreadContentCount(SupportSQLiteQuery query);
-
     @RawQuery
     List<Long> getThreadIds(SupportSQLiteQuery query);
 

diff --git a/podchat/src/main/java/com/fanap/podchat/persistance/module/MessageComponent.java b/podchat/src/main/java/com/fanap/podchat/persistance/module/MessageComponent.java
@@ -8,7 +8,6 @@
 import com.fanap.podchat.persistance.PhoneContactDbHelper;
 import com.fanap.podchat.persistance.dao.MessageDao;
 import com.fanap.podchat.persistance.dao.MessageQueueDao;
-import com.fanap.podchat.repository.CacheDataSource;
 
 import javax.inject.Singleton;
 
@@ -20,8 +19,6 @@ public interface MessageComponent {
 
     void inject(Chat chat);
 
-    void injectDataSource(CacheDataSource cacheDataSource);
-
     MessageDao messageDao();
 
     MessageQueueDao MessageQueueDao();

diff --git a/podchat/src/main/java/com/fanap/podchat/repository/DataSourceType.java b/podchat/src/main/java/com/fanap/podchat/repository/DataSourceType.java