Skip to content

Commit de086d6

Browse files
committed
Fix build issue
1 parent d3960dd commit de086d6

6 files changed

Lines changed: 19 additions & 97 deletions

File tree

app/src/main/java/com/ismartcoding/plain/web/INDEX.md

Lines changed: 0 additions & 45 deletions
This file was deleted.

app/src/main/res/values-fr/strings_files.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<string name="cannot_copy_folder_into_itself">Impossible de copier un dossier dans lui-même ou dans l’un de ses sous-dossiers.</string>
4848
<string name="file_save_to">Fichier enregistré dans {{path}}</string>
4949
<string name="group_by_taken_at">Regrouper par date de prise</string>
50-
<string name="view_mode">Mode d'affichage</string>
50+
<string name="view_mode">Mode d\'affichage</string>
5151
<string name="browse_by_tags">Parcourir par tags</string>
5252
<string name="browse_by_file_type">Parcourir par type de fichier</string>
5353
</resources>

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ coil="3.4.0"
55
coreKtxVersion="1.18.0"
66
gradle= "9.2.0"
77
cameraCoreVersion = "1.6.0"
8-
compose = "1.11.0"
8+
compose = "1.10.6"
99
activityComposeVersion = "1.13.0"
10-
composeBom = "2026.04.01"
10+
composeBom = "2026.03.01"
1111
coreSplashscreenVersion = "1.2.0"
1212
exifinterfaceVersion = "1.4.2"
1313
coreVersion = "3.5.4"

lib/consumer-rules.pro

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
-dontwarn com.google.re2j.Pattern
121121
-dontwarn io.netty.pkitesting.CertificateBuilder$Algorithm
122122
-dontwarn io.netty.pkitesting.CertificateBuilder
123+
-dontwarn io.netty.internal.tcnative.SSLCredential
123124
-dontwarn io.netty.pkitesting.X509Bundle
124125
-dontwarn jdk.jfr.Category
125126
-dontwarn jdk.jfr.DataAmount
@@ -129,4 +130,6 @@
129130
-dontwarn jdk.jfr.FlightRecorder
130131
-dontwarn jdk.jfr.Label
131132
-dontwarn jdk.jfr.MemoryAddress
132-
-dontwarn jdk.jfr.Name
133+
-dontwarn jdk.jfr.Name
134+
-dontwarn javax.naming.ldap.LdapName
135+
-dontwarn javax.naming.ldap.Rdn

lib/src/main/java/com/ismartcoding/lib/androidsvg/utils/SVGParserImpl.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import java.util.regex.Pattern;
5050
import java.util.zip.GZIPInputStream;
5151

52+
import javax.xml.XMLConstants;
5253
import javax.xml.parsers.ParserConfigurationException;
5354
import javax.xml.parsers.SAXParser;
5455
import javax.xml.parsers.SAXParserFactory;
@@ -810,12 +811,20 @@ private void parseUsingSAX(InputStream is) throws SVGParseException
810811
// Invoke the SAX XML parser on the input.
811812
SAXParserFactory spf = SAXParserFactory.newInstance();
812813

813-
// Disable external entity resolving
814-
spf.setFeature("http://xml.org/sax/features/external-general-entities", false);
815-
spf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
814+
// Harden parser against XXE and external resource resolution.
815+
spf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
816+
spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
817+
spf.setFeature("http://xml.org/sax/features/external-general-entities", false);
818+
spf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
819+
spf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
820+
spf.setXIncludeAware(false);
821+
spf.setNamespaceAware(true);
816822

817823
SAXParser sp = spf.newSAXParser();
818824
XMLReader xr = sp.getXMLReader();
825+
xr.setFeature("http://xml.org/sax/features/external-general-entities", false);
826+
xr.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
827+
xr.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
819828

820829
SAXHandler handler = new SAXHandler();
821830
xr.setContentHandler(handler);

lib/src/main/java/com/ismartcoding/lib/helpers/SslHelper.kt

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)