[Refactor] Use Kotlin String?.orEmpty().

zhanghai · Nov 28, 2023 · 62eda8f · 62eda8f
1 parent a872204
commit 62eda8f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/...a/me/zhanghai/android/files/fileproperties/permissions/SetSeLinuxContextDialogFragment.kt b/...a/me/zhanghai/android/files/fileproperties/permissions/SetSeLinuxContextDialogFragment.kt
@@ -66,7 +66,7 @@ class SetSeLinuxContextDialogFragment : AppCompatDialogFragment() {
     private val argsSeLinuxContext: String
         get() {
             val attributes = args.file.attributes as PosixFileAttributes
-            return attributes.seLinuxContext()?.toString() ?: ""
+            return attributes.seLinuxContext()?.toString().orEmpty()
         }
 
     private fun restoreSeLinuxContext() {

diff --git a/app/src/main/java/me/zhanghai/android/files/provider/archive/LocalArchiveFileSystem.kt b/app/src/main/java/me/zhanghai/android/files/provider/archive/LocalArchiveFileSystem.kt
@@ -106,7 +106,7 @@ internal class LocalArchiveFileSystem(
             if (!entry.isSymbolicLink) {
                 throw NotLinkException(link.toString())
             }
-            entry.symbolicLinkTarget ?: ""
+            entry.symbolicLinkTarget.orEmpty()
         }
 
     fun addPassword(password: String) {

diff --git a/app/src/main/java/me/zhanghai/android/files/provider/common/UriAuthority.kt b/app/src/main/java/me/zhanghai/android/files/provider/common/UriAuthority.kt
@@ -16,7 +16,7 @@ data class UriAuthority(
             throw IllegalArgumentException(e)
         }
         // URI.getRawAuthority() returns null when authority is empty.
-        return uri.rawAuthority ?: ""
+        return uri.rawAuthority.orEmpty()
     }
 
     // toString() is called by UI when the URI may not be valid, so build the string manually.

diff --git a/app/src/main/java/me/zhanghai/android/files/provider/ftp/FtpFileSystemProvider.kt b/app/src/main/java/me/zhanghai/android/files/provider/ftp/FtpFileSystemProvider.kt
@@ -110,7 +110,7 @@ object FtpFileSystemProvider : FileSystemProvider(), PathObservableProvider, Sea
         get() {
             val protocol = Protocol.fromScheme(scheme)
             val port = if (port != -1) port else protocol.defaultPort
-            val username = userInfo ?: ""
+            val username = userInfo.orEmpty()
             val queryUri = decodedQueryByteString?.toString()?.let { Uri.parse(it) }
             val mode = queryUri?.getQueryParameter(FtpPath.QUERY_PARAMETER_MODE)
                 ?.let { mode -> Mode.entries.first { it.name.equals(mode, true) } }

diff --git a/app/src/main/java/me/zhanghai/android/files/provider/sftp/SftpFileSystemProvider.kt b/app/src/main/java/me/zhanghai/android/files/provider/sftp/SftpFileSystemProvider.kt
@@ -108,7 +108,7 @@ object SftpFileSystemProvider : FileSystemProvider(), PathObservableProvider, Se
     private val URI.sftpAuthority: Authority
         get() {
             val port = if (port != -1) port else Authority.DEFAULT_PORT
-            val username = userInfo ?: ""
+            val username = userInfo.orEmpty()
             return Authority(host, port, username)
         }
 

diff --git a/app/src/main/java/me/zhanghai/android/files/provider/smb/SmbFileSystemProvider.kt b/app/src/main/java/me/zhanghai/android/files/provider/smb/SmbFileSystemProvider.kt
@@ -107,7 +107,7 @@ object SmbFileSystemProvider : FileSystemProvider(), PathObservableProvider, Sea
     private val URI.smbAuthority: Authority
         get() {
             val port = if (port != -1) port else Authority.DEFAULT_PORT
-            val userInfo = userInfo ?: ""
+            val userInfo = userInfo.orEmpty()
             val domainSeparatorIndex = userInfo.indexOf('\\')
             val username: String
             val domain: String?

diff --git a/app/src/main/java/me/zhanghai/android/files/util/AddressExtensions.kt b/app/src/main/java/me/zhanghai/android/files/util/AddressExtensions.kt
@@ -22,6 +22,6 @@ val Address.addressLines: Iterable<String?>
 // @see com.android.documentsui.inspector.MediaView.getAddress
 val Address.userFriendlyString: String?
     get() =
-        addressLines.joinToString("\n") { it ?: "" }.takeIfNotBlank()
+        addressLines.joinToString("\n") { it.orEmpty() }.takeIfNotBlank()
             ?: locality.takeIfNotBlank() ?: subAdminArea.takeIfNotBlank()
             ?: adminArea.takeIfNotBlank() ?: countryName.takeIfNotBlank()