From 658a09ea6aa24464b75646f0e82cca51d85d1c5a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 16 Sep 2022 17:50:17 +0200 Subject: [PATCH] No need to use `@SuppressLint("NewApi")` when `@ChecksSdkIntAtLeast` is used. --- .../matrix/android/sdk/api/util/BuildVersionSdkIntProvider.kt | 3 +++ .../features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/BuildVersionSdkIntProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/BuildVersionSdkIntProvider.kt index acbf9ca061..c8c328c92c 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/BuildVersionSdkIntProvider.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/BuildVersionSdkIntProvider.kt @@ -34,4 +34,7 @@ interface BuildVersionSdkIntProvider { result() } else null } + + @ChecksSdkIntAtLeast(parameter = 0) + fun isAtLeast(version: Int) = get() >= version } diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt index bb55ceb1b7..84e98785f4 100644 --- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt +++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt @@ -36,14 +36,13 @@ class LockScreenKeysMigrator @Inject constructor( /** * Performs any needed migrations in order. */ - @SuppressLint("NewApi") suspend fun migrateIfNeeded() { if (legacyPinCodeMigrator.isMigrationNeeded()) { legacyPinCodeMigrator.migrate() missingSystemKeyMigrator.migrateIfNeeded() } - if (systemKeyV1Migrator.isMigrationNeeded() && versionProvider.get() >= Build.VERSION_CODES.M) { + if (systemKeyV1Migrator.isMigrationNeeded() && versionProvider.isAtLeast(Build.VERSION_CODES.M)) { systemKeyV1Migrator.migrate() } }