Skip to content

Commit bb59a75

Browse files
committed
code review
1 parent 94956a2 commit bb59a75

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class SharedSecuredStorageResetAllFragment :
5252

5353
views.ssssResetOtherDevices.debouncedClicks {
5454
withState(sharedViewModel) {
55-
DeviceListBottomSheet.newInstance(it.userId, false).show(childFragmentManager, "DEV_LIST")
55+
DeviceListBottomSheet.newInstance(it.userId).show(childFragmentManager, "DEV_LIST")
5656
}
5757
}
5858

vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,12 @@ class DeviceListBottomSheet :
100100
@Parcelize
101101
data class Args(
102102
val userId: String,
103-
val allowDeviceAction: Boolean
104103
) : Parcelable
105104

106105
companion object {
107-
fun newInstance(userId: String, allowDeviceAction: Boolean = true): DeviceListBottomSheet {
106+
fun newInstance(userId: String): DeviceListBottomSheet {
108107
return DeviceListBottomSheet().apply {
109-
setArguments(Args(userId, allowDeviceAction))
108+
setArguments(Args(userId))
110109
}
111110
}
112111
}

vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
2222
// TODO Replace usage by the use case GetEncryptionTrustLevelForDeviceUseCase
2323
object TrustUtils {
2424

25-
// XXX why is this using the RoomEncryptionTrustLevel?
26-
// should be using a new DeviceTrustShield enum
2725
fun shieldForTrust(
2826
currentDevice: Boolean,
2927
trustMSK: Boolean,

vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForDeviceUseCase.kt

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ class GetEncryptionTrustLevelForDeviceUseCase @Inject constructor(
2525
private val getEncryptionTrustLevelForOtherDeviceUseCase: GetEncryptionTrustLevelForOtherDeviceUseCase,
2626
) {
2727

28+
// XXX why is this using the RoomEncryptionTrustLevel?
29+
// should be using a new DeviceTrustShield enum
2830
fun execute(currentSessionCrossSigningInfo: CurrentSessionCrossSigningInfo, cryptoDeviceInfo: CryptoDeviceInfo?): RoomEncryptionTrustLevel? {
2931
if (cryptoDeviceInfo == null) {
3032
return null

0 commit comments

Comments
 (0)