From 4e655dfbe20d7009d4386de104cb2f91e3400e27 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Fri, 17 Dec 2021 03:43:14 +0000
Subject: [PATCH] jami: fix UpdateCheck and update to 20211210-01

---
 metadata/cx.ring.yml | 46 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml
index 2fa8ea53d8..809e154e65 100644
--- a/metadata/cx.ring.yml
+++ b/metadata/cx.ring.yml
@@ -35,7 +35,7 @@ Description: |-
     You can also install Jami on Windows, macOS, iOS and GNU/Linux.
 
 RepoType: git
-Repo: https://git.jami.net/savoirfairelinux/ring-project
+Repo: https://review.jami.net/ring-project
 
 Builds:
   - versionName: 2.0.003
@@ -1533,6 +1533,44 @@ Builds:
       - ./compile.sh --release --daemon
     ndk: r22b
 
+  - versionName: 20211210-01
+    versionCode: 324
+    commit: android/release_324
+    timeout: 10800
+    subdir: client-android/ring-android/app
+    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - apt-get install -y -t testing swig
+      - apt-get install -y -t stretch-backports-sloppy libarchive13
+      - apt-get install -y -t stretch-backports cmake
+      - update-alternatives --auto java
+    gradle:
+      - noPush
+    rm:
+      - client-gnome
+      - client-ios
+      - client-macosx
+      - client-qt
+      - client-uwp
+      - lrc
+      - plugins
+      - docker
+      - docs
+      - guix
+      - packaging
+      - patches
+      - scripts
+    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
+        'platforms;android-31' 'build-tools;31.0.0'
+    build:
+      - cd ../..
+      - export ANDROID_NDK_ROOT="$ANDROID_NDK"
+      - export ANDROID_ABI="armeabi-v7a arm64-v8a x86_64"
+      - ./compile.sh --release --daemon
+    ndk: r23
+
 MaintainerNotes: |-
     Ring has a lot of native dependencies, the source tarballs of these are all downloaded and build for all enabled architectures.
     Build failed with swig 2.0.12 from jessie but works with 3.0.10 from jessie-backports.
@@ -1542,6 +1580,6 @@ MaintainerNotes: |-
 
 AutoUpdateMode: Version android/release_%c
 UpdateCheckMode: HTTP
-UpdateCheckData: https://git.jami.net/savoirfairelinux/ring-project/-/tags?format=atom|<title>android/release_(\d+)|https://git.jami.net/savoirfairelinux/ring-client-android/-/raw/master/ring-android/app/build.gradle|versionName\s"([\d-]+)"
-CurrentVersion: 20210924-01
-CurrentVersionCode: 320
+UpdateCheckData: https://git.jami.net/savoirfairelinux/ring-project/-/tags?format=atom|<title>android/release_(\d+)|https://git.jami.net/savoirfairelinux/ring-client-android/-/raw/master/ring-android/app/build.gradle.kts|versionName\s=\s"([\d-]+)"
+CurrentVersion: 20211210-01
+CurrentVersionCode: 324