From f5aa8f37bb978c7bd760f3d2705ceeeab611942f Mon Sep 17 00:00:00 2001 From: Koen J Date: Fri, 17 Jan 2025 22:19:02 +0100 Subject: [PATCH 1/3] Updated youtube. --- app/src/stable/assets/sources/youtube | 2 +- app/src/unstable/assets/sources/youtube | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube index f2c6ea94..f5afc782 160000 --- a/app/src/stable/assets/sources/youtube +++ b/app/src/stable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit f2c6ea94230e80031d6703116acdbbca0061e818 +Subproject commit f5afc782a95a5175c2d55d294808c8bac9fc327f diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube index f2c6ea94..f5afc782 160000 --- a/app/src/unstable/assets/sources/youtube +++ b/app/src/unstable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit f2c6ea94230e80031d6703116acdbbca0061e818 +Subproject commit f5afc782a95a5175c2d55d294808c8bac9fc327f From a410e2962a5ffdb0b6f0d85161dbb0357363a414 Mon Sep 17 00:00:00 2001 From: Koen J Date: Mon, 20 Jan 2025 14:04:55 +0100 Subject: [PATCH 2/3] Only take one line for signing. --- sign-all-sources.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sign-all-sources.sh b/sign-all-sources.sh index 3a6d783f..e725c588 100755 --- a/sign-all-sources.sh +++ b/sign-all-sources.sh @@ -6,8 +6,8 @@ sign_scripts() { local plugin_dir=$1 if [[ -d "$plugin_dir" ]]; then - script_file=$(find "$plugin_dir" -maxdepth 2 -name '*Script.js') - config_file=$(find "$plugin_dir" -maxdepth 2 -name '*Config.json') + script_file=$(find "$plugin_dir" -maxdepth 2 -name '*Script.js' | head -n 1) + config_file=$(find "$plugin_dir" -maxdepth 2 -name '*Config.json' | head -n 1) sign_script="$plugin_dir/sign.sh" if [[ -f "$sign_script" && -n "$script_file" && -n "$config_file" ]]; then From d040b93ca98d54352e8c80808c823fe8394de00b Mon Sep 17 00:00:00 2001 From: Koen J Date: Thu, 23 Jan 2025 14:26:08 +0100 Subject: [PATCH 3/3] Updated submodules and fixed IPv6 casting play address being wrong. --- .../main/java/com/futo/platformplayer/Extensions_Network.kt | 1 + .../main/java/com/futo/platformplayer/Extensions_Syntax.kt | 4 ++-- app/src/stable/assets/sources/soundcloud | 2 +- app/src/stable/assets/sources/youtube | 2 +- app/src/unstable/assets/sources/soundcloud | 2 +- app/src/unstable/assets/sources/youtube | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/Extensions_Network.kt b/app/src/main/java/com/futo/platformplayer/Extensions_Network.kt index 0c83a06d..52d8a663 100644 --- a/app/src/main/java/com/futo/platformplayer/Extensions_Network.kt +++ b/app/src/main/java/com/futo/platformplayer/Extensions_Network.kt @@ -6,6 +6,7 @@ import java.io.ByteArrayOutputStream import java.io.IOException import java.io.InputStream import java.net.Inet4Address +import java.net.Inet6Address import java.net.InetAddress import java.net.InetSocketAddress import java.net.Socket diff --git a/app/src/main/java/com/futo/platformplayer/Extensions_Syntax.kt b/app/src/main/java/com/futo/platformplayer/Extensions_Syntax.kt index e519df18..442304d4 100644 --- a/app/src/main/java/com/futo/platformplayer/Extensions_Syntax.kt +++ b/app/src/main/java/com/futo/platformplayer/Extensions_Syntax.kt @@ -33,10 +33,10 @@ fun Boolean?.toYesNo(): String { fun InetAddress?.toUrlAddress(): String { return when (this) { is Inet6Address -> { - "[${toString()}]" + "[${hostAddress}]" } is Inet4Address -> { - toString() + hostAddress } else -> { throw Exception("Invalid address type") diff --git a/app/src/stable/assets/sources/soundcloud b/app/src/stable/assets/sources/soundcloud index 90bceac1..a72aeb85 160000 --- a/app/src/stable/assets/sources/soundcloud +++ b/app/src/stable/assets/sources/soundcloud @@ -1 +1 @@ -Subproject commit 90bceac198bb8ea5946a054069b8ac8c7b178dcb +Subproject commit a72aeb85d0fc0c17382cb1a7066fe4ec8b63691c diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube index f5afc782..f3b6a99f 160000 --- a/app/src/stable/assets/sources/youtube +++ b/app/src/stable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit f5afc782a95a5175c2d55d294808c8bac9fc327f +Subproject commit f3b6a99fc66af989f81b839256149ed295b3a8c2 diff --git a/app/src/unstable/assets/sources/soundcloud b/app/src/unstable/assets/sources/soundcloud index 90bceac1..a72aeb85 160000 --- a/app/src/unstable/assets/sources/soundcloud +++ b/app/src/unstable/assets/sources/soundcloud @@ -1 +1 @@ -Subproject commit 90bceac198bb8ea5946a054069b8ac8c7b178dcb +Subproject commit a72aeb85d0fc0c17382cb1a7066fe4ec8b63691c diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube index f5afc782..f3b6a99f 160000 --- a/app/src/unstable/assets/sources/youtube +++ b/app/src/unstable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit f5afc782a95a5175c2d55d294808c8bac9fc327f +Subproject commit f3b6a99fc66af989f81b839256149ed295b3a8c2