From fda3423353920774a71b1b7cd87d317cba6f4b89 Mon Sep 17 00:00:00 2001
From: SL <No8blackball@163.com>
Date: Thu, 29 Aug 2024 15:56:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9ADelete=20unknown=20message=20format?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wkim/build.gradle                                  |  6 +++---
 .../com/xinbida/wukongim/manager/MsgManager.java   | 14 +++++---------
 .../wukongim/msgmodel/WKUnknownContent.java        | 14 --------------
 3 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKUnknownContent.java

diff --git a/wkim/build.gradle b/wkim/build.gradle
index 675a289..88d6410 100644
--- a/wkim/build.gradle
+++ b/wkim/build.gradle
@@ -34,8 +34,8 @@ android {
 
     buildTypes {
         release {
-            zipAlignEnabled true
-            minifyEnabled true
+            zipAlignEnabled false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -52,7 +52,7 @@ dependencies {
     api files('libs/xSocket-2.8.15.jar')
     implementation 'com.android.support:multidex:1.0.3'
     implementation "net.zetetic:android-database-sqlcipher:4.5.3"
-    implementation "androidx.sqlite:sqlite:2.3.1"
+    implementation "androidx.sqlite:sqlite-ktx:2.4.0"
     implementation 'org.whispersystems:curve25519-android:0.5.0'
     implementation 'org.whispersystems:signal-protocol-android:2.8.1'
 }
diff --git a/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java
index 8b0f4e8..55ed127 100644
--- a/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java
+++ b/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java
@@ -1,7 +1,6 @@
 package com.xinbida.wukongim.manager;
 
 import android.text.TextUtils;
-import android.util.Log;
 
 import androidx.annotation.NonNull;
 
@@ -43,8 +42,6 @@ import com.xinbida.wukongim.interfaces.IUploadAttachmentListener;
 import com.xinbida.wukongim.interfaces.IUploadMsgExtraListener;
 import com.xinbida.wukongim.message.MessageHandler;
 import com.xinbida.wukongim.message.WKConnection;
-import com.xinbida.wukongim.message.WKRead;
-import com.xinbida.wukongim.message.type.WKMsgContentType;
 import com.xinbida.wukongim.message.type.WKSendMsgResult;
 import com.xinbida.wukongim.msgmodel.WKFormatErrorContent;
 import com.xinbida.wukongim.msgmodel.WKImageContent;
@@ -52,7 +49,6 @@ import com.xinbida.wukongim.msgmodel.WKMessageContent;
 import com.xinbida.wukongim.msgmodel.WKMsgEntity;
 import com.xinbida.wukongim.msgmodel.WKReply;
 import com.xinbida.wukongim.msgmodel.WKTextContent;
-import com.xinbida.wukongim.msgmodel.WKUnknownContent;
 import com.xinbida.wukongim.msgmodel.WKVideoContent;
 import com.xinbida.wukongim.msgmodel.WKVoiceContent;
 import com.xinbida.wukongim.utils.DateUtils;
@@ -182,8 +178,8 @@ public class MsgManager extends BaseManager {
     public WKMessageContent getMsgContentModel(int contentType, JSONObject jsonObject) {
         if (jsonObject == null) jsonObject = new JSONObject();
         WKMessageContent baseContentMsgModel = getContentMsgModel(contentType, jsonObject);
-        if (baseContentMsgModel == null) {
-            baseContentMsgModel = new WKUnknownContent();
+        if (baseContentMsgModel == null){
+            baseContentMsgModel  = new WKMessageContent();
         }
         //解析@成员列表
         if (jsonObject.has("mention")) {
@@ -270,7 +266,7 @@ public class MsgManager extends BaseManager {
             } catch (IllegalAccessException | InstantiationException | NoSuchMethodException |
                      InvocationTargetException e) {
                 WKLoggerUtils.getInstance().e(TAG, "getContentMsgModel error" + e.getLocalizedMessage());
-                return new WKUnknownContent();
+                return null;
             }
         }
         try {
@@ -280,9 +276,9 @@ public class MsgManager extends BaseManager {
             }
         } catch (IllegalAccessException | InstantiationException e) {
             WKLoggerUtils.getInstance().e(TAG, "getContentMsgModel decodeMsg error");
-            return new WKUnknownContent();
+            return  null;
         }
-        return new WKUnknownContent();
+        return null;
     }
 
     private long getOrNearbyMsgSeq(long orderSeq) {
diff --git a/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKUnknownContent.java b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKUnknownContent.java
deleted file mode 100644
index 878f9cb..0000000
--- a/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKUnknownContent.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.xinbida.wukongim.msgmodel;
-
-import com.xinbida.wukongim.message.type.WKMsgContentType;
-
-public class WKUnknownContent extends WKMessageContent{
-    public WKUnknownContent(){
-        this.type = WKMsgContentType.WK_CONTENT_FORMAT_ERROR;
-    }
-
-    @Override
-    public String getDisplayContent() {
-        return "[未知消息]";
-    }
-}