From 5573246a3700122ebef2046b47f5e1fc8dfbf9e5 Mon Sep 17 00:00:00 2001
From: Albin <albin@mullvad.net>
Date: Wed, 17 May 2023 13:28:37 +0200
Subject: [PATCH] Update Mullvad VPN to 2023.1 (23010000)

This update includes some changes to the build system:
* Update NDK to r25c.
* Install protobuf packages required to build the mullvad-daemon.
* Remove podman sigstore signatures/"binaries" before building
  in order to be F-Droid compliant.
* Set timeout to 3h.

NOTE:
This update also disables F-Droid auto-updates and the update check
since it's broken since last release due to changes to how the app
generates its version code/name.
---
 metadata/net.mullvad.mullvadvpn.yml | 31 +++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/metadata/net.mullvad.mullvadvpn.yml b/metadata/net.mullvad.mullvadvpn.yml
index c9534c3251..7576e30912 100644
--- a/metadata/net.mullvad.mullvadvpn.yml
+++ b/metadata/net.mullvad.mullvadvpn.yml
@@ -184,7 +184,30 @@ Builds:
       - ../../build-apk.sh --fdroid
     ndk: r20b
 
-AutoUpdateMode: Version
-UpdateCheckMode: Tags ^android/[0-9.]+$
-CurrentVersion: '2022.3'
-CurrentVersionCode: 22030099
+  - versionName: '2023.1'
+    versionCode: 23010000
+    commit: 78128c463870274f0f45484ebc42ef80dc7e34c6
+    timeout: 10800
+    subdir: android/app
+    sudo:
+      - apt-get update
+      - apt-get install -y build-essential protobuf-compiler libprotobuf-dev
+    init: NDK_PATH="$$NDK$$" ../fdroid-build/init.sh
+    output: build/outputs/apk/fdroid/app-fdroid-unsigned.apk
+    rm:
+      - gui
+      - graphics
+      - ios
+      - windows
+      - building/sigstore
+    prebuild: sed -i -e 's|Repositories.GradlePlugins|"https://plugins.gradle.org/m2/"|'
+        ../build.gradle.kts
+    build:
+      - NDK_PATH="$$NDK$$" source ../fdroid-build/env.sh
+      - ../../build-apk.sh --fdroid
+    ndk: r25c
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: '2023.1'
+CurrentVersionCode: 23010000