From 9de22b1b4e133f1ef6c0b99c47334502245e09a3 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Tue, 26 Oct 2021 00:18:45 +0000
Subject: [PATCH] Misc fixes

---
 .../com.dozingcatsoftware.vectorcamera.yml    |  4 ++++
 metadata/com.tutpro.baresip.plus.yml          | 24 +------------------
 metadata/com.tutpro.baresip.yml               | 23 +-----------------
 metadata/com.zoffcc.applications.trifa.yml    | 21 ++--------------
 .../io.github.deweyreed.clipboardcleaner.yml  | 12 ++++------
 .../ar/summary.txt                            |  1 -
 .../de/summary.txt                            |  1 -
 .../en-US/summary.txt                         |  1 -
 .../eo/summary.txt                            |  1 -
 .../es/summary.txt                            |  1 -
 .../fr/summary.txt                            |  1 -
 .../gd/summary.txt                            |  1 -
 .../he/summary.txt                            |  1 -
 .../is/summary.txt                            |  1 -
 .../it/summary.txt                            |  1 -
 .../ja/summary.txt                            |  1 -
 .../nb/summary.txt                            |  1 -
 .../nn/summary.txt                            |  1 -
 .../pl/summary.txt                            |  1 -
 .../pt-BR/summary.txt                         |  1 -
 .../pt-PT/summary.txt                         |  1 -
 .../pt/summary.txt                            |  1 -
 .../ro/summary.txt                            |  1 -
 .../ru/summary.txt                            |  1 -
 .../tr/summary.txt                            |  1 -
 .../uk/summary.txt                            |  1 -
 .../vi/summary.txt                            |  1 -
 .../zh-CN/summary.txt                         |  1 -
 .../zh-TW/summary.txt                         |  1 -
 metadata/org.connectbot.yml                   | 20 ++++++++++++++--
 metadata/se.manyver.yml                       |  4 ++--
 metadata/wtf.technodisaster.tldr.yml          |  4 ++++
 32 files changed, 36 insertions(+), 100 deletions(-)
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/ar/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/de/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/en-US/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/eo/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/es/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/fr/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/gd/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/he/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/is/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/it/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/ja/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/nb/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/nn/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/pl/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/pt-BR/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/pt-PT/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/pt/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/ro/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/ru/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/tr/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/uk/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/vi/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/zh-CN/summary.txt
 delete mode 100644 metadata/io.github.deweyreed.clipboardcleaner/zh-TW/summary.txt

diff --git a/metadata/com.dozingcatsoftware.vectorcamera.yml b/metadata/com.dozingcatsoftware.vectorcamera.yml
index f2cc03de68..fb81c92ac5 100644
--- a/metadata/com.dozingcatsoftware.vectorcamera.yml
+++ b/metadata/com.dozingcatsoftware.vectorcamera.yml
@@ -129,6 +129,10 @@ Builds:
     versionCode: 13
     commit: 5ebb5d7234b98f4b9258815a7ed951ee432759e7
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.tutpro.baresip.plus.yml b/metadata/com.tutpro.baresip.plus.yml
index ab36358e7d..bbe93c426b 100644
--- a/metadata/com.tutpro.baresip.plus.yml
+++ b/metadata/com.tutpro.baresip.plus.yml
@@ -945,32 +945,10 @@ Builds:
       - popd
     ndk: r21e
 
-  - versionName: 22.0.0
-    versionCode: 58
-    commit: 2df733c5728df3d9846baaf877308802b25818df
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends -t testing nasm
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    srclibs:
-      - libbaresip-android@v13.0
-    build:
-      - pushd $$libbaresip-android$$
-      - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e
-        's|/usr/src/baresip-studio|../../com.tutpro.baresip.plus|' Makefile
-      - make download-sources
-      - make install-all
-      - popd
-    ndk: r21e
-
 MaintainerNotes: make download-sources checks out master branches of several libraries;
     this can cause build failures.
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: Tags v.*[0-9]$
 CurrentVersion: 22.0.0
 CurrentVersionCode: 58
diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml
index 79f4ef8ef7..345ecd9187 100644
--- a/metadata/com.tutpro.baresip.yml
+++ b/metadata/com.tutpro.baresip.yml
@@ -1959,31 +1959,10 @@ Builds:
       - popd
     ndk: r21e
 
-  - versionName: 35.0.0
-    versionCode: 180
-    commit: bc7be1ff49fca206bfa943ade7efb62fc3b4e5e5
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    srclibs:
-      - libbaresip-android@20.0
-    build:
-      - pushd $$libbaresip-android$$
-      - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e
-        's|/usr/src/baresip-studio|../../com.tutpro.baresip|' Makefile
-      - make download-sources
-      - make install-all
-      - popd
-    ndk: r21e
-
 MaintainerNotes: make download-sources checks out master branches of several libraries;
     this can cause build failures.
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: None
 UpdateCheckMode: Tags ^[0-9.]+$
 CurrentVersion: 35.0.0
 CurrentVersionCode: 180
