diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 99d8faa52..17c60571f 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -70,6 +70,26 @@ ss9xVg==
 =Zs5g
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    84E913A8E3A748C0
+uid    The Legion of the Bouncy Castle Inc. (Maven Repository Artifact Signer) <bcmavensync@bouncycastle.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQGNBGR/8HUBDADJ+V5VgTXFG4xVI/1r07a/pTXoAQhHyJMkVdFScGARsps07VXI
+IsYgPsifOFU55E7uRMZPTLAx5F1uxoZAWGtXIz0d4ISKhobFquH8jZe7TnsJBJNV
+eo3u7G54iSfLifiJ4q17NvaESBNSirPaAPfEni93+gQvdn3zVnDPfO+mhO00l/fE
+5GnqHt/Q2z2WKVQt3Vg0R66phe2XaFnycY/d+an73FiXqhuhm4sXlcA++gfSt1H1
+K7+ApqJsX9yw79A1FlGTPOeimqZqE75+OyQ9Kz0XTvN/GmHeEygTrNEnMDTr1BWz
+P0/ut0UXmktJtJXgLi5wUCncwwi+UpCSwwou7/3r+eBh5aykxSo9OtYe4xPNKWSo
+EiPZXpCH5Wjq9TpXOuhnZvRFqbR24mWz5+J/DoaVP3pwEhGXxr5VjVc1f8gJ8A34
+YYPlxUGcl8f3kykzvl4X5HDIbHb9MAl+9qtwQo1tFA9umD2Da/8bSsxrnZdkkzEA
+OpJYwT1EkQRZRcUAEQEAAbRmVGhlIExlZ2lvbiBvZiB0aGUgQm91bmN5IENhc3Rs
+ZSBJbmMuIChNYXZlbiBSZXBvc2l0b3J5IEFydGlmYWN0IFNpZ25lcikgPGJjbWF2
+ZW5zeW5jQGJvdW5jeWNhc3RsZS5vcmc+
+=/HDf
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    858FC4C4F43856A3
 uid    J. Daniel Kulp <dan@kulp.com>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c761c8ba9..e2cf6d78b 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -4,7 +4,7 @@
       <verify-metadata>true</verify-metadata>
       <verify-signatures>true</verify-signatures>
       <trusted-artifacts>
-         <trust group="com.android.tools.build" name="aapt2" version="8.3.2-10880808" reason="ships OS specific artifacts (win/linux) - temp global trust"/>
+         <trust group="com.android.tools.build" name="aapt2" version="8.4.0-11315950" reason="ships OS specific artifacts (win/linux) - temp global trust"/>
          <trust group="com.github.nextcloud-deps" name="android-talk-webrtc" version="110.5481.0" reason="ships OS specific artifacts (win/linux) - temp global trust"/>
          <trust file=".*-sources[.]jar" regex="true"/>
       </trusted-artifacts>
@@ -1669,6 +1669,14 @@
             <sha256 value="c6cfb0026e793dfdedebf60152140a48b7988ebd56de196731ee3e6b53e15be5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="play-sdk-proto" version="31.4.0">
+         <artifact name="play-sdk-proto-31.4.0.jar">
+            <sha256 value="68840b9dc064724dbe12844e0c59e325ac4dfaa818bf3262635bd5254010a29c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="play-sdk-proto-31.4.0.pom">
+            <sha256 value="c8cade26e02c55051e8373b6f59990171ece56bfec11150504c87bc99ef9456c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="repository" version="31.3.1">
          <artifact name="repository-31.3.1.jar">
             <sha256 value="df2533e154b736a0a95e4804893aa59099552842bf9635cda3751be9e894a0e2" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1845,6 +1853,14 @@
             <sha256 value="cfdc5c038e9cefba6162b9cb471efbd4f4d683fdc443f2de7de28a4a0cc3f638" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="aapt2" version="8.4.0-11315950">
+         <artifact name="aapt2-8.4.0-11315950-windows.jar">
+            <sha256 value="e153516c5e2933528c816c05ff9e21b189ac8c4b1bc456e468af71f6ea8229fc" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="aapt2-8.4.0-11315950.pom">
+            <sha256 value="438500be20c6e8ae2dbd6154433718d4c2d5e200272d9cd2c6ccd108e559a7fe" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="aapt2-proto" version="8.3.1-10880808">
          <artifact name="aapt2-proto-8.3.1-10880808.jar">
             <sha256 value="7fc7fbe0ab5341dc7a098e6eeddbfb2556a26092970b38a74139540191953337" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -2277,6 +2293,14 @@
             <sha256 value="def456455d616a1d143780d43d351fbe5e0ac8b2c27bc7abc503f21ed0ff5f30" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="31.4.0">
