From 214ce9720df2752e2e0f38b8961b056e376c24d6 Mon Sep 17 00:00:00 2001
From: Moon Sungjoon <sumoon@seoulsaram.org>
Date: Wed, 6 Sep 2023 10:33:33 +0300
Subject: [PATCH] Enable HWP conversion on MacOS M1

This PR reverts the patch that disables HWP / HWPX conversion on MacOS
M1. It does not fix conversion on Qubes OS (#494)

Previously, HWP / HWPX conversion didn't work on MacOS M1 systems (#498)
because libreoffice wasn't built with Java support on Alpine Linux for
ARM (aarch64).

Gratefully, the Alpine team has enabled Java support on the aarch64
system [1], so we can enable it again for ARM architectures.

Fixes #498

[1]: https://gitlab.alpinelinux.org/alpine/aports/-/commit/74d443f479df15fc57e6fde6ac02a36b24afdded
---
 README.md                              | 3 +--
 dangerzone/conversion/doc_to_pixels.py | 8 --------
 dangerzone/gui/main_window.py          | 8 +++-----
 tests/test_cli.py                      | 3 +--
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index fd53d4f..fa4e6c9 100644
--- a/README.md
+++ b/README.md
@@ -53,8 +53,7 @@ Dangerzone can convert these types of document into safe PDFs:
 - ODF Graphics (`.odg`)
 - Hancom HWP (Hangul Word Processor) (`.hwp`, `.hwpx`)
   * Not supported on
-    [MacOS with Apple Silicon CPU](https://github.com/freedomofpress/dangerzone/issues/498)
-    or [Qubes OS](https://github.com/freedomofpress/dangerzone/issues/494)
+    [Qubes OS](https://github.com/freedomofpress/dangerzone/issues/494)
 - Jpeg (`.jpg`, `.jpeg`)
 - GIF (`.gif`)
 - PNG (`.png`)
diff --git a/dangerzone/conversion/doc_to_pixels.py b/dangerzone/conversion/doc_to_pixels.py
index d8fa348..e8dd530 100644
--- a/dangerzone/conversion/doc_to_pixels.py
+++ b/dangerzone/conversion/doc_to_pixels.py
@@ -10,7 +10,6 @@ Here are the steps, with progress bar percentages:
 import asyncio
 import glob
 import os
-import platform
 import re
 import shutil
 import sys
@@ -167,13 +166,6 @@ class DocumentToPixels(DangerzoneConverter):
             #
             #     https://github.com/freedomofpress/dangerzone/issues/494
             #     https://github.com/freedomofpress/dangerzone/issues/498
-            if libreoffice_ext == "h2orestart.oxt" and platform.machine() in (
-                "arm64",
-                "aarch64",
-            ):
-                raise ValueError(
-                    "HWP / HWPX formats are not supported in ARM architectures"
-                )
             if libreoffice_ext == "h2orestart.oxt" and running_on_qubes():
                 raise ValueError("HWP / HWPX formats are not supported in Qubes")
             if libreoffice_ext:
diff --git a/dangerzone/gui/main_window.py b/dangerzone/gui/main_window.py
index 6180933..0f7253d 100644
--- a/dangerzone/gui/main_window.py
+++ b/dangerzone/gui/main_window.py
@@ -552,15 +552,13 @@ class DocSelectionWidget(QtWidgets.QWidget):
         self.file_dialog.setWindowTitle("Open Documents")
         self.file_dialog.setFileMode(QtWidgets.QFileDialog.ExistingFiles)
 
-        # XXX: We disable loading HWP/HWPX files on Qubes or MacOS M1 platforms, because
-        # H2ORestart does not work there. See:
+        # XXX: We disable loading HWP/HWPX files on Qubes, because H2ORestart does not work there.
+        # See:
         #
         # https://github.com/freedomofpress/dangerzone/issues/494
-        # https://github.com/freedomofpress/dangerzone/issues/498
         hwp_filters = "*.hwp *.hwpx"
-        if platform.machine() in ("arm64", "aarch64") or is_qubes_native_conversion():
+        if is_qubes_native_conversion():
             hwp_filters = ""
-
         self.file_dialog.setNameFilters(
             [
                 f"Documents (*.pdf *.docx *.doc *.docm *.xlsx *.xls *.pptx *.ppt *.odt *.odg *.odp *.ods {hwp_filters} *.jpg *.jpeg *.gif *.png *.tif *.tiff)"
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 148918b..1b4774e 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -4,7 +4,6 @@ import base64
 import contextlib
 import copy
 import os
-import platform
 import re
 import shutil
 import sys
@@ -308,7 +307,7 @@ class TestCliConversion(TestCliBasic):
 class TestExtraFormats(TestCli):
     @for_each_external_doc("*hwp*")
     def test_hancom_office(self, doc: str) -> None:
-        if platform.machine() in ("arm64", "aarch64") or is_qubes_native_conversion():
+        if is_qubes_native_conversion():
             pytest.skip("HWP / HWPX formats are not supported on this platform")
         with tempfile.NamedTemporaryFile("wb", delete=False) as decoded_doc:
             with open(doc, "rb") as encoded_doc: