Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleaning klint

Browse Source
This commit is contained in:
Valere 2020-02-26 14:03:33 +01:00
parent 5e0235e48d
commit 8ff31ac49d
6 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -758,7 +758,7 @@ internal class DefaultCrossSigningService @Inject constructor(
private fun reRequestAllPendingRoomKeyRequest() {
Timber.d("## CrossSigning - reRequest pending outgoing room key requests")
cryptoStore.getOutgoingRoomKeyRequests().forEach {
it.requestBody?.let {requestBody ->
it.requestBody?.let { requestBody ->
if (cryptoStore.getInboundGroupSession(requestBody.sessionId ?: "", requestBody.senderKey ?: "") == null) {
outgoingRoomKeyRequestManager.resendRoomKeyRequest(requestBody)
} else {
@ -767,5 +767,4 @@ internal class DefaultCrossSigningService @Inject constructor(
}
}
}
}

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

@ -1025,7 +1025,7 @@ internal class RealmCryptoStore @Inject constructor(
}
override fun getOutgoingRoomKeyRequests(): List<OutgoingRoomKeyRequest> {
return monarchy.fetchAllMappedSync( { realm ->
return monarchy.fetchAllMappedSync({ realm ->
realm.where(OutgoingRoomKeyRequestEntity::class.java)
}, {
it.toOutgoingRoomKeyRequest()

1
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/EventSharedAction.kt
View File

@ -108,5 +108,4 @@ sealed class EventSharedAction(@StringRes val titleRes: Int,
object UseKeyBackup :
EventSharedAction(R.string.e2e_use_keybackup, R.drawable.shield)
}

4
vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestEpoxyController.kt
View File

@ -35,7 +35,7 @@ class KeyRequestEpoxyController @Inject constructor(
) : TypedEpoxyController<KeyRequestListViewState>() {
interface InteractionListener {
//fun didTap(data: UserAccountData)
// fun didTap(data: UserAccountData)
}
var interactionListener: InteractionListener? = null
@ -60,7 +60,6 @@ class KeyRequestEpoxyController @Inject constructor(
val requestList = async.invoke().groupBy { it.roomId }
requestList.forEach {
genericItemHeader {
id(it.key)
text("roomId: ${it.key}")
@ -83,7 +82,6 @@ class KeyRequestEpoxyController @Inject constructor(
)
}
}
}
}
}.exhaustive

1
vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestListFragment.kt
View File

@ -23,7 +23,6 @@ import com.airbnb.mvrx.withState
import im.vector.riotx.R
import im.vector.riotx.core.extensions.cleanup
import im.vector.riotx.core.extensions.configureWith
import im.vector.riotx.core.platform.VectorBaseActivity
import im.vector.riotx.core.platform.VectorBaseFragment
import im.vector.riotx.core.resources.ColorProvider
import kotlinx.android.synthetic.main.fragment_generic_recycler.*

1
vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestsFragment.kt
View File

@ -44,7 +44,6 @@ class KeyRequestsFragment @Inject constructor() : VectorBaseFragment() {
TabLayoutMediator(devToolKeyRequestTabs, devToolKeyRequestPager) { tab, _ ->
tab.text = "Outgoing"
}.attach()
}
private inner class KeyReqPagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {