From 39b0a6c510a944532e187f92f2abca4bed690d2e Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sun, 6 Feb 2022 22:17:19 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.oasisfeng.island.fdroid.yml      | 25 +----------
 metadata/com.standardnotes.yml                | 41 ++++++++-----------
 metadata/gh.cloneconf.apkpurer.yml            | 10 ++---
 metadata/gh.cloneconf.ardicter.yml            | 12 +++---
 ...hub.sds100.keymapper.inputmethod.latin.yml |  9 ++--
 metadata/io.github.sds100.keymapper.yml       | 10 +++--
 metadata/io.heckel.ntfy.yml                   |  4 ++
 metadata/io.nekohasekai.sagernet.yml          |  6 +--
 ...penfoodfacts.github.scrachx.openbeauty.yml |  5 +++
 metadata/org.kde.bettercounter.yml            |  4 ++
 metadata/se.manyver.yml                       |  1 -
 11 files changed, 56 insertions(+), 71 deletions(-)

diff --git a/metadata/com.oasisfeng.island.fdroid.yml b/metadata/com.oasisfeng.island.fdroid.yml
index bca1217a62..c8d039dc05 100644
--- a/metadata/com.oasisfeng.island.fdroid.yml
+++ b/metadata/com.oasisfeng.island.fdroid.yml
@@ -7,28 +7,6 @@ WebSite: https://secure-system.gitlab.io/Insular/
 SourceCode: https://gitlab.com/secure-system/Insular
 IssueTracker: https://gitlab.com/secure-system/Insular/issues
 
-Description: |-
-    Insular is a FLOSS fork of Island.
-    With Insular, you can:<ul>
-    <li>Isolate app, for privacy protection.</li>
-    <li>Clone app, for parallel running.</li>
-    <li>Freeze app, to completely block its background behaviors.</li>
-    <li>Hide app, for various reasons.</li>
-    <li>Archive app, for potential future use on-demand.</li>
-    <li>Use VPN only on one side, or different VPN on both sides.</li>
-    <li>Prohibit USB access</li></ul>
-    If your device is incompatible or not encrypted, you can skip this limitation manually. Please refer to <a href="https://forum.xda-developers.com/android/-t3366295">the XDA post</a> for details.
-    To uninstall and remove Insular completely, please first "Destroy Insular" in Settings - Setup - Click the recycle-bin icon besides Insular. If you have already uninstalled Insular app, please "Remove work profile" in your device "Settings - Accounts".
-
-    <b>PERMISSIONS</b><ul>
-    <li>DEVICE-ADMIN: Device administrator privilege is required to create the Insular space (work profile), which serves as the fundamental functionality of Insular. It will be explicitly requested for your consent.</li>
-    <li>PACKAGE_USAGE_STATS: Required to correctly recognize the running state of apps. It will be explicitly requested for your consent.</li></ul>
-    We will never collect any data and Insular has no Internet permission. Please read our privacy policy for more details.
-
-    <b>Differences from Island</b><ul>
-    <li>all blobs (gms, crashlytics, etc) are removed to comply with F-droid's policy</li>
-    <li>Internet access for this app is removed because we just don't need it</li>
-
 RepoType: git
 Repo: https://gitlab.com/secure-system/Insular.git
 
@@ -449,6 +427,7 @@ Builds:
 
   - versionName: 6.0.2-21fbf17d
     versionCode: 51620
+    disable: https://gitlab.com/secure-system/Insular/-/issues/43
     commit: 05a8365ac18a085b88230aa68d2df60003aa67a9
     subdir: assembly
     sudo:
@@ -465,7 +444,7 @@ Builds:
       - assembly/google-services.json
       - shared/src/main/res/xml/analytics_tracker.xml
     prebuild:
