From 76db601fb5f4e7e9931f757d7020b3a75a0cc451 Mon Sep 17 00:00:00 2001
From: F-Droid checkupdates bot <fdroidci@bubu1.eu>
Date: Sat, 8 Oct 2022 05:37:29 +0000
Subject: [PATCH] Update Blokada 5 (ad blocker and privacy app) to 22.4.1
 (666022401)

---
 metadata/org.blokada.fem.fdroid.yml | 45 +++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/metadata/org.blokada.fem.fdroid.yml b/metadata/org.blokada.fem.fdroid.yml
index 868b9a979a..5d4cb5a1d3 100644
--- a/metadata/org.blokada.fem.fdroid.yml
+++ b/metadata/org.blokada.fem.fdroid.yml
@@ -503,8 +503,49 @@ Builds:
       - ./build.blocka.sh
     ndk: r24
 
+  - versionName: 22.4.1
+    versionCode: 666022401
+    commit: f1e6f68dbb901e0c3d49ae4218d0891c13066fed
+    subdir: android5/app
+    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - five
+    srclibs:
+      - rustup@1.25.1
+    rm:
+      - ios
+      - android5/app/src/engine/jniLibs
+      - android5/app/src/libre/jniLibs
+    prebuild:
+      - unzip -P default_blocklist src/libre/assets/default_blocklist.zip default_blocklist
+        -d src/libre/assets
+      - rm src/libre/assets/default_blocklist.zip
+      - sed -i -e 's/origin.alarm/fem.fdroid/' -e '/billingclient/d' build.gradle
+      - sed -e '/interface IPaymentService/,/^}/d' -e 's/PaymentServiceMock/BillingService/'
+        -e '/BlokadaException/d' src/main/java/service/IPaymentService.kt > src/main/java/service/BillingService.kt
+    build:
+      - $$rustup$$/rustup-init.sh -y
+      - source $HOME/.cargo/env
+      - rustup default 1.61.0
+      - rustup target add armv7-linux-androideabi
+      - rustup target add aarch64-linux-android
+      - cargo install cargo-ndk --version 1.0.0
+      - cd ../..
+      - curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip
+      - echo "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e ndk.zip"
+        | sha256sum -c -
+      - unzip -q ndk.zip
+      - export ANDROID_NDK=$(pwd)/android-ndk-r21e
+      - ./build.boringtun.sh
+      - ./build.blocka.sh
+    ndk: r24
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^android-v[0-9.]+$
 UpdateCheckName: org.blokada.origin.alarm
-CurrentVersion: 22.3.8
-CurrentVersionCode: 666022308
+CurrentVersion: 22.4.1
+CurrentVersionCode: 666022401