Merge branch 'miscupdates2' into 'master'

Updates: FairEmail, Conversations, Quicksy

See merge request fdroid/fdroiddata!8486

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

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: |-

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