diff --git a/app/build.gradle b/app/build.gradle
index 04318cd810..fe4319aff1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -309,7 +309,7 @@ dependencies {
         exclude group: "com.android.support"
     }
     implementation 'com.caverock:androidsvg:1.4'
-    implementation 'androidx.annotation:annotation:1.7.1'
+    implementation 'androidx.annotation:annotation:1.8.0'
     implementation 'com.vanniktech:emoji-google:0.18.0'
 
     implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:$fidoVersion"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e0ec9fe5bc..4e479f341c 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -8,6 +8,9 @@
          <trust group="com.fasterxml.jackson" name="jackson-base" version="2.14.2" reason="no keys available, no pom artifact to create a checksum"/>
          <trust file=".*-sources[.]jar" regex="true"/>
       </trusted-artifacts>
+      <ignored-keys>
+         <ignored-key id="1669C4BB543E0445" reason="Key couldn't be downloaded from any key server"/>
+      </ignored-keys>
       <trusted-keys>
          <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah" name="JavaEWAH" version="1.2.3"/>
          <trusted-key id="042B29E928995B9DB963C636C7CA19B7B620D787" group="com.github.stephenc.jcip" name="jcip-annotations" version="1.0-1"/>
@@ -667,8 +670,7 @@
       </component>
       <component group="androidx.arch.core" name="core-runtime" version="2.2.0">
          <artifact name="core-runtime-2.2.0.aar">
-             <sha256 value="a1be5e0caa2b07623862af6ae21b3ab0718123245184d0e30dea81b53f990a47"
-                 origin="Generated by Gradle" reason="Artifact is not signed" />
+            <sha256 value="a1be5e0caa2b07623862af6ae21b3ab0718123245184d0e30dea81b53f990a47" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
          <artifact name="core-runtime-2.2.0.module">
             <sha256 value="a8b17513949e5db6c9601c30be19df953762dd877512f1e2cfcfae81d2440944" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5750,17 +5752,14 @@
             <sha256 value="b4f19aae9d8687651cf8f760cb89be155cfa0a9aed818cb50cfbcb15f36c9f2d" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-       <component group="com.github.nextcloud" name="android-library"
-           version="354911a81da973d8874381480ed0ea577e992572">
-           <artifact name="android-library-354911a81da973d8874381480ed0ea577e992572.aar">
-               <sha256 value="a8db03b27d8289fd2e6d5cbe99712e7bb387628a83c387298287a4e5f20a0db0"
-                   origin="Generated by Gradle" reason="Artifact is not signed" />
-           </artifact>
-           <artifact name="android-library-354911a81da973d8874381480ed0ea577e992572.module">
-               <sha256 value="803eeabdbf8e78808a42986a9e6ec7d5e7e74ec9024a38a577898ef699f504db"
-                   origin="Generated by Gradle" reason="Artifact is not signed" />
-           </artifact>
-       </component>
+      <component group="com.github.nextcloud" name="android-library" version="354911a81da973d8874381480ed0ea577e992572">
+         <artifact name="android-library-354911a81da973d8874381480ed0ea577e992572.aar">
+            <sha256 value="a8db03b27d8289fd2e6d5cbe99712e7bb387628a83c387298287a4e5f20a0db0" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-354911a81da973d8874381480ed0ea577e992572.module">
+            <sha256 value="803eeabdbf8e78808a42986a9e6ec7d5e7e74ec9024a38a577898ef699f504db" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="5f92d92c490d2d9039bfd392cf16c61a37738646">
          <artifact name="android-library-5f92d92c490d2d9039bfd392cf16c61a37738646.aar">
             <sha256 value="adec67393e6d6a05d1d96ed4e4dd2e675999e43ca544ea069cee1dbac4d3132c" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5793,15 +5792,12 @@
             <sha256 value="0e72841878595f83c6d8f93aa51f78a67e821f53446fcb7a5d94cfaad8ebbbac" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-       <component group="com.github.nextcloud" name="android-library"
-           version="84711877b4703f8df3d638a016419b4aa731db2b">
-           <artifact name="android-library-84711877b4703f8df3d638a016419b4aa731db2b.aar">
-               <sha256 value="d801b368fc7d4d5d2d2852765442ccbf7df21f0a9198d369181637a8142914cc"
-                   origin="Generated by Gradle" reason="Artifact is not signed" />
-           </artifact>
-           <artifact name="android-library-84711877b4703f8df3d638a016419b4aa731db2b.module">
-               <sha256 value="de2e7d2fdde1d6981af8fcd54812dfe510ab7e22bdf8225ed569616b6c1155f4"
-                   origin="Generated by Gradle" reason="Artifact is not signed" />
+      <component group="com.github.nextcloud" name="android-library" version="84711877b4703f8df3d638a016419b4aa731db2b">
+         <artifact name="android-library-84711877b4703f8df3d638a016419b4aa731db2b.aar">
+            <sha256 value="d801b368fc7d4d5d2d2852765442ccbf7df21f0a9198d369181637a8142914cc" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-84711877b4703f8df3d638a016419b4aa731db2b.module">
+            <sha256 value="de2e7d2fdde1d6981af8fcd54812dfe510ab7e22bdf8225ed569616b6c1155f4" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
       <component group="com.github.nextcloud" name="android-library" version="9fdcd0af0ff910086281f32e3b8ef74490671149">
@@ -6627,7 +6623,7 @@
       </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.3.4">
          <artifact name="error_prone_annotations-2.3.4.pom">
-            <sha256 value="1326738a4b4f7ccacf607b866a11fb85193ef60f6a59461187ce7265f9be5bed" origin="Generated by Gradle"/>
+            <sha256 value="1326738a4b4f7ccacf607b866a11fb85193ef60f6a59461187ce7265f9be5bed" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.5.1">
@@ -6676,6 +6672,11 @@
             <sha256 value="767525d9a81129cd081968382980336327be4162b1e2251a182911daa733c123" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_parent" version="2.3.4">
+         <artifact name="error_prone_parent-2.3.4.pom">
+            <sha256 value="40495b437a60d2398f0fdfc054b89d9c394a82347a274a0721c2e950a4302186" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_parent" version="2.5.1">
          <artifact name="error_prone_parent-2.5.1.pom">
             <sha256 value="a17a7677482a3a51a45f5e08140072acd332ccb12f23899b0052d80a729c2e52" origin="Generated by Gradle"/>