From 6f80c3da6fcf6df67f3dc21e7b72e72de6c0b93d Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon.kter@protonmail.com>
Date: Tue, 2 Mar 2021 11:13:56 +0200
Subject: [PATCH] Updates: FairEmail, Conversations, Quicksy

---
 metadata/eu.faircode.email.yml      | 14 ++++++++++++--
 metadata/eu.siacs.conversations.yml |  4 ++--
 metadata/im.quicksy.client.yml      | 16 +++++++++++++---
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index 4c74091334..4e67ac6184 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -3728,9 +3728,19 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21d
 
+  - versionName: '1.1518'
+    versionCode: 1518
+    commit: '1.1518'
+    subdir: app
+    submodules: true
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
+    ndk: r21d
+
 MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore.
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '1.1515'
-CurrentVersionCode: 1515
+CurrentVersion: '1.1518'
+CurrentVersionCode: 1518
diff --git a/metadata/eu.siacs.conversations.yml b/metadata/eu.siacs.conversations.yml
index b1d927677d..7e8e27c647 100644
--- a/metadata/eu.siacs.conversations.yml
+++ b/metadata/eu.siacs.conversations.yml
@@ -1967,9 +1967,9 @@ Builds:
     commit: 2.9.7
     gradle:
       - conversationsFreeCompat
-    prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
+    prebuild: sed -i -e '/MissingTranslation/aabortOnError\ false' -e '/libwebrtc/d'
         -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.32006'" -e
-        '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+        '/splits/,+5d' -e '/Variants.all/,+8d' build.gradle
     ndk: r21d
 
 MaintainerNotes: |-
diff --git a/metadata/im.quicksy.client.yml b/metadata/im.quicksy.client.yml
index c6b7cecdf7..654711cdf6 100644
--- a/metadata/im.quicksy.client.yml
+++ b/metadata/im.quicksy.client.yml
@@ -42,7 +42,7 @@ Description: |-
 
     Anti-Features:
     * NonFreeNet - you can't change the server where the accounts are created
-    * Tracking - uses a 3rd party service provider (<a href="https://twilio.com">Twilio</a>) to send SMS as needed for authentication
+    * Tracking - uses a 3rd party service provider (<a href="https://twilio.com">Twilio</a> or <a href="https://nexmo.com">Nexmo</a>) to send SMS as needed for authentication
 
 RepoType: git
 Repo: https://github.com/iNPUTmice/Conversations.git
@@ -460,7 +460,17 @@ Builds:
         '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
     ndk: r21d
 
+  - versionName: 2.9.7+fcr
+    versionCode: 42000
+    commit: 2.9.7
+    gradle:
+      - quicksyFreeCompat
+    prebuild: sed -i -e '/MissingTranslation/aabortOnError\ false' -e '/libwebrtc/d'
+        -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.32006'" -e
+        '/splits/,+5d' -e '/Variants.all/,+8d' build.gradle
+    ndk: r21d
+
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.9.6+fcr
-CurrentVersionCode: 407
+CurrentVersion: 2.9.7+fcr
+CurrentVersionCode: 42000