From 4ec0f3d2d82d5bef9b4a2eae05879dd86dd67919 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Mon, 17 May 2021 18:31:33 +0200 Subject: [PATCH] Refactor deprecated toUpperCase / toLowerCase methods --- .../cryptomator/presentation/logging/GeneratedErrorCode.kt | 4 +--- .../presentation/model/comparator/CloudModelComparator.kt | 3 +-- .../presentation/presenter/BrowseFilesPresenter.kt | 2 +- .../presentation/ui/activity/LicenseCheckActivity.kt | 3 +-- .../presentation/ui/activity/VaultListActivity.kt | 3 +-- .../presentation/ui/adapter/BrowseFilesAdapter.kt | 3 +-- .../presentation/ui/bottomsheet/FileSettingsBottomSheet.kt | 3 +-- .../presentation/ui/fragment/TextEditorFragment.kt | 5 ++--- .../main/java/org/cryptomator/presentation/util/FileUtil.kt | 3 +-- 9 files changed, 10 insertions(+), 19 deletions(-) diff --git a/presentation/src/main/java/org/cryptomator/presentation/logging/GeneratedErrorCode.kt b/presentation/src/main/java/org/cryptomator/presentation/logging/GeneratedErrorCode.kt index 27bded58..f43d6817 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/logging/GeneratedErrorCode.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/logging/GeneratedErrorCode.kt @@ -1,7 +1,5 @@ package org.cryptomator.presentation.logging -import java.util.Locale - internal object GeneratedErrorCode { private const val A_PRIME = Int.MAX_VALUE @@ -22,7 +20,7 @@ internal object GeneratedErrorCode { var value = code value = value and 0xfffff xor (value ushr 20) value = value or 0x100000 - return value.toString(32).substring(1).toUpperCase(Locale.getDefault()) + return value.toString(32).substring(1).uppercase() } private fun traceCode(throwable: Throwable?): Int { diff --git a/presentation/src/main/java/org/cryptomator/presentation/model/comparator/CloudModelComparator.kt b/presentation/src/main/java/org/cryptomator/presentation/model/comparator/CloudModelComparator.kt index e9fd6527..fb512f73 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/model/comparator/CloudModelComparator.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/model/comparator/CloudModelComparator.kt @@ -4,13 +4,12 @@ import android.content.Context import org.cryptomator.presentation.model.CloudModel import org.cryptomator.presentation.model.WebDavCloudModel import java.util.Comparator -import java.util.Locale class CloudModelComparator(private val context: Context) : Comparator { override fun compare(o1: CloudModel, o2: CloudModel): Int { return if (o1 is WebDavCloudModel && o2 is WebDavCloudModel) { - o1.url().compareTo(o2.url().toUpperCase(Locale.getDefault()), ignoreCase = true) + o1.url().compareTo(o2.url().uppercase(), ignoreCase = true) } else { context.getString(o1.name()).compareTo(context.getString(o2.name()), ignoreCase = true) } diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt index fb9ac8dd..89a6e577 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt @@ -425,7 +425,7 @@ class BrowseFilesPresenter @Inject constructor( // } private fun viewFile(cloudFile: CloudFileModel) { - val lowerFileName = cloudFile.name.toLowerCase(Locale.getDefault()) + val lowerFileName = cloudFile.name.lowercase() if (lowerFileName.endsWith(".txt") || lowerFileName.endsWith(".md") || lowerFileName.endsWith(".todo")) { startIntent( Intents.textEditorIntent() // diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/LicenseCheckActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/LicenseCheckActivity.kt index da0326f2..2753f76f 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/LicenseCheckActivity.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/LicenseCheckActivity.kt @@ -10,7 +10,6 @@ import org.cryptomator.presentation.presenter.LicenseCheckPresenter import org.cryptomator.presentation.ui.activity.view.UpdateLicenseView import org.cryptomator.presentation.ui.dialog.LicenseConfirmationDialog import org.cryptomator.presentation.ui.dialog.UpdateLicenseDialog -import java.util.Locale import javax.inject.Inject import kotlin.system.exitProcess import kotlinx.android.synthetic.main.toolbar_layout.toolbar @@ -53,7 +52,7 @@ class LicenseCheckActivity : BaseActivity(), UpdateLicenseDialog.Callback, Licen } private fun setupToolbar() { - toolbar.title = getString(R.string.app_name).toUpperCase(Locale.getDefault()) + toolbar.title = getString(R.string.app_name).uppercase() setSupportActionBar(toolbar) } diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/VaultListActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/VaultListActivity.kt index f9a55886..3b5e8bd7 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/VaultListActivity.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/VaultListActivity.kt @@ -28,7 +28,6 @@ import org.cryptomator.presentation.ui.dialog.VaultDeleteConfirmationDialog import org.cryptomator.presentation.ui.dialog.VaultRenameDialog import org.cryptomator.presentation.ui.fragment.VaultListFragment import org.cryptomator.presentation.ui.layout.ObscuredAwareCoordinatorLayout.Listener -import java.util.Locale import javax.inject.Inject import kotlinx.android.synthetic.main.activity_layout_obscure_aware.activityRootView import kotlinx.android.synthetic.main.toolbar_layout.toolbar @@ -100,7 +99,7 @@ class VaultListActivity : BaseActivity(), // } private fun setupToolbar() { - toolbar.title = getString(R.string.app_name).toUpperCase(Locale.getDefault()) + toolbar.title = getString(R.string.app_name).uppercase() setSupportActionBar(toolbar) } diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BrowseFilesAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BrowseFilesAdapter.kt index 3375d9e4..aba523ce 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BrowseFilesAdapter.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BrowseFilesAdapter.kt @@ -29,7 +29,6 @@ import org.cryptomator.presentation.util.ResourceHelper.Companion.getDrawable import org.cryptomator.util.Optional import org.cryptomator.util.SharedPreferencesHandler import java.util.Comparator -import java.util.Locale import javax.inject.Inject import kotlinx.android.synthetic.main.item_browse_files_node.view.cloudNodeImage import kotlinx.android.synthetic.main.item_browse_files_node.view.itemCheckBox @@ -119,7 +118,7 @@ constructor( if (sharedPreferencesHandler.useGlobSearch()) { nodes?.filter { cloudNode -> PatternMatcher(filterText, PatternMatcher.PATTERN_SIMPLE_GLOB).match(cloudNode.name) } } else { - nodes?.filter { cloudNode -> cloudNode.name.toLowerCase(Locale.getDefault()).startsWith(filterText.toLowerCase(Locale.getDefault())) } + nodes?.filter { cloudNode -> cloudNode.name.lowercase().startsWith(filterText.lowercase()) } } } else { nodes diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/FileSettingsBottomSheet.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/FileSettingsBottomSheet.kt index 0afa3de5..e03d706a 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/FileSettingsBottomSheet.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/FileSettingsBottomSheet.kt @@ -6,7 +6,6 @@ import org.cryptomator.generator.BottomSheet import org.cryptomator.presentation.R import org.cryptomator.presentation.model.CloudFileModel import org.cryptomator.presentation.model.CloudNodeModel -import java.util.Locale import kotlinx.android.synthetic.main.dialog_bottom_sheet_file_settings.delete_file import kotlinx.android.synthetic.main.dialog_bottom_sheet_file_settings.export_file import kotlinx.android.synthetic.main.dialog_bottom_sheet_file_settings.iv_file_image @@ -38,7 +37,7 @@ class FileSettingsBottomSheet : BaseBottomSheet { textEditorPresenter.lastFilterLocation -= 1 diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/FileUtil.kt b/presentation/src/main/java/org/cryptomator/presentation/util/FileUtil.kt index 37750ddc..f70df428 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/util/FileUtil.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/util/FileUtil.kt @@ -23,7 +23,6 @@ import java.io.ObjectOutputStream import java.io.OutputStream import java.util.ArrayList import java.util.HashSet -import java.util.Locale import javax.inject.Inject import timber.log.Timber @@ -109,7 +108,7 @@ class FileUtil @Inject constructor(private val context: Context, private val mim private fun fileNameLowerCaseExtension(cloudFile: CloudFileModel): String { val cloudFileName = cloudFile.name val extension = getExtension(cloudFileName) - return if (extension != null) getSimpleFileName(cloudFileName) + "." + extension.toLowerCase(Locale.ROOT) else cloudFileName + return if (extension != null) getSimpleFileName(cloudFileName) + "." + extension.lowercase() else cloudFileName } fun fileInfo(name: String): FileInfo {