From 15b257720ebeb2d667dcd205ed1de2498c5ead99 Mon Sep 17 00:00:00 2001
From: androidacy-user <opensource@androidacy.com>
Date: Tue, 3 Jan 2023 13:32:18 -0500
Subject: [PATCH] Rework module validation and setup

Signed-off-by: androidacy-user <opensource@androidacy.com>
---
 app/src/main/java/com/fox2code/mmm/utils/ZipFileOpener.java | 2 +-
 app/src/main/res/values/strings.xml                         | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/fox2code/mmm/utils/ZipFileOpener.java b/app/src/main/java/com/fox2code/mmm/utils/ZipFileOpener.java
index 9e74b53..a25a26b 100644
--- a/app/src/main/java/com/fox2code/mmm/utils/ZipFileOpener.java
+++ b/app/src/main/java/com/fox2code/mmm/utils/ZipFileOpener.java
@@ -150,7 +150,7 @@ public class ZipFileOpener extends FoxActivity {
             }
             runOnUiThread(() -> {
                 new MaterialAlertDialogBuilder(this)
-                        .setTitle(R.string.zip_security_warning)
+                        .setTitle(getString(R.string.zip_security_warning, moduleInfo))
                         .setMessage(getString(R.string.zip_intent_module_install, moduleInfo, Files.getFileName(this, uri)))
                         .setCancelable(false)
                         .setNegativeButton(R.string.no, (d, i) -> {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a6c08c1..24444df 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -271,10 +271,12 @@
     <string name="no_file_provided">No file was provided when trying to open zip.</string>
     <string name="zip_load_failed">Could not load the zip file</string>
     <string name="zip_prop_load_failed">Could not load the module properties</string>
-    <string name="zip_security_warning">Security warning</string>
+    <string name="zip_security_warning">Install %s?</string>
     <string name="zip_intent_module_install">Do you really want to install the module \"%s\" from the ZIP file \"%s\"? Installing untrusted modules can lead to security risks.</string>
     <string name="androidacy_thanks">Developed in part by Androidacy</string>
     <string name="androidacy_thanks_desc">Huge shoutout to Androidacy for their integration and contributions to the app.</string>
     <string name="contributors">And of course, thanks to all of our contributors, whether it\'s translations, code, or just being fun to hang out with! We love you all.</string>
-	<string name="zip_unpacking">Inspecting module…</string><string name="warning_message">Warning!This module has indicators it may have been installed without your knowledge, or may be attempting to hide itself. Uninstall is strongly recommended.</string><string name="understand">I understand</string><string name="setup_theme_title">Choose theme</string>
+	<string name="zip_unpacking">Inspecting module…</string>
+    <string name="warning_message">Warning! This module has indicators it may have been installed without your knowledge, or may be attempting to hide itself. Uninstall is strongly recommended.</string>
+    <string name="understand">I understand</string><string name="setup_theme_title">Choose theme</string>
 </resources>