From 7b579fdbe06dc786ecdb402a0e3625cd6fa386af Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Wed, 11 Sep 2024 09:31:07 -0500
Subject: [PATCH] Use same MIME type as delta chat

---
 .../java/eu/siacs/conversations/persistance/FileBackend.java    | 2 +-
 .../java/eu/siacs/conversations/ui/ConversationFragment.java    | 2 +-
 .../java/eu/siacs/conversations/ui/adapter/MessageAdapter.java  | 2 +-
 src/main/java/eu/siacs/conversations/utils/MimeUtils.java       | 2 +-
 src/main/java/eu/siacs/conversations/utils/UIHelper.java        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 1e8c20399a2c67348f8931e324d0d9adb5042c4a..1e30615e557f5b69fe13621064dc1e64e9cb98cd 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -2066,7 +2066,7 @@ public class FileBackend {
             } else if (audio) {
                 fileParams.runtime = getMediaRuntime(file);
             }
-            if ("application/xdc+zip".equals(mime)) {
+            if ("application/webxdc+zip".equals(mime)) {
                 try {
                     final var zip = new ZipFile(file);
                     final ZipEntry manifestEntry = zip == null ? null : zip.getEntry("manifest.toml");
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index a7b1aea30d908b30653184dfa4d4225cd7bc1c1f..15378babdf5ebdc200a1d7f520c6ba470a29dbc1 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -856,7 +856,7 @@ public class ConversationFragment extends XmppFragment
             return;
         }
         final String subject = binding.textinputSubject.getText().toString();
-        if ("application/xdc+zip".equals(type)) newSubThread();
+        if ("application/webxdc+zip".equals(type)) newSubThread();
         final Toast prepareFileToast =
                 Toast.makeText(getActivity(), getText(R.string.preparing_file), Toast.LENGTH_LONG);
         prepareFileToast.show();
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 4b276c2ebc17d6122354edfbb67482b4980334bc..5ff2026429e0c751790ef73077e481617ad50530 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -1413,7 +1413,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 }
             } else if (message.getFileParams().runtime > 0) {
                 displayAudioMessage(viewHolder, message, bubbleColor, type);
-            } else if ("application/xdc+zip".equals(message.getFileParams().getMediaType()) && message.getConversation() instanceof Conversation && message.getThread() != null && !message.getFileParams().getCids().isEmpty()) {
+            } else if ("application/webxdc+zip".equals(message.getFileParams().getMediaType()) && message.getConversation() instanceof Conversation && message.getThread() != null && !message.getFileParams().getCids().isEmpty()) {
                 displayWebxdcMessage(viewHolder, message, bubbleColor, type);
             } else {
                 displayOpenableMessage(viewHolder, message, bubbleColor, type);
diff --git a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java
index 90dfe137aca81cf872c6e924fa3d5b1a28c784ee..1df2f8a2407a519f22da70c0d2675796aaa1ad6f 100644
--- a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java
+++ b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java
@@ -237,7 +237,7 @@ public final class MimeUtils {
         add("application/x-x509-server-cert", "crt");
         add("application/x-xcf", "xcf");
         add("application/x-xfig", "fig");
-        add("application/xdc+zip", "xdc");
+        add("application/webxdc+zip", "xdc");
         add("application/xhtml+xml", "xhtml");
         add("video/3gpp", "3gpp");
         add("video/3gpp", "3gp");
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index 922cb6d435cbc50d5c5e3210251c32993b54d56c..4f7640113037a97d557e5e0c3d825735b1f2de32 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -450,7 +450,7 @@ public class UIHelper {
             return context.getString(R.string.ebook);
         } else if (mime.equals("application/gpx+xml")) {
             return context.getString(R.string.gpx_track);
-        } else if (mime.equals("application/xdc+zip")) {
+        } else if (mime.equals("application/webxdc+zip")) {
             final var name = message.getFileParams().getName();
             if (name != null && name.length() < 20) {
                 return name;