diff --git a/metadata/com.zoffcc.applications.trifa.yml b/metadata/com.zoffcc.applications.trifa.yml
index 493f4d9c8f..e44e83022e 100644
--- a/metadata/com.zoffcc.applications.trifa.yml
+++ b/metadata/com.zoffcc.applications.trifa.yml
@@ -913,26 +913,9 @@ Builds:
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
     ndk: r20b
 
-  - versionName: 1.0.120
-    versionCode: 10120
-    commit: a018b300d5b32e916bed73c75f9280e4f0ffb3d0
-    subdir: android-refimpl-app/app
-    gradle:
-      - yes
-    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
-    ndk: r20b
-
-  - versionName: 1.0.121
-    versionCode: 10121
-    commit: 0f52a86ca6a26de182adbf7b8638490322e88a9a
-    subdir: android-refimpl-app/app
-    gradle:
-      - yes
-    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
-    ndk: r20b
-
   - versionName: 1.0.122
     versionCode: 10122
+    disable: https://gitlab.com/fdroid/fdroiddata/-/issues/2519
     commit: 2b5f0653d74e2ff673d0d88b979279d21a38961c
     subdir: android-refimpl-app/app
     gradle:
@@ -944,7 +927,7 @@ MaintainerNotes: |-
     There was an issue with proprietary emoji, see https://github.com/zoff99/ToxAndroidRefImpl/issues/139
     This was fixed starting from version 1.0.96 and the NonFreeAssets tag was removed.
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: None
 UpdateCheckMode: Tags ^[0-9].*
 CurrentVersion: 1.0.122
 CurrentVersionCode: 10122
diff --git a/metadata/io.github.deweyreed.clipboardcleaner.yml b/metadata/io.github.deweyreed.clipboardcleaner.yml
index f6cf09c013..6b6323b4a9 100644
--- a/metadata/io.github.deweyreed.clipboardcleaner.yml
+++ b/metadata/io.github.deweyreed.clipboardcleaner.yml
@@ -6,14 +6,6 @@ IssueTracker: https://github.com/DeweyReed/ClipboardCleaner/issues
 Changelog: https://github.com/DeweyReed/ClipboardCleaner/releases
 
 AutoName: ClipboardCleaner
-Description: |-
-    As you may know, Android clipboard content and its changes can be accessed by
-    any app, which is a security hole if you care about it. Any app can get your copied password, credit card numbers
-    and more.
-
-    However, ClipboardCleaner can't protect your passwords from being accessed by
-    any app. But it gives you some ways to
-    check and clean your clipboard.
 
 RepoType: git
 Repo: https://github.com/DeweyReed/ClipboardCleaner
