From fbb23dfb66666fd7475702e59e3490cb493ecd10 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 9 Oct 2019 16:43:12 +0200 Subject: [PATCH] ktlint: fix (no-empty-first-line-in-method-block) issues --- .editorconfig | 1 + .../matrix/android/internal/auth/DefaultAuthenticator.kt | 1 - .../im/vector/matrix/android/internal/crypto/MXOlmDevice.kt | 2 -- .../matrix/android/internal/crypto/keysbackup/KeysBackup.kt | 1 - .../android/internal/database/helper/ChunkEntityHelper.kt | 1 - .../matrix/android/internal/database/mapper/PushersMapper.kt | 1 - .../internal/database/query/TimelineEventEntityQueries.kt | 2 -- .../internal/session/content/DefaultContentUrlResolver.kt | 1 - .../matrix/android/internal/session/filter/FilterUtil.kt | 1 - .../android/internal/session/pushers/AddHttpPusherWorker.kt | 1 - .../android/internal/session/pushers/DefaultPusherService.kt | 1 - .../internal/session/room/EventRelationsAggregationTask.kt | 1 - .../android/internal/session/room/read/DefaultReadService.kt | 1 - .../internal/session/room/relation/DefaultRelationService.kt | 1 - .../session/room/timeline/TokenChunkEventPersistor.kt | 2 -- .../internal/session/securestorage/SecretStoringUtils.kt | 3 --- .../matrix/android/internal/session/sync/RoomSyncHandler.kt | 3 --- .../matrix/android/internal/session/sync/job/SyncThread.kt | 1 - .../im/vector/matrix/android/internal/task/TaskExecutor.kt | 2 -- .../im/vector/matrix/android/internal/util/CompatUtil.kt | 1 - .../im/vector/matrix/android/internal/util/LiveDataUtils.kt | 1 - .../matrix/android/api/pushrules/PushrulesConditionTest.kt | 1 - .../settings/troubleshoot/TestBatteryOptimization.kt | 1 - .../riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt | 1 - .../riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt | 1 - vector/src/main/java/im/vector/riotx/EmojiCompatWrapper.kt | 1 - vector/src/main/java/im/vector/riotx/VectorApplication.kt | 1 - .../main/java/im/vector/riotx/core/extensions/EditText.kt | 1 - .../java/im/vector/riotx/core/ui/list/GenericFooterItem.kt | 1 - .../im/vector/riotx/core/utils/ExternalApplicationsUtil.kt | 1 - .../im/vector/riotx/features/crypto/keys/KeysExporter.kt | 1 - .../keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt | 1 - .../restore/KeysBackupRestoreFromPassphraseViewModel.kt | 1 - .../crypto/keysbackup/setup/KeysBackupSetupActivity.kt | 1 - .../riotx/features/home/room/detail/RoomDetailFragment.kt | 3 --- .../features/home/room/detail/composer/TextComposerView.kt | 2 -- .../room/detail/timeline/action/MessageActionsBottomSheet.kt | 1 - .../home/room/detail/timeline/action/MessageMenuViewModel.kt | 1 - .../home/room/detail/timeline/factory/DefaultItemFactory.kt | 1 - .../room/detail/timeline/factory/EncryptionItemFactory.kt | 1 - .../room/detail/timeline/factory/MergedHeaderItemFactory.kt | 1 - .../home/room/detail/timeline/factory/MessageItemFactory.kt | 5 ----- .../home/room/detail/timeline/factory/NoticeItemFactory.kt | 1 - .../home/room/detail/timeline/factory/TimelineItemFactory.kt | 1 - .../timeline/helper/ContentUploadStateTrackerBinder.kt | 1 - .../detail/timeline/helper/MessageItemAttributesFactory.kt | 1 - .../vector/riotx/features/login/LoginSsoFallbackFragment.kt | 1 - .../im/vector/riotx/features/media/VideoContentRenderer.kt | 2 -- .../riotx/features/notifications/NotifiableEventResolver.kt | 2 -- .../features/notifications/NotificationBroadcastReceiver.kt | 1 - .../features/notifications/NotificationDrawerManager.kt | 1 - .../vector/riotx/features/notifications/NotificationUtils.kt | 1 - .../java/im/vector/riotx/features/popup/PopupAlertManager.kt | 1 - .../java/im/vector/riotx/features/rageshake/BugReporter.kt | 1 - .../riotx/features/reactions/EmojiReactionPickerActivity.kt | 1 - .../vector/riotx/features/reactions/widget/ReactionButton.kt | 1 - .../features/settings/VectorSettingsHelpAboutFragment.kt | 1 - .../settings/VectorSettingsNotificationPreferenceFragment.kt | 2 -- .../VectorSettingsNotificationsTroubleshootFragment.kt | 1 - .../settings/VectorSettingsSecurityPrivacyFragment.kt | 2 -- .../NotificationTroubleshootRecyclerViewAdapter.kt | 1 - .../features/settings/troubleshoot/TestAccountSettings.kt | 1 - .../features/settings/troubleshoot/TestDeviceSettings.kt | 1 - 63 files changed, 1 insertion(+), 81 deletions(-) diff --git a/.editorconfig b/.editorconfig index 7e805e52d8..074c8e40e7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -29,3 +29,4 @@ disabled_rules=no-wildcard-imports,no-multi-spaces,colon-spacing,chain-wrapping, # no-semi # no-empty-class-body # experimental:multiline-if-else +# experimental:no-empty-first-line-in-method-block diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt index d52b47f081..e379090677 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt @@ -98,7 +98,6 @@ internal class DefaultAuthenticator @Inject constructor(@Unauthenticated private suspend fun authenticate(homeServerConnectionConfig: HomeServerConnectionConfig, login: String, password: String) = withContext(coroutineDispatchers.io) { - val authAPI = buildAuthAPI(homeServerConnectionConfig) val loginParams = if (Patterns.EMAIL_ADDRESS.matcher(login).matches()) { PasswordLoginParams.thirdPartyIdentifier(ThreePidMedium.EMAIL, login, password, "Mobile") diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXOlmDevice.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXOlmDevice.kt index 057e217933..9655806b2d 100755 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXOlmDevice.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXOlmDevice.kt @@ -234,7 +234,6 @@ internal class MXOlmDevice @Inject constructor( * @return {{payload: string, session_id: string}} decrypted payload, and session id of new session. */ fun createInboundSession(theirDeviceIdentityKey: String, messageType: Int, ciphertext: String): Map? { - Timber.v("## createInboundSession() : theirIdentityKey: $theirDeviceIdentityKey") var olmSession: OlmSession? = null @@ -555,7 +554,6 @@ internal class MXOlmDevice @Inject constructor( val sessions = ArrayList(megolmSessionsData.size) for (megolmSessionData in megolmSessionsData) { - val sessionId = megolmSessionData.sessionId val senderKey = megolmSessionData.senderKey val roomId = megolmSessionData.roomId diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackup.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackup.kt index cbe9298ee7..a66d50dfad 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackup.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackup.kt @@ -982,7 +982,6 @@ internal class KeysBackup @Inject constructor( keysBackupStateManager.state = KeysBackupState.Disabled } else { getKeysBackupTrust(keyBackupVersion, object : MatrixCallback { - override fun onSuccess(data: KeysBackupVersionTrust) { val versionInStore = cryptoStore.getKeyBackupVersion() diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt index 140716fa67..4c65fc1e64 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt @@ -111,7 +111,6 @@ internal fun ChunkEntity.add(roomId: String, direction: PaginationDirection, stateIndexOffset: Int = 0, isUnlinked: Boolean = false) { - assertIsManaged() if (event.eventId != null && timelineEvents.find(event.eventId) != null) { return diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushersMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushersMapper.kt index 085cc815ca..315c8a766c 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushersMapper.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushersMapper.kt @@ -24,7 +24,6 @@ import im.vector.matrix.android.internal.session.pushers.JsonPusher internal object PushersMapper { fun map(pushEntity: PusherEntity): Pusher { - return Pusher( pushKey = pushEntity.pushKey, kind = pushEntity.kind ?: "", diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/TimelineEventEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/TimelineEventEntityQueries.kt index 38e04d62a9..d7e2f59742 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/TimelineEventEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/TimelineEventEntityQueries.kt @@ -63,7 +63,6 @@ internal fun TimelineEventEntity.Companion.latestEvent(realm: Realm, includesSending: Boolean, includedTypes: List = emptyList(), excludedTypes: List = emptyList()): TimelineEventEntity? { - val roomEntity = RoomEntity.where(realm, roomId).findFirst() ?: return null val eventList = if (includesSending && roomEntity.sendingTimelineEvents.isNotEmpty()) { roomEntity.sendingTimelineEvents @@ -117,7 +116,6 @@ internal fun TimelineEventEntity.Companion.findAllInRoomWithSendStates(realm: Re roomId: String, sendStates: List) : RealmResults { - val sendStatesStr = sendStates.map { it.name }.toTypedArray() return realm.where() .equalTo(TimelineEventEntityFields.ROOM_ID, roomId) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUrlResolver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUrlResolver.kt index 81180fbf82..f288f949cd 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUrlResolver.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUrlResolver.kt @@ -58,7 +58,6 @@ internal class DefaultContentUrlResolver @Inject constructor(private val homeSer contentUrl: String, prefix: String, params: String? = null): String? { - var serverAndMediaId = contentUrl.removePrefix(MATRIX_CONTENT_URI_SCHEME) val fragmentOffset = serverAndMediaId.indexOf("#") var fragment = "" diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterUtil.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterUtil.kt index 526191cf2f..d3020b3fa6 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterUtil.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterUtil.kt @@ -55,7 +55,6 @@ internal object FilterUtil { } } } else { - filterBody.room?.let { room -> room.ephemeral?.types?.remove("m.receipt") if (room.ephemeral?.types?.isEmpty() == true) { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/AddHttpPusherWorker.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/AddHttpPusherWorker.kt index 1bb61820dd..9eed515d14 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/AddHttpPusherWorker.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/AddHttpPusherWorker.kt @@ -44,7 +44,6 @@ internal class AddHttpPusherWorker(context: Context, params: WorkerParameters) @Inject lateinit var monarchy: Monarchy override suspend fun doWork(): Result { - val params = WorkerParamsFactory.fromData(inputData) ?: return Result.failure() diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultPusherService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultPusherService.kt index 9f8426aba7..243e4d4b03 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultPusherService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultPusherService.kt @@ -54,7 +54,6 @@ internal class DefaultPusherService @Inject constructor(private val context: Con lang: String, appDisplayName: String, deviceDisplayName: String, url: String, append: Boolean, withEventIdOnly: Boolean) : UUID { - val pusher = JsonPusher( pushKey = pushkey, kind = "http", diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/EventRelationsAggregationTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/EventRelationsAggregationTask.kt index 9a07cd0de8..00d6619ce7 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/EventRelationsAggregationTask.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/EventRelationsAggregationTask.kt @@ -278,7 +278,6 @@ internal class DefaultEventRelationsAggregationTask @Inject constructor( } else { // is this a known event (is possible? pagination?) if (!sum.sourceEvents.contains(reactionEventId)) { - // check if it's not the sync of a local echo if (!isLocalEcho && sum.sourceLocalEcho.contains(txId)) { // ok it has already been counted, just sync the list, do not touch count diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/DefaultReadService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/DefaultReadService.kt index 694b6d5937..b8b9fe82ef 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/DefaultReadService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/DefaultReadService.kt @@ -101,7 +101,6 @@ internal class DefaultReadService @AssistedInject constructor(@Assisted private } override fun getEventReadReceiptsLive(eventId: String): LiveData> { - val liveRealmData = monarchy.findAllMappedWithChanges( { ReadReceiptsSummaryEntity.where(it, eventId) }, { readReceiptsSummaryMapper.map(it) } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/DefaultRelationService.kt index e17b00e1f3..6abc7ed60e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/DefaultRelationService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/DefaultRelationService.kt @@ -76,7 +76,6 @@ internal class DefaultRelationService @AssistedInject constructor(@Assisted priv } override fun undoReaction(reaction: String, targetEventId: String, myUserId: String)/*: Cancelable*/ { - val params = FindReactionEventForUndoTask.Params( roomId, targetEventId, diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEventPersistor.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEventPersistor.kt index abcd29bd1d..0d9fb4e9e6 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEventPersistor.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEventPersistor.kt @@ -107,7 +107,6 @@ internal class TokenChunkEventPersistor @Inject constructor(private val monarchy suspend fun insertInDb(receivedChunk: TokenChunkEvent, roomId: String, direction: PaginationDirection): Result { - monarchy .awaitTransaction { realm -> Timber.v("Start persisting ${receivedChunk.events.size} events in $roomId towards $direction") @@ -194,7 +193,6 @@ internal class TokenChunkEventPersistor @Inject constructor(private val monarchy direction: PaginationDirection, currentChunk: ChunkEntity, otherChunk: ChunkEntity): ChunkEntity { - // We always merge the bottom chunk into top chunk, so we are always merging backwards Timber.v("Merge ${currentChunk.prevToken} | ${currentChunk.nextToken} with ${otherChunk.prevToken} | ${otherChunk.nextToken}") return if (direction == PaginationDirection.BACKWARDS && !otherChunk.isLastForward) { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/securestorage/SecretStoringUtils.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/securestorage/SecretStoringUtils.kt index 55c74928cd..de1c7b0479 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/securestorage/SecretStoringUtils.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/securestorage/SecretStoringUtils.kt @@ -261,7 +261,6 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte } private fun decryptForOldDevicesNotGood(data: ByteArray, keyAlias: String): String? { - val (salt, iv, encrypted) = format2Extract(ByteArrayInputStream(data)) val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256") val spec = PBEKeySpec(keyAlias.toCharArray(), salt, 10_000, 128) @@ -280,7 +279,6 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte @RequiresApi(Build.VERSION_CODES.KITKAT) private fun decryptStringK(data: ByteArray, keyAlias: String): String? { - val (encryptedKey, iv, encrypted) = format1Extract(ByteArrayInputStream(data)) // we need to decrypt the key @@ -411,7 +409,6 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte @RequiresApi(Build.VERSION_CODES.KITKAT) @Throws(IOException::class) private fun loadSecureObjectK(keyAlias: String, inputStream: InputStream): T? { - val (encryptedKey, iv, encrypted) = format1Extract(inputStream) // we need to decrypt the key diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt index 9e8c75019f..5fb25834c0 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt @@ -92,7 +92,6 @@ internal class RoomSyncHandler @Inject constructor(private val monarchy: Monarch // PRIVATE METHODS ***************************************************************************** private fun handleRoomSync(realm: Realm, handlingStrategy: HandlingStrategy, isInitialSync: Boolean, reporter: DefaultInitialSyncProgressService?) { - val rooms = when (handlingStrategy) { is HandlingStrategy.JOINED -> handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_joined_rooms, 0.6f) { @@ -116,7 +115,6 @@ internal class RoomSyncHandler @Inject constructor(private val monarchy: Monarch roomId: String, roomSync: RoomSync, isInitialSync: Boolean): RoomEntity { - Timber.v("Handle join sync for room $roomId") if (roomSync.ephemeral != null && roomSync.ephemeral.events.isNotEmpty()) { @@ -194,7 +192,6 @@ internal class RoomSyncHandler @Inject constructor(private val monarchy: Monarch eventList: List, prevToken: String? = null, isLimited: Boolean = true): ChunkEntity { - val lastChunk = ChunkEntity.findLastLiveChunkFromRoom(realm, roomEntity.roomId) var stateIndexOffset = 0 val chunkEntity = if (!isLimited && lastChunk != null) { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt index 570e6e9735..d8de292d70 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt @@ -129,7 +129,6 @@ internal class SyncThread @Inject constructor(private val syncTask: SyncTask, this.callbackThread = TaskThread.SYNC this.executionThread = TaskThread.SYNC this.callback = object : MatrixCallback { - override fun onSuccess(data: Unit) { Timber.v("onSuccess") latch.countDown() diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskExecutor.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskExecutor.kt index 341e9dc227..14e546e0d6 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskExecutor.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskExecutor.kt @@ -34,7 +34,6 @@ internal class TaskExecutor @Inject constructor(private val coroutineDispatchers private val executorScope = CoroutineScope(SupervisorJob()) fun execute(task: ConfigurableTask): Cancelable { - val job = executorScope.launch(task.callbackThread.toDispatcher()) { val resultOrFailure = runCatching { withContext(task.executionThread.toDispatcher()) { @@ -66,7 +65,6 @@ internal class TaskExecutor @Inject constructor(private val coroutineDispatchers maxDelay: Long = 10_000, // 10 second factor: Double = 2.0, block: suspend () -> T): T { - var currentDelay = initialDelay repeat(times - 1) { try { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CompatUtil.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CompatUtil.kt index e277226d1e..2e71d6b2fc 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CompatUtil.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CompatUtil.kt @@ -240,7 +240,6 @@ object CompatUtil { KeyStoreException::class, IllegalBlockSizeException::class) fun createCipherOutputStream(out: OutputStream, context: Context): OutputStream? { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) { return out } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/LiveDataUtils.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/LiveDataUtils.kt index 9fc970ec4e..75fae162a5 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/LiveDataUtils.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/LiveDataUtils.kt @@ -24,7 +24,6 @@ object LiveDataUtils { fun combine(firstSource: LiveData, secondSource: LiveData, mapper: (FIRST, SECOND) -> OUT): LiveData { - return MediatorLiveData().apply { var firstValue: FIRST? = null var secondValue: SECOND? = null diff --git a/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushrulesConditionTest.kt b/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushrulesConditionTest.kt index ff001cd87f..36aded79ad 100644 --- a/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushrulesConditionTest.kt +++ b/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushrulesConditionTest.kt @@ -128,7 +128,6 @@ class PushrulesConditionTest { @Test fun test_roommember_condition() { - val conditionEqual3 = RoomMemberCountCondition("3") val conditionEqual3Bis = RoomMemberCountCondition("==3") val conditionLessThan3 = RoomMemberCountCondition("<3") diff --git a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt index c8ec24e05e..4d18beac8f 100644 --- a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt +++ b/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt @@ -26,7 +26,6 @@ import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest class TestBatteryOptimization(val fragment: Fragment) : TroubleshootTest(R.string.settings_troubleshoot_test_battery_title) { override fun perform() { - if (fragment.context != null && isIgnoringBatteryOptimizations(fragment.context!!)) { description = fragment.getString(R.string.settings_troubleshoot_test_battery_success) status = TestStatus.SUCCESS diff --git a/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt index daf5a6b0c5..6648d79490 100644 --- a/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt +++ b/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt @@ -31,7 +31,6 @@ import timber.log.Timber class AlarmSyncBroadcastReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { - // Aquire a lock to give enough time for the sync :/ (context.getSystemService(Context.POWER_SERVICE) as PowerManager).run { newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "riotx:fdroidSynclock").apply { diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt index 765706d8ff..ac5b5c882d 100755 --- a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt +++ b/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt @@ -174,7 +174,6 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() { } private fun handleNotificationWithoutSyncingMode(data: Map, session: Session?) { - if (session == null) { Timber.e("## handleNotificationWithoutSyncingMode cannot find session") return diff --git a/vector/src/main/java/im/vector/riotx/EmojiCompatWrapper.kt b/vector/src/main/java/im/vector/riotx/EmojiCompatWrapper.kt index 1d13b87a28..945ddaec5a 100644 --- a/vector/src/main/java/im/vector/riotx/EmojiCompatWrapper.kt +++ b/vector/src/main/java/im/vector/riotx/EmojiCompatWrapper.kt @@ -29,7 +29,6 @@ class EmojiCompatWrapper @Inject constructor(private val context: Context) { private var initialized = false fun init(fontRequest: FontRequest) { - // Use emoji compat for the benefit of emoji spans val config = FontRequestEmojiCompatConfig(context, fontRequest) // we want to replace all emojis with selected font diff --git a/vector/src/main/java/im/vector/riotx/VectorApplication.kt b/vector/src/main/java/im/vector/riotx/VectorApplication.kt index f353293c23..081d1c69aa 100644 --- a/vector/src/main/java/im/vector/riotx/VectorApplication.kt +++ b/vector/src/main/java/im/vector/riotx/VectorApplication.kt @@ -119,7 +119,6 @@ class VectorApplication : Application(), HasVectorInjector, MatrixConfiguration. lastAuthenticatedSession.configureAndStart(pushRuleTriggerListener, sessionListener) } ProcessLifecycleOwner.get().lifecycle.addObserver(object : LifecycleObserver { - @OnLifecycleEvent(Lifecycle.Event.ON_RESUME) fun entersForeground() { FcmHelper.onEnterForeground(appContext) diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt b/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt index 9843c7d1e0..5889375bb9 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt +++ b/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt @@ -28,7 +28,6 @@ import im.vector.riotx.core.platform.SimpleTextWatcher fun EditText.setupAsSearch(@DrawableRes searchIconRes: Int = R.drawable.ic_filter, @DrawableRes clearIconRes: Int = R.drawable.ic_x_green) { - addTextChangedListener(object : SimpleTextWatcher() { override fun afterTextChanged(s: Editable) { val clearIcon = if (s.isNotEmpty()) clearIconRes else 0 diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt index db30ac91bc..02869fa420 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt +++ b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt @@ -42,7 +42,6 @@ abstract class GenericFooterItem : VectorEpoxyModel() var itemClickAction: GenericItem.Action? = null override fun bind(holder: Holder) { - holder.text.setTextOrHide(text) when (style) { GenericItem.STYLE.BIG_TEXT -> holder.text.textSize = 18f diff --git a/vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt index 6e3b03b091..b2f09024e0 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt @@ -237,7 +237,6 @@ fun openMedia(activity: Activity, savedMediaPath: String, mimeType: String) { } fun shareMedia(context: Context, file: File, mediaMimeType: String?) { - var mediaUri: Uri? = null try { mediaUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileProvider", file) diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt index 71de11dfbe..54e3a34744 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt @@ -37,7 +37,6 @@ class KeysExporter(private val session: Session) { */ fun export(context: Context, password: String, callback: MatrixCallback) { session.exportRoomKeys(password, object : MatrixCallback { - override fun onSuccess(data: ByteArray) { GlobalScope.launch(Dispatchers.Main) { withContext(Dispatchers.IO) { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt index 9e01680993..7ece88e086 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt @@ -102,7 +102,6 @@ class KeysBackupRestoreFromKeyViewModel @Inject constructor() : ViewModel() { private fun trustOnDecrypt(keysBackup: KeysBackupService, keysVersionResult: KeysVersionResult) { keysBackup.trustKeysBackupVersion(keysVersionResult, true, object : MatrixCallback { - override fun onSuccess(data: Unit) { Timber.v("##### trustKeysBackupVersion onSuccess") } diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt index fbaf7cb3bd..4e86f60909 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt @@ -109,7 +109,6 @@ class KeysBackupRestoreFromPassphraseViewModel @Inject constructor() : ViewModel private fun trustOnDecrypt(keysBackup: KeysBackupService, keysVersionResult: KeysVersionResult) { keysBackup.trustKeysBackupVersion(keysVersionResult, true, object : MatrixCallback { - override fun onSuccess(data: Unit) { Timber.v("##### trustKeysBackupVersion onSuccess") } diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt index b6b4f0df48..291da66362 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt @@ -139,7 +139,6 @@ class KeysBackupSetupActivity : SimpleFragmentActivity() { .export(this@KeysBackupSetupActivity, passphrase, object : MatrixCallback { - override fun onSuccess(data: String) { hideWaitingView() diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt index 828516ff50..64d50b2804 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt @@ -303,7 +303,6 @@ class RoomDetailFragment : private fun setupNotificationView() { notificationAreaView.delegate = object : NotificationAreaView.Delegate { - override fun onTombstoneEventClicked(tombstoneEvent: Event) { roomDetailViewModel.process(RoomDetailActions.HandleTombstoneEvent(tombstoneEvent)) } @@ -453,7 +452,6 @@ class RoomDetailFragment : } recyclerView.setController(timelineEventController) recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { if (recyclerView.scrollState == RecyclerView.SCROLL_STATE_IDLE) { updateJumpToBottomViewVisibility() @@ -702,7 +700,6 @@ class RoomDetailFragment : private fun renderRoomSummary(state: RoomDetailViewState) { state.asyncRoomSummary()?.let { - if (it.membership.isLeft()) { Timber.w("The room has been left") activity?.finish() diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt index f22aa789b5..62df5d5e95 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt @@ -74,7 +74,6 @@ class TextComposerView @JvmOverloads constructor(context: Context, attrs: Attrib val transition = AutoTransition() transition.duration = animationDuration transition.addListener(object : Transition.TransitionListener { - override fun onTransitionEnd(transition: Transition) { transitionComplete?.invoke() } @@ -106,7 +105,6 @@ class TextComposerView @JvmOverloads constructor(context: Context, attrs: Attrib val transition = AutoTransition() transition.duration = animationDuration transition.addListener(object : Transition.TransitionListener { - override fun onTransitionEnd(transition: Transition) { transitionComplete?.invoke() } diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt index 4854058218..11f3207e32 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt @@ -102,7 +102,6 @@ class MessageActionsBottomSheet : VectorBaseBottomSheetDialogFragment() { .commit() } quickReactionFragment.interactionListener = object : QuickReactionFragment.InteractionListener { - override fun didQuickReactWith(clickedOn: String, add: Boolean, eventId: String) { actionHandlerModel.fireAction(SimpleAction.QuickReact(eventId, clickedOn, add)) dismiss() diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt index 34a84df6f6..14d730044a 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt @@ -172,7 +172,6 @@ class MessageMenuViewModel @AssistedInject constructor(@Assisted initialState: M } if (event.root.sendState == SendState.SENT) { - // TODO Can be redacted // TODO sent by me or sufficient power level diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt index d55e1accd3..1ae47f9c22 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt @@ -34,7 +34,6 @@ class DefaultItemFactory @Inject constructor(private val avatarSizeProvider: Ava informationData: MessageInformationData, highlight: Boolean, callback: TimelineEventController.Callback?): DefaultItem { - return DefaultItem_() .leftGuideline(avatarSizeProvider.leftGuideline) .highlighted(highlight) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt index 6a7f64a8e4..12f49c2e74 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt @@ -41,7 +41,6 @@ class EncryptionItemFactory @Inject constructor(private val stringProvider: Stri fun create(event: TimelineEvent, highlight: Boolean, callback: TimelineEventController.Callback?): NoticeItem? { - val text = buildNoticeText(event.root, event.senderName) ?: return null val informationData = MessageInformationData( eventId = event.root.eventId ?: "?", diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt index abe9af84fc..1df885cd35 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt @@ -42,7 +42,6 @@ class MergedHeaderItemFactory @Inject constructor(private val sessionHolder: Act callback: TimelineEventController.Callback?, requestModelBuild: () -> Unit) : MergedHeaderItem? { - return if (!event.canBeMerged() || (nextEvent?.root?.getClearType() == event.root.getClearType() && !addDaySeparator)) { null } else { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt index d633038ea5..58bda1eaf5 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt @@ -166,7 +166,6 @@ class MessageItemFactory @Inject constructor( highlight: Boolean, callback: TimelineEventController.Callback?, attributes: AbsMessageItem.Attributes): MessageImageVideoItem? { - val (maxWidth, maxHeight) = timelineMediaSizeProvider.getMaxSize() val data = ImageContentRenderer.Data( filename = messageContent.body, @@ -196,7 +195,6 @@ class MessageItemFactory @Inject constructor( highlight: Boolean, callback: TimelineEventController.Callback?, attributes: AbsMessageItem.Attributes): MessageImageVideoItem? { - val (maxWidth, maxHeight) = timelineMediaSizeProvider.getMaxSize() val thumbnailData = ImageContentRenderer.Data( filename = messageContent.body, @@ -233,7 +231,6 @@ class MessageItemFactory @Inject constructor( highlight: Boolean, callback: TimelineEventController.Callback?, attributes: AbsMessageItem.Attributes): MessageTextItem? { - val isFormatted = messageContent.formattedBody.isNullOrBlank().not() val bodyToUse = messageContent.formattedBody?.let { htmlRenderer.get().render(it.trim()) @@ -296,7 +293,6 @@ class MessageItemFactory @Inject constructor( highlight: Boolean, callback: TimelineEventController.Callback?, attributes: AbsMessageItem.Attributes): MessageTextItem? { - val message = messageContent.body.let { val formattedBody = span { text = it @@ -318,7 +314,6 @@ class MessageItemFactory @Inject constructor( highlight: Boolean, callback: TimelineEventController.Callback?, attributes: AbsMessageItem.Attributes): MessageTextItem? { - val message = messageContent.body.let { val formattedBody = "* ${informationData.memberName} $it" linkifyBody(formattedBody, callback) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt index 9e2f51406d..8768da26cf 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt @@ -36,7 +36,6 @@ class NoticeItemFactory @Inject constructor(private val eventFormatter: NoticeEv highlight: Boolean, readMarkerVisible: Boolean, callback: TimelineEventController.Callback?): NoticeItem? { - val formattedText = eventFormatter.format(event) ?: return null val informationData = informationDataFactory.create(event, null, readMarkerVisible) val attributes = NoticeItem.Attributes( diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt index 09b3881217..b396eb1f0e 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt @@ -35,7 +35,6 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me eventIdToHighlight: String?, readMarkerVisible: Boolean, callback: TimelineEventController.Callback?): VectorEpoxyModel<*> { - val highlight = event.root.eventId == eventIdToHighlight val computedModel = try { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt index f0114a8213..3fdce63668 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt @@ -40,7 +40,6 @@ class ContentUploadStateTrackerBinder @Inject constructor(private val activeSess fun bind(eventId: String, isLocalFile: Boolean, progressLayout: ViewGroup) { - activeSessionHolder.getActiveSession().also { session -> val uploadStateTracker = session.contentUploadProgressTracker() val updateListener = ContentMediaProgressUpdater(progressLayout, isLocalFile, colorProvider, errorFormatter) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt index 9e5dac6315..0e1229eeca 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt @@ -37,7 +37,6 @@ class MessageItemAttributesFactory @Inject constructor( fun create(messageContent: MessageContent?, informationData: MessageInformationData, callback: TimelineEventController.Callback?): AbsMessageItem.Attributes { - return AbsMessageItem.Attributes( avatarSize = avatarSizeProvider.avatarSize, informationData = informationData, diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginSsoFallbackFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginSsoFallbackFragment.kt index 8b12a14b9c..cac981db84 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginSsoFallbackFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/login/LoginSsoFallbackFragment.kt @@ -271,7 +271,6 @@ class LoginSsoFallbackFragment : VectorBaseFragment(), OnBackPressed { if (parameters.containsKey("homeServer") && parameters.containsKey("userId") && parameters.containsKey("accessToken")) { - // We cannot parse Credentials here because of https://github.com/matrix-org/synapse/issues/4756 // Build on object manually val credentials = Credentials( diff --git a/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt b/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt index 731e0012f9..833f795ecb 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt @@ -89,7 +89,6 @@ class VideoContentRenderer @Inject constructor(private val activeSessionHolder: }) } } else { - val resolvedUrl = contentUrlResolver.resolveFullSize(data.url) if (resolvedUrl == null) { @@ -98,7 +97,6 @@ class VideoContentRenderer @Inject constructor(private val activeSessionHolder: errorView.isVisible = true errorView.setText(R.string.unknown_error) } else { - // Temporary code, some remote videos are not played by videoview setVideoUri // So for now we download them then play thumbnailView.isVisible = true diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt index 4336cbfbb2..06108e07fe 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt @@ -64,7 +64,6 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St return resolveStateRoomEvent(event, session) } else -> { - // If the event can be displayed, display it as is Timber.w("NotifiableEventResolver Received an unsupported event matching a bing rule") // TODO Better event text display @@ -85,7 +84,6 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St } private fun resolveMessageEvent(event: TimelineEvent, session: Session): NotifiableEvent? { - // The event only contains an eventId, and roomId (type is m.room.*) , we need to get the displayable content (names, avatar, text, etc...) val room = session.getRoom(event.root.roomId!! /*roomID cannot be null*/) diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt index c4833a036d..e26395641d 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt @@ -109,7 +109,6 @@ class NotificationBroadcastReceiver : BroadcastReceiver() { } private fun sendMatrixEvent(message: String, session: Session, room: Room, context: Context?) { - room.sendTextMessage(message) // Create a new event to be displayed in the notification drawer, right now diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt index 4848b6f1df..24ae0e722a 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt @@ -207,7 +207,6 @@ class NotificationDrawerManager @Inject constructor(private val context: Context val myUserDisplayName = user?.displayName?.takeIf { it.isNotBlank() } ?: session.myUserId val myUserAvatarUrl = session.contentUrlResolver().resolveThumbnail(user?.avatarUrl, avatarSize, avatarSize, ContentUrlResolver.ThumbnailMethod.SCALE) synchronized(eventList) { - Timber.v("%%%%%%%% REFRESH NOTIFICATION DRAWER ") // TMP code var hasNewEvent = false diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt index 3c2e9bde69..1a5385663b 100755 --- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt @@ -322,7 +322,6 @@ class NotificationUtils @Inject constructor(private val context: Context, roomId: String, matrixId: String, callId: String): Notification { - val builder = NotificationCompat.Builder(context, CALL_NOTIFICATION_CHANNEL_ID) .setContentTitle(ensureTitleNotEmpty(roomName)) .apply { diff --git a/vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt index 0fce7f7ba6..664ea79fd2 100644 --- a/vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt +++ b/vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt @@ -166,7 +166,6 @@ object PopupAlertManager { .setTitle(alert.title) .setText(alert.description) .apply { - if (!animate) { setEnterAnimation(R.anim.anim_alerter_no_anim) } diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt index 4e722af037..e358823316 100755 --- a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt +++ b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt @@ -149,7 +149,6 @@ class BugReporter @Inject constructor(private val activeSessionHolder: ActiveSes theBugDescription: String, listener: IMXBugReportListener?) { object : AsyncTask() { - // enumerate files to delete val mBugReportFiles: MutableList = ArrayList() diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt index a22b6df918..0a4e05a4c8 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt @@ -138,7 +138,6 @@ class EmojiReactionPickerActivity : VectorBaseActivity(), EmojiCompatFontProvide val searchItem = menu.findItem(R.id.search) (searchItem.actionView as? SearchView)?.let { - searchItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener { override fun onMenuItemActionExpand(p0: MenuItem?): Boolean { it.isIconified = false diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt b/vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt index 26afab9396..811d399b23 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt @@ -160,7 +160,6 @@ class ReactionButton @JvmOverloads constructor(context: Context, attrs: Attribut * @param v */ override fun onClick(v: View) { - if (!isEnabled) { return } diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt index cebded5f0a..a05ccb305d 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt @@ -45,7 +45,6 @@ class VectorSettingsHelpAboutFragment : VectorSettingsBaseFragment() { // preference to start the App info screen, to facilitate App permissions access findPreference(APP_INFO_LINK_PREFERENCE_KEY)!! .onPreferenceClickListener = Preference.OnPreferenceClickListener { - activity?.let { val intent = Intent().apply { action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationPreferenceFragment.kt index c7fb0877ae..cfb4c88259 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationPreferenceFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationPreferenceFragment.kt @@ -67,7 +67,6 @@ class VectorSettingsNotificationPreferenceFragment : VectorSettingsBaseFragment( } override fun onPreferenceTreeClick(preference: Preference?): Boolean { - return when (preference?.key) { VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY -> { updateEnabledForDevice(preference) @@ -119,7 +118,6 @@ class VectorSettingsNotificationPreferenceFragment : VectorSettingsBaseFragment( it, !switchPref.isChecked, object : MatrixCallback { - override fun onSuccess(data: Unit) { // Push rules will be updated form the sync } diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt index 79fb559481..5737425a3b 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt @@ -87,7 +87,6 @@ class VectorSettingsNotificationsTroubleshootFragment : VectorBaseFragment() { } private fun startUI() { - mSummaryDescription.text = getString(R.string.settings_troubleshoot_diagnostic_running_status, 0, 0) testManager = testManagerFactory.create(this) diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt index 213960e0de..dfc7004554 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt @@ -560,9 +560,7 @@ class VectorSettingsSecurityPrivacyFragment : VectorSettingsBaseFragment() { * @param aDeviceInfo the device information */ private fun displayDeviceDetailsDialog(aDeviceInfo: DeviceInfo) { - activity?.let { - val builder = AlertDialog.Builder(it) val inflater = it.layoutInflater val layout = inflater.inflate(R.layout.dialog_device_details, null) diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt index 23a6c8e86e..a650702bcb 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt @@ -66,7 +66,6 @@ class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList { - override fun onSuccess(data: Unit) { manager?.retry() } diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt index 7231864b47..8344211a2c 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt @@ -28,7 +28,6 @@ class TestDeviceSettings @Inject constructor(private val vectorPreferences: Vect : TroubleshootTest(R.string.settings_troubleshoot_test_device_settings_title) { override fun perform() { - if (vectorPreferences.areNotificationEnabledForDevice()) { description = stringProvider.getString(R.string.settings_troubleshoot_test_device_settings_success) quickFix = null