changed extension identification

HamidrezaAmz · Oct 4, 2021 · e855a9b · e855a9b
1 parent 7d5d082
commit e855a9b
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/chatkitlight/build.gradle b/chatkitlight/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 97
-        versionName "3.0.47.2.1"
+        versionCode 98
+        versionName "3.0.47.3"
         vectorDrawables.useSupportLibrary = true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/chatkitlight/src/main/java/ir/vasl/chatkitlight/ui/adapter/ConversationAdapter.java b/chatkitlight/src/main/java/ir/vasl/chatkitlight/ui/adapter/ConversationAdapter.java
@@ -1214,7 +1214,12 @@ public ConversationViewHolder(LawoneConversationClientFileBinding clientFileBind
                 if (FileHelper.checkFileExistence(context, getItem(getBindingAdapterPosition()).getFileName())) {
                     Uri fileUri = FileHelper.getFileUri(context, getItem(getBindingAdapterPosition()).getFileName());
                     String type = FileHelper.getMimeType(context, fileUri);
-                    String extension = ExtensionHelper.getUriExtension(getItem(getBindingAdapterPosition()).getMessage());
+                    String extension = "";
+                    try{
+                        extension = ExtensionHelper.getUriExtension(getItem(getBindingAdapterPosition()).getMessage());
+                    } catch (StringIndexOutOfBoundsException exception){
+                        extension = ExtensionHelper.getUriExtension(getItem(getBindingAdapterPosition()).getFileName());
+                    }
                     if (extension.contains(PublicValue.PDF) || extension.contains(PublicValue.DOC) || extension.contains(PublicValue.DOCX))
                         OnFileClicked(fileUri);
                     else
@@ -1377,8 +1382,12 @@ public ConversationViewHolder(LawoneConversationServerFileBinding serverFileBind
                 if (FileHelper.checkFileExistence(context, getItem(getBindingAdapterPosition()).getFileName())) {
                     Uri fileUri = FileHelper.getFileUri(context, getItem(getBindingAdapterPosition()).getFileName());
                     String type = FileHelper.getMimeType(context, fileUri);
-                    String extension = ExtensionHelper.getUriExtension(fileUri);
-
+                    String extension = "";
+                    try{
+                        extension = ExtensionHelper.getUriExtension(getItem(getBindingAdapterPosition()).getMessage());
+                    } catch (StringIndexOutOfBoundsException exception){
+                        extension = ExtensionHelper.getUriExtension(getItem(getBindingAdapterPosition()).getFileName());
+                    }
                     if (extension.contains(PublicValue.PDF) || extension.contains(PublicValue.DOC) || extension.contains(PublicValue.DOCX))
                         OnFileClicked(fileUri);
                     else