misc fixes

metadata/com.beemdevelopment.aegis.yml

@@ -233,10 +233,14 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 2.2.1
-    versionCode: 61
-    commit: 27e56d60b5ee6e2c15b2ec27d0d6fe7132b4c216
+  - versionName: 2.2.2
+    versionCode: 62
+    commit: dd9c307deacfe75c968ecb14221cb72fcf121b63
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 

metadata/com.dessalines.thumbkey.yml

@@ -181,6 +181,7 @@ Builds:
 
   - versionName: 1.14.0
     versionCode: 31
+    disable: https://github.com/dessalines/thumb-key/issues/400
     commit: d7e6cb291864158001c188a4c841e6bb91f7b224
     subdir: app
     sudo:

metadata/com.fox2code.mmm.fdroid.yml

@@ -402,7 +402,9 @@ Builds:
     prebuild:
       - sdkmanager 'build-tools;33.0.2'
       - sed -i -e '/check for app updates/{n;n;s/true/false/;}' src/main/res/xml/root_preferences.xml
-      - sed -i -e '/isEnable/s/true/false/' build.gradle.kts
+      - sed -i -e '/isEnable/s/true/false/' -e '/sentry {/,/^}/d' -e '/io.sentry.android.gradle/d'
+        build.gradle.kts
+      - sed -i -e '/gradleEnterprise {/,/^}/d' -e '/com.gradle.enterprise/d' ../settings.gradle.kts
     ndk: r25c
 
 MaintainerNotes: |-

metadata/com.github.lamarios.clipious.yml

@@ -1462,117 +1462,6 @@ Builds:
       - popd
       - mv /tmp/build com.github.lamarios.clipious
 
-  - versionName: 1.15.3
-    versionCode: 40271
-    commit: ef99ffad1a257fd33932a7708609e6741e2554c9
-    submodules: true
-    output: build/app/outputs/flutter-apk/app-x86_64-release.apk
-    binary: https://github.com/lamarios/clipious/releases/download/%v/app-x86_64-release.apk
-    rm:
-      - ios
-      - macos
-      - linux
-      - windows
-      - web
-    prebuild:
-      - cd ..
-      - mv com.github.lamarios.clipious /tmp/build
-      - pushd /tmp/build/
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - submodules/flutter/bin/flutter config --no-analytics
-      - submodules/flutter/bin/flutter pub get
-      - popd
-      - mv /tmp/build com.github.lamarios.clipious
-    scanignore:
-      - submodules/flutter/packages/flutter_tools/gradle/flutter.gradle
-      - submodules/flutter/bin/cache
-    scandelete:
-      - submodules/flutter
-      - .pub-cache
-    build:
-      - cd ..
-      - mv com.github.lamarios.clipious /tmp/build
-      - pushd /tmp/build/
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - submodules/flutter/bin/flutter pub run flutter_native_splash:create
-      - submodules/flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-x64"
-      - popd
-      - mv /tmp/build com.github.lamarios.clipious
-
-  - versionName: 1.15.3
-    versionCode: 40272
-    commit: ef99ffad1a257fd33932a7708609e6741e2554c9
-    submodules: true
-    output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
-    binary: https://github.com/lamarios/clipious/releases/download/%v/app-armeabi-v7a-release.apk
-    rm:
-      - ios
-      - macos
-      - linux
-      - windows
-      - web
-    prebuild:
-      - cd ..
-      - mv com.github.lamarios.clipious /tmp/build
-      - pushd /tmp/build/
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - submodules/flutter/bin/flutter config --no-analytics
-      - submodules/flutter/bin/flutter pub get
-      - popd
-      - mv /tmp/build com.github.lamarios.clipious
-    scanignore:
-      - submodules/flutter/packages/flutter_tools/gradle/flutter.gradle
-      - submodules/flutter/bin/cache
-    scandelete:
-      - submodules/flutter
-      - .pub-cache
-    build:
-      - cd ..
-      - mv com.github.lamarios.clipious /tmp/build
-      - pushd /tmp/build/
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - submodules/flutter/bin/flutter pub run flutter_native_splash:create
-      - submodules/flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm"
-      - popd
-      - mv /tmp/build com.github.lamarios.clipious
-
-  - versionName: 1.15.3
-    versionCode: 40273
-    commit: ef99ffad1a257fd33932a7708609e6741e2554c9
-    submodules: true
-    output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
-    binary: https://github.com/lamarios/clipious/releases/download/%v/app-arm64-v8a-release.apk
-    rm:
-      - ios
-      - macos
-      - linux
-      - windows
-      - web
-    prebuild:
-      - cd ..
-      - mv com.github.lamarios.clipious /tmp/build
-      - pushd /tmp/build/
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - submodules/flutter/bin/flutter config --no-analytics
-      - submodules/flutter/bin/flutter pub get
-      - popd
-      - mv /tmp/build com.github.lamarios.clipious
-    scanignore:
-      - submodules/flutter/packages/flutter_tools/gradle/flutter.gradle
-      - submodules/flutter/bin/cache
-    scandelete:
-      - submodules/flutter
-      - .pub-cache
-    build:
-      - cd ..
-      - mv com.github.lamarios.clipious /tmp/build
-      - pushd /tmp/build/
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - submodules/flutter/bin/flutter pub run flutter_native_splash:create
-      - submodules/flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64"
-      - popd
-      - mv /tmp/build com.github.lamarios.clipious
-
   - versionName: 1.15.4
     versionCode: 40281
     commit: 597e88e3caa448035ca880cd009e5c4728885166