-      - sed -i -e 's!..\/deagle!$$deagle$$!' -e 's!..\/setup-wizard!$$setupwizard$$!'
+      - sed -i -e 's!../deagle!$$deagle$$!' -e 's!../setup-wizard!$$setupwizard$$!'
         ../settings.gradle
       - echo 'org.gradle.jvmargs=-Xmx4096m' >> ../gradle.properties
 
diff --git a/metadata/com.standardnotes.yml b/metadata/com.standardnotes.yml
index b2dd7b9b67..ee620d896d 100644
--- a/metadata/com.standardnotes.yml
+++ b/metadata/com.standardnotes.yml
@@ -2741,43 +2741,35 @@ Builds:
     subdir: android/app/
     sudo:
       - sysctl fs.inotify.max_user_watches=524288
-      - curl -Lo node.tar.gz https://nodejs.org/download/release/v14.18.2/node-v14.18.2-linux-x64.tar.gz
-      - echo "83fa18a0e3642235446b66653eb27c169224ae9c1a15a32d6c3d9ddefb154ed4 node.tar.gz"
+      - curl -Lo node.tar.xz https://nodejs.org/dist/v16.13.2/node-v16.13.2-linux-x64.tar.xz
+      - echo "7f5e9a42d6e86147867d35643c7b1680c27ccd45db85666fc52798ead5e74421 node.tar.xz"
         | sha256sum -c -
-      - tar xf node.tar.gz
-      - cp -a node-v*-linux-x64/. /usr/local/
-      - rm -rf node-v*-linux-x64/
+      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
       - npm -g install yarn
     init:
       - cd ../..
       - yarn cache clean snjs
       - npm_config_build_from_source=true yarn --force
-    patch:
-      - bugsnag-3.9.4.patch
     gradle:
       - prod
     srclibs:
       - libsodium@1.0.18
     rm:
       - .gitmodules
+      - .devcontainer
+      - .github
+      - .vscode
+      - __tests__
+      - ios
+      - android/app/gradle
     prebuild:
-      - wget -O /tmp/cmdline-tools.zip -t 5 "https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip"
-      - echo "124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf /tmp/cmdline-tools.zip"  |
-        sha256sum -c -
-      - unzip -q -o /tmp/cmdline-tools.zip -d /tmp/cmdline-tools
-      - rm /tmp/cmdline-tools.zip
-      - mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools/tools
-      - mv /tmp/cmdline-tools/cmdline-tools/* ${ANDROID_SDK_ROOT}/cmdline-tools/tools
-        || true
-      - export PATH=${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin:${PATH}
-      - yes | sdkmanager --licenses
-      - sdkmanager 'cmake;3.10.2.4988404' > /dev/null
-      - sed -i -e '/detox/d' -e '/DETOX_CI/d' build.gradle
-      - echo "android { splits { abi { enable false } } }" >> build.gradle
-      - sed -i -e "s/versionName appVersionName/versionName \"$$VERSION$$\"/" -e "s/versionCode
-        appVersionCode/versionCode $$VERCODE$$/" build.gradle
-      - sed -i -e "/appVersionName/d" -e "/appVersionCode/d" build.gradle
-      - sed -i -e "/@bugsnag\/react-native/d" -e "/bugsnag-sourcemaps/d" ../../package.json
+      - $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404' > /dev/null
+      - sed -i -e '/detox/Id' -e 's/versionName appVersionName/versionName "$$VERSION$$"/'
+        -e 's/versionCode appVersionCode/versionCode $$VERCODE$$/' build.gradle
+      - sed -i -e "/bugsnag/d" ../../package.json build.gradle src/main/java/com/standardnotes/MainActivity.java
+      - sed -i -e '/Bugsnag/d' ../../src/App.tsx
+      - sed -i -e '/String bugsnagOptOut/,/^    }/d' -e '/Configuration config/,/^    }});/d'
+        -e '/bugsnag/Id' src/main/java/com/standardnotes/MainApplication.java
     scanignore:
       - android/build.gradle
       - node_modules/hermes-engine
@@ -2789,7 +2781,6 @@ Builds:
       - node_modules/standard-notes-rn/android/build.gradle
       - node_modules/@react-native-community/async-storage/android/build.gradle
       - node_modules/@react-native-community/masked-view/android/build.gradle
-      - node_modules/@react-native-community/netinfo/android/build.gradle
     scandelete:
       - node_modules/
     build:
diff --git a/metadata/gh.cloneconf.apkpurer.yml b/metadata/gh.cloneconf.apkpurer.yml
index 369768e7fb..2c99fdefa8 100644
--- a/metadata/gh.cloneconf.apkpurer.yml
+++ b/metadata/gh.cloneconf.apkpurer.yml
@@ -105,9 +105,9 @@ Builds:
     gradle:
       - yes
 
-  - versionName: v25.0
-    versionCode: 25
-    commit: 5926c1f9c3619947e2694c198973d50c893741ff
+  - versionName: '12.0'
+    versionCode: 12
+    commit: fe665425a32db4ce78bbac0c790de1b1b476ad4f
     subdir: app
     sudo:
       - apt-get update || apt-get update
@@ -118,5 +118,5 @@ Builds:
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: v25.0
-CurrentVersionCode: 25
+CurrentVersion: '12.0'
+CurrentVersionCode: 12
diff --git a/metadata/gh.cloneconf.ardicter.yml b/metadata/gh.cloneconf.ardicter.yml
index ac4bbc2ca1..e4a086829e 100644
--- a/metadata/gh.cloneconf.ardicter.yml
+++ b/metadata/gh.cloneconf.ardicter.yml
@@ -83,18 +83,18 @@ Builds:
     gradle:
       - yes
 
-  - versionName: v21.0
-    versionCode: 21
-    commit: e8919a604d85049a39207fc4a42072119fbd4825
+  - versionName: '10.0'
+    versionCode: 10
+    commit: 7144980c3ba6c4ede0bc173f402a36388fef0aec
     subdir: app
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
+      - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
       - yes
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: v21.0
-CurrentVersionCode: 21
+CurrentVersion: '10.0'
+CurrentVersionCode: 10
diff --git a/metadata/io.github.sds100.keymapper.inputmethod.latin.yml b/metadata/io.github.sds100.keymapper.inputmethod.latin.yml
index 4ad0c0884a..4dfc4fc8a2 100644
--- a/metadata/io.github.sds100.keymapper.inputmethod.latin.yml
+++ b/metadata/io.github.sds100.keymapper.inputmethod.latin.yml
@@ -3,8 +3,9 @@ Categories:
 License: GPL-3.0-only
 AuthorName: sds100
 AuthorEmail: developer.sds100@gmail.com
-SourceCode: https://github.com/keymapperorg/KeyMapper
-Changelog: https://github.com/keymapperorg/KeyMapper/releases
+SourceCode: https://github.com/keymapperorg/KeyMapperKeyboard
+IssueTracker: https://github.com/keymapperorg/KeyMapperKeyboard/issues
+Changelog: https://github.com/keymapperorg/KeyMapperKeyboard/releases
 
 AutoName: Key Mapper GUI Keyboard
 
@@ -23,7 +24,7 @@ Builds:
       - dictionaries/*_wordlist.combined.gz
     ndk: r21d
 
-AutoUpdateMode: None
-UpdateCheckMode: None
+AutoUpdateMode: Version
+UpdateCheckMode: Tags
 CurrentVersion: 1.4.2
 CurrentVersionCode: 13
diff --git a/metadata/io.github.sds100.keymapper.yml b/metadata/io.github.sds100.keymapper.yml
index 06a6c990f1..22408a19f8 100644
--- a/metadata/io.github.sds100.keymapper.yml
+++ b/metadata/io.github.sds100.keymapper.yml
@@ -1,14 +1,16 @@
 Categories:
   - System
 License: GPL-3.0-only
-SourceCode: https://github.com/sds100/KeyMapper
-IssueTracker: https://github.com/sds100/KeyMapper/issues
-Changelog: https://github.com/sds100/KeyMapper/blob/HEAD/CHANGELOG.md
+AuthorName: sds100
+AuthorEmail: developer.sds100@gmail.com
+SourceCode: https://github.com/keymapperorg/KeyMapper
+IssueTracker: https://github.com/keymapperorg/KeyMapper/issues
+Changelog: https://github.com/keymapperorg/KeyMapper/blob/HEAD/CHANGELOG.md
 
 AutoName: Key Mapper
 
 RepoType: git
-Repo: https://github.com/sds100/KeyMapper
+Repo: https://github.com/keymapperorg/KeyMapper
 
 Builds:
   - versionName: 1.1.6
diff --git a/metadata/io.heckel.ntfy.yml b/metadata/io.heckel.ntfy.yml
index 1638c8ccc1..f7cb6612b6 100644
--- a/metadata/io.heckel.ntfy.yml
+++ b/metadata/io.heckel.ntfy.yml
@@ -98,6 +98,10 @@ Builds:
     versionCode: 20
     commit: e4b714e516cac23630b3ad9a0922438c6724d213
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - fdroid
     prebuild: sed -i -e '/google-services/d' build.gradle
diff --git a/metadata/io.nekohasekai.sagernet.yml b/metadata/io.nekohasekai.sagernet.yml
index 27d9842d3b..ccaa81b4ad 100644
--- a/metadata/io.nekohasekai.sagernet.yml
+++ b/metadata/io.nekohasekai.sagernet.yml
@@ -670,7 +670,7 @@ Builds:
     ndk: r23b
 
   - versionName: 0.7-rc06
-    versionCode: 770
+    versionCode: 767
     commit: a5d5e1647791dde25943445643c9c8703f39fbdf
     subdir: app
     submodules: true
@@ -693,7 +693,7 @@ Builds:
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^\d.*
-VercodeOperation: '%c * 5'
+VercodeOperation: 459 + %c * 2
 UpdateCheckData: sager.properties|VERSION_CODE=(\d+)||
 CurrentVersion: 0.7-rc06
-CurrentVersionCode: 770
+CurrentVersionCode: 767
diff --git a/metadata/openfoodfacts.github.scrachx.openbeauty.yml b/metadata/openfoodfacts.github.scrachx.openbeauty.yml
index a060b87fbc..ad30345411 100644
--- a/metadata/openfoodfacts.github.scrachx.openbeauty.yml
+++ b/metadata/openfoodfacts.github.scrachx.openbeauty.yml
@@ -270,8 +270,13 @@ Builds:
     versionCode: 433
     commit: 4af091d54c7cee7efad49ef3ae256c3ff4540f92
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - obf
+      - fdroid
     prebuild:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle.kts
diff --git a/metadata/org.kde.bettercounter.yml b/metadata/org.kde.bettercounter.yml
index d0442a5d2d..e1aea4960d 100644
--- a/metadata/org.kde.bettercounter.yml
+++ b/metadata/org.kde.bettercounter.yml
@@ -46,6 +46,10 @@ Builds:
     versionCode: 11100
     commit: 2a022fb72a7b98d8fe3da140cf4ca01ec7bfa006
     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/se.manyver.yml b/metadata/se.manyver.yml
index 439f77042d..83b6437bfc 100644
--- a/metadata/se.manyver.yml
+++ b/metadata/se.manyver.yml
@@ -2178,7 +2178,6 @@ Builds:
     prebuild: sed -i -e '/lifecycle/d' ../build.gradle
     scanignore:
       - android/build.gradle
-      - node_modules/@react-native-community/async-storage/android/build.gradle
       - node_modules/react-native-localize/android/build.gradle
       - node_modules/react-native-vector-icons/android/build.gradle
       - node_modules/react-native-svg/android/build.gradle