+         <artifact name="intellij-core-31.4.0.jar">
+            <sha256 value="025e5a282d9fb83a4e6073ff4ccd5a28e38f8a322a856d4aa29e4ad00bd377f4" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="intellij-core-31.4.0.pom">
+            <sha256 value="b456a93837c0dbd4a95ab7361403d917d6af104d02409d37f5abb76b10ce108e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="31.3.1">
          <artifact name="kotlin-compiler-31.3.1.jar">
             <sha256 value="a36d1397296679ecb909369802eb99bbde47f4ccb3b087601ca4d7c032edd794" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -2293,6 +2317,14 @@
             <sha256 value="82c32972e8eb1544c45a183daa0a8cd260aa4945bcce615cbe3492d16fdc9e2b" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="31.4.0">
+         <artifact name="kotlin-compiler-31.4.0.jar">
+            <sha256 value="fd45a1e4a45c51b46920445586f71c92a8801cb0880bcc0f485144ffbfbc284f" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="kotlin-compiler-31.4.0.pom">
+            <sha256 value="2af52dd13175b4e4d921363e8787a00307f90b7c8d9b8e606ad30b5863332c14" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.external.org-jetbrains" name="uast" version="31.3.1">
          <artifact name="uast-31.3.1.jar">
             <sha256 value="9ad499cb766d5568cc30e7a8ce19c58b559d6db234a4ecb46e9743b61a5a63ea" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -2309,6 +2341,14 @@
             <sha256 value="e1e73c0e3fea035fe4ed5bc5ce808daef57feb5608a32f98177259f338ce017b" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.android.tools.external.org-jetbrains" name="uast" version="31.4.0">
+         <artifact name="uast-31.4.0.jar">
+            <sha256 value="0df6547b37453f5ad2006179cd65b0ab7109b8f67b837d739509b2ff4f8310b3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="uast-31.4.0.pom">
+            <sha256 value="9f691ba1f7b45ba72e88cc5a6c8966b9591c4721a639c39b33b7283ebd715646" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.3.1">
          <artifact name="layoutlib-api-31.3.1.jar">
             <sha256 value="3c9064c3c3ab0e73f3a5953d1c11c57dbf57a3297957c1d7d460c92e14cf34b2" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -2349,6 +2389,14 @@
             <sha256 value="3fb62ab58493b9ced8ed86d6a5032a78f9975a13a5ba63c60cebd4fa70da3fff" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint" version="31.4.0">
+         <artifact name="lint-31.4.0.jar">
+            <sha256 value="4c8bbdfaa4fcddd5e8b8f3e9606057a1e5dd6ed8013a7bbc9ae2d4a7d950152c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="lint-31.4.0.pom">
+            <sha256 value="e8a9326808773e7648528ab913337f94e53fe5631ad01b7b4e7fd931a326a6d6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-api" version="31.3.1">
          <artifact name="lint-api-31.3.1.jar">
             <sha256 value="aaa23051dfcb94c4b49a11d6b7136458e181a4b3123bd4992e73535084553bf2" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -2365,6 +2413,14 @@
             <sha256 value="22478a5fbd28b2ee9551e341b07b37530b61a56341ff7c3bf280371857d3e0be" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-api" version="31.4.0">
+         <artifact name="lint-api-31.4.0.jar">
+            <sha256 value="03046cddd2df9b0d25ae1f5260102922b9efc8118ad1c2566443a04e3008ee55" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="lint-api-31.4.0.pom">
+            <sha256 value="58b47b2f0b82be0861def98aa83ef9017b79c643f8585a6ff2d2acfc4f9898bd" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-checks" version="31.3.1">
          <artifact name="lint-checks-31.3.1.jar">
             <sha256 value="913dfa487088bc77a2a487a66df185b634e893ae9920dfcd31674ad2a2c88c5a" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -2381,6 +2437,14 @@
             <sha256 value="af583cfb5d1eb4eff82e02589ea03fb372a98a478063e9b2a403c110df8542d6" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-checks" version="31.4.0">
+         <artifact name="lint-checks-31.4.0.jar">
+            <sha256 value="51ad2a41dcf521ad7bb0de716ab7f13a065e3cafe69e9d94c95b54f8589992c6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="lint-checks-31.4.0.pom">
+            <sha256 value="38f0def6d4c49294564cefe3f5d97df288ce8f474fa4e4d7332b10de436756cd" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-gradle" version="31.3.1">
          <artifact name="lint-gradle-31.3.1.jar">
             <sha256 value="16f40f5175fa670d9c2f4c1dfc012dc9a118c91b7f1717c29d1075cb13b1c590" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -2397,6 +2461,14 @@
             <sha256 value="2ed71f287d15b0441573a838d0368f17f934c3954f0b4032ea82a3a827adbe8a" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-gradle" version="31.4.0">
+         <artifact name="lint-gradle-31.4.0.jar">
+            <sha256 value="ec188c62447a6c7cd781072577b04470d7a8c321de926a95f5c7f92342060fbe" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="lint-gradle-31.4.0.pom">
+            <sha256 value="297b9f004c263a35efbaff26f7acd60819dc59dd5d6362510df285a4c1b740c4" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-model" version="31.3.1">
          <artifact name="lint-model-31.3.1.jar">
             <sha256 value="243bb5e90bef1f94b419506bc9c236e86cecd977220e89ddb9e9f973b9e56ce1" origin="Generated by Gradle" reason="Artifact is not signed"/>