@@ -1595,7 +1484,6 @@ Builds:
       - popd
       - mv /tmp/build com.github.lamarios.clipious
     scanignore:
-      - submodules/flutter/packages/flutter_tools/gradle/flutter.gradle
       - submodules/flutter/bin/cache
     scandelete:
       - submodules/flutter
@@ -1632,7 +1520,6 @@ Builds:
       - popd
       - mv /tmp/build com.github.lamarios.clipious
     scanignore:
-      - submodules/flutter/packages/flutter_tools/gradle/flutter.gradle
       - submodules/flutter/bin/cache
     scandelete:
       - submodules/flutter
@@ -1669,7 +1556,6 @@ Builds:
       - popd
       - mv /tmp/build com.github.lamarios.clipious
     scanignore:
-      - submodules/flutter/packages/flutter_tools/gradle/flutter.gradle
       - submodules/flutter/bin/cache
     scandelete:
       - submodules/flutter

metadata/com.luk.saucenao.yml

@@ -185,17 +185,14 @@ Builds:
     gradle:
       - github
 
-  - versionName: '1.19'
-    versionCode: 21
-    commit: 3f71a8bbde5234cbe5e8d442fffb7b5730b0c454
-    subdir: app
-    gradle:
-      - github
-
   - versionName: '1.20'
     versionCode: 22
     commit: 22adc2c40b65f2b4670f50b011fa02b1453691bb
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - github
 

metadata/com.mikifus.padland.yml

@@ -180,6 +180,10 @@ Builds:
     versionCode: 25
     commit: d3f94f003384bd852e8791b1edbd4dd3f0c04903
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     prebuild: sed -i -e 's/1.4-beta/1.4/' build.gradle

metadata/com.nima.mymood.yml

@@ -72,9 +72,9 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 1.5.0
-    versionCode: 9
-    commit: 10ae80c916b46bf5fccc50778e161e3f67e86c72
+  - versionName: 1.5.1
+    versionCode: 10
+    commit: c2971254d9818e3a0316abfab575697043cce3a1
     subdir: app
     sudo:
       - apt-get update
@@ -87,5 +87,5 @@ AllowedAPKSigningKeys: 999abf5c903a2b77a61fde9df495d187f974a62d0182f33d0cc31fd1c
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: 1.5.0
-CurrentVersionCode: 9
+CurrentVersion: 1.5.1
+CurrentVersionCode: 10

metadata/com.nononsenseapps.feeder.yml

@@ -4,16 +4,16 @@ Categories:
 License: GPL-3.0-only
 AuthorName: Space Cowboy
 AuthorWebSite: https://cowboyprogrammer.org
-SourceCode: https://gitlab.com/spacecowboy/Feeder
+SourceCode: https://github.com/spacecowboy/Feeder
 Translation: https://hosted.weblate.org/projects/feeder/
-Changelog: https://gitlab.com/spacecowboy/Feeder/blob/HEAD/CHANGELOG.md
+Changelog: https://github.com/spacecowboy/Feeder/blob/HEAD/CHANGELOG.md
 Donate: https://ko-fi.com/spacecowboy
 Bitcoin: 1PdmeeGxB2iktvmtkGqwUNmYq7L9tnxjwE
 
 AutoName: Feeder
 
 RepoType: git
-Repo: https://gitlab.com/spacecowboy/Feeder.git
+Repo: https://github.com/spacecowboy/Feeder.git
 
 Builds:
   - versionName: 1.2.2
@@ -1811,9 +1811,9 @@ Builds:
       - graphics
     prebuild: echo 'org.gradle.jvmargs=-Xmx2g' >> ../gradle.properties
 
-  - versionName: 2.6.1
-    versionCode: 285
-    commit: 731e676ce03dc36353b6be9b3e15ef4f352dd1d6
+  - versionName: 2.6.2
+    versionCode: 286
+    commit: c8757deb9b1964e842ac0091747ca38d4208a27b
     subdir: app
     submodules: true
     sudo:
@@ -1824,9 +1824,8 @@ Builds:
       - yes
     rm:
       - graphics