@@ -114,6 +106,10 @@ Builds:
     versionCode: 170
     commit: 51e28f3a6b3c5b4abbe044ba1bd314d91e79f944
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/ar/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/ar/summary.txt
deleted file mode 100644
index b34bbe322d..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/ar/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-تفقد ونظف الحافظة
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/de/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/de/summary.txt
deleted file mode 100644
index 138e53aa4a..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/de/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Zwischenablage prüfen und bereinigen
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/en-US/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/en-US/summary.txt
deleted file mode 100644
index 7c0b731d56..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/en-US/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Check and clean your clipboard
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/eo/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/eo/summary.txt
deleted file mode 100644
index 050cdc85ec..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/eo/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Montri kaj forviŝi tondujon
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/es/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/es/summary.txt
deleted file mode 100644
index 4d8e48ff80..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/es/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Compruebe y limpe su portapapeles
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/fr/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/fr/summary.txt
deleted file mode 100644
index 8273faeb67..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/fr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Vérifiez et nettoyez votre presse-papiers
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/gd/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/gd/summary.txt
deleted file mode 100644
index 435da7fa39..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/gd/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Cuir sùil air an stòr-bhòrd agad is glan e
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/he/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/he/summary.txt
deleted file mode 100644
index d87ff48658..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/he/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-בדיקה וניקוי של לוח הגזירים שלך
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/is/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/is/summary.txt
deleted file mode 100644
index 929b564c53..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/is/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Skoða og hreinsa klippispjaldið þitt
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/it/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/it/summary.txt
deleted file mode 100644
index a82a1643f3..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/it/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Controlla e pulisci i tuoi appunti
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/ja/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/ja/summary.txt
deleted file mode 100644
index 847f8a33d5..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/ja/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-クリップボードの確認と消去
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/nb/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/nb/summary.txt
deleted file mode 100644
index 8fa1f2feee..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/nb/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sjekk og tøm din utklippstavle
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/nn/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/nn/summary.txt
deleted file mode 100644
index 71e9dc13db..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/nn/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Vis og tøm utklippstavla
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/pl/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/pl/summary.txt
deleted file mode 100644
index 7f0c0a9188..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/pl/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sprawdź i wyczyść schowek
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/pt-BR/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/pt-BR/summary.txt
deleted file mode 100644
index 2514708393..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/pt-BR/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Verifique e limpe sua área de transferência
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/pt-PT/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/pt-PT/summary.txt
deleted file mode 100644
index 62f5a5db22..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/pt-PT/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Verifique e limpe a sua área de transferência
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/pt/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/pt/summary.txt
deleted file mode 100644
index 62f5a5db22..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/pt/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Verifique e limpe a sua área de transferência
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/ro/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/ro/summary.txt
deleted file mode 100644
index 012fe5f451..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/ro/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Verificați și curățați clipboard-ul
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/ru/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/ru/summary.txt
deleted file mode 100644
index e64febcaac..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/ru/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Проверяйте и очищайте ваш буфер обмена
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/tr/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/tr/summary.txt
deleted file mode 100644
index 1af979874d..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/tr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Panonuzu kontrol edin ve temizleyin
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/uk/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/uk/summary.txt
deleted file mode 100644
index 163c96c210..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/uk/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Перевірте та почистіть буфер обміну
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/vi/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/vi/summary.txt
deleted file mode 100644
index b937eb42e0..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/vi/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kiểm tra và dọn dẹp bộ nhớ tạm của bạn
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/zh-CN/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/zh-CN/summary.txt
deleted file mode 100644
index a28477b58e..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/zh-CN/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-检查并清空剪贴板
diff --git a/metadata/io.github.deweyreed.clipboardcleaner/zh-TW/summary.txt b/metadata/io.github.deweyreed.clipboardcleaner/zh-TW/summary.txt
deleted file mode 100644
index e1ad45def9..0000000000
--- a/metadata/io.github.deweyreed.clipboardcleaner/zh-TW/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-檢查並清空剪貼板
diff --git a/metadata/org.connectbot.yml b/metadata/org.connectbot.yml
index 2e6e996793..a1d4e1debb 100644
--- a/metadata/org.connectbot.yml
+++ b/metadata/org.connectbot.yml
@@ -165,7 +165,23 @@ Builds:
     prebuild: sed -i -e '/googleImplementation/d' -e 's/androidGitVersion.name()/"1.9.6"/'
         build.gradle
 
+  - versionName: 1.9.8-oss
+    versionCode: 10908000
+    commit: v1.9.8
+    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - oss
+    prebuild:
+      - sed -i -e 's/androidGitVersion.name()/"1.9.8"/' build.gradle
+      - sed -i -e '/url MAVEN_REPO_CACHE/d' ../settings.gradle ../build.gradle
+      - sed -i -e '/buildCache {/,/^}/d' ../settings.gradle
+    ndk: r21d
+
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 1.9.6-oss
-CurrentVersionCode: 10906000
+CurrentVersion: 1.9.8-oss
+CurrentVersionCode: 10908000
diff --git a/metadata/se.manyver.yml b/metadata/se.manyver.yml
index 39bb387cf7..6e9132ccff 100644
--- a/metadata/se.manyver.yml
+++ b/metadata/se.manyver.yml
@@ -1611,7 +1611,7 @@ Builds:
       - npm run build-android-assets
     ndk: r21e
 
-  - versionName: 0.2110.22-beta-fdroid-fdroid
+  - versionName: 0.2110.22-beta-fdroid
     versionCode: 110
     commit: 1444e12a587adf50f63277609b60209e963badf5
     timeout: 80000
@@ -1667,7 +1667,7 @@ MaintainerNotes: scanignore is used to allow the "node_modules/react-native/andr
     local Maven repository which contains the prebuilt react-native library which
     we get from npm.
 
-AutoUpdateMode: Version +-fdroid v%v
+AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
 CurrentVersion: 0.2110.22-beta-fdroid
 CurrentVersionCode: 110
diff --git a/metadata/wtf.technodisaster.tldr.yml b/metadata/wtf.technodisaster.tldr.yml
index fda904612e..cf59de20d5 100644
--- a/metadata/wtf.technodisaster.tldr.yml
+++ b/metadata/wtf.technodisaster.tldr.yml
@@ -39,6 +39,10 @@ Builds:
   - versionName: 2.1.1
     versionCode: 5
     commit: 6bed7f19f7446696cb1502931fe8da641a93b7c8
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
       - flutter@2.5.3