Fix Transifex issue by using CDATA for html in string

EmmanuelMess · EmmanuelMess · commit d0f6575cd20c · 2025-05-26T21:45:11.000-03:00
diff --git a/app/src/main/java/com/amaze/filemanager/ui/dialogs/GeneralDialogCreation.java b/app/src/main/java/com/amaze/filemanager/ui/dialogs/GeneralDialogCreation.java
@@ -21,6 +21,7 @@
 package com.amaze.filemanager.ui.dialogs;
 
 import static android.os.Build.VERSION.SDK_INT;
+import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_COMPACT;
 import static com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants.PREFERENCE_SORTBY_ONLY_THIS;
 
 import java.io.File;
@@ -92,6 +93,7 @@
 import android.os.Build;
 import android.text.InputType;
 import android.text.SpannableString;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.format.Formatter;
 import android.view.LayoutInflater;
@@ -107,6 +109,7 @@
 import androidx.appcompat.widget.AppCompatCheckBox;
 import androidx.appcompat.widget.AppCompatEditText;
 import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.text.HtmlCompat;
 import androidx.core.text.TextUtilsCompat;
 import androidx.core.view.ViewCompat;
 import androidx.preference.PreferenceManager;
@@ -1030,8 +1033,11 @@ public static void showPasswordDialog(
   }
 
   public static void showSMBHelpDialog(Context m, int accentColor) {
+    final @NonNull Spanned text =
+        HtmlCompat.fromHtml(m.getString(R.string.smb_instructions), FROM_HTML_MODE_COMPACT);
+
     MaterialDialog.Builder b = new MaterialDialog.Builder(m);
-    b.content(m.getText(R.string.smb_instructions));
+    b.content(text);
     b.positiveText(R.string.doit);
     b.positiveColor(accentColor);
     b.build().show();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -330,15 +330,15 @@
     <string name="use_custom_ip">Use custom IP</string>
     <string name="bookmark_lost">Bookmark not found, recreating&#8230;</string>
 
-    <string name="smb_instructions">
+    <string name="smb_instructions"><![CDATA[
         <html>
             <body>
                 <h1>How to access shared Windows folder on Android (SMB)</h1>\n\n
                 <ul>
                     <li>
                         <b>Enable File Sharing on Windows</b>\n
                     </li>
-                    <p style='margin-left: 40px'>
+                    <p style="margin-left: 40px">
                         Open the Control Panel, click Choose HomeGroup and Sharing options under Network
                         and Internet, and click "Change Advanced Sharing Settings," enable the "File and
                         Printer Sharing" feature.\n\n
@@ -347,7 +347,7 @@
                     <li>
                         <b>Additional File Sharing settings</b>\n
                     </li>
-                    <p style='margin-left: 40px'>
+                    <p style="margin-left: 40px">
                         You may also want to configure the other advanced sharing settings here. \n
                         For example, you could enable access to your files without a password if you trust all
                         the devices on your local network. Once file and printer sharing is enabled, you can
@@ -359,7 +359,7 @@
                     <li>
                         <b>Make sure both devices are on same Wifi</b>\n
                     </li>
-                    <p style='margin-left: 40px'>
+                    <p style="margin-left: 40px">
                         This feature makes files available on the local network, so your PC and mobile devices
                         have to be on the same local network. You can\’t access a shared Windows folder
                         over the Internet or when your smartphone is connected to its mobile data — it
@@ -369,7 +369,7 @@
                     <li>
                         <b>Find IP Address</b>\n
                     </li>
-                    <p style='margin-left: 40px'>
+                    <p style="margin-left: 40px">
                         Open Command Prompt. Type \'ipconfig\' and press Enter. Look for Default Gateway
                         under your network adapter for your router\'s IP address. Look for
                         \\\"IPv4 Address\\\" under the same adapter section to find your computer\'s IP
@@ -380,7 +380,7 @@
                 </ul>
             </body>
         </html>
-    </string>
+    ]]></string>
     <string name="share_limit">Can\'t share more than 100 files</string>
     <string name="otg_access">Select the root of OTG device</string>
     <string name="information">Information</string>
