refactor: replace if/else condition with a null block by let in modul…

…e `owncloudApp`
owncloud · Dec 11, 2024 · d30be87 · d30be87
1 parent a8c8d78
commit d30be87
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/...loudApp/src/main/java/com/owncloud/android/presentation/files/filelist/FileListAdapter.kt b/...loudApp/src/main/java/com/owncloud/android/presentation/files/filelist/FileListAdapter.kt
@@ -188,11 +188,7 @@ class FileListAdapter(
             val fileIcon = holder.itemView.findViewById<ImageView>(R.id.thumbnail).apply {
                 tag = file.id
             }
-            val thumbnail: Bitmap? = if (file.remoteId != null) {
-                ThumbnailsCacheManager.getBitmapFromDiskCache(file.remoteId)
-            } else {
-                null
-            }
+            val thumbnail: Bitmap? = file.remoteId?.let { ThumbnailsCacheManager.getBitmapFromDiskCache(file.remoteId) }
 
             holder.itemView.findViewById<LinearLayout>(R.id.ListItemLayout)?.apply {
                 contentDescription = "LinearLayout-$name"

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
@@ -862,14 +862,8 @@ class FileDisplayActivity : FileActivity(),
                     syncInProgress = true
 
                 } else {
-                    var currentFile: OCFile? = if (file == null)
-                        null
-                    else
-                        storageManager.getFileByPath(file.remotePath, file.spaceId)
-                    val currentDir = if (currentDir == null)
-                        null
-                    else
-                        storageManager.getFileByPath(currentDir!!.remotePath, currentDir.spaceId)
+                    var currentFile: OCFile? = file?.let { storageManager.getFileByPath(file.remotePath, file.spaceId) }
+                    val currentDir = currentDir?.let { storageManager.getFileByPath(currentDir!!.remotePath, currentDir.spaceId) }
 
                     if (currentDir == null) {
                         // current folder was removed from the server

diff --git a/...pp/src/test/java/com/owncloud/android/presentation/sharing/PublicLinkPasswordUtilsTest.kt b/...pp/src/test/java/com/owncloud/android/presentation/sharing/PublicLinkPasswordUtilsTest.kt
@@ -40,7 +40,7 @@ class PublicLinkPasswordUtilsTest {
 
     @Test
     fun `generatePassword creates password fulfilling all policies`() {
-        repeat (1000) {
+        repeat(1000) {
             val password = generatePassword(
                 minChars = minCharacters,
                 maxChars = maxCharacters,