From 5a5dd65478fd2ca3a535cafb1730927b47776bd8 Mon Sep 17 00:00:00 2001
From: Tobias Kaminsky <tobias@kaminsky.me>
Date: Tue, 23 Apr 2024 11:25:17 +0200
Subject: [PATCH 1/3] Update library

Signed-off-by: Tobias Kaminsky <tobias@kaminsky.me>
---
 build.gradle                     | 2 +-
 gradle/verification-metadata.xml | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c4a9144bb143..bac1a6c1368a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@
  */
 buildscript {
     ext {
-        androidLibraryVersion ="0c886d61f6"
+        androidLibraryVersion ="5fbc7d3a9bc9fd123ce9593cc500bb6415e797c6"
         androidPluginVersion = '8.3.2'
         androidxMediaVersion = '1.3.1'
         androidxTestVersion = "1.5.0"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 981bf2476029..cb11a2ec946c 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -5172,6 +5172,14 @@
             <sha256 value="9f5dc2343cdf500b2cc17756418fce0506d13ef480ab8276cda415950e795991" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="5fbc7d3a9bc9fd123ce9593cc500bb6415e797c6">
+         <artifact name="android-library-5fbc7d3a9bc9fd123ce9593cc500bb6415e797c6.aar">
+            <sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-5fbc7d3a9bc9fd123ce9593cc500bb6415e797c6.module">
+            <sha256 value="1bf1482df26848a59743a94ea6ee53d4ef6f014af5a21274214ab62eb2c6a8d6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="6dcffdb0ba">
          <artifact name="android-library-6dcffdb0ba.aar">
             <sha256 value="00e121d803e9258b36cb2d6e20904552c9e88dbff6b193b3b9adc0fcd224959a" origin="Generated by Gradle" reason="Artifact is not signed"/>

From 2ff5006273f33fa0ab788dcfb5daa7e3891becc9 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Tue, 23 Apr 2024 11:39:36 +0200
Subject: [PATCH 2/3] fix packaging option

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 app/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/build.gradle b/app/build.gradle
index 419d0737be6f..90b7c0167fd8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -195,6 +195,7 @@ android {
     packagingOptions {
         resources {
             excludes += 'META-INF/LICENSE*'
+            excludes += 'META-INF/versions/9/OSGI-INF/MANIFEST*'
             pickFirst 'MANIFEST.MF' // workaround for duplicated manifest on some dependencies
         }
     }

From 90b3958894df952c0e0e0580734b3768ee3b9e84 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 24 Apr 2024 07:21:10 +0200
Subject: [PATCH 3/3] fix test

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../com/owncloud/android/utils/theme/CapabilityUtilsIT.kt  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/androidTest/java/com/owncloud/android/utils/theme/CapabilityUtilsIT.kt b/app/src/androidTest/java/com/owncloud/android/utils/theme/CapabilityUtilsIT.kt
index 0746c4dd845b..98b410f6707d 100644
--- a/app/src/androidTest/java/com/owncloud/android/utils/theme/CapabilityUtilsIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/utils/theme/CapabilityUtilsIT.kt
@@ -17,11 +17,12 @@ import org.junit.Test
 class CapabilityUtilsIT : AbstractIT() {
     @Test
     fun checkOutdatedWarning() {
+        assertFalse(test(NextcloudVersion.nextcloud_28))
         assertFalse(test(NextcloudVersion.nextcloud_27))
-        assertFalse(test(NextcloudVersion.nextcloud_26))
-        assertFalse(test(NextcloudVersion.nextcloud_25))
-        assertFalse(test(NextcloudVersion.nextcloud_24))
 
+        assertTrue(test(NextcloudVersion.nextcloud_26))
+        assertTrue(test(NextcloudVersion.nextcloud_25))
+        assertTrue(test(NextcloudVersion.nextcloud_24))
         assertTrue(test(NextcloudVersion.nextcloud_23))
         assertTrue(test(NextcloudVersion.nextcloud_22))
         assertTrue(test(NextcloudVersion.nextcloud_21))