Merge remote-tracking branch 'origin/wepod-fixed-bugs' into beta

FanapSoft · Jun 14, 2021 · ab4f063 · ab4f063
2 parents 5a3c7e8 + dae03f2
commit ab4f063
Show file tree

Hide file tree

Showing 5 changed files with 2,991 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 # Changelog
 All notable changes to this project will be documented here.
+## Version [0.9.***]
+[BugFixed] Failure to receive history in specipic situtions
 
 
 ## Version [0.9.8.2]

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -45,8 +45,17 @@
         <!-- <action android:name="android.intent.action.QUICKBOOT_POWERON" /> -->
         <!-- </intent-filter> -->
         <!-- </receiver> -->
+<!--        <activity-->
+<!--            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> -->
         <activity
-            android:name="com.example.chat.application.chatexample.ChatActivity"
+            android:name="com.example.chat.application.chatexample.ChatMainActivity"
             android:launchMode="singleInstance">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />