clean klint

matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTest.kt

@@ -25,7 +25,14 @@ import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener
-import im.vector.matrix.android.common.*
+import im.vector.matrix.android.common.CommonTestHelper
+import im.vector.matrix.android.common.CryptoTestData
+import im.vector.matrix.android.common.CryptoTestHelper
+import im.vector.matrix.android.common.SessionTestParams
+import im.vector.matrix.android.common.TestConstants
+import im.vector.matrix.android.common.TestMatrixCallback
+import im.vector.matrix.android.common.assertDictEquals
+import im.vector.matrix.android.common.assertListEquals
 import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP
 import im.vector.matrix.android.internal.crypto.MegolmSessionData
 import im.vector.matrix.android.internal.crypto.OutgoingRoomKeyRequest
@@ -36,12 +43,18 @@ import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersio
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
 import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
 import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrapper
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Assert.fail
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
-import java.util.*
+import java.util.ArrayList
+import java.util.Collections
 import java.util.concurrent.CountDownLatch
 
 @RunWith(AndroidJUnit4::class)
@@ -298,7 +311,10 @@ class KeysBackupTest : InstrumentedTest {
         val decryption = keysBackup.pkDecryptionFromRecoveryKey(keyBackupCreationInfo.recoveryKey)
         assertNotNull(decryption)
         // - Check decryptKeyBackupData() returns stg
-        val sessionData = keysBackup.decryptKeyBackupData(keyBackupData, session.olmInboundGroupSession!!.sessionIdentifier(), cryptoTestData.roomId, decryption!!)
+        val sessionData = keysBackup
+                .decryptKeyBackupData(keyBackupData,
+                        session.olmInboundGroupSession!!.sessionIdentifier(),
+                        cryptoTestData.roomId, decryption!!)
         assertNotNull(sessionData)
         // - Compare the decrypted megolm key with the original one
         assertKeysEquals(session.exportKeys(), sessionData)

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/crosssigning/CrossSigningService.kt

@@ -21,7 +21,6 @@ import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.util.Optional
 import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustResult
 import im.vector.matrix.android.internal.crypto.crosssigning.UserTrustResult
-import im.vector.matrix.android.internal.crypto.model.rest.SignatureUploadResponse
 import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
 
 interface CrossSigningService {

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationTransaction.kt

@@ -33,5 +33,4 @@ interface SasVerificationTransaction : VerificationTransaction {
     fun userHasVerifiedShortCode()
 
     fun shortCodeDoesNotMatch()
-
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/VerificationService.kt

@@ -52,7 +52,11 @@ interface VerificationService {
     /**
      * Request a key verification from another user using toDevice events.
      */
-    fun requestKeyVerificationInDMs(methods: List<VerificationMethod>, otherUserId: String, roomId: String, localId: String? = LocalEcho.createLocalEchoId()): PendingVerificationRequest
+    fun requestKeyVerificationInDMs(methods: List<VerificationMethod>,
+                                    otherUserId: String,
+                                    roomId: String,
+                                    localId: String? = LocalEcho.createLocalEchoId()
+    ): PendingVerificationRequest
 
     fun declineVerificationRequestInDMs(otherUserId: String, otherDeviceId: String, transactionId: String, roomId: String)
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt

@@ -16,7 +16,6 @@
 
 package im.vector.matrix.android.internal.crypto
 
-import com.zhuinden.monarchy.Monarchy
 import dagger.Binds
 import dagger.Module
 import dagger.Provides

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt

@@ -155,7 +155,6 @@ internal class DefaultCryptoService @Inject constructor(
         private val cryptoCoroutineScope: CoroutineScope
 ) : CryptoService {
 
-
     init {
         verificationService.cryptoService = this
     }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/DefaultCrossSigningService.kt

@@ -27,7 +27,6 @@ import im.vector.matrix.android.internal.crypto.MXOlmDevice
 import im.vector.matrix.android.internal.crypto.MyDeviceInfoHolder
 import im.vector.matrix.android.internal.crypto.model.CryptoCrossSigningKey
 import im.vector.matrix.android.internal.crypto.model.KeyUsage
-import im.vector.matrix.android.internal.crypto.model.rest.KeysQueryResponse
 import im.vector.matrix.android.internal.crypto.model.rest.UploadSignatureQueryBuilder
 import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
 import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
@@ -584,8 +583,13 @@ internal class DefaultCrossSigningService @Inject constructor(
          */
 
         val otherSSKSignature = otherDevice.signatures?.get(otherUserId)?.get("ed25519:${otherKeys.selfSigningKey()?.unpaddedBase64PublicKey}")
-                ?: return legacyFallbackTrust(locallyTrusted, DeviceTrustResult.MissingDeviceSignature(otherDeviceId, otherKeys.selfSigningKey()?.unpaddedBase64PublicKey
+                ?: return legacyFallbackTrust(
-                        ?: ""))
+                        locallyTrusted,
+                        DeviceTrustResult.MissingDeviceSignature(otherDeviceId, otherKeys.selfSigningKey()
+                                ?.unpaddedBase64PublicKey
+                                ?: ""
+                        )
+                )
 
         // Check  bob's device is signed by bob's SSK
         try {
@@ -606,7 +610,6 @@ internal class DefaultCrossSigningService @Inject constructor(
     }
 
     override fun onUsersDeviceUpdate(users: List<String>) {
-
         Timber.d("## CrossSigning - onUsersDeviceUpdate for ${users.size} users")
         users.forEach { otherUserId ->
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UploadSignatureQueryBuilder.kt

@@ -38,7 +38,11 @@ data class UploadSignatureQueryBuilder(
     fun build(): Map<String, Map<String, @JvmSuppressWildcards Any>> {
         val map = HashMap<String, HashMap<String, Any>>()
 
-        val usersList = (deviceInfoList.map { it.userId } + signingKeyInfoList.mapNotNull { it.userId }).distinct()
+        val usersList = (
+                deviceInfoList.map { it.userId }
+                        + signingKeyInfoList
+                        .map { it.userId }
+                ).distinct()
 
         usersList.forEach { userID ->
             val userMap = HashMap<String, Any>()

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt

@@ -365,7 +365,11 @@ internal class RealmCryptoStore(private val realmConfiguration: RealmConfigurati
 
     override fun getLiveDeviceList(userId: String): LiveData<List<CryptoDeviceInfo>> {
         val liveData = monarchy.findAllMappedWithChanges(
-                { realm: Realm -> realm.where<UserEntity>().equalTo(UserEntityFields.USER_ID, userId) },
+                { realm: Realm ->
+                    realm
+                            .where<UserEntity>()
+                            .equalTo(UserEntityFields.USER_ID, userId)
+                },
                 { entity ->
                     entity.devices.map { CryptoMapper.mapToModel(it) }
                 }
@@ -969,7 +973,10 @@ internal class RealmCryptoStore(private val realmConfiguration: RealmConfigurati
 
     override fun getLiveCrossSigningInfo(userId: String): LiveData<Optional<MXCrossSigningInfo>> {
         val liveData = monarchy.findAllMappedWithChanges(
-                { realm: Realm -> realm.where<CrossSigningInfoEntity>().equalTo(UserEntityFields.USER_ID, userId) },
+                { realm: Realm ->
+                    realm.where<CrossSigningInfoEntity>()
+                            .equalTo(UserEntityFields.USER_ID, userId)
+                },
                 { entity ->
                     MXCrossSigningInfo(
                             userId = userId,

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreMigration.kt

@@ -49,7 +49,6 @@ internal object RealmCryptoStoreMigration : RealmMigration {
                     .addField(TrustLevelEntityFields.LOCALLY_VERIFIED, Boolean::class.java)
                     .setNullable(TrustLevelEntityFields.LOCALLY_VERIFIED, true)
 
-
             val keyInfoEntitySchema = realm.schema.create("KeyInfoEntity")
                     .addField(KeyInfoEntityFields.PUBLIC_KEY_BASE64, String::class.java)
                     .addField(KeyInfoEntityFields.SIGNATURES, String::class.java)

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/UploadSignaturesTask.kt

@@ -34,8 +34,7 @@ internal class DefaultUploadSignaturesTask @Inject constructor(
         private val eventBus: EventBus
 ) : UploadSignaturesTask {
 
-    override suspend fun execute(params: UploadSignaturesTask.Params): Unit {
+    override suspend fun execute(params: UploadSignaturesTask.Params) {
-
         try {
             val response = executeRequest<SignatureUploadResponse>(eventBus) {
                 apiCall = cryptoApi.uploadSignatures(params.signatures)

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt

@@ -400,8 +400,9 @@ internal class DefaultVerificationService @Inject constructor(
                                     ?.filterIsInstance(SasVerificationTransaction::class.java)
                                     ?.takeIf { it.isNotEmpty() }
                                     ?.also {
-                                        // Multiple keyshares between two devices: any two devices may only have at most one key verification in flight at a time.
+                                        // Multiple keyshares between two devices:
-                                        Timber.v("## SAS onStartRequestReceived - There is already a transaction with this user ${startReq.transactionID}")
+                                        // any two devices may only have at most one key verification in flight at a time.
+                                        Timber.v("## SAS onStartRequestReceived - Already a transaction with this user ${startReq.transactionID}")
                                     }
                                     ?.forEach {
                                         it.cancel(CancelCode.UnexpectedMessage)
@@ -882,7 +883,9 @@ internal class DefaultVerificationService @Inject constructor(
         val methodValues = if (crossSigningService.isCrossSigningEnabled()) {
             // Add reciprocate method if application declares it can scan or show QR codes
             // Not sure if it ok to do that (?)
-            val reciprocateMethod = methods.firstOrNull { it == VerificationMethod.QR_CODE_SCAN || it == VerificationMethod.QR_CODE_SHOW }?.let { listOf(VERIFICATION_METHOD_RECIPROCATE) }.orEmpty()
+            val reciprocateMethod = methods
+                    .firstOrNull { it == VerificationMethod.QR_CODE_SCAN || it == VerificationMethod.QR_CODE_SHOW }
+                    ?.let { listOf(VERIFICATION_METHOD_RECIPROCATE) }.orEmpty()
             methods.map { it.toValue() } + reciprocateMethod
         } else {
             // Filter out SCAN and SHOW qr code method

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SASDefaultVerificationTransaction.kt

@@ -27,7 +27,6 @@ import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.internal.crypto.actions.SetDeviceVerificationAction
 import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
 import im.vector.matrix.android.internal.crypto.model.MXKey
-import im.vector.matrix.android.internal.crypto.model.rest.SignatureUploadResponse
 import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
 import im.vector.matrix.android.internal.extensions.toUnsignedInt
 import im.vector.matrix.android.internal.util.withoutPrefix

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt

@@ -24,7 +24,6 @@ import im.vector.matrix.android.api.session.crypto.sas.VerificationTxState
 import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.internal.crypto.actions.SetDeviceVerificationAction
 import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.rest.SignatureUploadResponse
 import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
 import im.vector.matrix.android.internal.crypto.verification.DefaultVerificationTransaction
 import im.vector.matrix.android.internal.crypto.verification.VerificationInfo
@@ -135,7 +134,6 @@ internal class DefaultQrCodeVerificationTransaction(
                     }
                 }
             }
-
         }
 
         if (!canTrustOtherUserMasterKey && toVerifyDeviceIds.isEmpty()) {

vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemWithValue.kt

@@ -66,7 +66,6 @@ abstract class GenericItemWithValue : VectorEpoxyModel<GenericItemWithValue.Hold
             holder.titleIcon.isVisible = false
         }
 
-
         holder.valueText.setTextOrHide(value)
 
         if (valueColorInt != null) {

vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt

@@ -139,7 +139,9 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(@Assisted ini
                                 copy(
                                         roomId = data,
                                         pendingRequest = Success(
-                                                session.getVerificationService().requestKeyVerificationInDMs(supportedVerificationMethods, otherUserId, data, pendingLocalId)
+                                                session
+                                                        .getVerificationService()
+                                                        .requestKeyVerificationInDMs(supportedVerificationMethods, otherUserId, data, pendingLocalId)
                                         )
                                 )
                             }
@@ -153,7 +155,12 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(@Assisted ini
                     })
                 } else {
                     setState {
-                        copy(pendingRequest = Success(session.getVerificationService().requestKeyVerificationInDMs(supportedVerificationMethods, otherUserId, roomId)))
+                        copy(
+                                pendingRequest = Success(session
+                                        .getVerificationService()
+                                        .requestKeyVerificationInDMs(supportedVerificationMethods, otherUserId, roomId)
+                                )
+                        )
                     }
                 }
             }

vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestFragment.kt

@@ -17,7 +17,6 @@ package im.vector.riotx.features.crypto.verification.request
 
 import android.os.Bundle
 import android.view.View
-import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.riotx.R
@@ -42,7 +41,6 @@ class VerificationRequestFragment @Inject constructor(
         setupRecyclerView()
     }
 
-
     override fun onDestroyView() {
         bottomSheetVerificationRecyclerView.cleanup()
         controller.listener = null

vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt

@@ -120,7 +120,6 @@ object PopupAlertManager {
         }
         currentAlerter = next
         next?.let {
-
             if (next.shouldBeDisplayedIn?.invoke(currentActivity) == false) return
             val currentTime = System.currentTimeMillis()
             if (next.expirationTimestamp != null && currentTime > next.expirationTimestamp!!) {

vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileFragment.kt

@@ -101,7 +101,6 @@ class RoomMemberProfileFragment @Inject constructor(
                     }
                 }
             }
-
         }
     }
 
@@ -148,31 +147,8 @@ class RoomMemberProfileFragment @Inject constructor(
 
     override fun onTapVerify() {
         viewModel.handle(RoomMemberProfileAction.VerifyUser())
-//        if (state.isRoomEncrypted) {
-//            if( !state.isMine && state.userMXCrossSigningInfo?.isTrusted == false) {
-//                // we want to verify
-//                // TODO do not use current room, find or create DM
-//                VerificationBottomSheet.withArgs(
-//                        state.roomId,
-//                        state.userId
-//                ).show(parentFragmentManager, "REQ")
-//            }
-//        }
     }
 
-//    override fun onTapVerify() = withState(viewModel) { state ->
-//        if (state.isRoomEncrypted) {
-//            if( !state.isMine && state.userMXCrossSigningInfo?.isTrusted == false) {
-//                // we want to verify
-//                // TODO do not use current room, find or create DM
-//                VerificationBottomSheet.withArgs(
-//                        state.roomId,
-//                        state.userId
-//                ).show(parentFragmentManager, "REQ")
-//            }
-//        }
-//    }
-
     override fun onShowDeviceList() = withState(viewModel) {
         DeviceListBottomSheet.newInstance(it.userId).show(parentFragmentManager, "DEV_LIST")
     }

vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewModel.kt

@@ -48,9 +48,7 @@ import im.vector.matrix.rx.unwrap
 import im.vector.riotx.R
 import im.vector.riotx.core.platform.VectorViewModel
 import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.DataSource
 import im.vector.riotx.core.utils.LiveEvent
-import im.vector.riotx.core.utils.PublishDataSource
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import kotlinx.coroutines.Dispatchers
@@ -149,7 +147,6 @@ class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private v
                 )
             }
         }
-
     }
 
     private fun observeRoomMemberSummary(room: Room) {

vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewState.kt

@@ -23,7 +23,6 @@ import com.airbnb.mvrx.Uninitialized
 import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
 import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
 import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
 
 data class RoomMemberProfileViewState(
         val userId: String,

vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListEpoxyController.kt

@@ -55,7 +55,6 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
         }
         when (data.cryptoDevices) {
             Uninitialized -> {
-
             }
             is Loading    -> {
                 loadingItem {
@@ -64,12 +63,10 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
                 }
             }
             is Success    -> {
-
                 val deviceList = data.cryptoDevices.invoke().sortedByDescending {
                     it.isVerified
                 }
 
-
                 // Build top header
                 val allGreen = deviceList.fold(true, { prev, device ->
                     prev && device.isVerified
@@ -96,7 +93,6 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
                     id("sessions")
                     style(GenericItem.STYLE.BIG_TEXT)
                     title(stringProvider.getString(R.string.room_member_profile_sessions_section_title))
-
                 }
                 if (deviceList.isEmpty()) {
                     // Can this really happen?

vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt

@@ -34,7 +34,6 @@ class DeviceTrustInfoActionFragment @Inject constructor(
         val epoxyController: DeviceTrustInfoEpoxyController
 ) : VectorBaseFragment(), DeviceTrustInfoEpoxyController.InteractionListener {
 
-
     override fun getLayoutResId() = R.layout.bottom_sheet_generic_list
 
     private val viewModel: DeviceListBottomSheetViewModel by parentFragmentViewModel(DeviceListBottomSheetViewModel::class)
@@ -66,5 +65,3 @@ class DeviceTrustInfoActionFragment @Inject constructor(
         viewModel.manuallyVerify(device)
     }
 }
-
-

vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningEpoxyController.kt

@@ -118,7 +118,6 @@ class CrossSigningEpoxyController @Inject constructor(
                 id("loading")
             }
         } else {
-
             val crossSigningKeys = data.crossSigningInfo
 
             crossSigningKeys?.masterKey()?.let {

vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsFragment.kt

@@ -122,4 +122,3 @@ class CrossSigningSettingsFragment @Inject constructor(
         viewModel.handle(CrossSigningAction.InitializeCrossSigning())
     }
 }
-

vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewModel.kt

@@ -99,7 +99,6 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(@Assisted privat
             copy(isUploadingKeys = true)
         }
         session.getCrossSigningService().initializeCrossSigning(auth, object : MatrixCallback<Unit> {
-
             override fun onSuccess(data: Unit) {
                 setState {
                     copy(isUploadingKeys = false)

vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceItem.kt

@@ -17,7 +17,6 @@
 package im.vector.riotx.features.settings.devices
 
 import android.graphics.Typeface
-import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
@@ -110,7 +109,6 @@ abstract class DeviceItem : VectorEpoxyModel<DeviceItem.Holder>() {
                 it.isVisible = false
             }
         }
-
     }
 
     class Holder : VectorEpoxyHolder() {

vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheet.kt

@@ -91,5 +91,4 @@ class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(),
         dismiss()
         sharedViewModel.handle(action)
     }
-
 }

vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt

@@ -47,7 +47,8 @@ class DeviceVerificationInfoBottomSheetViewModel @AssistedInject constructor(@As
     companion object : MvRxViewModelFactory<DeviceVerificationInfoBottomSheetViewModel, DeviceVerificationInfoBottomSheetViewState> {
 
         @JvmStatic
-        override fun create(viewModelContext: ViewModelContext, state: DeviceVerificationInfoBottomSheetViewState): DeviceVerificationInfoBottomSheetViewModel? {
+        override fun create(viewModelContext: ViewModelContext, state: DeviceVerificationInfoBottomSheetViewState)
+                : DeviceVerificationInfoBottomSheetViewModel? {
             val fragment: DeviceVerificationInfoBottomSheet = (viewModelContext as FragmentViewModelContext).fragment()
             return fragment.deviceVerificationInfoViewModelFactory.create(state)
         }

vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoEpoxyController.kt

@@ -22,11 +22,9 @@ import im.vector.riotx.core.epoxy.dividerItem
 import im.vector.riotx.core.epoxy.loadingItem
 import im.vector.riotx.core.resources.ColorProvider
 import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.resources.UserPreferencesProvider
 import im.vector.riotx.core.ui.list.GenericItem
 import im.vector.riotx.core.ui.list.genericItem
 import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
-import im.vector.riotx.features.home.AvatarRenderer
 import javax.inject.Inject
 
 class DeviceVerificationInfoEpoxyController @Inject constructor(private val stringProvider: StringProvider,
@@ -43,7 +41,6 @@ class DeviceVerificationInfoEpoxyController @Inject constructor(private val stri
                 id("loading")
             }
         } else {
-
             if (device.isVerified) {
                 genericItem {
                     id("trust${device.deviceId}")

vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesController.kt

@@ -29,7 +29,6 @@ import im.vector.riotx.core.epoxy.errorWithRetryItem
 import im.vector.riotx.core.epoxy.loadingItem
 import im.vector.riotx.core.error.ErrorFormatter
 import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.genericFooterItem
 import im.vector.riotx.core.ui.list.genericItemHeader
 import im.vector.riotx.features.settings.VectorPreferences
 import javax.inject.Inject
@@ -97,7 +96,6 @@ class DevicesController @Inject constructor(private val errorFormatter: ErrorFor
 
         // Other devices
         if (devices.size > 1) {
-
             genericItemHeader {
                 id("others")
                 text(stringProvider.getString(R.string.devices_other_devices))