fix after rebase

Signed-off-by: tobiasKaminsky <[email protected]>
nextcloud · Jan 14, 2025 · c386471 · c386471
1 parent ffe7dd4
commit c386471
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/...src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt b/...src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt
@@ -15,6 +15,7 @@ import com.owncloud.android.AbstractIT
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.lib.resources.shares.ShareType
 import com.owncloud.android.lib.resources.shares.ShareeUser
+import com.owncloud.android.lib.resources.systemTag.SystemTag
 import com.owncloud.android.utils.MimeType
 import com.owncloud.android.utils.ScreenshotTest
 import org.junit.Assert
@@ -50,7 +51,7 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
             fileLength = 3072000
             modificationTimestamp = 746443755000
             parentId = sut.storageManager.getFileByEncryptedRemotePath("/").fileId
-            tags = listOf("Top secret")
+            tags = listOf(SystemTag("Top secret", null))
             sut.storageManager.saveFile(this)
         }
 
@@ -72,7 +73,7 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
             fileLength = 12092000
             modificationTimestamp = 746143952000
             parentId = sut.storageManager.getFileByEncryptedRemotePath("/").fileId
-            tags = listOf("Confidential", "+5")
+            tags = listOf(SystemTag("Confidential", null), SystemTag("+5", null))
             sut.storageManager.saveFile(this)
         }
 

diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -655,13 +655,17 @@ private void applyChipVisuals(Chip chip, SystemTag tag) {
         viewThemeUtils.material.themeChipSuggestion(chip);
         chip.setText(tag.getName());
 
-        if (tag.getColor() == null) {
+        if (tag.getColor() == null || tag.getColor().isEmpty()) {
             return;
         }
 
-        int color = Color.parseColor(tag.getColor());
-        chip.setChipStrokeColor(ColorStateList.valueOf(color));
-        chip.setTextColor(color);
+        try {
+            int color = Color.parseColor(tag.getColor());
+            chip.setChipStrokeColor(ColorStateList.valueOf(color));
+            chip.setTextColor(color);
+        } catch (IllegalArgumentException e) {
+            // do nothing
+        }
     }
 
     private void prepareFileSize(ListItemViewHolder holder, OCFile file, long size) {

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@
  */
 buildscript {
     ext {
-        androidLibraryVersion ="24744f9235fa9446fa314f66e753fab5f9554313"
+        androidLibraryVersion ="1b59a97bdbbf2160236880e6cb02933e3bd441a1"
         androidPluginVersion = '8.8.0'
         androidxMediaVersion = '1.5.1'
         androidxTestVersion = "1.6.1"

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -9096,6 +9096,22 @@
             <sha256 value="66fc4c12f83ef0d2ae5536ebc4d808e2225129ba4668af77f03f27bd95b93934" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="1b59a97bdbbf2160236880e6cb02933e3bd441a1">
+         <artifact name="android-library-1b59a97bdbbf2160236880e6cb02933e3bd441a1.aar">
+            <sha256 value="8093484cb07ee1d96376c5b6ec0390c381a364aad2c7465ce306691075433d58" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-1b59a97bdbbf2160236880e6cb02933e3bd441a1.module">
+            <sha256 value="4d022bff5a48c368ad91f681268429e1b4efae92080ee11d21cf743cbac358dc" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.nextcloud" name="android-library" version="24744f9235fa9446fa314f66e753fab5f9554313">
+         <artifact name="android-library-24744f9235fa9446fa314f66e753fab5f9554313.aar">
+            <sha256 value="f7bbb063eace028f28fb1d3e8215a29f2d5a8c3964cfa29b559d18cb87abbb85" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-24744f9235fa9446fa314f66e753fab5f9554313.module">
+            <sha256 value="b54a67922d5a797da641e1a5f7bc7ad1e409f6cfc20b001792fbdab5a5424e57" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="26dc8477962f12356db840bb1a774f0186b38e4d">
          <artifact name="android-library-26dc8477962f12356db840bb1a774f0186b38e4d.aar">
             <sha256 value="57ab4fd7c922875a7e0b5feac20aa27ab5df0fd3b4e042f92ed727c0b6316e81" origin="Generated by Gradle" reason="Artifact is not signed"/>