-    prebuild: echo 'org.gradle.jvmargs=-Xmx2g' >> ../gradle.properties
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: 2.6.1
-CurrentVersionCode: 285
+CurrentVersion: 2.6.2
+CurrentVersionCode: 286

metadata/com.sanzoghenzo.markdownr.yml

@@ -85,7 +85,7 @@ Builds:
     srclibs:
       - flutter@stable
     prebuild:
-      - version=$(sed -n -E "s/.*flutter-version:\ '(.*)'/\1/p" .github/workflows/release.yml)
+      - version=$(sed -n -E 's/.*flutter-version:\ "(.*)"/\1/p' .github/workflows/release.yml)
       - pushd $$flutter$$
       - git checkout -f $version
       - popd

metadata/com.simplemobiletools.thankyou.yml

@@ -232,6 +232,10 @@ Builds:
     versionCode: 31
     commit: 204c26fa2ade0f2ee9dd780e2e518798a120a443
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - fdroid
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle

metadata/de.baumann.browser.yml

@@ -810,6 +810,10 @@ Builds:
     versionCode: 141
     commit: 825638589d7b1e301b6e7696a2624d6c0c1b2281
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     prebuild: sed -i -e '/jitpack.de/d' ../build.gradle

metadata/de.kromke.andreas.cameradatefolders.yml

@@ -57,6 +57,10 @@ Builds:
     versionCode: 5
     commit: 867093dbe24be79af223cafa187cd1087b8cc546
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 

metadata/io.github.benderblog.traintime_pda.yml

@@ -290,6 +290,7 @@ Builds:
 
   - versionName: 0.3.0
     versionCode: 91
+    disable: https://github.com/BenderBlog/traintime_pda/issues/11
     commit: ee2a39b5a11062ce645beb80148802b97c6a09f7
     submodules: true
     sudo:
@@ -335,6 +336,7 @@ Builds:
 
   - versionName: 0.3.0
     versionCode: 92
+    disable: https://github.com/BenderBlog/traintime_pda/issues/11
     commit: ee2a39b5a11062ce645beb80148802b97c6a09f7
     submodules: true
     sudo:
@@ -380,6 +382,7 @@ Builds:
 
   - versionName: 0.3.0
     versionCode: 93
+    disable: https://github.com/BenderBlog/traintime_pda/issues/11
     commit: ee2a39b5a11062ce645beb80148802b97c6a09f7
     submodules: true
     sudo:

metadata/net.vonforst.evmap.yml

@@ -556,6 +556,7 @@ Builds:
 
   - versionName: 1.6.8
     versionCode: 198
+    disable: https://github.com/ev-map/EVMap/issues/295
     commit: a7770e1c1b7b463798399a3c1d7fac1d97c98e3f
     subdir: app
     sudo:

metadata/network.loki.messenger.fdroid.yml

@@ -697,36 +697,28 @@ Builds:
     subdir: app
     submodules: true
     gradle:
-      - play
+      - website
     srclibs:
       - session-lazysodium-android@883c0aada48d4211d5fca30d025a90f9b2919edf
     rm:
-      - app/src/main/java/org/thoughtcrime/securesms/notifications/FcmUtils.kt
-      - app/src/main/java/org/thoughtcrime/securesms/notifications/LokiPushNotificationManager.kt
-      - app/src/main/java/org/thoughtcrime/securesms/notifications/PushNotificationService.kt
       - liblazysodium
     prebuild:
       - ln -s $$session-lazysodium-android$$/app ../liblazysodium
       - ln -s $$session-lazysodium-android$$/session-lazysodium-java ..
-      - sed -i -e '/gms/d' -e 's/raw.github.com.*"/jitpack.io"/' ../build.gradle
+      - sed -i -e '/gms/d' -e 's/raw.github.com.*"/jitpack.io"/' -e 's|developer.huawei.com/repo/|jitpack.io|'
+        ../build.gradle
       - sed -i -e '/gms/d' -e '/firebase-messaging/,/^    }/d' -e '/enable true/d'
         -e '/circular-progress-button/s/1.1.3-S2/1.1.3/' -e '/defaultConfig/a applicationId
