Bugfix/update folder icons

.github/workflows/analysis.yml

@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
     analysis:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             -   name: Setup variables
                 id: get-vars

app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.kt

@@ -49,6 +49,7 @@ class FileDisplayActivityScreenshotIT : AbstractIT() {
         Manifest.permission.WRITE_EXTERNAL_STORAGE
     )
 
+    // FIXME test fails
     @Test
     @ScreenshotTest
     fun open() {
@@ -66,6 +67,7 @@ class FileDisplayActivityScreenshotIT : AbstractIT() {
         screenshot(sut)
     }
 
+    // FIXME test fails
     @Test
     @ScreenshotTest
     fun showMediaThenAllFiles() {
@@ -100,6 +102,7 @@ class FileDisplayActivityScreenshotIT : AbstractIT() {
         screenshot(fileDisplayActivity)
     }
 
+    // FIXME test fails
     @Test
     @ScreenshotTest
     fun drawer() {

app/src/androidTest/java/com/nmc/android/ui/LauncherActivityIT.kt

@@ -43,6 +43,8 @@ class LauncherActivityIT : AbstractIT() {
     @Test
     fun verifyUIElements() {
         waitForIdleSync()
+
+        // FIXME test fails
         onView(withId(R.id.ivSplash)).check(matches(isCompletelyDisplayed()))
         onView(withId(R.id.splashScreenBold)).check(matches(isCompletelyDisplayed()))
         onView(withId(R.id.splashScreenNormal)).check(matches(isCompletelyDisplayed()))

app/src/androidTest/java/com/owncloud/android/datamodel/OCFileIconTests.kt

@@ -0,0 +1,105 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Alper Ozturk
+ * Copyright (C) 2023 Alper Ozturk
+ * Copyright (C) 2023 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.datamodel
+
+import com.owncloud.android.R
+import com.owncloud.android.lib.common.network.WebdavEntry.MountType
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+class OCFileIconTests {
+
+    private val path = "/path/to/a/file.txt"
+    private var sut: OCFile? = null
+
+    @Before
+    fun setup() {
+        sut = OCFile(path)
+    }
+
+    @Test
+    fun testGetFileOverlayIconWhenFileIsAutoUploadFolderShouldReturnFolderOverlayUploadIcon() {
+        val fileOverlayIcon = sut?.getFileOverlayIconId(true)
+        val expectedDrawable = R.drawable.ic_folder_overlay_upload
+        assert(fileOverlayIcon == expectedDrawable)
+    }
+
+    @Test
+    fun testGetFileOverlayIconWhenFileIsEncryptedShouldReturnFolderOverlayKeyIcon() {
+        sut?.isEncrypted = true
+        val fileOverlayIcon = sut?.getFileOverlayIconId(false)
+        val expectedDrawable = R.drawable.ic_folder_overlay_key
+        assert(fileOverlayIcon == expectedDrawable)
+    }
+
+    @Test
+    fun testGetFileOverlayIconWhenFileIsGroupFolderShouldReturnFolderOverlayAccountGroupIcon() {
+        sut?.mountType = MountType.GROUP
+        val fileOverlayIcon = sut?.getFileOverlayIconId(false)
+        val expectedDrawable = R.drawable.ic_folder_overlay_account_group
+        assert(fileOverlayIcon == expectedDrawable)
+    }
+
+    @Test
+    fun testGetFileOverlayIconWhenFileIsSharedViaLinkShouldReturnFolderOverlayLinkIcon() {
+        sut?.isSharedViaLink = true
+        val fileOverlayIcon = sut?.getFileOverlayIconId(false)
+        val expectedDrawable = R.drawable.ic_folder_overlay_link
+        assert(fileOverlayIcon == expectedDrawable)
+    }
+
+    @Test
+    fun testGetFileOverlayIconWhenFileIsSharedShouldReturnFolderOverlayShareIcon() {
+        sut?.isSharedWithSharee = true
+        val fileOverlayIcon = sut?.getFileOverlayIconId(false)
+        val expectedDrawable = R.drawable.ic_folder_overlay_share
+        assert(fileOverlayIcon == expectedDrawable)
+    }
+
+    @Test
+    fun testGetFileOverlayIconWhenFileIsExternalShouldReturnFolderOverlayExternalIcon() {
+        sut?.mountType = MountType.EXTERNAL
+        val fileOverlayIcon = sut?.getFileOverlayIconId(false)
+        val expectedDrawable = R.drawable.ic_folder_overlay_external
+        assert(fileOverlayIcon == expectedDrawable)
+    }
+
+    @Test
+    fun testGetFileOverlayIconWhenFileIsLockedShouldReturnFolderOverlayLockIcon() {
+        sut?.isLocked = true
+        val fileOverlayIcon = sut?.getFileOverlayIconId(false)
+        val expectedDrawable = R.drawable.ic_folder_overlay_lock
+        assert(fileOverlayIcon == expectedDrawable)
+    }
+
+    @Test
+    fun testGetFileOverlayIconWhenFileIsFolderShouldReturnNull() {
+        val fileOverlayIcon = sut?.getFileOverlayIconId(false)
+        assert(fileOverlayIcon == null)
+    }
+
+    @After
+    fun destroy() {
+        sut = null
+    }
+}

app/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java

@@ -70,7 +70,6 @@ public void createDefaultOCFile() {
         mFile = new OCFile(PATH);
     }
 
-
     @Test
     public void writeThenReadAsParcelable() {
 

app/src/androidTest/java/com/owncloud/android/ui/LoginIT.kt

@@ -56,6 +56,7 @@ class LoginIT : AbstractIT() {
         ActivityScenario.launch(AuthenticatorActivity::class.java)
     }
 
+    // FIXME test fails
     @Test
     @Throws(InterruptedException::class)
     @Suppress("MagicNumber", "SwallowedException")

app/src/androidTest/java/com/owncloud/android/ui/activity/DrawerActivityIT.java

@@ -119,6 +119,7 @@ public void switchAccountViaAccountList() {
 
         waitForIdleSync();
 
+        // FIXME test fails
         assertEquals(account2, sut.getUser().get().toPlatformAccount());
 
         onView(withId(R.id.switch_account_button)).perform(click());

app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java

@@ -539,6 +539,8 @@ public void testSslUntrustedCertDialog() {
 
         final SslCertificate certificate = new SslCertificate("foo", "bar", "2022/01/10", "2022/01/30");
         final SslError sslError = new SslError(SslError.SSL_UNTRUSTED, certificate);
+
+        // FIXME test fails
         final SslErrorHandler handler = Mockito.mock(SslErrorHandler.class);
 
 

app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt

@@ -242,6 +242,22 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
             sut.storageManager.saveFile(this)
         }
 
+        OCFile("/sharedViaLink/").apply {
+            mimeType = MimeType.DIRECTORY
+            isSharedViaLink = true
+            modificationTimestamp = 1619003571000
+            parentId = sut.storageManager.getFileByEncryptedRemotePath("/").fileId
+            sut.storageManager.saveFile(this)
+        }
+
+        OCFile("/share/").apply {
+            mimeType = MimeType.DIRECTORY
+            isSharedWithSharee = true
+            modificationTimestamp = 1619303571000
+            parentId = sut.storageManager.getFileByEncryptedRemotePath("/").fileId
+            sut.storageManager.saveFile(this)
+        }
+
         OCFile("/groupFolder/").apply {
             mimeType = MimeType.DIRECTORY
             modificationTimestamp = 1615003571000
@@ -259,6 +275,15 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
             sut.storageManager.saveFile(this)
         }
 
+        OCFile("/locked/").apply {
+            mimeType = MimeType.DIRECTORY
+            isLocked = true
+            decryptedRemotePath = "/locked/"
+            modificationTimestamp = 1613003571000
+            parentId = sut.storageManager.getFileByEncryptedRemotePath("/").fileId
+            sut.storageManager.saveFile(this)
+        }
+
         sut.addFragment(fragment)
 
         shortSleep()

app/src/androidTest/java/com/owncloud/android/utils/DrawableUtilTests.kt

@@ -0,0 +1,63 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Alper Ozturk
+ * Copyright (C) 2023 Alper Ozturk
+ * Copyright (C) 2023 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.utils
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.After
+import org.junit.Assert.fail
+import org.junit.Before
+import org.junit.Test
+
+class DrawableUtilTests {
+
+    private var sut: DrawableUtil? = null
+    private var context: Context? = null
+
+    @Before
+    fun setUp() {
+        sut = DrawableUtil()
+        context = InstrumentationRegistry.getInstrumentation().context
+    }
+
+    @Test
+    fun testAddDrawableAsOverlayWhenGivenValidDrawablesShouldContainTwoDrawable() {
+        val bitmap: Bitmap = Bitmap.createBitmap(2, 2, Bitmap.Config.ARGB_8888)
+        val drawable = BitmapDrawable(context?.resources, bitmap)
+
+        val layerDrawable = sut?.addDrawableAsOverlay(drawable, drawable)
+
+        if (layerDrawable == null) {
+            fail("Layer drawable expected to be not null")
+        }
+
+        assert(layerDrawable?.numberOfLayers == 2)
+    }
+
+    @After
+    fun destroy() {
+        sut = null
+        context = null
+    }
+}

app/src/androidTest/java/com/owncloud/android/utils/FileExportUtilsIT.kt

@@ -47,6 +47,7 @@ class FileExportUtilsIT : AbstractIT() {
 
         sut.exportFile("export.txt", "/text/plain", targetContext.contentResolver, null, file)
 
+        // FIXME test fails
         assertTrue(expectedFile.exists())
         assertEquals(file.length(), expectedFile.length())
         assertTrue(expectedFile.delete())
@@ -71,6 +72,7 @@ class FileExportUtilsIT : AbstractIT() {
 
         sut.exportFile("export.txt", "/text/plain", targetContext.contentResolver, ocFile, null)
 
+        // FIXME test fails
         assertTrue(expectedFile.exists())
         assertEquals(file.length(), expectedFile.length())
         assertTrue(expectedFile.delete())

app/src/gplay/java/com/nextcloud/android/appReview/InAppReviewHelperImpl.kt

@@ -29,8 +29,8 @@ import com.google.android.play.core.review.ReviewManagerFactory
 import com.nextcloud.appReview.AppReviewShownModel
 import com.nextcloud.appReview.InAppReviewHelper
 import com.nextcloud.client.preferences.AppPreferences
-import com.nextcloud.utils.getFormattedStringDate
-import com.nextcloud.utils.isCurrentYear
+import com.nextcloud.utils.extensions.getFormattedStringDate
+import com.nextcloud.utils.extensions.isCurrentYear
 import com.owncloud.android.lib.common.utils.Log_OC
 
 // Reference: https://developer.android.com/guide/playcore/in-app-review

app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java

@@ -71,6 +71,7 @@ default void onDarkThemeModeChanged(DarkMode mode) {
 
     boolean instantPictureUploadEnabled();
     boolean instantVideoUploadEnabled();
+    boolean isDarkModeEnabled();
 
     boolean isShowHiddenFilesEnabled();
     void setShowHiddenFilesEnabled(boolean enabled);

app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java

@@ -435,6 +435,11 @@ public int getUploaderBehaviour() {
         return preferences.getInt(AUTO_PREF__UPLOADER_BEHAVIOR, 1);
     }
 
+    @Override
+    public boolean isDarkModeEnabled() {
+        return getDarkThemeMode() == DarkMode.DARK;
+    }
+
     @Override
     public void setDarkThemeMode(DarkMode mode) {
         preferences.edit().putString(PREF__DARK_THEME, mode.name()).apply();

app/src/main/java/com/nextcloud/utils/ShortcutUtil.kt

@@ -71,16 +71,12 @@ class ShortcutUtil @Inject constructor(private val mContext: Context) {
                 thumbnail = bitmapToAdaptiveBitmap(thumbnail)
                 icon = IconCompat.createWithAdaptiveBitmap(thumbnail)
             } else if (file.isFolder) {
-                val bitmapIcon = MimeTypeUtil.getFolderTypeIcon(
-                    file.isSharedWithMe || file.isSharedWithSharee,
-                    file.isSharedViaLink,
-                    file.isEncrypted,
-                    syncedFolderProvider.findByRemotePathAndAccount(file.remotePath, user),
-                    file.isGroupFolder,
-                    file.mountType,
-                    mContext,
-                    viewThemeUtils
-                ).toBitmap()
+                val isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, user)
+                val isDarkModeActive = syncedFolderProvider.preferences.isDarkModeEnabled
+
+                val overlayIconId = file.getFileOverlayIconId(isAutoUploadFolder)
+                val drawable = MimeTypeUtil.getFileIcon(isDarkModeActive, overlayIconId, mContext, viewThemeUtils)
+                val bitmapIcon = drawable.toBitmap()
                 icon = IconCompat.createWithBitmap(bitmapIcon)
             } else {
                 icon = IconCompat.createWithResource(

app/src/main/java/com/nextcloud/utils/Extensions.kt → app/src/main/java/com/nextcloud/utils/extensions/Extensions.kt

@@ -20,7 +20,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.utils
+package com.nextcloud.utils.extensions
 
 import android.text.Selection
 import android.text.Spannable