Merge pull request #128 from tobexyz/chore/release

prepare release 4.2.0
tobexyz · Sep 29, 2024 · a12175a · a12175a
2 parents ee0642e + 73996cb
commit a12175a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/fastlane/metadata/android/en-US/changelogs/40200.txt b/fastlane/metadata/android/en-US/changelogs/40200.txt
@@ -0,0 +1,6 @@
+Version 4.2.0
+- added proxy function for https urls shared with yaacc to terminate ssl and provide an http content url for receiver device
+- setup new documentation page https://tobexyz.github.io/yaacc-code/
+- code refactorings
+
+https://github.com/tobexyz/yaacc-code/compare/4.1.0...4.2.0
diff --git a/yaacc/src/main/AndroidManifest.xml b/yaacc/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:versionCode="40200"
-    android:versionName="4.2.0-SNAPSHOT">
+    android:versionName="4.2.0">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

diff --git a/yaacc/src/main/java/org/fourthline/cling/support/contentdirectory/DIDLParser.java b/yaacc/src/main/java/org/fourthline/cling/support/contentdirectory/DIDLParser.java
@@ -117,7 +117,7 @@ public DIDLContent parse(String xml) throws Exception {
         createRootHandler(content, this);
 
         Log.d(getClass().getName(), "Parsing DIDL XML content");
-        parse(new InputSource(new StringReader(xml.replaceAll("&", "&amp;"))));
+        parse(new InputSource(new StringReader(xml.replaceAll("&(?!amp;)", "&amp;"))));
         return content;
     }