-        "network.loki.messenger.fdroid"' build.gradle
-      - sed -i -z -E -e 's/<[^<]+pref_key_use_fcm[^>]+>//' src/main/res/xml/preferences_notifications.xml
+        "network.loki.messenger.fdroid"' -e 's/ext.websiteUpdateUrl = ".*"/ext.websiteUpdateUrl
+        = "null"/g' -e '/PLAY_STORE_DISABLED/s/false/true/g' build.gradle
       - sed -i -E -e '/app_name/s/>(.+)</>\1 F-Droid</' src/main/res/*/strings.xml
       - for uri in $(sed -n -E 's/android:authorities="network.loki.(.*)"/\1/p' src/main/AndroidManifest.xml);
         do find src/main/java/org/thoughtcrime/securesms -type f -exec sed -i -e "s/network.loki.$uri/network.loki.fdroid.$uri/"
         {} +; done
       - sed -i -e '/READ_PHONE_STATE/d' -e '/c2dm/d' -e 's/ACCESS_SESSION_SECRETS/fdroid.ACCESS_SESSION_SECRETS/'
         -e '/android:authorities/s/network.loki/network.loki.fdroid/' src/main/AndroidManifest.xml
-      - cd src/main/java/org/thoughtcrime/securesms
       - sed -i -e '/fun toggleFCM()/,/^    }/d' -e 's/toggleFCM/toggleBackgroundPolling/'
-        onboarding/PNModeActivity.kt
-      - sed -i -e '/void registerForFCMIfNeeded/,/^    }/s/^        .*//' -e '/FcmUtils/d'
-        -e '/LokiPushNotificationManager/d' ApplicationContext.java
-      - sed -i -e '/pref_key_use_fcm/,/^      });/d' preferences/NotificationsPreferenceFragment.java
-      - sed -i -e 's/IOUtils.readInputStreamFully(bodyStream);/new byte[bodyStream.available()];bodyStream.read(data);/'
-        -e '/IOUtils/d' linkpreview/LinkPreviewRepository.java
+        src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
       - sdkmanager 'cmake;3.22.1'
     scandelete:
       - libsession-util/libsession-util/external

metadata/org.dkf.jmule.yml

@@ -39,6 +39,7 @@ Builds:
 
   - versionName: '38'
     versionCode: 38
+    disable: https://github.com/a-pavlov/jed2k/issues/97
     commit: b80dd59332ac1a1f64780fb6cbec7bec71a65c15
     gradle:
       - yes

metadata/org.dystopia.email.yml

@@ -9,45 +9,6 @@ Changelog: https://framagit.org/dystopia-project/simple-email/blob/HEAD/CHANGELO
 
 Name: SimpleEmail
 AutoName: Email
-Description: |-
-  SimpleEmail is Free Software, minimalistic and privacy friendly email app.
-
-  * Easy navigation
-  * No unnecessary settings
-  * No bells and whistles
-  * Simple design
-
-  SimpleEmail starts a foreground service with a low priority status bar notification to make sure you'll never miss new email.
-
-  This project has been forked from https://f-droid.org/packages/eu.faircode.email.
-
-  <b>Features</b>
-
-  * 100% Free Software
-  * Multiple accounts (inboxes)
-  * Multiple identities (outboxes)
-  * Unified inbox
-  * Conversation view
-  * Two way synchronization
-  * Offline storage and operations
-  * Battery friendly
-  * Low data usage
-  * Folder management
-  * Signatures
-  * Dark theme
-  * Account colors
-  * Search on server
-  * Encryption/decryption
-  * Export settings
-
-  <b>Secure:</b>
-  * Allow encrypted connections only
-  * Accept valid security certificates only
-  * Authentication required
-  * Safe message view (styling, scripting and unsafe HTML removed)
-  * No special permissions required
-  * No advertisements
-  * No analytics and no tracking
 
 RepoType: git
 Repo: https://framagit.org/dystopia-project/simple-email.git
@@ -130,6 +91,10 @@ Builds:
     commit: 35f8a660556898e2ebddd42d938d45f067715292
     subdir: app
     submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 

metadata/org.stypox.dicio.yml

@@ -34,8 +34,12 @@ Builds:
 
   - versionName: '0.10'
     versionCode: 10
-    commit: bb85b76388f32e2575b9322cdca2152833c45de7
+    commit: 7d30e9853fd9fe3a96906e7efeb7cf773690a039
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
 

metadata/org.voidsink.anewjkuapp.yml

@@ -321,13 +321,13 @@ Builds:
       - sed -i -e '/maven {$/,/}/d; /com.google.gms/d; /io.fabric.tools/d' ../build.gradle
       - sed -i -e '/applicationVariants/,+4d; /googleImplementation/d' build.gradle
 
-  - versionName: 0.54.0-fdroid
-    versionCode: 140086
-    commit: 94c4cf35bef299a8b74b7671ce97ae8b5a10abce
+  - versionName: 0.55.0-fdroid
+    versionCode: 140087
+    commit: 56f9ac54ab3243831e016f7972034e1dced6d7c9
     subdir: app
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk
+      - apt-get install -y openjdk-17-jdk-headless
       - update-alternatives --auto java
     gradle:
       - fdroid
@@ -341,6 +341,10 @@ Builds:
     versionCode: 140087
     commit: 56f9ac54ab3243831e016f7972034e1dced6d7c9
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - fdroid
     rm: