mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-18 13:00:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix warning 1.5: 'toUpperCase(Locale): String' and 'toLowerCase(Locale): String' are deprecated

Browse source
This commit is contained in:
Benoit Marty 2021-05-14 12:47:53 +02:00
parent 7a28be941c
commit c70445a9a1
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
View file

@ -132,7 +132,7 @@ sealed class MatrixItem(
dn.substring(startIndex, startIndex + length) dn.substring(startIndex, startIndex + length)
} }
.toUpperCase(Locale.ROOT) .uppercase(Locale.ROOT)
} }
companion object { companion object {

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
View file

@ -345,7 +345,7 @@ internal abstract class SASDefaultVerificationTransaction(
} }
protected fun hashUsingAgreedHashMethod(toHash: String): String? { protected fun hashUsingAgreedHashMethod(toHash: String): String? {
if ("sha256" == accepted?.hash?.toLowerCase(Locale.ROOT)) { if ("sha256" == accepted?.hash?.lowercase(Locale.ROOT)) {
val olmUtil = OlmUtility() val olmUtil = OlmUtility()
val hashBytes = olmUtil.sha256(toHash) val hashBytes = olmUtil.sha256(toHash)
olmUtil.releaseUtility() olmUtil.releaseUtility()
@ -355,7 +355,7 @@ internal abstract class SASDefaultVerificationTransaction(
} }
private fun macUsingAgreedMethod(message: String, info: String): String? { private fun macUsingAgreedMethod(message: String, info: String): String? {
return when (accepted?.messageAuthenticationCode?.toLowerCase(Locale.ROOT)) { return when (accepted?.messageAuthenticationCode?.lowercase(Locale.ROOT)) {
SAS_MAC_SHA256_LONGKDF -> getSAS().calculateMacLongKdf(message, info) SAS_MAC_SHA256_LONGKDF -> getSAS().calculateMacLongKdf(message, info)
SAS_MAC_SHA256 -> getSAS().calculateMac(message, info) SAS_MAC_SHA256 -> getSAS().calculateMac(message, info)
else -> null else -> null

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
View file

@ -117,7 +117,7 @@ internal class DefaultIdentityBulkLookupTask @Inject constructor(
return withOlmUtility { olmUtility -> return withOlmUtility { olmUtility ->
threePids.map { threePid -> threePids.map { threePid ->
base64ToBase64Url( base64ToBase64Url(
olmUtility.sha256(threePid.value.toLowerCase(Locale.ROOT) olmUtility.sha256(threePid.value.lowercase(Locale.ROOT)
+ " " + threePid.toMedium() + " " + pepper) + " " + threePid.toMedium() + " " + pepper)
) )
} }

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt
View file

@ -27,7 +27,7 @@ fun String.md5() = try {
digest.update(toByteArray()) digest.update(toByteArray())
digest.digest() digest.digest()
.joinToString("") { String.format("%02X", it) } .joinToString("") { String.format("%02X", it) }
.toLowerCase(Locale.ROOT) .lowercase(Locale.ROOT)
} catch (exc: Exception) { } catch (exc: Exception) {
// Should not happen, but just in case // Should not happen, but just in case
hashCode().toString() hashCode().toString()

2
vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt
View file

@ -45,7 +45,7 @@ fun getMimeTypeFromUri(context: Context, uri: Uri): String? {
if (null != mimeType) { if (null != mimeType) {
// the mimetype is sometimes in uppercase. // the mimetype is sometimes in uppercase.
mimeType = mimeType.toLowerCase(Locale.ROOT) mimeType = mimeType.lowercase(Locale.ROOT)
} }
} catch (e: Exception) { } catch (e: Exception) {
Timber.e(e, "Failed to open resource input stream") Timber.e(e, "Failed to open resource input stream")

2
vector/src/main/java/im/vector/app/core/utils/FileUtils.kt
View file

@ -112,7 +112,7 @@ fun getFileExtension(fileUri: String): String? {
val ext = filename.substring(dotPos + 1) val ext = filename.substring(dotPos + 1)
if (ext.isNotBlank()) { if (ext.isNotBlank()) {
return ext.toLowerCase(Locale.ROOT) return ext.lowercase(Locale.ROOT)
} }
} }
} }

2
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
View file

@ -449,7 +449,7 @@ class RoomDetailViewModel @AssistedInject constructor(
widgetSessionId = widgetSessionId.substring(0, 7) widgetSessionId = widgetSessionId.substring(0, 7)
} }
val roomId: String = room.roomId val roomId: String = room.roomId
val confId = roomId.substring(1, roomId.indexOf(":") - 1) + widgetSessionId.toLowerCase(VectorLocale.applicationLocale) val confId = roomId.substring(1, roomId.indexOf(":") - 1) + widgetSessionId.lowercase(VectorLocale.applicationLocale)
val preferredJitsiDomain = tryOrNull { val preferredJitsiDomain = tryOrNull {
rawService.getElementWellknown(session.myUserId) rawService.getElementWellknown(session.myUserId)

2
vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
View file

@ -181,7 +181,7 @@ object VectorLocale {
} }
} }
// sort by human display names // sort by human display names
.sortedBy { localeToLocalisedString(it).toLowerCase(it) } .sortedBy { localeToLocalisedString(it).lowercase(it) }
supportedLocales.clear() supportedLocales.clear()
supportedLocales.addAll(list) supportedLocales.addAll(list)