From f2824e2e88dc54147034dd0645dca7044044d1f0 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sat, 17 Feb 2024 17:28:23 +0800
Subject: [PATCH] misc fixes

---
 metadata/app.upvpn.upvpn.yml                 |  9 +++++----
 metadata/com.m3u.androidApp.yml              | 11 +++++++++--
 metadata/com.massive.yml                     |  9 ++++++---
 metadata/com.prostudio.urltopdfconverter.yml |  1 +
 metadata/de.k3b.android.intentintercept.yml  |  4 ++++
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/metadata/app.upvpn.upvpn.yml b/metadata/app.upvpn.upvpn.yml
index 52e09b5bca..9b890e1342 100644
--- a/metadata/app.upvpn.upvpn.yml
+++ b/metadata/app.upvpn.upvpn.yml
@@ -75,8 +75,9 @@ Builds:
       - ln -s $$wireguard-tools$$ tunnel/wireguard-tools
 
   - versionName: u3
-    versionCode: 8
-    commit: 748b9413ad2212af5087a1e8abd8c11a57d8be6a
+    versionCode: 7
+    disable: https://github.com/upvpn/upvpn-app/issues/14
+    commit: 633a94ebac3b4fae8160a20f24fb55c589abdf1a
     subdir: upvpn-android/app
     sudo:
       - apt-get update
@@ -96,6 +97,6 @@ Builds:
 AllowedAPKSigningKeys: 5c9552f891010689cbac0194a7c129c5207ac66ab7a9a4ddb814ffcfbf666e72
 
 AutoUpdateMode: Version
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags ^android
 CurrentVersion: u3
-CurrentVersionCode: 8
+CurrentVersionCode: 7
diff --git a/metadata/com.m3u.androidApp.yml b/metadata/com.m3u.androidApp.yml
index beae7f2e2d..517b9c362a 100644
--- a/metadata/com.m3u.androidApp.yml
+++ b/metadata/com.m3u.androidApp.yml
@@ -10,7 +10,7 @@ AutoName: M3U
 
 RepoType: git
 Repo: https://github.com/realOxy/M3UAndroid.git
-Binaries: https://github.com/realOxy/M3UAndroid/releases/download/v%v/androidApp-release.apk
+Binaries: https://github.com/realOxy/M3UAndroid/releases/download/v%v/androidApp-full-universal-release.apk
 
 Builds:
   - versionName: 1.13.6
@@ -23,6 +23,7 @@ Builds:
       - update-java-alternatives -a
     gradle:
       - yes
+    binary: https://github.com/realOxy/M3UAndroid/releases/download/v%v/androidApp-release.apk
 
   - versionName: 1.14.0-alpha10
     versionCode: 95
@@ -34,6 +35,7 @@ Builds:
       - update-java-alternatives -a
     gradle:
       - yes
+    binary: https://github.com/realOxy/M3UAndroid/releases/download/v%v/androidApp-release.apk
 
   - versionName: 1.14.0-alpha12
     versionCode: 97
@@ -45,6 +47,7 @@ Builds:
       - update-java-alternatives -a
     gradle:
       - yes
+    binary: https://github.com/realOxy/M3UAndroid/releases/download/v%v/androidApp-release.apk
 
   - versionName: 1.14.0-alpha13
     versionCode: 98
@@ -56,6 +59,7 @@ Builds:
       - update-java-alternatives -a
     gradle:
       - yes
+    binary: https://github.com/realOxy/M3UAndroid/releases/download/v%v/androidApp-release.apk
 
   - versionName: 1.14.0-alpha15
     versionCode: 100
@@ -67,9 +71,11 @@ Builds:
       - update-java-alternatives -a
     gradle:
       - yes
+    binary: https://github.com/realOxy/M3UAndroid/releases/download/v%v/androidApp-release.apk
 
   - versionName: 1.14.0-beta03
     versionCode: 106
+    disable: https://github.com/realOxy/M3UAndroid/issues/95
     commit: afe4b27a10f1f1592d67c1a413f5c86c4286ac93
     subdir: androidApp
     sudo:
@@ -77,7 +83,8 @@ Builds:
       - apt-get install -y openjdk-17-jdk-headless
       - update-java-alternatives -a
     gradle:
-      - yes
+      - full
+    prebuild: sed -i -e 's/isEnable.*/isEnable = false/' build.gradle.kts
 
 AllowedAPKSigningKeys: a7ccec654319efae75095bdcc39b983704185618f2a0328b20f8d9dec66f8bc2
 
diff --git a/metadata/com.massive.yml b/metadata/com.massive.yml
index b8f8ba0805..56606c2bd3 100644
--- a/metadata/com.massive.yml
+++ b/metadata/com.massive.yml
@@ -3584,11 +3584,14 @@ Builds:
     commit: 617fca00943821ec4d16da7e24de620410242501
     subdir: android/app
     sudo:
-      - curl -Lo node.tar.gz https://nodejs.org/dist/v16.17.1/node-v16.17.1-linux-x64.tar.gz
-      - echo "da5658693243b3ecf6a4cba6751a71df1eb9e9703ca93b42a9404aed85f58ad0 node.tar.gz"
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v20.11.1/node-v20.11.1-linux-x64.tar.gz
+      - echo "bf3a779bef19452da90fb88358ec2c57e0d2f882839b20dc6afc297b6aafc0d7 node.tar.gz"
         | sha256sum -c -
       - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
       - sysctl fs.inotify.max_user_watches=524288 || true
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     init: npm install -f
     gradle:
       - yes
@@ -3607,7 +3610,7 @@ Builds:
       - node_modules/react-native-permissions/android/build.gradle
     scandelete:
       - node_modules/
-    ndk: r21d
+    ndk: r25b
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/com.prostudio.urltopdfconverter.yml b/metadata/com.prostudio.urltopdfconverter.yml
index e8b0df2484..d22e9d10ca 100644
--- a/metadata/com.prostudio.urltopdfconverter.yml
+++ b/metadata/com.prostudio.urltopdfconverter.yml
@@ -34,6 +34,7 @@ Builds:
 
   - versionName: 1.0.2
     versionCode: 3
+    disable: https://github.com/tawhidmonowar/URLtoPDFConverter/issues/28
     commit: e1fad03e71f57a6cc297f90ad404a9ef7c73f29b
     subdir: app
     sudo:
diff --git a/metadata/de.k3b.android.intentintercept.yml b/metadata/de.k3b.android.intentintercept.yml
index 2235ef49db..999d20eecd 100644
--- a/metadata/de.k3b.android.intentintercept.yml
+++ b/metadata/de.k3b.android.intentintercept.yml
@@ -88,6 +88,10 @@ Builds:
     versionCode: 406
     commit: bff844ffe4948c168cb15b32219ac77410a4e15b
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes