Merge branch 'develop'

# Conflicts: # podchat/src/main/java/com/fanap/podchat/util/NetworkUtils/NetworkPingSender.java
FanapSoft · Nov 23, 2020 · 3c8dba9 · 3c8dba9
2 parents 2ecbfcf + 1646f1a
commit 3c8dba9
Show file tree

Hide file tree

Showing 165 changed files with 6,513 additions and 13,478 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,49 @@
 # Changelog
 All notable changes to this project will be documented here.
 
+## Version [0.9.3.1] -2020-11-22
+
+[Added] ```isSentryLogActive```
+
+[Added] ```isSentryResponseLogActive```
+
+
+
+## Version [0.9.3.0] -2020-11-02
+
+[Added] ```closeThread```
+
+[Added] ```safeLeaveThread```
+
+[Added] ```shouldKeepHistory``` to ```RequestLeaveThread``` and ```SafeLeaveRequest```
+
+[Added] ChatMessageType, STICKER
+
+[Added] ```addGroupCallParticipant```
+
+[Added] ```removeGroupCallParticipant```
+
+[Added] ```onCallParticipantLeft``` callback
+
+[Added] Group image to notification
+
+[Changed] ```isInCache``` to ```isAvailableInCache```
+
+[BugFixed] ```deleteMultipleMessage```
+
+
+
+
+## Version [0.9.1.0] -2020-10-07
+
+[Added] **Audio Call**
+
+[Added] ```getChatState()```
+
+[Added] New Message Type 'STICKER'
+
+
+
 ## Version [0.9.0.0] -2020-9-22
 
 [Improved] Contacts Cache Performance

diff --git a/app/src/androidTest/java/com/example/podchat/ChatTest.java b/app/src/androidTest/java/com/example/podchat/ChatTest.java
@@ -202,15 +202,6 @@ public void getCurrentUserRoles() {
     }
 
 
-    @Test
-    @MediumTest
-    public void getUserInfo() {
-        sleep(5000);
-        presenter.getUserInfo(null);
-        sleep(5000);
-        Mockito.verify(view, Mockito.times(1)).onGetUserInfo(outPutUserInfo);
-
-    }
 
 
     @Test
@@ -367,7 +358,7 @@ public void getContacts() {
         sleep(3000);
         presenter.getContact(50, 0L, null);
         sleep(3000);
-        Mockito.verify(view, Mockito.times(1)).onGetContacts();
+        Mockito.verify(view, Mockito.times(1)).onGetContacts(outPutContact.getResult());
     }
 
     @Test
@@ -478,7 +469,7 @@ public void replyMessage() {
     @MediumTest
     public void renameThread() {
         sleep(3000);
-        presenter.renameThread(632, "5_گروه خودمونی", null);
+        presenter.renameThread(9162, "5 گروه خودمونی ما", null);
         sleep(3000);
         Mockito.verify(view, Mockito.times(1)).onRenameGroupThread();
     }
@@ -578,13 +569,13 @@ public void syncContact() {
     @Test
     @MediumTest
     public void AddParticipant() {
-        sleep(5000);
-        List<Long> participantIds = new ArrayList<>();
-        participantIds.add(824L);
-        participantIds.add(577L);
-        presenter.addParticipants(691, participantIds, null);
-        sleep(5000);
-        Mockito.verify(view, Mockito.times(1)).onAddParticipant();
+//        sleep(5000);
+//        List<Long> participantIds = new ArrayList<>();
+//        participantIds.add(824L);
+//        participantIds.add(577L);
+//
+//        sleep(5000);
+//        Mockito.verify(view, Mockito.times(1)).onAddParticipant();
     }
 
     @Test

diff --git a/app/src/androidTest/java/com/example/podchat/DbTest.java b/app/src/androidTest/java/com/example/podchat/DbTest.java
@@ -310,4 +310,9 @@ public void justFirstMsgIdC3() {
     }
 
 
+
+
+
+
+
 }
diff --git a/app/src/androidTest/java/com/example/podchat/Test.java b/app/src/androidTest/java/com/example/podchat/Test.java
@@ -0,0 +1,26 @@
+package com.example.podchat;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class Test {
+    @org.junit.Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("com.example.android_testing", appContext.getPackageName());
+    }
+
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,11 +10,9 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.INTERNET" />
 
-
     <application
         android:name="com.example.chat.application.chatexample.BaseApplication"
         android:allowBackup="true"
@@ -26,17 +24,16 @@
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning"
         tools:targetApi="n">
+        <activity android:name="com.fanap.podchat.KafkaTestActivity">
+
+
 
-        <activity
-            android:name="com.example.chat.application.chatexample.CallActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
-        <activity android:name="com.example.chat.application.chatexample.ChatSandBoxActivity" />
-        <!-- <receiver android:name="com.arissystem.touca.tmtp.TmtpPushReceiver" -->
+        <activity android:name="com.example.chat.application.chatexample.CallActivity">
+
+        </activity>
+        <activity android:name="com.example.chat.application.chatexample.ChatSandBoxActivity" /> <!-- <receiver android:name="com.arissystem.touca.tmtp.TmtpPushReceiver" -->
         <!-- android:exported="true"> -->
         <!-- <intent-filter> -->
         <!-- <action android:name="com.arissystem.touca.app" /> -->
@@ -49,13 +46,15 @@
         <!-- </intent-filter> -->
         <!-- </receiver> -->
         <activity
-            android:launchMode="singleInstance"
-            android:name="com.example.chat.application.chatexample.ChatActivity">
+            android:name="com.example.chat.application.chatexample.ChatActivity"
+            android:launchMode="singleInstance">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
 
         </activity>
     </application>
 
-
-
 </manifest>
diff --git a/app/src/main/java/com/example/chat/application/chatexample/BaseApplication.java b/app/src/main/java/com/example/chat/application/chatexample/BaseApplication.java
@@ -2,6 +2,7 @@
 
 import android.support.multidex.MultiDex;
 import android.support.multidex.MultiDexApplication;
+import android.util.Log;
 
 
 public class BaseApplication extends MultiDexApplication {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -310,4 +310,9 @@ public void justFirstMsgIdC3() {
		}







		}