Merge branch 'proton222' into 'master'

ProtonVPN - 2.2.2 and AUM

See merge request fdroid/fdroiddata!6872

metadata/ch.protonvpn.android.yml

@@ -118,7 +118,59 @@ Builds:
     gradleprops:
       - buildUniversalApk
 
-AutoUpdateMode: None
+  - versionName: 2.2.2
-UpdateCheckMode: Tags
+    versionCode: 20202
-CurrentVersion: 2.1.7
+    commit: 2.2.2
-CurrentVersionCode: 20107
+    subdir: app
+    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y --no-install-recommends libgmp-dev
+    patch:
+      - openvpn-build.patch
+    gradle:
+      - prod
+    output: build/outputs/apk/prod/release/ProtonVPN-*-prod-release-unsigned.apk
+    rm:
+      - app/src/main/jniLibs/x86/*
+      - app/src/main/jniLibs/x86_64/*
+      - app/src/main/jniLibs/armeabi-v7a/*
+      - app/src/main/jniLibs/arm64-v8a/*
+      - openvpn/src/main/cpp/mbedtls/tests
+      - openvpn/src/main/cpp/openvpn3/test/unittests
+      - strongswan/testing/hosts/alice/etc/raddb/certs/random
+    prebuild:
+      - sed -i -e '/triple/d' -e '/play\ {/,+4d' build.gradle
+      - pushd ../strongswan
+      - export PATH=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
+      - git clone git://git.strongswan.org/android-ndk-boringssl.git -b ndk-static
+        src/frontends/android/app/src/main/jni/openssl
+      - ./autogen.sh
+      - ./configure
+      - make dist
+      - pushd src/frontends/android/app
+      - sed -i -e '/android\ {/alintOptions\ {abortOnError\ false}' build.gradle
+      - gradle assembleRelease
+      - popd
+      - popd
+      - cp -r ../strongswan/src/frontends/android/app/src/main/libs/* src/main/jniLibs/
+      - rm -fr ../strongswan/src/frontends/android/app/src/main/libs/*
+      - rm -fr ../strongswan/src/frontends/android/app/build
+      - pushd ..
+      - gradle openvpn:assemble
+      - rm -fr openvpn/build/intermediates
+      - rm -fr openvpn/build/kotlin
+      - rm -fr openvpn/build/tmp
+      - rm -fr openvpn/.cxx
+      - popd
+    scanignore:
+      - app/src/main/jniLibs/
+    ndk: r20b
+    gradleprops:
+      - buildUniversalApk
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: HTTP
+UpdateCheckData: https://raw.githubusercontent.com/ProtonVPN/android-app/master/metadata/version_fdroid.txt|versionCode=(.*)|.|versionName=(.*)
+CurrentVersion: 2.2.2
+CurrentVersionCode: 20202