diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/PermalinkParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/PermalinkParserTest.kt
index b11a538949..8717b3f7a8 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/PermalinkParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/PermalinkParserTest.kt
@@ -37,7 +37,10 @@ class PermalinkParserTest {
Assert.assertTrue("Should be parsed as email invite but was ${parsedLink::class.java}", parsedLink is PermalinkData.RoomEmailInviteLink)
parsedLink as PermalinkData.RoomEmailInviteLink
Assert.assertEquals("!MRBNLPtFnMAazZVPMO:matrix.org", parsedLink.roomId)
- Assert.assertEquals("XmOwRZnSFabCRhTywFbJWKXWVNPysOpXIbroMGaUymqkJSvHeVKRsjHajwjCYdBsvGSvHauxbKfJmOxtXldtyLnyBMLKpBQCMzyYggrdapbVIceWZBtmslOQrXLABRoe", parsedLink.token)
+ Assert.assertEquals(
+ "XmOwRZnSFabCRhTywFbJWKXWVNPysOpXIbroMGaUymqkJSvHeVKRsjHajwjCYdBsvGSvHauxbKfJmOxtXldtyLnyBMLKpBQCMzyYggrdapbVIceWZBtmslOQrXLABRoe",
+ parsedLink.token
+ )
Assert.assertEquals("vector.im", parsedLink.identityServer)
Assert.assertEquals("Team2", parsedLink.roomName)
Assert.assertEquals("hiphop5", parsedLink.inviterName)
@@ -45,7 +48,8 @@ class PermalinkParserTest {
@Test
fun testParseLinkWIthEvent() {
- val rawInvite = "https://matrix.to/#/!OGEhHVWSdvArJzumhm:matrix.org/\$xuvJUVDJnwEeVjPx029rAOZ50difpmU_5gZk_T0jGfc?via=matrix.org&via=libera.chat&via=matrix.example.io"
+ val rawInvite =
+ "https://matrix.to/#/!OGEhHVWSdvArJzumhm:matrix.org/\$xuvJUVDJnwEeVjPx029rAOZ50difpmU_5gZk_T0jGfc?via=matrix.org&via=libera.chat&via=matrix.example.io"
val parsedLink = PermalinkParser.parse(rawInvite)
Assert.assertTrue("Should be parsed as room link", parsedLink is PermalinkData.RoomLink)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
index 3e3af10799..a44cd6c80f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
@@ -21,5 +21,7 @@ import kotlinx.coroutines.asCoroutineDispatcher
import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
import java.util.concurrent.Executors
-internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(Main, Main, Main, Main,
- Executors.newSingleThreadExecutor().asCoroutineDispatcher())
+internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(
+ Main, Main, Main, Main,
+ Executors.newSingleThreadExecutor().asCoroutineDispatcher()
+)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
index 52dbfc7155..d2dfe4d945 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
@@ -67,9 +67,11 @@ class DeactivateAccountTest : InstrumentedTest {
val throwable = commonTestHelper.logAccountWithError(session.myUserId, TestConstants.PASSWORD)
// Test the error
- assertTrue(throwable is Failure.ServerError &&
- throwable.error.code == MatrixError.M_USER_DEACTIVATED &&
- throwable.error.message == "This account has been deactivated")
+ assertTrue(
+ throwable is Failure.ServerError &&
+ throwable.error.code == MatrixError.M_USER_DEACTIVATED &&
+ throwable.error.message == "This account has been deactivated"
+ )
// Try to create an account with the deactivate account user id, it will fail (M_USER_IN_USE)
val hs = commonTestHelper.createHomeServerConfig()
@@ -95,8 +97,10 @@ class DeactivateAccountTest : InstrumentedTest {
// Test the error
accountCreationError.let {
- assertTrue(it is Failure.ServerError &&
- it.error.code == MatrixError.M_USER_IN_USE)
+ assertTrue(
+ it is Failure.ServerError &&
+ it.error.code == MatrixError.M_USER_IN_USE
+ )
}
// No need to close the session, it has been deactivated
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
index 058b1f7933..4ead511c4d 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
@@ -291,7 +291,8 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
)
)
}
- }, it)
+ }, it
+ )
}
}
@@ -308,7 +309,8 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
requestID,
roomId,
bob.myUserId,
- bob.sessionParams.credentials.deviceId!!)
+ bob.sessionParams.credentials.deviceId!!
+ )
// we should reach SHOW SAS on both
var alicePovTx: OutgoingSasVerificationTransaction? = null
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
index dc58339498..525e168cf1 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
@@ -29,15 +29,17 @@ import org.matrix.android.sdk.internal.raw.RawModule
import org.matrix.android.sdk.internal.settings.SettingsModule
import org.matrix.android.sdk.internal.util.system.SystemModule
-@Component(modules = [
- TestModule::class,
- MatrixModule::class,
- NetworkModule::class,
- AuthModule::class,
- RawModule::class,
- SettingsModule::class,
- SystemModule::class
-])
+@Component(
+ modules = [
+ TestModule::class,
+ MatrixModule::class,
+ NetworkModule::class,
+ AuthModule::class,
+ RawModule::class,
+ SettingsModule::class,
+ SystemModule::class
+ ]
+)
@MatrixScope
internal interface TestMatrixComponent : MatrixComponent {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
index 3f75aa0979..e823aa39a1 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
@@ -76,9 +76,11 @@ class CryptoStoreTest : InstrumentedTest {
}
val olmSession1 = OlmSession().apply {
- initOutboundSession(olmAccount1,
+ initOutboundSession(
+ olmAccount1,
olmAccount1.identityKeys()[OlmAccount.JSON_KEY_IDENTITY_KEY],
- olmAccount1.oneTimeKeys()[OlmAccount.JSON_KEY_ONE_TIME_KEY]?.values?.first())
+ olmAccount1.oneTimeKeys()[OlmAccount.JSON_KEY_ONE_TIME_KEY]?.values?.first()
+ )
}
val sessionId1 = olmSession1.sessionIdentifier()
@@ -93,9 +95,11 @@ class CryptoStoreTest : InstrumentedTest {
}
val olmSession2 = OlmSession().apply {
- initOutboundSession(olmAccount2,
+ initOutboundSession(
+ olmAccount2,
olmAccount2.identityKeys()[OlmAccount.JSON_KEY_IDENTITY_KEY],
- olmAccount2.oneTimeKeys()[OlmAccount.JSON_KEY_ONE_TIME_KEY]?.values?.first())
+ olmAccount2.oneTimeKeys()[OlmAccount.JSON_KEY_ONE_TIME_KEY]?.values?.first()
+ )
}
val sessionId2 = olmSession2.sessionIdentifier()
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
index 88d99f12e0..ed922fdddc 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
@@ -299,11 +299,13 @@ class E2eeSanityTests : InstrumentedTest {
}
val importedResult = testHelper.doSync<ImportRoomKeysResult> {
- keysBackupService.restoreKeyBackupWithPassword(keyVersionResult!!,
+ keysBackupService.restoreKeyBackupWithPassword(
+ keyVersionResult!!,
keyBackupPassword,
null,
null,
- null, it)
+ null, it
+ )
}
assertEquals(3, importedResult.totalNumberOfKeys)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
index 17664c78aa..65ba33cb02 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
@@ -83,7 +83,8 @@ class ExportEncryptionTest {
@Test
fun checkExportDecrypt1() {
val password = "password"
- val input = "-----BEGIN MEGOLM SESSION DATA-----\nAXNhbHRzYWx0c2FsdHNhbHSIiIiIiIiIiIiIiIiIiIiIAAAACmIRUW2OjZ3L2l6j9h0lHlV3M2dx\n" + "cissyYBxjsfsAndErh065A8=\n-----END MEGOLM SESSION DATA-----"
+ val input =
+ "-----BEGIN MEGOLM SESSION DATA-----\nAXNhbHRzYWx0c2FsdHNhbHSIiIiIiIiIiIiIiIiIiIiIAAAACmIRUW2OjZ3L2l6j9h0lHlV3M2dx\n" + "cissyYBxjsfsAndErh065A8=\n-----END MEGOLM SESSION DATA-----"
val expectedString = "plain"
var decodedString: String? = null
@@ -93,15 +94,18 @@ class ExportEncryptionTest {
fail("## checkExportDecrypt1() failed : " + e.message)
}
- assertEquals("## checkExportDecrypt1() : expectedString $expectedString -- decodedString $decodedString",
+ assertEquals(
+ "## checkExportDecrypt1() : expectedString $expectedString -- decodedString $decodedString",
expectedString,
- decodedString)
+ decodedString
+ )
}
@Test
fun checkExportDecrypt2() {
val password = "betterpassword"
- val input = "-----BEGIN MEGOLM SESSION DATA-----\nAW1vcmVzYWx0bW9yZXNhbHT//////////wAAAAAAAAAAAAAD6KyBpe1Niv5M5NPm4ZATsJo5nghk\n" + "KYu63a0YQ5DRhUWEKk7CcMkrKnAUiZny\n-----END MEGOLM SESSION DATA-----"
+ val input =
+ "-----BEGIN MEGOLM SESSION DATA-----\nAW1vcmVzYWx0bW9yZXNhbHT//////////wAAAAAAAAAAAAAD6KyBpe1Niv5M5NPm4ZATsJo5nghk\n" + "KYu63a0YQ5DRhUWEKk7CcMkrKnAUiZny\n-----END MEGOLM SESSION DATA-----"
val expectedString = "Hello, World"
var decodedString: String? = null
@@ -111,15 +115,18 @@ class ExportEncryptionTest {
fail("## checkExportDecrypt2() failed : " + e.message)
}
- assertEquals("## checkExportDecrypt2() : expectedString $expectedString -- decodedString $decodedString",
+ assertEquals(
+ "## checkExportDecrypt2() : expectedString $expectedString -- decodedString $decodedString",
expectedString,
- decodedString)
+ decodedString
+ )
}
@Test
fun checkExportDecrypt3() {
val password = "SWORDFISH"
- val input = "-----BEGIN MEGOLM SESSION DATA-----\nAXllc3NhbHR5Z29vZG5lc3P//////////wAAAAAAAAAAAAAD6OIW+Je7gwvjd4kYrb+49gKCfExw\n" + "MgJBMD4mrhLkmgAngwR1pHjbWXaoGybtiAYr0moQ93GrBQsCzPbvl82rZhaXO3iH5uHo/RCEpOqp\nPgg29363BGR+/Ripq/VCLKGNbw==\n-----END MEGOLM SESSION DATA-----"
+ val input =
+ "-----BEGIN MEGOLM SESSION DATA-----\nAXllc3NhbHR5Z29vZG5lc3P//////////wAAAAAAAAAAAAAD6OIW+Je7gwvjd4kYrb+49gKCfExw\n" + "MgJBMD4mrhLkmgAngwR1pHjbWXaoGybtiAYr0moQ93GrBQsCzPbvl82rZhaXO3iH5uHo/RCEpOqp\nPgg29363BGR+/Ripq/VCLKGNbw==\n-----END MEGOLM SESSION DATA-----"
val expectedString = "alphanumericallyalphanumericallyalphanumericallyalphanumerically"
var decodedString: String? = null
@@ -129,9 +136,11 @@ class ExportEncryptionTest {
fail("## checkExportDecrypt3() failed : " + e.message)
}
- assertEquals("## checkExportDecrypt3() : expectedString $expectedString -- decodedString $decodedString",
+ assertEquals(
+ "## checkExportDecrypt3() : expectedString $expectedString -- decodedString $decodedString",
expectedString,
- decodedString)
+ decodedString
+ )
}
@Test
@@ -147,9 +156,11 @@ class ExportEncryptionTest {
fail("## checkExportEncrypt1() failed : " + e.message)
}
- assertEquals("## checkExportEncrypt1() : expectedString $expectedString -- decodedString $decodedString",
+ assertEquals(
+ "## checkExportEncrypt1() : expectedString $expectedString -- decodedString $decodedString",
expectedString,
- decodedString)
+ decodedString
+ )
}
@Test
@@ -165,9 +176,11 @@ class ExportEncryptionTest {
fail("## checkExportEncrypt2() failed : " + e.message)
}
- assertEquals("## checkExportEncrypt2() : expectedString $expectedString -- decodedString $decodedString",
+ assertEquals(
+ "## checkExportEncrypt2() : expectedString $expectedString -- decodedString $decodedString",
expectedString,
- decodedString)
+ decodedString
+ )
}
@Test
@@ -183,14 +196,17 @@ class ExportEncryptionTest {
fail("## checkExportEncrypt3() failed : " + e.message)
}
- assertEquals("## checkExportEncrypt3() : expectedString $expectedString -- decodedString $decodedString",
+ assertEquals(
+ "## checkExportEncrypt3() : expectedString $expectedString -- decodedString $decodedString",
expectedString,
- decodedString)
+ decodedString
+ )
}
@Test
fun checkExportEncrypt4() {
- val password = "passwordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpassword" + "passwordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpassword"
+ val password =
+ "passwordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpassword" + "passwordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpassword"
val expectedString = "alphanumericallyalphanumericallyalphanumericallyalphanumerically"
var decodedString: String? = null
@@ -201,8 +217,10 @@ class ExportEncryptionTest {
fail("## checkExportEncrypt4() failed : " + e.message)
}
- assertEquals("## checkExportEncrypt4() : expectedString $expectedString -- decodedString $decodedString",
+ assertEquals(
+ "## checkExportEncrypt4() : expectedString $expectedString -- decodedString $decodedString",
expectedString,
- decodedString)
+ decodedString
+ )
}
}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
index de4a928dc3..0f3a4b4181 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
@@ -171,7 +171,10 @@ class UnwedgingTest : InstrumentedTest {
// Let us wedge the session now. Set crypto state like after the first message
Timber.i("## CRYPTO | testUnwedging: wedge the session now. Set crypto state like after the first message")
- aliceCryptoStore.storeSession(OlmSessionWrapper(deserializeFromRealm<OlmSession>(oldSession)!!), bobSession.cryptoService().getMyDevice().identityKey()!!)
+ aliceCryptoStore.storeSession(
+ OlmSessionWrapper(deserializeFromRealm<OlmSession>(oldSession)!!),
+ bobSession.cryptoService().getMyDevice().identityKey()!!
+ )
olmDevice.clearOlmSessionCache()
Thread.sleep(6_000)
@@ -218,7 +221,8 @@ class UnwedgingTest : InstrumentedTest {
)
)
}
- }, it)
+ }, it
+ )
}
// Wait until we received back the key
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
index 0f3ff7898f..a37626dc20 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
@@ -126,8 +126,16 @@ class XSigningTest : InstrumentedTest {
assertNull("Alice should not see bob User key", bobKeysFromAlicePOV.userKey())
assertNotNull("Alice can see bob SelfSigned key", bobKeysFromAlicePOV.selfSigningKey())
- assertEquals("Bob keys from alice pov should match", bobKeysFromAlicePOV.masterKey()?.unpaddedBase64PublicKey, bobSession.cryptoService().crossSigningService().getMyCrossSigningKeys()?.masterKey()?.unpaddedBase64PublicKey)
- assertEquals("Bob keys from alice pov should match", bobKeysFromAlicePOV.selfSigningKey()?.unpaddedBase64PublicKey, bobSession.cryptoService().crossSigningService().getMyCrossSigningKeys()?.selfSigningKey()?.unpaddedBase64PublicKey)
+ assertEquals(
+ "Bob keys from alice pov should match",
+ bobKeysFromAlicePOV.masterKey()?.unpaddedBase64PublicKey,
+ bobSession.cryptoService().crossSigningService().getMyCrossSigningKeys()?.masterKey()?.unpaddedBase64PublicKey
+ )
+ assertEquals(
+ "Bob keys from alice pov should match",
+ bobKeysFromAlicePOV.selfSigningKey()?.unpaddedBase64PublicKey,
+ bobSession.cryptoService().crossSigningService().getMyCrossSigningKeys()?.selfSigningKey()?.unpaddedBase64PublicKey
+ )
assertFalse("Bob keys from alice pov should not be trusted", bobKeysFromAlicePOV.isTrusted())
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index 592d24fb69..5066a4339f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -145,7 +145,10 @@ class KeyShareTests : InstrumentedTest {
Log.v("TEST", "Incoming request Session 1 (looking for $outGoingRequestId)")
Log.v("TEST", "=========================")
it.forEach { keyRequest ->
- Log.v("TEST", "[ts${keyRequest.localCreationTimestamp}] requestId ${keyRequest.requestId}, for sessionId ${keyRequest.requestBody?.sessionId} is ${keyRequest.state}")
+ Log.v(
+ "TEST",
+ "[ts${keyRequest.localCreationTimestamp}] requestId ${keyRequest.requestId}, for sessionId ${keyRequest.requestBody?.sessionId} is ${keyRequest.state}"
+ )
}
Log.v("TEST", "=========================")
}
@@ -164,8 +167,10 @@ class KeyShareTests : InstrumentedTest {
}
// Mark the device as trusted
- aliceSession.cryptoService().setDeviceVerification(DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true), aliceSession.myUserId,
- aliceSession2.sessionParams.deviceId ?: "")
+ aliceSession.cryptoService().setDeviceVerification(
+ DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true), aliceSession.myUserId,
+ aliceSession2.sessionParams.deviceId ?: ""
+ )
// Re request
aliceSession2.cryptoService().reRequestRoomKeyForEvent(receivedEvent.root)
@@ -223,7 +228,8 @@ class KeyShareTests : InstrumentedTest {
)
)
}
- }, it)
+ }, it
+ )
}
// Also bootstrap keybackup on first session
@@ -282,8 +288,10 @@ class KeyShareTests : InstrumentedTest {
})
val txId = "m.testVerif12"
- aliceVerificationService2.beginKeyVerification(VerificationMethod.SAS, aliceSession1.myUserId, aliceSession1.sessionParams.deviceId
- ?: "", txId)
+ aliceVerificationService2.beginKeyVerification(
+ VerificationMethod.SAS, aliceSession1.myUserId, aliceSession1.sessionParams.deviceId
+ ?: "", txId
+ )
commonTestHelper.waitWithLatch { latch ->
commonTestHelper.retryPeriodicallyWithLatch(latch) {
@@ -337,7 +345,8 @@ class KeyShareTests : InstrumentedTest {
)
)
}
- }, it)
+ }, it
+ )
}
// Create an encrypted room and send a couple of messages
@@ -371,7 +380,8 @@ class KeyShareTests : InstrumentedTest {
)
)
}
- }, it)
+ }, it
+ )
}
// Let alice invite bob
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
index bad9fd0f68..b3896b02de 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
@@ -147,13 +147,15 @@ class WithHeldTests : InstrumentedTest {
val aliceInterceptor = testHelper.getTestInterceptor(aliceSession)
// Simulate no OTK
- aliceInterceptor!!.addRule(MockOkHttpInterceptor.SimpleRule(
- "/keys/claim",
- 200,
- """
+ aliceInterceptor!!.addRule(
+ MockOkHttpInterceptor.SimpleRule(
+ "/keys/claim",
+ 200,
+ """
{ "one_time_keys" : {} }
"""
- ))
+ )
+ )
Log.d("#TEST", "Recovery :${aliceSession.sessionParams.credentials.accessToken}")
val roomAlicePov = aliceSession.getRoom(testData.roomId)!!
@@ -184,7 +186,10 @@ class WithHeldTests : InstrumentedTest {
// Ensure that alice has marked the session to be shared with bob
val sessionId = eventBobPOV!!.root.content.toModel<EncryptedEventContent>()!!.sessionId!!
- val chainIndex = aliceSession.cryptoService().getSharedWithInfo(testData.roomId, sessionId).getObject(bobSession.myUserId, bobSession.sessionParams.credentials.deviceId)
+ val chainIndex = aliceSession.cryptoService().getSharedWithInfo(testData.roomId, sessionId).getObject(
+ bobSession.myUserId,
+ bobSession.sessionParams.credentials.deviceId
+ )
Assert.assertEquals("Alice should have marked bob's device for this session", 0, chainIndex)
// Add a new device for bob
@@ -202,7 +207,10 @@ class WithHeldTests : InstrumentedTest {
}
}
- val chainIndex2 = aliceSession.cryptoService().getSharedWithInfo(testData.roomId, sessionId).getObject(bobSecondSession.myUserId, bobSecondSession.sessionParams.credentials.deviceId)
+ val chainIndex2 = aliceSession.cryptoService().getSharedWithInfo(testData.roomId, sessionId).getObject(
+ bobSecondSession.myUserId,
+ bobSecondSession.sessionParams.credentials.deviceId
+ )
Assert.assertEquals("Alice should have marked bob's device for this session", 1, chainIndex2)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
index d035fe5fde..9bf08f6fc0 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
@@ -54,9 +54,11 @@ class KeysBackupPasswordTest : InstrumentedTest {
assertEquals(OlmPkDecryption.privateKeyLength(), generatePrivateKeyResult.privateKey.size)
// Reverse operation
- val retrievedPrivateKey = retrievePrivateKeyWithPassword(PASSWORD,
+ val retrievedPrivateKey = retrievePrivateKeyWithPassword(
+ PASSWORD,
generatePrivateKeyResult.salt,
- generatePrivateKeyResult.iterations)
+ generatePrivateKeyResult.iterations
+ )
assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
assertArrayEquals(generatePrivateKeyResult.privateKey, retrievedPrivateKey)
@@ -102,9 +104,11 @@ class KeysBackupPasswordTest : InstrumentedTest {
assertEquals(OlmPkDecryption.privateKeyLength(), generatePrivateKeyResult.privateKey.size)
// Reverse operation, with bad password
- val retrievedPrivateKey = retrievePrivateKeyWithPassword(BAD_PASSWORD,
+ val retrievedPrivateKey = retrievePrivateKeyWithPassword(
+ BAD_PASSWORD,
generatePrivateKeyResult.salt,
- generatePrivateKeyResult.iterations)
+ generatePrivateKeyResult.iterations
+ )
assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
assertByteArrayNotEqual(generatePrivateKeyResult.privateKey, retrievedPrivateKey)
@@ -122,9 +126,11 @@ class KeysBackupPasswordTest : InstrumentedTest {
assertEquals(OlmPkDecryption.privateKeyLength(), generatePrivateKeyResult.privateKey.size)
// Reverse operation, with bad iteration
- val retrievedPrivateKey = retrievePrivateKeyWithPassword(PASSWORD,
+ val retrievedPrivateKey = retrievePrivateKeyWithPassword(
+ PASSWORD,
generatePrivateKeyResult.salt,
- 500_001)
+ 500_001
+ )
assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
assertByteArrayNotEqual(generatePrivateKeyResult.privateKey, retrievedPrivateKey)
@@ -142,9 +148,11 @@ class KeysBackupPasswordTest : InstrumentedTest {
assertEquals(OlmPkDecryption.privateKeyLength(), generatePrivateKeyResult.privateKey.size)
// Reverse operation, with bad iteration
- val retrievedPrivateKey = retrievePrivateKeyWithPassword(PASSWORD,
+ val retrievedPrivateKey = retrievePrivateKeyWithPassword(
+ PASSWORD,
BAD_SALT,
- generatePrivateKeyResult.iterations)
+ generatePrivateKeyResult.iterations
+ )
assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
assertByteArrayNotEqual(generatePrivateKeyResult.privateKey, retrievedPrivateKey)
@@ -168,7 +176,8 @@ class KeysBackupPasswordTest : InstrumentedTest {
116.toByte(), 224.toByte(), 229.toByte(), 224.toByte(), 9.toByte(), 3.toByte(), 178.toByte(), 162.toByte(),
120.toByte(), 23.toByte(), 108.toByte(), 218.toByte(), 22.toByte(), 61.toByte(), 241.toByte(), 200.toByte(),
235.toByte(), 173.toByte(), 236.toByte(), 100.toByte(), 115.toByte(), 247.toByte(), 33.toByte(), 132.toByte(),
- 195.toByte(), 154.toByte(), 64.toByte(), 158.toByte(), 184.toByte(), 148.toByte(), 20.toByte(), 85.toByte())
+ 195.toByte(), 154.toByte(), 64.toByte(), 158.toByte(), 184.toByte(), 148.toByte(), 20.toByte(), 85.toByte()
+ )
assertArrayEquals(privateKeyBytes, retrievedPrivateKey)
}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
index 3220f161fa..a7ddb6c553 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
@@ -272,10 +272,12 @@ class KeysBackupTest : InstrumentedTest {
assertNotNull(decryption)
// - Check decryptKeyBackupData() returns stg
val sessionData = keysBackup
- .decryptKeyBackupData(keyBackupData,
+ .decryptKeyBackupData(
+ keyBackupData,
session.olmInboundGroupSession!!.sessionIdentifier(),
cryptoTestData.roomId,
- decryption!!)
+ decryption!!
+ )
assertNotNull(sessionData)
// - Compare the decrypted megolm key with the original one
keysBackupTestHelper.assertKeysEquals(session.exportKeys(), sessionData)
@@ -297,7 +299,8 @@ class KeysBackupTest : InstrumentedTest {
// - Restore the e2e backup from the homeserver
val importRoomKeysResult = testHelper.doSync<ImportRoomKeysResult> {
- testData.aliceSession2.cryptoService().keysBackupService().restoreKeysWithRecoveryKey(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
+ testData.aliceSession2.cryptoService().keysBackupService().restoreKeysWithRecoveryKey(
+ testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
testData.prepareKeysBackupDataResult.megolmBackupCreationInfo.recoveryKey,
null,
null,
@@ -680,7 +683,8 @@ class KeysBackupTest : InstrumentedTest {
val steps = ArrayList<StepProgressListener.Step>()
val importRoomKeysResult = testHelper.doSync<ImportRoomKeysResult> {
- testData.aliceSession2.cryptoService().keysBackupService().restoreKeyBackupWithPassword(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
+ testData.aliceSession2.cryptoService().keysBackupService().restoreKeyBackupWithPassword(
+ testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
password,
null,
null,
@@ -771,7 +775,8 @@ class KeysBackupTest : InstrumentedTest {
// - Restore the e2e backup with the recovery key.
val importRoomKeysResult = testHelper.doSync<ImportRoomKeysResult> {
- testData.aliceSession2.cryptoService().keysBackupService().restoreKeysWithRecoveryKey(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
+ testData.aliceSession2.cryptoService().keysBackupService().restoreKeysWithRecoveryKey(
+ testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
testData.prepareKeysBackupDataResult.megolmBackupCreationInfo.recoveryKey,
null,
null,
@@ -1055,7 +1060,11 @@ class KeysBackupTest : InstrumentedTest {
assertFalse(keysBackup2.isEnabled)
// - Validate the old device from the new one
- aliceSession2.cryptoService().setDeviceVerification(DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true), aliceSession2.myUserId, oldDeviceId)
+ aliceSession2.cryptoService().setDeviceVerification(
+ DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true),
+ aliceSession2.myUserId,
+ oldDeviceId
+ )
// -> Backup should automatically enable on the new device
val latch4 = CountDownLatch(1)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
index ac83cb8882..90e7fc1e45 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
@@ -88,10 +88,12 @@ internal class KeysBackupTestHelper(
stateObserver.stopAndCheckStates(null)
- return KeysBackupScenarioData(cryptoTestData,
+ return KeysBackupScenarioData(
+ cryptoTestData,
aliceKeys,
prepareKeysBackupDataResult,
- aliceSession2)
+ aliceSession2
+ )
}
fun prepareAndCreateKeysBackupData(keysBackup: KeysBackupService,
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
index a882f69013..c758050fc9 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
@@ -207,14 +207,16 @@ class QuadSTests : InstrumentedTest {
// Assert that can decrypt with both keys
testHelper.runBlockingTest {
- aliceSession.sharedSecretStorageService().getSecret("my.secret",
+ aliceSession.sharedSecretStorageService().getSecret(
+ "my.secret",
keyId1,
RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)!!
)
}
testHelper.runBlockingTest {
- aliceSession.sharedSecretStorageService().getSecret("my.secret",
+ aliceSession.sharedSecretStorageService().getSecret(
+ "my.secret",
keyId2,
RawBytesKeySpec.fromRecoveryKey(key2Info.recoveryKey)!!
)
@@ -245,13 +247,15 @@ class QuadSTests : InstrumentedTest {
testHelper.runBlockingTest {
try {
- aliceSession.sharedSecretStorageService().getSecret("my.secret",
+ aliceSession.sharedSecretStorageService().getSecret(
+ "my.secret",
keyId1,
RawBytesKeySpec.fromPassphrase(
"A bad passphrase",
key1Info.content?.passphrase?.salt ?: "",
key1Info.content?.passphrase?.iterations ?: 0,
- null)
+ null
+ )
)
} catch (throwable: Throwable) {
assert(throwable is SharedSecretStorageError.BadMac)
@@ -260,13 +264,15 @@ class QuadSTests : InstrumentedTest {
// Now try with correct key
testHelper.runBlockingTest {
- aliceSession.sharedSecretStorageService().getSecret("my.secret",
+ aliceSession.sharedSecretStorageService().getSecret(
+ "my.secret",
keyId1,
RawBytesKeySpec.fromPassphrase(
passphrase,
key1Info.content?.passphrase?.salt ?: "",
key1Info.content?.passphrase?.iterations ?: 0,
- null)
+ null
+ )
)
}
@@ -321,7 +327,8 @@ class QuadSTests : InstrumentedTest {
keyId,
passphrase,
emptyKeySigner,
- null)
+ null
+ )
}
assertAccountData(session, "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$keyId")
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
index 14e659e2b6..2892cf8464 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
@@ -75,10 +75,12 @@ class SASTest : InstrumentedTest {
}
bobVerificationService.addListener(bobListener)
- val txID = aliceVerificationService.beginKeyVerification(VerificationMethod.SAS,
+ val txID = aliceVerificationService.beginKeyVerification(
+ VerificationMethod.SAS,
bobSession.myUserId,
bobSession.cryptoService().getMyDevice().deviceId,
- null)
+ null
+ )
assertNotNull("Alice should have a started transaction", txID)
val aliceKeyTx = aliceVerificationService.getExistingTransaction(bobSession.myUserId, txID!!)
@@ -467,8 +469,10 @@ class SASTest : InstrumentedTest {
val aliceTx = aliceVerificationService.getExistingTransaction(bobUserId, verificationSAS!!) as SASDefaultVerificationTransaction
val bobTx = bobVerificationService.getExistingTransaction(aliceSession.myUserId, verificationSAS) as SASDefaultVerificationTransaction
- assertEquals("Should have same SAS", aliceTx.getShortCodeRepresentation(SasMode.DECIMAL),
- bobTx.getShortCodeRepresentation(SasMode.DECIMAL))
+ assertEquals(
+ "Should have same SAS", aliceTx.getShortCodeRepresentation(SasMode.DECIMAL),
+ bobTx.getShortCodeRepresentation(SasMode.DECIMAL)
+ )
cryptoTestData.cleanUp(testHelper)
}
@@ -544,7 +548,8 @@ class SASTest : InstrumentedTest {
// Assert that devices are verified
val bobDeviceInfoFromAlicePOV: CryptoDeviceInfo? = aliceSession.cryptoService().getDeviceInfo(bobUserId, bobDeviceId)
- val aliceDeviceInfoFromBobPOV: CryptoDeviceInfo? = bobSession.cryptoService().getDeviceInfo(aliceSession.myUserId, aliceSession.cryptoService().getMyDevice().deviceId)
+ val aliceDeviceInfoFromBobPOV: CryptoDeviceInfo? =
+ bobSession.cryptoService().getDeviceInfo(aliceSession.myUserId, aliceSession.cryptoService().getMyDevice().deviceId)
assertTrue("alice device should be verified from bob point of view", aliceDeviceInfoFromBobPOV!!.isVerified)
assertTrue("bob device should be verified from alice point of view", bobDeviceInfoFromAlicePOV!!.isVerified)
@@ -611,14 +616,16 @@ class SASTest : InstrumentedTest {
requestID!!,
cryptoTestData.roomId,
bobSession.myUserId,
- bobSession.sessionParams.deviceId!!)
+ bobSession.sessionParams.deviceId!!
+ )
bobVerificationService.beginKeyVerificationInDMs(
VerificationMethod.SAS,
requestID!!,
cryptoTestData.roomId,
aliceSession.myUserId,
- aliceSession.sessionParams.deviceId!!)
+ aliceSession.sessionParams.deviceId!!
+ )
// we should reach SHOW SAS on both
var alicePovTx: SasVerificationTransaction?
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
index 76bf6dc040..d7b4d636fc 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
@@ -37,7 +37,8 @@ class QrCodeTest : InstrumentedTest {
sharedSecret = "MTIzNDU2Nzg"
)
- private val value1 = "MATRIX\u0002\u0000\u0000\u000DMaTransaction\u0092Ñ0qCú²íq\u0087á®\u0013à\u0098\u0091\u000DÇéoÃ\"_²lq]hC«¢UMynd¤Ù.ô\u0091XäÏ\u0094ê\u008B«\u009Døl\u000F¿+\u008CË\u0014¤®õÁ\u008BA¥12345678"
+ private val value1 =
+ "MATRIX\u0002\u0000\u0000\u000DMaTransaction\u0092Ñ0qCú²íq\u0087á®\u0013à\u0098\u0091\u000DÇéoÃ\"_²lq]hC«¢UMynd¤Ù.ô\u0091XäÏ\u0094ê\u008B«\u009Døl\u000F¿+\u008CË\u0014¤®õÁ\u008BA¥12345678"
private val qrCode2 = QrCodeData.SelfVerifyingMasterKeyTrusted(
transactionId = "MaTransaction",
@@ -46,7 +47,8 @@ class QrCodeTest : InstrumentedTest {
sharedSecret = "MTIzNDU2Nzg"
)
- private val value2 = "MATRIX\u0002\u0001\u0000\u000DMaTransaction\u0092Ñ0qCú²íq\u0087á®\u0013à\u0098\u0091\u000DÇéoÃ\"_²lq]hC«¢UMynd¤Ù.ô\u0091XäÏ\u0094ê\u008B«\u009Døl\u000F¿+\u008CË\u0014¤®õÁ\u008BA¥12345678"
+ private val value2 =
+ "MATRIX\u0002\u0001\u0000\u000DMaTransaction\u0092Ñ0qCú²íq\u0087á®\u0013à\u0098\u0091\u000DÇéoÃ\"_²lq]hC«¢UMynd¤Ù.ô\u0091XäÏ\u0094ê\u008B«\u009Døl\u000F¿+\u008CË\u0014¤®õÁ\u008BA¥12345678"
private val qrCode3 = QrCodeData.SelfVerifyingMasterKeyNotTrusted(
transactionId = "MaTransaction",
@@ -55,7 +57,8 @@ class QrCodeTest : InstrumentedTest {
sharedSecret = "MTIzNDU2Nzg"
)
- private val value3 = "MATRIX\u0002\u0002\u0000\u000DMaTransactionMynd¤Ù.ô\u0091XäÏ\u0094ê\u008B«\u009Døl\u000F¿+\u008CË\u0014¤®õÁ\u008BA¥\u0092Ñ0qCú²íq\u0087á®\u0013à\u0098\u0091\u000DÇéoÃ\"_²lq]hC«¢U12345678"
+ private val value3 =
+ "MATRIX\u0002\u0002\u0000\u000DMaTransactionMynd¤Ù.ô\u0091XäÏ\u0094ê\u008B«\u009Døl\u000F¿+\u008CË\u0014¤®õÁ\u008BA¥\u0092Ñ0qCú²íq\u0087á®\u0013à\u0098\u0091\u000DÇéoÃ\"_²lq]hC«¢U12345678"
private val sharedSecretByteArray = "12345678".toByteArray(Charsets.ISO_8859_1)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
index 374d709505..6097bf8c93 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
@@ -175,7 +175,8 @@ class VerificationTest : InstrumentedTest {
)
)
}
- }, callback)
+ }, callback
+ )
}
testHelper.doSync<Unit> { callback ->
@@ -191,7 +192,8 @@ class VerificationTest : InstrumentedTest {
)
)
}
- }, callback)
+ }, callback
+ )
}
val aliceVerificationService = aliceSession.cryptoService().verificationService()
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
index ef98ed22c7..acb23bf723 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
@@ -71,10 +71,12 @@ class MarkdownParserTest : InstrumentedTest {
testIdentity("")
testIdentity("a")
testIdentity("1")
- testIdentity("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et " +
- "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea com" +
- "modo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pari" +
- "atur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
+ testIdentity(
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et " +
+ "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea com" +
+ "modo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pari" +
+ "atur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+ )
}
@Test
@@ -294,16 +296,20 @@ class MarkdownParserTest : InstrumentedTest {
"$markdownPattern$name$markdownPattern"
.let {
markdownParser.parse(it)
- .expect(expectedText = it,
- expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>")
+ .expect(
+ expectedText = it,
+ expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>"
+ )
}
// Test twice the same tag
"$markdownPattern$name$markdownPattern and $markdownPattern$name bis$markdownPattern"
.let {
markdownParser.parse(it)
- .expect(expectedText = it,
- expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> and <$htmlExpectedTag>$name bis</$htmlExpectedTag>")
+ .expect(
+ expectedText = it,
+ expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> and <$htmlExpectedTag>$name bis</$htmlExpectedTag>"
+ )
}
val textBefore = "a"
@@ -313,48 +319,60 @@ class MarkdownParserTest : InstrumentedTest {
"$textBefore$markdownPattern$name$markdownPattern"
.let {
markdownParser.parse(it)
- .expect(expectedText = it,
- expectedFormattedText = "$textBefore<$htmlExpectedTag>$name</$htmlExpectedTag>")
+ .expect(
+ expectedText = it,
+ expectedFormattedText = "$textBefore<$htmlExpectedTag>$name</$htmlExpectedTag>"
+ )
}
// With text before and space
"$textBefore $markdownPattern$name$markdownPattern"
.let {
markdownParser.parse(it)
- .expect(expectedText = it,
- expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag>")
+ .expect(
+ expectedText = it,
+ expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag>"
+ )
}
// With sticked text after
"$markdownPattern$name$markdownPattern$textAfter"
.let {
markdownParser.parse(it)
- .expect(expectedText = it,
- expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter")
+ .expect(
+ expectedText = it,
+ expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter"
+ )
}
// With space and text after
"$markdownPattern$name$markdownPattern $textAfter"
.let {
markdownParser.parse(it)
- .expect(expectedText = it,
- expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter")
+ .expect(
+ expectedText = it,
+ expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter"
+ )
}
// With sticked text before and text after
"$textBefore$markdownPattern$name$markdownPattern$textAfter"
.let {
markdownParser.parse(it)
- .expect(expectedText = it,
- expectedFormattedText = "a<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter")
+ .expect(
+ expectedText = it,
+ expectedFormattedText = "a<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter"
+ )
}
// With text before and after, with spaces
"$textBefore $markdownPattern$name$markdownPattern $textAfter"
.let {
markdownParser.parse(it)
- .expect(expectedText = it,
- expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter")
+ .expect(
+ expectedText = it,
+ expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter"
+ )
}
}
@@ -366,16 +384,20 @@ class MarkdownParserTest : InstrumentedTest {
"$markdownPattern$name\n$name$markdownPattern"
.let {
markdownParser.parse(it)
- .expect(expectedText = it,
- expectedFormattedText = "<$htmlExpectedTag>$name$softBreak$name</$htmlExpectedTag>")
+ .expect(
+ expectedText = it,
+ expectedFormattedText = "<$htmlExpectedTag>$name$softBreak$name</$htmlExpectedTag>"
+ )
}
// With new line between two blocks
"$markdownPattern$name$markdownPattern\n$markdownPattern$name$markdownPattern"
.let {
markdownParser.parse(it)
- .expect(expectedText = it,
- expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag><br /><$htmlExpectedTag>$name</$htmlExpectedTag>")
+ .expect(
+ expectedText = it,
+ expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag><br /><$htmlExpectedTag>$name</$htmlExpectedTag>"
+ )
}
}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
index d38afc6b62..67eafea55d 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
@@ -39,27 +39,35 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
"""{"a":["c":"b","d":"e"]}""",
"""{"a":["d":"b","c":"e"]}"""
).forEach {
- assertEquals(it,
- JsonCanonicalizer.canonicalize(it))
+ assertEquals(
+ it,
+ JsonCanonicalizer.canonicalize(it)
+ )
}
}
@Test
fun reorderTest() {
- assertEquals("""{"a":true,"b":false}""",
- JsonCanonicalizer.canonicalize("""{"b":false,"a":true}"""))
+ assertEquals(
+ """{"a":true,"b":false}""",
+ JsonCanonicalizer.canonicalize("""{"b":false,"a":true}""")
+ )
}
@Test
fun realSampleTest() {
- assertEquals("""{"algorithms":["m.megolm.v1.aes-sha2","m.olm.v1.curve25519-aes-sha2"],"device_id":"VSCUNFSOUI","keys":{"curve25519:VSCUNFSOUI":"utyOjnhiQ73qNhi9HlN0OgWIowe5gthTS8r0r9TcJ3o","ed25519:VSCUNFSOUI":"qNhEt+Yggaajet0hX\/FjTRLfySgs65ldYyomm7PIx6U"},"user_id":"@benoitx:matrix.org"}""",
- JsonCanonicalizer.canonicalize("""{"algorithms":["m.megolm.v1.aes-sha2","m.olm.v1.curve25519-aes-sha2"],"device_id":"VSCUNFSOUI","user_id":"@benoitx:matrix.org","keys":{"curve25519:VSCUNFSOUI":"utyOjnhiQ73qNhi9HlN0OgWIowe5gthTS8r0r9TcJ3o","ed25519:VSCUNFSOUI":"qNhEt+Yggaajet0hX/FjTRLfySgs65ldYyomm7PIx6U"}}"""))
+ assertEquals(
+ """{"algorithms":["m.megolm.v1.aes-sha2","m.olm.v1.curve25519-aes-sha2"],"device_id":"VSCUNFSOUI","keys":{"curve25519:VSCUNFSOUI":"utyOjnhiQ73qNhi9HlN0OgWIowe5gthTS8r0r9TcJ3o","ed25519:VSCUNFSOUI":"qNhEt+Yggaajet0hX\/FjTRLfySgs65ldYyomm7PIx6U"},"user_id":"@benoitx:matrix.org"}""",
+ JsonCanonicalizer.canonicalize("""{"algorithms":["m.megolm.v1.aes-sha2","m.olm.v1.curve25519-aes-sha2"],"device_id":"VSCUNFSOUI","user_id":"@benoitx:matrix.org","keys":{"curve25519:VSCUNFSOUI":"utyOjnhiQ73qNhi9HlN0OgWIowe5gthTS8r0r9TcJ3o","ed25519:VSCUNFSOUI":"qNhEt+Yggaajet0hX/FjTRLfySgs65ldYyomm7PIx6U"}}""")
+ )
}
@Test
fun doubleQuoteTest() {
- assertEquals("{\"a\":\"\\\"\"}",
- JsonCanonicalizer.canonicalize("{\"a\":\"\\\"\"}"))
+ assertEquals(
+ "{\"a\":\"\\\"\"}",
+ JsonCanonicalizer.canonicalize("{\"a\":\"\\\"\"}")
+ )
}
/* ==========================================================================================
@@ -68,38 +76,52 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
@Test
fun matrixOrg001Test() {
- assertEquals("""{}""",
- JsonCanonicalizer.canonicalize("""{}"""))
+ assertEquals(
+ """{}""",
+ JsonCanonicalizer.canonicalize("""{}""")
+ )
}
@Test
fun matrixOrg002Test() {
- assertEquals("""{"one":1,"two":"Two"}""",
- JsonCanonicalizer.canonicalize("""{
+ assertEquals(
+ """{"one":1,"two":"Two"}""",
+ JsonCanonicalizer.canonicalize(
+ """{
"one": 1,
"two": "Two"
-}"""))
+}"""
+ )
+ )
}
@Test
fun matrixOrg003Test() {
- assertEquals("""{"a":"1","b":"2"}""",
- JsonCanonicalizer.canonicalize("""{
+ assertEquals(
+ """{"a":"1","b":"2"}""",
+ JsonCanonicalizer.canonicalize(
+ """{
"b": "2",
"a": "1"
-}"""))
+}"""
+ )
+ )
}
@Test
fun matrixOrg004Test() {
- assertEquals("""{"a":"1","b":"2"}""",
- JsonCanonicalizer.canonicalize("""{"b":"2","a":"1"}"""))
+ assertEquals(
+ """{"a":"1","b":"2"}""",
+ JsonCanonicalizer.canonicalize("""{"b":"2","a":"1"}""")
+ )
}
@Test
fun matrixOrg005Test() {
- assertEquals("""{"auth":{"mxid":"@john.doe:example.com","profile":{"display_name":"John Doe","three_pids":[{"address":"john.doe@example.org","medium":"email"},{"address":"123456789","medium":"msisdn"}]},"success":true}}""",
- JsonCanonicalizer.canonicalize("""{
+ assertEquals(
+ """{"auth":{"mxid":"@john.doe:example.com","profile":{"display_name":"John Doe","three_pids":[{"address":"john.doe@example.org","medium":"email"},{"address":"123456789","medium":"msisdn"}]},"success":true}}""",
+ JsonCanonicalizer.canonicalize(
+ """{
"auth": {
"success": true,
"mxid": "@john.doe:example.com",
@@ -117,37 +139,53 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
]
}
}
-}"""))
+}"""
+ )
+ )
}
@Test
fun matrixOrg006Test() {
- assertEquals("""{"a":"日本語"}""",
- JsonCanonicalizer.canonicalize("""{
+ assertEquals(
+ """{"a":"日本語"}""",
+ JsonCanonicalizer.canonicalize(
+ """{
"a": "日本語"
-}"""))
+}"""
+ )
+ )
}
@Test
fun matrixOrg007Test() {
- assertEquals("""{"日":1,"本":2}""",
- JsonCanonicalizer.canonicalize("""{
+ assertEquals(
+ """{"日":1,"本":2}""",
+ JsonCanonicalizer.canonicalize(
+ """{
"本": 2,
"日": 1
-}"""))
+}"""
+ )
+ )
}
@Test
fun matrixOrg008Test() {
- assertEquals("""{"a":"日"}""",
- JsonCanonicalizer.canonicalize("{\"a\": \"\u65E5\"}"))
+ assertEquals(
+ """{"a":"日"}""",
+ JsonCanonicalizer.canonicalize("{\"a\": \"\u65E5\"}")
+ )
}
@Test
fun matrixOrg009Test() {
- assertEquals("""{"a":null}""",
- JsonCanonicalizer.canonicalize("""{
+ assertEquals(
+ """{"a":null}""",
+ JsonCanonicalizer.canonicalize(
+ """{
"a": null
-}"""))
+}"""
+ )
+ )
}
}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/ordering/StringOrderTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/ordering/StringOrderTest.kt
index 728986441a..b5870ebf69 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/ordering/StringOrderTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/ordering/StringOrderTest.kt
@@ -26,9 +26,18 @@ class StringOrderTest {
@Test
fun testbasing() {
- assertEquals("a", StringOrderUtils.baseToString(StringOrderUtils.stringToBase("a", StringOrderUtils.DEFAULT_ALPHABET), StringOrderUtils.DEFAULT_ALPHABET))
- assertEquals("element", StringOrderUtils.baseToString(StringOrderUtils.stringToBase("element", StringOrderUtils.DEFAULT_ALPHABET), StringOrderUtils.DEFAULT_ALPHABET))
- assertEquals("matrix", StringOrderUtils.baseToString(StringOrderUtils.stringToBase("matrix", StringOrderUtils.DEFAULT_ALPHABET), StringOrderUtils.DEFAULT_ALPHABET))
+ assertEquals(
+ "a",
+ StringOrderUtils.baseToString(StringOrderUtils.stringToBase("a", StringOrderUtils.DEFAULT_ALPHABET), StringOrderUtils.DEFAULT_ALPHABET)
+ )
+ assertEquals(
+ "element",
+ StringOrderUtils.baseToString(StringOrderUtils.stringToBase("element", StringOrderUtils.DEFAULT_ALPHABET), StringOrderUtils.DEFAULT_ALPHABET)
+ )
+ assertEquals(
+ "matrix",
+ StringOrderUtils.baseToString(StringOrderUtils.stringToBase("matrix", StringOrderUtils.DEFAULT_ALPHABET), StringOrderUtils.DEFAULT_ALPHABET)
+ )
}
@Test
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt
index f6e08a576e..a2984dd27e 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt
@@ -59,7 +59,8 @@ class ThreadMessagingTest : InstrumentedTest {
val sentMessages = commonTestHelper.sendTextMessage(
room = aliceRoom,
message = textMessage,
- nbOfMessages = 1)
+ nbOfMessages = 1
+ )
val initMessage = sentMessages.first()
@@ -73,7 +74,8 @@ class ThreadMessagingTest : InstrumentedTest {
room = aliceRoom,
message = "Reply In the above thread",
numberOfMessages = 1,
- rootThreadEventId = initMessage.root.eventId.orEmpty())
+ rootThreadEventId = initMessage.root.eventId.orEmpty()
+ )
val replyInThread = repliesInThread.first()
replyInThread.root.isThread().shouldBeTrue()
@@ -116,7 +118,8 @@ class ThreadMessagingTest : InstrumentedTest {
val sentMessages = commonTestHelper.sendTextMessage(
room = aliceRoom,
message = textMessage,
- nbOfMessages = 1)
+ nbOfMessages = 1
+ )
val initMessage = sentMessages.first()
@@ -134,7 +137,8 @@ class ThreadMessagingTest : InstrumentedTest {
room = bobRoom,
message = "Reply In the above thread",
numberOfMessages = 1,
- rootThreadEventId = initMessage.root.eventId.orEmpty())
+ rootThreadEventId = initMessage.root.eventId.orEmpty()
+ )
val replyInThread = repliesInThread.first()
replyInThread.root.isThread().shouldBeTrue()
@@ -190,7 +194,8 @@ class ThreadMessagingTest : InstrumentedTest {
val sentMessages = commonTestHelper.sendTextMessage(
room = aliceRoom,
message = textMessage,
- nbOfMessages = 5)
+ nbOfMessages = 5
+ )
sentMessages.forEach {
it.root.isThread().shouldBeFalse()
@@ -206,7 +211,8 @@ class ThreadMessagingTest : InstrumentedTest {
room = aliceRoom,
message = "Reply In the above thread",
numberOfMessages = 40,
- rootThreadEventId = selectedInitMessage.root.eventId.orEmpty())
+ rootThreadEventId = selectedInitMessage.root.eventId.orEmpty()
+ )
repliesInThread.forEach {
it.root.isThread().shouldBeTrue()
@@ -253,7 +259,8 @@ class ThreadMessagingTest : InstrumentedTest {
val sentMessages = commonTestHelper.sendTextMessage(
room = aliceRoom,
message = textMessage,
- nbOfMessages = 5)
+ nbOfMessages = 5
+ )
sentMessages.forEach {
it.root.isThread().shouldBeFalse()
@@ -270,7 +277,8 @@ class ThreadMessagingTest : InstrumentedTest {
room = aliceRoom,
message = "Alice reply In the above second thread message",
numberOfMessages = 35,
- rootThreadEventId = secondMessage.root.eventId.orEmpty())
+ rootThreadEventId = secondMessage.root.eventId.orEmpty()
+ )
// Let's reply in timeline to that message from another user
val bobSession = cryptoTestData.secondSession!!
@@ -282,14 +290,16 @@ class ThreadMessagingTest : InstrumentedTest {
room = bobRoom,
message = "Bob reply In the above first thread message",
numberOfMessages = 42,
- rootThreadEventId = firstMessage.root.eventId.orEmpty())
+ rootThreadEventId = firstMessage.root.eventId.orEmpty()
+ )
// Bob will also reply in second thread 5 times
val bobThreadRepliesInSecondMessage = commonTestHelper.replyInThreadMessage(
room = bobRoom,
message = "Another Bob reply In the above second thread message",
numberOfMessages = 20,
- rootThreadEventId = secondMessage.root.eventId.orEmpty())
+ rootThreadEventId = secondMessage.root.eventId.orEmpty()
+ )
aliceThreadRepliesInSecondMessage.forEach {
it.root.isThread().shouldBeTrue()
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
index 27d3fdc856..94b2ba55a3 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
@@ -68,7 +68,8 @@ internal class ChunkEntityTest : InstrumentedTest {
roomId = ROOM_ID,
eventEntity = fakeEvent,
direction = PaginationDirection.FORWARDS,
- roomMemberContentsByUser = emptyMap())
+ roomMemberContentsByUser = emptyMap()
+ )
chunk.timelineEvents.size shouldBeEqualTo 1
}
}
@@ -84,12 +85,14 @@ internal class ChunkEntityTest : InstrumentedTest {
roomId = ROOM_ID,
eventEntity = fakeEvent,
direction = PaginationDirection.FORWARDS,
- roomMemberContentsByUser = emptyMap())
+ roomMemberContentsByUser = emptyMap()
+ )
chunk.addTimelineEvent(
roomId = ROOM_ID,
eventEntity = fakeEvent,
direction = PaginationDirection.FORWARDS,
- roomMemberContentsByUser = emptyMap())
+ roomMemberContentsByUser = emptyMap()
+ )
chunk.timelineEvents.size shouldBeEqualTo 1
}
}
@@ -162,7 +165,8 @@ internal class ChunkEntityTest : InstrumentedTest {
roomId = roomId,
eventEntity = fakeEvent,
direction = direction,
- roomMemberContentsByUser = emptyMap())
+ roomMemberContentsByUser = emptyMap()
+ )
}
}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
index 3864ea1cd1..d5b4a07fc0 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
@@ -71,7 +71,8 @@ class TimelineForwardPaginationTest : InstrumentedTest {
val sentMessages = commonTestHelper.sendTextMessage(
roomFromAlicePOV,
message,
- numberOfMessagesToSend)
+ numberOfMessagesToSend
+ )
// Alice clear the cache and restart the sync
commonTestHelper.clearCacheAndSync(aliceSession)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
index 5d09b74e6c..6e5fed8df9 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
@@ -94,7 +94,8 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
val firstMessageFromAliceId = commonTestHelper.sendTextMessage(
roomFromAlicePOV,
firstMessage,
- 30)
+ 30
+ )
.last()
.eventId
@@ -130,7 +131,8 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
commonTestHelper.sendTextMessage(
roomFromAlicePOV,
secondMessage,
- 30)
+ 30
+ )
// Bob start to sync
bobSession.startSync(true)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt
index 251b2c614c..42f710d7cf 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt
@@ -64,7 +64,8 @@ class TimelineSimpleBackPaginationTest : InstrumentedTest {
commonTestHelper.sendTextMessage(
roomFromAlicePOV,
message,
- numberOfMessagesToSent)
+ numberOfMessagesToSent
+ )
val bobTimeline = roomFromBobPOV.timelineService().createTimeline(null, TimelineSettings(30))
bobTimeline.start()
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
index ab0bbe7f73..e17b7efbd6 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
@@ -85,7 +85,8 @@ class SearchMessagesTest : InstrumentedTest {
commonTestHelper.sendTextMessage(
roomFromAlicePOV,
MESSAGE,
- 2)
+ 2
+ )
val data = commonTestHelper.runBlockingTest {
block.invoke(cryptoTestData)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
index d2c8b52fc7..6a17cb74ad 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -177,21 +177,27 @@ class SpaceHierarchyTest : InstrumentedTest {
val commonTestHelper = CommonTestHelper(context())
val session = commonTestHelper.createAccount("John", SessionTestParams(true))
- val spaceAInfo = createPublicSpace(session, "SpaceA", listOf(
+ val spaceAInfo = createPublicSpace(
+ session, "SpaceA", listOf(
Triple("A1", true /*auto-join*/, true/*canonical*/),
Triple("A2", true, true)
- ))
+ )
+ )
- /* val spaceBInfo = */ createPublicSpace(session, "SpaceB", listOf(
+ /* val spaceBInfo = */ createPublicSpace(
+ session, "SpaceB", listOf(
Triple("B1", true /*auto-join*/, true/*canonical*/),
Triple("B2", true, true),
Triple("B3", true, true)
- ))
+ )
+ )
- val spaceCInfo = createPublicSpace(session, "SpaceC", listOf(
+ val spaceCInfo = createPublicSpace(
+ session, "SpaceC", listOf(
Triple("C1", true /*auto-join*/, true/*canonical*/),
Triple("C2", true, true)
- ))
+ )
+ )
// add C as a subspace of A
val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
@@ -254,15 +260,19 @@ class SpaceHierarchyTest : InstrumentedTest {
val commonTestHelper = CommonTestHelper(context())
val session = commonTestHelper.createAccount("John", SessionTestParams(true))
- val spaceAInfo = createPublicSpace(session, "SpaceA", listOf(
+ val spaceAInfo = createPublicSpace(
+ session, "SpaceA", listOf(
Triple("A1", true /*auto-join*/, true/*canonical*/),
Triple("A2", true, true)
- ))
+ )
+ )
- val spaceCInfo = createPublicSpace(session, "SpaceC", listOf(
+ val spaceCInfo = createPublicSpace(
+ session, "SpaceC", listOf(
Triple("C1", true /*auto-join*/, true/*canonical*/),
Triple("C2", true, true)
- ))
+ )
+ )
// add C as a subspace of A
val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
@@ -296,16 +306,20 @@ class SpaceHierarchyTest : InstrumentedTest {
val commonTestHelper = CommonTestHelper(context())
val session = commonTestHelper.createAccount("John", SessionTestParams(true))
- val spaceAInfo = createPublicSpace(session, "SpaceA", listOf(
+ val spaceAInfo = createPublicSpace(
+ session, "SpaceA", listOf(
Triple("A1", true /*auto-join*/, true/*canonical*/),
Triple("A2", true, true)
- ))
+ )
+ )
- val spaceBInfo = createPublicSpace(session, "SpaceB", listOf(
+ val spaceBInfo = createPublicSpace(
+ session, "SpaceB", listOf(
Triple("B1", true /*auto-join*/, true/*canonical*/),
Triple("B2", true, true),
Triple("B3", true, true)
- ))
+ )
+ )
// add B as a subspace of A
val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
@@ -315,10 +329,12 @@ class SpaceHierarchyTest : InstrumentedTest {
session.spaceService().setSpaceParent(spaceBInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
}
- val spaceCInfo = createPublicSpace(session, "SpaceC", listOf(
+ val spaceCInfo = createPublicSpace(
+ session, "SpaceC", listOf(
Triple("C1", true /*auto-join*/, true/*canonical*/),
Triple("C2", true, true)
- ))
+ )
+ )
commonTestHelper.waitWithLatch { latch ->
@@ -446,21 +462,27 @@ class SpaceHierarchyTest : InstrumentedTest {
val commonTestHelper = CommonTestHelper(context())
val session = commonTestHelper.createAccount("John", SessionTestParams(true))
- /* val spaceAInfo = */ createPublicSpace(session, "SpaceA", listOf(
+ /* val spaceAInfo = */ createPublicSpace(
+ session, "SpaceA", listOf(
Triple("A1", true /*auto-join*/, true/*canonical*/),
Triple("A2", true, true)
- ))
+ )
+ )
- val spaceBInfo = createPublicSpace(session, "SpaceB", listOf(
+ val spaceBInfo = createPublicSpace(
+ session, "SpaceB", listOf(
Triple("B1", true /*auto-join*/, true/*canonical*/),
Triple("B2", true, true),
Triple("B3", true, true)
- ))
+ )
+ )
- val spaceCInfo = createPublicSpace(session, "SpaceC", listOf(
+ val spaceCInfo = createPublicSpace(
+ session, "SpaceC", listOf(
Triple("C1", true /*auto-join*/, true/*canonical*/),
Triple("C2", true, true)
- ))
+ )
+ )
val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
@@ -494,10 +516,12 @@ class SpaceHierarchyTest : InstrumentedTest {
val aliceSession = commonTestHelper.createAccount("Alice", SessionTestParams(true))
val bobSession = commonTestHelper.createAccount("Bib", SessionTestParams(true))
- val spaceAInfo = createPrivateSpace(aliceSession, "Private Space A", listOf(
+ val spaceAInfo = createPrivateSpace(
+ aliceSession, "Private Space A", listOf(
Triple("General", true /*suggested*/, true/*canonical*/),
Triple("Random", true, true)
- ))
+ )
+ )
commonTestHelper.runBlockingTest {
aliceSession.getRoom(spaceAInfo.spaceId)!!.membershipService().invite(bobSession.myUserId, null)
diff --git a/matrix-sdk-android/src/main/java/org/commonmark/ext/maths/internal/MathsHtmlNodeRenderer.kt b/matrix-sdk-android/src/main/java/org/commonmark/ext/maths/internal/MathsHtmlNodeRenderer.kt
index 0efecbbe8a..83fcae7190 100644
--- a/matrix-sdk-android/src/main/java/org/commonmark/ext/maths/internal/MathsHtmlNodeRenderer.kt
+++ b/matrix-sdk-android/src/main/java/org/commonmark/ext/maths/internal/MathsHtmlNodeRenderer.kt
@@ -28,8 +28,12 @@ internal class MathsHtmlNodeRenderer(private val context: HtmlNodeRendererContex
val display = node.javaClass == DisplayMaths::class.java
val contents = node.firstChild // should be the only child
val latex = (contents as Text).literal
- val attributes = context.extendAttributes(node, if (display) "div" else "span", Collections.singletonMap("data-mx-maths",
- latex))
+ val attributes = context.extendAttributes(
+ node, if (display) "div" else "span", Collections.singletonMap(
+ "data-mx-maths",
+ latex
+ )
+ )
html.tag(if (display) "div" else "span", attributes)
html.tag("code")
context.render(contents)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
index 217f7e3da8..e7d1e64a2b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
@@ -132,9 +132,11 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
val matrixConfiguration = (appContext as MatrixConfiguration.Provider).providesMatrixConfiguration()
instance = Matrix(appContext, matrixConfiguration)
} else {
- throw IllegalStateException("Matrix is not initialized properly." +
- " If you want to manage your own Matrix instance use Matrix.createInstance" +
- " otherwise you should call Matrix.initialize or let your application implement MatrixConfiguration.Provider.")
+ throw IllegalStateException(
+ "Matrix is not initialized properly." +
+ " If you want to manage your own Matrix instance use Matrix.createInstance" +
+ " otherwise you should call Matrix.initialize or let your application implement MatrixConfiguration.Provider."
+ )
}
}
return instance
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/converter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/converter.kt
index 1a4c1ee51c..80630bc4e7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/converter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/converter.kt
@@ -1,127 +1,129 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.api.auth
-
-import org.matrix.android.sdk.api.auth.data.LocalizedFlowDataLoginTerms
-import org.matrix.android.sdk.api.auth.registration.TermPolicies
-
-/**
- * This method extract the policies from the login terms parameter, regarding the user language.
- * For each policy, if user language is not found, the default language is used and if not found, the first url and name are used (not predictable)
- *
- * Example of Data:
- * <pre>
- * "m.login.terms": {
- * "policies": {
- * "privacy_policy": {
- * "version": "1.0",
- * "en": {
- * "url": "http:\/\/matrix.org\/_matrix\/consent?v=1.0",
- * "name": "Terms and Conditions"
- * }
- * }
- * }
- * }
- *</pre>
- *
- * @param userLanguage the user language
- * @param defaultLanguage the default language to use if the user language is not found for a policy in registrationFlowResponse
- */
-fun TermPolicies.toLocalizedLoginTerms(userLanguage: String,
- defaultLanguage: String = "en"): List<LocalizedFlowDataLoginTerms> {
- val result = ArrayList<LocalizedFlowDataLoginTerms>()
-
- val policies = get("policies")
- if (policies is Map<*, *>) {
- policies.keys.forEach { policyName ->
- val localizedFlowDataLoginTermsPolicyName = policyName as String
- var localizedFlowDataLoginTermsVersion: String? = null
- var localizedFlowDataLoginTermsLocalizedUrl: String? = null
- var localizedFlowDataLoginTermsLocalizedName: String? = null
-
- val policy = policies[policyName]
-
- // Enter this policy
- if (policy is Map<*, *>) {
- // Version
- localizedFlowDataLoginTermsVersion = policy["version"] as String?
-
- var userLanguageUrlAndName: UrlAndName? = null
- var defaultLanguageUrlAndName: UrlAndName? = null
- var firstUrlAndName: UrlAndName? = null
-
- // Search for language
- policy.keys.forEach { policyKey ->
- when (policyKey) {
- "version" -> Unit // Ignore
- userLanguage -> {
- // We found the data for the user language
- userLanguageUrlAndName = extractUrlAndName(policy[policyKey])
- }
- defaultLanguage -> {
- // We found default language
- defaultLanguageUrlAndName = extractUrlAndName(policy[policyKey])
- }
- else -> {
- if (firstUrlAndName == null) {
- // Get at least some data
- firstUrlAndName = extractUrlAndName(policy[policyKey])
- }
- }
- }
- }
-
- // Copy found language data by priority
- when {
- userLanguageUrlAndName != null -> {
- localizedFlowDataLoginTermsLocalizedUrl = userLanguageUrlAndName!!.url
- localizedFlowDataLoginTermsLocalizedName = userLanguageUrlAndName!!.name
- }
- defaultLanguageUrlAndName != null -> {
- localizedFlowDataLoginTermsLocalizedUrl = defaultLanguageUrlAndName!!.url
- localizedFlowDataLoginTermsLocalizedName = defaultLanguageUrlAndName!!.name
- }
- firstUrlAndName != null -> {
- localizedFlowDataLoginTermsLocalizedUrl = firstUrlAndName!!.url
- localizedFlowDataLoginTermsLocalizedName = firstUrlAndName!!.name
- }
- }
- }
-
- result.add(LocalizedFlowDataLoginTerms(
- policyName = localizedFlowDataLoginTermsPolicyName,
- version = localizedFlowDataLoginTermsVersion,
- localizedUrl = localizedFlowDataLoginTermsLocalizedUrl,
- localizedName = localizedFlowDataLoginTermsLocalizedName
- ))
- }
- }
-
- return result
-}
-
-private fun extractUrlAndName(policyData: Any?): UrlAndName? {
- if (policyData is Map<*, *>) {
- val url = policyData["url"] as String?
- val name = policyData["name"] as String?
-
- if (url != null && name != null) {
- return UrlAndName(url, name)
- }
- }
- return null
-}
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.auth
+
+import org.matrix.android.sdk.api.auth.data.LocalizedFlowDataLoginTerms
+import org.matrix.android.sdk.api.auth.registration.TermPolicies
+
+/**
+ * This method extract the policies from the login terms parameter, regarding the user language.
+ * For each policy, if user language is not found, the default language is used and if not found, the first url and name are used (not predictable)
+ *
+ * Example of Data:
+ * <pre>
+ * "m.login.terms": {
+ * "policies": {
+ * "privacy_policy": {
+ * "version": "1.0",
+ * "en": {
+ * "url": "http:\/\/matrix.org\/_matrix\/consent?v=1.0",
+ * "name": "Terms and Conditions"
+ * }
+ * }
+ * }
+ * }
+ *</pre>
+ *
+ * @param userLanguage the user language
+ * @param defaultLanguage the default language to use if the user language is not found for a policy in registrationFlowResponse
+ */
+fun TermPolicies.toLocalizedLoginTerms(userLanguage: String,
+ defaultLanguage: String = "en"): List<LocalizedFlowDataLoginTerms> {
+ val result = ArrayList<LocalizedFlowDataLoginTerms>()
+
+ val policies = get("policies")
+ if (policies is Map<*, *>) {
+ policies.keys.forEach { policyName ->
+ val localizedFlowDataLoginTermsPolicyName = policyName as String
+ var localizedFlowDataLoginTermsVersion: String? = null
+ var localizedFlowDataLoginTermsLocalizedUrl: String? = null
+ var localizedFlowDataLoginTermsLocalizedName: String? = null
+
+ val policy = policies[policyName]
+
+ // Enter this policy
+ if (policy is Map<*, *>) {
+ // Version
+ localizedFlowDataLoginTermsVersion = policy["version"] as String?
+
+ var userLanguageUrlAndName: UrlAndName? = null
+ var defaultLanguageUrlAndName: UrlAndName? = null
+ var firstUrlAndName: UrlAndName? = null
+
+ // Search for language
+ policy.keys.forEach { policyKey ->
+ when (policyKey) {
+ "version" -> Unit // Ignore
+ userLanguage -> {
+ // We found the data for the user language
+ userLanguageUrlAndName = extractUrlAndName(policy[policyKey])
+ }
+ defaultLanguage -> {
+ // We found default language
+ defaultLanguageUrlAndName = extractUrlAndName(policy[policyKey])
+ }
+ else -> {
+ if (firstUrlAndName == null) {
+ // Get at least some data
+ firstUrlAndName = extractUrlAndName(policy[policyKey])
+ }
+ }
+ }
+ }
+
+ // Copy found language data by priority
+ when {
+ userLanguageUrlAndName != null -> {
+ localizedFlowDataLoginTermsLocalizedUrl = userLanguageUrlAndName!!.url
+ localizedFlowDataLoginTermsLocalizedName = userLanguageUrlAndName!!.name
+ }
+ defaultLanguageUrlAndName != null -> {
+ localizedFlowDataLoginTermsLocalizedUrl = defaultLanguageUrlAndName!!.url
+ localizedFlowDataLoginTermsLocalizedName = defaultLanguageUrlAndName!!.name
+ }
+ firstUrlAndName != null -> {
+ localizedFlowDataLoginTermsLocalizedUrl = firstUrlAndName!!.url
+ localizedFlowDataLoginTermsLocalizedName = firstUrlAndName!!.name
+ }
+ }
+ }
+
+ result.add(
+ LocalizedFlowDataLoginTerms(
+ policyName = localizedFlowDataLoginTermsPolicyName,
+ version = localizedFlowDataLoginTermsVersion,
+ localizedUrl = localizedFlowDataLoginTermsLocalizedUrl,
+ localizedName = localizedFlowDataLoginTermsLocalizedName
+ )
+ )
+ }
+ }
+
+ return result
+}
+
+private fun extractUrlAndName(policyData: Any?): UrlAndName? {
+ if (policyData is Map<*, *>) {
+ val url = policyData["url"] as String?
+ val name = policyData["name"] as String?
+
+ if (url != null && name != null) {
+ return UrlAndName(url, name)
+ }
+ }
+ return null
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationFlowResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationFlowResponse.kt
index 0da9eb4b7e..2b421f2873 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationFlowResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationFlowResponse.kt
@@ -88,8 +88,10 @@ fun RegistrationFlowResponse.toFlowResult(): FlowResult {
val isMandatory = flows?.all { type in it.stages.orEmpty() } == true
val stage = when (type) {
- LoginFlowTypes.RECAPTCHA -> Stage.ReCaptcha(isMandatory, ((params?.get(type) as? Map<*, *>)?.get("public_key") as? String)
- ?: "")
+ LoginFlowTypes.RECAPTCHA -> Stage.ReCaptcha(
+ isMandatory, ((params?.get(type) as? Map<*, *>)?.get("public_key") as? String)
+ ?: ""
+ )
LoginFlowTypes.DUMMY -> Stage.Dummy(isMandatory)
LoginFlowTypes.TERMS -> Stage.Terms(isMandatory, params?.get(type) as? TermPolicies ?: emptyMap<String, String>())
LoginFlowTypes.EMAIL_IDENTITY -> Stage.Email(isMandatory)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CryptoCrossSigningKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CryptoCrossSigningKey.kt
index 11996e673e..70ff76a4ef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CryptoCrossSigningKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CryptoCrossSigningKey.kt
@@ -93,7 +93,8 @@ data class CryptoCrossSigningKey(
userId = userId,
usages = listOf(usage.value),
keys = mapOf("ed25519:$b64key" to b64key),
- signatures = signMap)
+ signatures = signMap
+ )
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
index e3ccbad249..8e930f2a50 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
@@ -68,7 +68,8 @@ interface FileService {
mxcUrl = messageContent.getFileUrl(),
fileName = messageContent.getFileName(),
mimeType = messageContent.mimeType,
- elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt())
+ elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt()
+ )
/**
* Use this URI and pass it to intent using flag Intent.FLAG_GRANT_READ_URI_PERMISSION
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 8784d85c10..946f882f1a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -379,9 +379,11 @@ internal class DefaultAuthenticationService @Inject constructor(
throw MatrixIdFailure.InvalidMatrixId
}
- return getWellknownTask.execute(GetWellknownTask.Params(
- domain = matrixId.getDomain(),
- homeServerConnectionConfig = homeServerConnectionConfig)
+ return getWellknownTask.execute(
+ GetWellknownTask.Params(
+ domain = matrixId.getDomain(),
+ homeServerConnectionConfig = homeServerConnectionConfig
+ )
)
}
@@ -390,13 +392,15 @@ internal class DefaultAuthenticationService @Inject constructor(
password: String,
initialDeviceName: String,
deviceId: String?): Session {
- return directLoginTask.execute(DirectLoginTask.Params(
- homeServerConnectionConfig = homeServerConnectionConfig,
- userId = matrixId,
- password = password,
- deviceName = initialDeviceName,
- deviceId = deviceId
- ))
+ return directLoginTask.execute(
+ DirectLoginTask.Params(
+ homeServerConnectionConfig = homeServerConnectionConfig,
+ userId = matrixId,
+ password = password,
+ deviceName = initialDeviceName,
+ deviceId = deviceId
+ )
+ )
}
private fun buildAuthAPI(homeServerConnectionConfig: HomeServerConnectionConfig): AuthAPI {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt
index a92384b4ed..08d683af7f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt
@@ -21,9 +21,11 @@ import io.realm.annotations.RealmModule
/**
* Realm module for authentication classes
*/
-@RealmModule(library = true,
+@RealmModule(
+ library = true,
classes = [
SessionParamsEntity::class,
PendingSessionEntity::class
- ])
+ ]
+)
internal class AuthRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt
index 8e4043c11b..1296ea7cc4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt
@@ -44,7 +44,8 @@ internal class PendingSessionMapper @Inject constructor(moshi: Moshi) {
resetPasswordData = resetPasswordData,
currentSession = entity.currentSession,
isRegistrationStarted = entity.isRegistrationStarted,
- currentThreePidData = threePidData)
+ currentThreePidData = threePidData
+ )
}
fun map(sessionData: PendingSessionData?): PendingSessionEntity? {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
index 147c0e8be0..86929b1afe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
@@ -54,6 +54,7 @@ internal class SessionParamsMapper @Inject constructor(moshi: Moshi) {
sessionParams.userId,
credentialsJson,
homeServerConnectionConfigJson,
- sessionParams.isTokenValid)
+ sessionParams.isTokenValid
+ )
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index 590b333e90..890cb68aad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -120,21 +120,25 @@ internal class DefaultRegistrationWizard(
RegisterAddThreePidTask.Params(
threePid,
pendingSessionData.clientSecret,
- pendingSessionData.sendAttempt))
+ pendingSessionData.sendAttempt
+ )
+ )
pendingSessionData = pendingSessionData.copy(sendAttempt = pendingSessionData.sendAttempt + 1)
.also { pendingSessionStore.savePendingSessionData(it) }
val params = RegistrationParams(
auth = if (threePid is RegisterThreePid.Email) {
- AuthParams.createForEmailIdentity(safeSession,
+ AuthParams.createForEmailIdentity(
+ safeSession,
ThreePidCredentials(
clientSecret = pendingSessionData.clientSecret,
sid = response.sid
)
)
} else {
- AuthParams.createForMsisdnIdentity(safeSession,
+ AuthParams.createForMsisdnIdentity(
+ safeSession,
ThreePidCredentials(
clientSecret = pendingSessionData.clientSecret,
sid = response.sid
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 54c9990bf6..8c09da72de 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -712,8 +712,10 @@ internal class DefaultCryptoService @Inject constructor(
}.foldToCallback(callback)
} else {
val algorithm = getEncryptionAlgorithm(roomId)
- val reason = String.format(MXCryptoError.UNABLE_TO_ENCRYPT_REASON,
- algorithm ?: MXCryptoError.NO_MORE_ALGORITHM_REASON)
+ val reason = String.format(
+ MXCryptoError.UNABLE_TO_ENCRYPT_REASON,
+ algorithm ?: MXCryptoError.NO_MORE_ALGORITHM_REASON
+ )
Timber.tag(loggerTag.value).e("encryptEventContent() : failed $reason")
callback.onFailure(Failure.CryptoError(MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_ENCRYPT, reason)))
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
index 3b43ad672b..04ac090da9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
@@ -73,7 +73,7 @@ internal class SendGossipRequestWorker(context: Context, params: WorkerParameter
val eventType: String
val requestId: String
when {
- params.keyShareRequest != null -> {
+ params.keyShareRequest != null -> {
eventType = EventType.ROOM_KEY_REQUEST
requestId = params.keyShareRequest.requestId
val toDeviceContent = RoomKeyShareRequest(
@@ -120,7 +120,7 @@ internal class SendGossipRequestWorker(context: Context, params: WorkerParameter
}
}
}
- else -> {
+ else -> {
return buildErrorResult(params, "Unknown empty gossiping request").also {
Timber.e("Unknown empty gossiping request: $params")
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
index fffc2b4d4b..df29a494db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
@@ -137,10 +137,14 @@ internal class EnsureOlmSessionsForDevicesAction @Inject constructor(
olmDevice.verifySignature(fingerprint, oneTimeKey.signalableJSONDictionary(), signature)
isVerified = true
} catch (e: Exception) {
- Timber.tag(loggerTag.value).d(e, "verifyKeyAndStartSession() : Verify error for otk: ${oneTimeKey.signalableJSONDictionary()}," +
- " signature:$signature fingerprint:$fingerprint")
- Timber.tag(loggerTag.value).e("verifyKeyAndStartSession() : Verify error for ${deviceInfo.userId}|${deviceInfo.deviceId} " +
- " - signable json ${oneTimeKey.signalableJSONDictionary()}")
+ Timber.tag(loggerTag.value).d(
+ e, "verifyKeyAndStartSession() : Verify error for otk: ${oneTimeKey.signalableJSONDictionary()}," +
+ " signature:$signature fingerprint:$fingerprint"
+ )
+ Timber.tag(loggerTag.value).e(
+ "verifyKeyAndStartSession() : Verify error for ${deviceInfo.userId}|${deviceInfo.deviceId} " +
+ " - signable json ${oneTimeKey.signalableJSONDictionary()}"
+ )
errorMessage = e.message
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
index 4c407c9eb9..8ba4f6b56b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
@@ -96,11 +96,13 @@ internal class MXMegolmDecryption(private val userId: String,
}
return runCatching {
- olmDevice.decryptGroupMessage(encryptedEventContent.ciphertext,
+ olmDevice.decryptGroupMessage(
+ encryptedEventContent.ciphertext,
event.roomId,
timeline,
encryptedEventContent.sessionId,
- encryptedEventContent.senderKey)
+ encryptedEventContent.senderKey
+ )
}
.fold(
{ olmDecryptionResult ->
@@ -132,9 +134,11 @@ internal class MXMegolmDecryption(private val userId: String,
requestKeysForEvent(event, true)
}
// Encapsulate as withHeld exception
- throw MXCryptoError.Base(MXCryptoError.ErrorType.KEYS_WITHHELD,
+ throw MXCryptoError.Base(
+ MXCryptoError.ErrorType.KEYS_WITHHELD,
withHeldInfo.code?.value ?: "",
- withHeldInfo.reason)
+ withHeldInfo.reason
+ )
}
if (requestKeysOnFail) {
@@ -144,7 +148,8 @@ internal class MXMegolmDecryption(private val userId: String,
throw MXCryptoError.Base(
MXCryptoError.ErrorType.UNKNOWN_MESSAGE_INDEX,
"UNKNOWN_MESSAGE_INDEX",
- null)
+ null
+ )
}
val reason = String.format(MXCryptoError.OLM_REASON, throwable.olmException.message)
@@ -153,7 +158,8 @@ internal class MXMegolmDecryption(private val userId: String,
throw MXCryptoError.Base(
MXCryptoError.ErrorType.OLM,
reason,
- detailedReason)
+ detailedReason
+ )
}
if (throwable is MXCryptoError.Base) {
if (
@@ -166,9 +172,11 @@ internal class MXMegolmDecryption(private val userId: String,
requestKeysForEvent(event, true)
}
// Encapsulate as withHeld exception
- throw MXCryptoError.Base(MXCryptoError.ErrorType.KEYS_WITHHELD,
+ throw MXCryptoError.Base(
+ MXCryptoError.ErrorType.KEYS_WITHHELD,
withHeldInfo.code?.value ?: "",
- withHeldInfo.reason)
+ withHeldInfo.reason
+ )
} else {
// This is un-used in Matrix Android SDK2, not sure if needed
// addEventToPendingList(event, timeline)
@@ -298,13 +306,15 @@ internal class MXMegolmDecryption(private val userId: String,
}
Timber.tag(loggerTag.value).i("onRoomKeyEvent addInboundGroupSession ${roomKeyContent.sessionId}")
- val added = olmDevice.addInboundGroupSession(roomKeyContent.sessionId,
+ val added = olmDevice.addInboundGroupSession(
+ roomKeyContent.sessionId,
roomKeyContent.sessionKey,
roomKeyContent.roomId,
senderKey,
forwardingCurve25519KeyChain,
keysClaimed,
- exportFormat)
+ exportFormat
+ )
if (added) {
defaultKeysBackupService.maybeBackupKeys()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
index 3eba04b9f1..8ad9f191d7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
@@ -56,6 +56,7 @@ internal class MXMegolmDecryptionFactory @Inject constructor(
sendToDeviceTask,
coroutineDispatchers,
cryptoCoroutineScope,
- eventsManager)
+ eventsManager
+ )
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index b31b5e8a64..4ceef4fa5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -337,8 +337,9 @@ internal class MXMegolmEncryption(
sessionId: String,
senderKey: String?,
code: WithHeldCode) {
- Timber.tag(loggerTag.value).d("notifyKeyWithHeld() :sending withheld for session:$sessionId and code $code to" +
- " ${targets.joinToString { "${it.userId}|${it.deviceId}" }}"
+ Timber.tag(loggerTag.value).d(
+ "notifyKeyWithHeld() :sending withheld for session:$sessionId and code $code to" +
+ " ${targets.joinToString { "${it.userId}|${it.deviceId}" }}"
)
val withHeldContent = RoomKeyWithHeldContent(
roomId = roomId,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
index 59d78c3e05..61ad345c62 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
@@ -36,6 +36,7 @@ internal class SharedWithHelper(
userId = deviceInfo.userId,
deviceId = deviceInfo.deviceId,
deviceIdentityKey = deviceInfo.identityKey() ?: "",
- chainIndex = chainIndex)
+ chainIndex = chainIndex
+ )
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
index 0db8700852..13eeefd1a6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
@@ -45,20 +45,26 @@ internal class MXOlmDecryption(
override suspend fun decryptEvent(event: Event, timeline: String): MXEventDecryptionResult {
val olmEventContent = event.content.toModel<OlmEventContent>() ?: run {
Timber.tag(loggerTag.value).e("## decryptEvent() : bad event format")
- throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_EVENT_FORMAT,
- MXCryptoError.BAD_EVENT_FORMAT_TEXT_REASON)
+ throw MXCryptoError.Base(
+ MXCryptoError.ErrorType.BAD_EVENT_FORMAT,
+ MXCryptoError.BAD_EVENT_FORMAT_TEXT_REASON
+ )
}
val cipherText = olmEventContent.ciphertext ?: run {
Timber.tag(loggerTag.value).e("## decryptEvent() : missing cipher text")
- throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_CIPHER_TEXT,
- MXCryptoError.MISSING_CIPHER_TEXT_REASON)
+ throw MXCryptoError.Base(
+ MXCryptoError.ErrorType.MISSING_CIPHER_TEXT,
+ MXCryptoError.MISSING_CIPHER_TEXT_REASON
+ )
}
val senderKey = olmEventContent.senderKey ?: run {
Timber.tag(loggerTag.value).e("## decryptEvent() : missing sender key")
- throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_SENDER_KEY,
- MXCryptoError.MISSING_SENDER_KEY_TEXT_REASON)
+ throw MXCryptoError.Base(
+ MXCryptoError.ErrorType.MISSING_SENDER_KEY,
+ MXCryptoError.MISSING_SENDER_KEY_TEXT_REASON
+ )
}
val messageAny = cipherText[olmDevice.deviceCurve25519Key] ?: run {
@@ -98,52 +104,70 @@ internal class MXOlmDecryption(
}
if (olmPayloadContent.recipient != userId) {
- Timber.tag(loggerTag.value).e("## decryptEvent() : Event ${event.eventId}:" +
- " Intended recipient ${olmPayloadContent.recipient} does not match our id $userId")
- throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_RECIPIENT,
- String.format(MXCryptoError.BAD_RECIPIENT_REASON, olmPayloadContent.recipient))
+ Timber.tag(loggerTag.value).e(
+ "## decryptEvent() : Event ${event.eventId}:" +
+ " Intended recipient ${olmPayloadContent.recipient} does not match our id $userId"
+ )
+ throw MXCryptoError.Base(
+ MXCryptoError.ErrorType.BAD_RECIPIENT,
+ String.format(MXCryptoError.BAD_RECIPIENT_REASON, olmPayloadContent.recipient)
+ )
}
val recipientKeys = olmPayloadContent.recipientKeys ?: run {
- Timber.tag(loggerTag.value).e("## decryptEvent() : Olm event (id=${event.eventId}) contains no 'recipient_keys'" +
- " property; cannot prevent unknown-key attack")
- throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_PROPERTY,
- String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "recipient_keys"))
+ Timber.tag(loggerTag.value).e(
+ "## decryptEvent() : Olm event (id=${event.eventId}) contains no 'recipient_keys'" +
+ " property; cannot prevent unknown-key attack"
+ )
+ throw MXCryptoError.Base(
+ MXCryptoError.ErrorType.MISSING_PROPERTY,
+ String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "recipient_keys")
+ )
}
val ed25519 = recipientKeys["ed25519"]
if (ed25519 != olmDevice.deviceEd25519Key) {
Timber.tag(loggerTag.value).e("## decryptEvent() : Event ${event.eventId}: Intended recipient ed25519 key $ed25519 did not match ours")
- throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_RECIPIENT_KEY,
- MXCryptoError.BAD_RECIPIENT_KEY_REASON)
+ throw MXCryptoError.Base(
+ MXCryptoError.ErrorType.BAD_RECIPIENT_KEY,
+ MXCryptoError.BAD_RECIPIENT_KEY_REASON
+ )
}
if (olmPayloadContent.sender.isNullOrBlank()) {
Timber.tag(loggerTag.value)
.e("## decryptEvent() : Olm event (id=${event.eventId}) contains no 'sender' property; cannot prevent unknown-key attack")
- throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_PROPERTY,
- String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "sender"))
+ throw MXCryptoError.Base(
+ MXCryptoError.ErrorType.MISSING_PROPERTY,
+ String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "sender")
+ )
}
if (olmPayloadContent.sender != event.senderId) {
Timber.tag(loggerTag.value)
.e("Event ${event.eventId}: sender ${olmPayloadContent.sender} does not match reported sender ${event.senderId}")
- throw MXCryptoError.Base(MXCryptoError.ErrorType.FORWARDED_MESSAGE,
- String.format(MXCryptoError.FORWARDED_MESSAGE_REASON, olmPayloadContent.sender))
+ throw MXCryptoError.Base(
+ MXCryptoError.ErrorType.FORWARDED_MESSAGE,
+ String.format(MXCryptoError.FORWARDED_MESSAGE_REASON, olmPayloadContent.sender)
+ )
}
if (olmPayloadContent.roomId != event.roomId) {
Timber.tag(loggerTag.value)
.e("## decryptEvent() : Event ${event.eventId}: room ${olmPayloadContent.roomId} does not match reported room ${event.roomId}")
- throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ROOM,
- String.format(MXCryptoError.BAD_ROOM_REASON, olmPayloadContent.roomId))
+ throw MXCryptoError.Base(
+ MXCryptoError.ErrorType.BAD_ROOM,
+ String.format(MXCryptoError.BAD_ROOM_REASON, olmPayloadContent.roomId)
+ )
}
val keys = olmPayloadContent.keys ?: run {
Timber.tag(loggerTag.value).e("## decryptEvent failed : null keys")
- throw MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_DECRYPT,
- MXCryptoError.MISSING_CIPHER_TEXT_REASON)
+ throw MXCryptoError.Base(
+ MXCryptoError.ErrorType.UNABLE_TO_DECRYPT,
+ MXCryptoError.MISSING_CIPHER_TEXT_REASON
+ )
}
return MXEventDecryptionResult(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
index 972176e25b..d5c5e85e41 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
@@ -26,6 +26,7 @@ internal class MXOlmDecryptionFactory @Inject constructor(private val olmDevice:
fun create(): MXOlmDecryption {
return MXOlmDecryption(
olmDevice,
- userId)
+ userId
+ )
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
index 50ce2d2bf3..44e55900e4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
@@ -38,6 +38,7 @@ internal class MXOlmEncryptionFactory @Inject constructor(private val olmDevice:
cryptoStore,
messageEncrypter,
deviceListManager,
- ensureOlmSessionsForUsersAction)
+ ensureOlmSessionsForUsersAction
+ )
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
index ba1718688f..e2887e5826 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
@@ -566,8 +566,10 @@ internal class DefaultCrossSigningService @Inject constructor(
}
// Sign the other MasterKey with our UserSigning key
- val newSignature = JsonCanonicalizer.getCanonicalJson(Map::class.java,
- otherMasterKeys.signalableJSONDictionary()).let { userPkSigning?.sign(it) }
+ val newSignature = JsonCanonicalizer.getCanonicalJson(
+ Map::class.java,
+ otherMasterKeys.signalableJSONDictionary()
+ ).let { userPkSigning?.sign(it) }
if (newSignature == null) {
// race??
@@ -684,7 +686,8 @@ internal class DefaultCrossSigningService @Inject constructor(
val otherSSKSignature = otherDevice.signatures?.get(otherUserId)?.get("ed25519:${otherKeys.selfSigningKey()?.unpaddedBase64PublicKey}")
?: return legacyFallbackTrust(
locallyTrusted,
- DeviceTrustResult.MissingDeviceSignature(otherDeviceId, otherKeys.selfSigningKey()
+ DeviceTrustResult.MissingDeviceSignature(
+ otherDeviceId, otherKeys.selfSigningKey()
?.unpaddedBase64PublicKey
?: ""
)
@@ -733,7 +736,8 @@ internal class DefaultCrossSigningService @Inject constructor(
val otherSSKSignature = otherDevice.signatures?.get(otherKeys.userId)?.get("ed25519:${otherKeys.selfSigningKey()?.unpaddedBase64PublicKey}")
?: return legacyFallbackTrust(
locallyTrusted,
- DeviceTrustResult.MissingDeviceSignature(otherDevice.deviceId, otherKeys.selfSigningKey()
+ DeviceTrustResult.MissingDeviceSignature(
+ otherDevice.deviceId, otherKeys.selfSigningKey()
?.unpaddedBase64PublicKey
?: ""
)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
index e63a6dc791..e6352809c4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
@@ -516,7 +516,8 @@ internal class DefaultKeysBackupService @Inject constructor(
UpdateKeysBackupVersionBody(
algorithm = keysBackupVersion.algorithm,
authData = newMegolmBackupAuthDataWithNewSignature.toJsonDict(),
- version = keysBackupVersion.version)
+ version = keysBackupVersion.version
+ )
}
// And send it to the homeserver
@@ -719,14 +720,18 @@ internal class DefaultKeysBackupService @Inject constructor(
}
}
}
- Timber.v("restoreKeysWithRecoveryKey: Decrypted ${sessionsData.size} keys out" +
- " of $sessionsFromHsCount from the backup store on the homeserver")
+ Timber.v(
+ "restoreKeysWithRecoveryKey: Decrypted ${sessionsData.size} keys out" +
+ " of $sessionsFromHsCount from the backup store on the homeserver"
+ )
// Do not trigger a backup for them if they come from the backup version we are using
val backUp = keysVersionResult.version != keysBackupVersion?.version
if (backUp) {
- Timber.v("restoreKeysWithRecoveryKey: Those keys will be backed up" +
- " to backup version: ${keysBackupVersion?.version}")
+ Timber.v(
+ "restoreKeysWithRecoveryKey: Those keys will be backed up" +
+ " to backup version: ${keysBackupVersion?.version}"
+ )
}
// Import them into the crypto store
@@ -801,11 +806,15 @@ internal class DefaultKeysBackupService @Inject constructor(
// Get key for the room and for the session
val data = getRoomSessionDataTask.execute(GetRoomSessionDataTask.Params(roomId, sessionId, version))
// Convert to KeysBackupData
- KeysBackupData(mutableMapOf(
- roomId to RoomKeysBackupData(mutableMapOf(
- sessionId to data
- ))
- ))
+ KeysBackupData(
+ mutableMapOf(
+ roomId to RoomKeysBackupData(
+ mutableMapOf(
+ sessionId to data
+ )
+ )
+ )
+ )
} else if (roomId != null) {
// Get all keys for the room
val data = getRoomSessionsDataTask.execute(GetRoomSessionsDataTask.Params(roomId, version))
@@ -1326,7 +1335,8 @@ internal class DefaultKeysBackupService @Inject constructor(
"sender_key" to sessionData.senderKey,
"sender_claimed_keys" to sessionData.senderClaimedKeys,
"forwarding_curve25519_key_chain" to (sessionData.forwardingCurve25519KeyChain.orEmpty()),
- "session_key" to sessionData.sessionKey)
+ "session_key" to sessionData.sessionKey
+ )
val json = MoshiProvider.providesMoshi()
.adapter(Map::class.java)
@@ -1354,7 +1364,8 @@ internal class DefaultKeysBackupService @Inject constructor(
sessionData = mapOf(
"ciphertext" to encryptedSessionBackupData.mCipherText,
"mac" to encryptedSessionBackupData.mMac,
- "ephemeral" to encryptedSessionBackupData.mEphemeralKey)
+ "ephemeral" to encryptedSessionBackupData.mEphemeralKey
+ )
)
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
index 7f1b03b932..f90522b036 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
@@ -40,7 +40,8 @@ internal class DefaultDeleteRoomSessionDataTask @Inject constructor(
roomKeysApi.deleteRoomSessionData(
params.roomId,
params.sessionId,
- params.version)
+ params.version
+ )
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
index 394cc861d6..7db33e0c46 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
@@ -38,7 +38,8 @@ internal class DefaultDeleteRoomSessionsDataTask @Inject constructor(
return executeRequest(globalErrorReceiver) {
roomKeysApi.deleteRoomSessionsData(
params.roomId,
- params.version)
+ params.version
+ )
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
index ff515ed80f..df8e6bfebf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
@@ -41,7 +41,8 @@ internal class DefaultGetRoomSessionDataTask @Inject constructor(
roomKeysApi.getRoomSessionData(
params.roomId,
params.sessionId,
- params.version)
+ params.version
+ )
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
index 1b4fe2d966..f9ea078ef2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
@@ -39,7 +39,8 @@ internal class DefaultGetRoomSessionsDataTask @Inject constructor(
return executeRequest(globalErrorReceiver) {
roomKeysApi.getRoomSessionsData(
params.roomId,
- params.version)
+ params.version
+ )
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
index 180aaecf82..637c6ddeb7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
@@ -44,7 +44,8 @@ internal class DefaultStoreRoomSessionDataTask @Inject constructor(
params.roomId,
params.sessionId,
params.version,
- params.keyBackupData)
+ params.keyBackupData
+ )
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
index d1aa9d2eb0..09e52da755 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
@@ -42,7 +42,8 @@ internal class DefaultStoreRoomSessionsDataTask @Inject constructor(
roomKeysApi.storeRoomSessionsData(
params.roomId,
params.version,
- params.roomKeysBackupData)
+ params.roomKeysBackupData
+ )
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
index 3dbeafe9de..47f2578c43 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
@@ -40,7 +40,8 @@ internal class DefaultStoreSessionsDataTask @Inject constructor(
return executeRequest(globalErrorReceiver) {
roomKeysApi.storeSessionsData(
params.version,
- params.keysBackupData)
+ params.keysBackupData
+ )
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
index 8c877593e7..dc50afe67d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
@@ -213,7 +213,8 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
secretKey.privateKey,
ByteArray(32) { 0.toByte() },
secretName.toByteArray(),
- 64)
+ 64
+ )
// The first 32 bytes are used as the AES key, and the next 32 bytes are used as the MAC key
val aesKey = pseudoRandomKey.copyOfRange(0, 32)
@@ -255,7 +256,8 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
secretKey.privateKey,
ByteArray(32) { 0.toByte() },
secretName.toByteArray(),
- 64)
+ 64
+ )
// The first 32 bytes are used as the AES key, and the next 32 bytes are used as the MAC key
val aesKey = pseudoRandomKey.copyOfRange(0, 32)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt
index a2f2f8e97a..b4c94a7fd1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt
@@ -38,7 +38,8 @@ import org.matrix.android.sdk.internal.crypto.store.db.model.WithHeldSessionEnti
/**
* Realm module for Crypto store classes
*/
-@RealmModule(library = true,
+@RealmModule(
+ library = true,
classes = [
CryptoMetadataEntity::class,
CryptoRoomEntity::class,
@@ -57,5 +58,6 @@ import org.matrix.android.sdk.internal.crypto.store.db.model.WithHeldSessionEnti
WithHeldSessionEntity::class,
SharedSessionEntity::class,
OutboundGroupSessionInfoEntity::class
- ])
+ ]
+)
internal class RealmCryptoStoreModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
index 5e4b9b96da..8b7bf9c26b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
@@ -27,11 +27,13 @@ import javax.inject.Inject
internal class CrossSigningKeysMapper @Inject constructor(moshi: Moshi) {
- private val signaturesAdapter = moshi.adapter<Map<String, Map<String, String>>>(Types.newParameterizedType(
- Map::class.java,
- String::class.java,
- Any::class.java
- ))
+ private val signaturesAdapter = moshi.adapter<Map<String, Map<String, String>>>(
+ Types.newParameterizedType(
+ Map::class.java,
+ String::class.java,
+ Any::class.java
+ )
+ )
fun update(keyInfo: KeyInfoEntity, cryptoCrossSigningKey: CryptoCrossSigningKey) {
// update signatures?
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt
index 52d0124c2b..e5bdd2aa9b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt
@@ -72,16 +72,20 @@ internal class MigrateCryptoTo004(realm: DynamicRealm) : RealmMigrator(realm, 4)
?.addField(CryptoMetadataEntityFields.X_SIGN_SELF_SIGNED_PRIVATE_KEY, String::class.java)
val moshi = Moshi.Builder().add(SerializeNulls.JSON_ADAPTER_FACTORY).build()
- val listMigrationAdapter = moshi.adapter<List<String>>(Types.newParameterizedType(
- List::class.java,
- String::class.java,
- Any::class.java
- ))
- val mapMigrationAdapter = moshi.adapter<JsonDict>(Types.newParameterizedType(
- Map::class.java,
- String::class.java,
- Any::class.java
- ))
+ val listMigrationAdapter = moshi.adapter<List<String>>(
+ Types.newParameterizedType(
+ List::class.java,
+ String::class.java,
+ Any::class.java
+ )
+ )
+ val mapMigrationAdapter = moshi.adapter<JsonDict>(
+ Types.newParameterizedType(
+ Map::class.java,
+ String::class.java,
+ Any::class.java
+ )
+ )
realm.schema.get("DeviceInfoEntity")
?.addField(DeviceInfoEntityFields.USER_ID, String::class.java)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
index c71d5e73a2..ca41930f80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
@@ -27,21 +27,27 @@ import timber.log.Timber
internal object CryptoMapper {
private val moshi = Moshi.Builder().add(SerializeNulls.JSON_ADAPTER_FACTORY).build()
- private val listMigrationAdapter = moshi.adapter<List<String>>(Types.newParameterizedType(
- List::class.java,
- String::class.java,
- Any::class.java
- ))
- private val mapMigrationAdapter = moshi.adapter<JsonDict>(Types.newParameterizedType(
- Map::class.java,
- String::class.java,
- Any::class.java
- ))
- private val mapOfStringMigrationAdapter = moshi.adapter<Map<String, Map<String, String>>>(Types.newParameterizedType(
- Map::class.java,
- String::class.java,
- Any::class.java
- ))
+ private val listMigrationAdapter = moshi.adapter<List<String>>(
+ Types.newParameterizedType(
+ List::class.java,
+ String::class.java,
+ Any::class.java
+ )
+ )
+ private val mapMigrationAdapter = moshi.adapter<JsonDict>(
+ Types.newParameterizedType(
+ Map::class.java,
+ String::class.java,
+ Any::class.java
+ )
+ )
+ private val mapOfStringMigrationAdapter = moshi.adapter<Map<String, Map<String, String>>>(
+ Types.newParameterizedType(
+ Map::class.java,
+ String::class.java,
+ Any::class.java
+ )
+ )
internal fun mapToEntity(deviceInfo: CryptoDeviceInfo): DeviceInfoEntity {
return DeviceInfoEntity(primaryKey = DeviceInfoEntity.createPrimaryKey(deviceInfo.userId, deviceInfo.deviceId))
@@ -91,11 +97,13 @@ internal object CryptoMapper {
},
keys = deviceInfoEntity.keysMapJson?.let {
try {
- moshi.adapter<Map<String, String>>(Types.newParameterizedType(
- Map::class.java,
- String::class.java,
- Any::class.java
- )).fromJson(it)
+ moshi.adapter<Map<String, String>>(
+ Types.newParameterizedType(
+ Map::class.java,
+ String::class.java,
+ Any::class.java
+ )
+ ).fromJson(it)
} catch (failure: Throwable) {
Timber.e(failure)
null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
index bdfe818c62..14674ef258 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
@@ -73,11 +73,13 @@ internal class DefaultSendEventTask @Inject constructor(
@Throws
private suspend fun handleEncryption(params: SendEventTask.Params): Event {
if (params.encrypt && !params.event.isEncrypted()) {
- return encryptEventTask.execute(EncryptEventTask.Params(
- params.event.roomId ?: "",
- params.event,
- listOf("m.relates_to")
- ))
+ return encryptEventTask.execute(
+ EncryptEventTask.Params(
+ params.event.roomId ?: "",
+ params.event,
+ listOf("m.relates_to")
+ )
+ )
}
return params.event
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
index c4a6ba27d6..44aa6d9db1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
@@ -64,11 +64,13 @@ internal class DefaultSendVerificationMessageTask @Inject constructor(
private suspend fun handleEncryption(params: SendVerificationMessageTask.Params): Event {
if (cryptoSessionInfoProvider.isRoomEncrypted(params.event.roomId ?: "")) {
try {
- return encryptEventTask.execute(EncryptEventTask.Params(
- params.event.roomId ?: "",
- params.event,
- listOf("m.relates_to")
- ))
+ return encryptEventTask.execute(
+ EncryptEventTask.Params(
+ params.event.roomId ?: "",
+ params.event,
+ listOf("m.relates_to")
+ )
+ )
} catch (throwable: Throwable) {
// We said it's ok to send verification request in clear
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
index 68f1cf62d5..8ecb68560b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
@@ -53,7 +53,8 @@ internal class DefaultIncomingSASDefaultVerificationTransaction(
transactionId,
otherUserID,
null,
- isIncoming = true),
+ isIncoming = true
+),
IncomingSasVerificationTransaction {
override val uxState: IncomingSasVerificationTransaction.UxState
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
index e0d912a9a6..4bdf414295 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
@@ -50,7 +50,8 @@ internal class DefaultOutgoingSASDefaultVerificationTransaction(
transactionId,
otherUserId,
otherDeviceId,
- isIncoming = false),
+ isIncoming = false
+),
OutgoingSasVerificationTransaction {
override val uxState: OutgoingSasVerificationTransaction.UxState
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
index 69d9388c5f..692ddd0148 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
@@ -105,8 +105,10 @@ internal abstract class DefaultVerificationTransaction(
private fun setDeviceVerified(userId: String, deviceId: String) {
// TODO should not override cross sign status
- setDeviceVerificationAction.handle(DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true),
+ setDeviceVerificationAction.handle(
+ DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true),
userId,
- deviceId)
+ deviceId
+ )
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
index 4bf01a2809..00069ba122 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
@@ -58,7 +58,8 @@ internal abstract class SASDefaultVerificationTransaction(
transactionId,
otherUserId,
otherDeviceId,
- isIncoming),
+ isIncoming
+),
SasVerificationTransaction {
companion object {
@@ -297,9 +298,11 @@ internal abstract class SASDefaultVerificationTransaction(
return
}
- trust(otherMasterKeyIsVerified,
+ trust(
+ otherMasterKeyIsVerified,
verifiedDevices,
- eventuallyMarkMyMasterKeyAsTrusted = otherMasterKey?.trustLevel?.isVerified() == false)
+ eventuallyMarkMyMasterKeyAsTrusted = otherMasterKey?.trustLevel?.isVerified() == false
+ )
}
override fun cancel() {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
index 06f0b36798..1793cd123b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
@@ -54,7 +54,8 @@ internal class DefaultQrCodeVerificationTransaction(
transactionId,
otherUserId,
otherDeviceId,
- isIncoming),
+ isIncoming
+),
QrCodeVerificationTransaction {
override val qrCodeText: String?
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt
index 0ac57db9bc..34a9525194 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt
@@ -56,7 +56,8 @@ internal sealed class QrCodeData(
transactionId,
userMasterCrossSigningPublicKey,
otherUserMasterCrossSigningPublicKey,
- sharedSecret)
+ sharedSecret
+ )
/**
* self-verifying in which the current device does trust the master key
@@ -77,7 +78,8 @@ internal sealed class QrCodeData(
transactionId,
userMasterCrossSigningPublicKey,
otherDeviceKey,
- sharedSecret)
+ sharedSecret
+ )
/**
* self-verifying in which the current device does not yet trust the master key
@@ -98,5 +100,6 @@ internal sealed class QrCodeData(
transactionId,
deviceKey,
userMasterCrossSigningPublicKey,
- sharedSecret)
+ sharedSecret
+ )
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
index 04cf5b78af..03b1948302 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
@@ -207,8 +207,10 @@ internal fun List<TimelineEvent>.mapEventsWithEdition(realm: Realm, roomId: Stri
?.eventId
?.let { editedEventId ->
TimelineEventEntity.where(realm, roomId, eventId = editedEventId).findFirst()?.let { editedEvent ->
- it.root.threadDetails = it.root.threadDetails?.copy(lastRootThreadEdition = editedEvent.root?.asDomain()?.getDecryptedTextSummary()
- ?: "(edited)")
+ it.root.threadDetails = it.root.threadDetails?.copy(
+ lastRootThreadEdition = editedEvent.root?.asDomain()?.getDecryptedTextSummary()
+ ?: "(edited)"
+ )
it
} ?: it
} ?: it
@@ -341,7 +343,8 @@ internal fun updateNotificationsNew(roomId: String, realm: Realm, currentUserId:
realm = realm,
roomId = roomId,
rootThreadEventId = eventId,
- senderId = currentUserId)
+ senderId = currentUserId
+ )
val rootThreadEventEntity = EventEntity.where(realm, eventId).findFirst()
if (isUserParticipating) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
index 9a92b14510..be5a500956 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
@@ -24,7 +24,8 @@ import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntit
/**
* Realm module for Session
*/
-@RealmModule(library = true,
+@RealmModule(
+ library = true,
classes = [
ChunkEntity::class,
EventEntity::class,
@@ -71,5 +72,6 @@ import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntit
SpaceParentSummaryEntity::class,
UserPresenceEntity::class,
ThreadSummaryEntity::class
- ])
+ ]
+)
internal class SessionRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
index 2fad2d8e78..dbc6aac6b5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
@@ -43,15 +43,17 @@ import org.matrix.android.sdk.internal.worker.MatrixWorkerFactory
import org.matrix.olm.OlmManager
import java.io.File
-@Component(modules = [
- MatrixModule::class,
- NetworkModule::class,
- AuthModule::class,
- RawModule::class,
- SettingsModule::class,
- SystemModule::class,
- NoOpTestModule::class
-])
+@Component(
+ modules = [
+ MatrixModule::class,
+ NetworkModule::class,
+ AuthModule::class,
+ RawModule::class,
+ SettingsModule::class,
+ SystemModule::class,
+ NoOpTestModule::class
+ ]
+)
@MatrixScope
internal interface MatrixComponent {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
index 9cab307c61..49713a1d7f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
@@ -36,7 +36,8 @@ internal object MatrixModule {
@Provides
@MatrixScope
fun providesMatrixCoroutineDispatchers(): MatrixCoroutineDispatchers {
- return MatrixCoroutineDispatchers(io = Dispatchers.IO,
+ return MatrixCoroutineDispatchers(
+ io = Dispatchers.IO,
computation = Dispatchers.Default,
main = Dispatchers.Main,
crypto = createBackgroundHandler("Crypto_Thread").asCoroutineDispatcher(),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
index 10b0d4fb13..8f007f227c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
@@ -46,17 +46,18 @@ internal object MoshiProvider {
.add(TlsVersionMoshiAdapter())
// Use addLast here so we can inject a SplitLazyRoomSyncJsonAdapter later to override the default parsing.
.addLast(DefaultLazyRoomSyncEphemeralJsonAdapter())
- .add(RuntimeJsonAdapterFactory.of(MessageContent::class.java, "msgtype", MessageDefaultContent::class.java)
- .registerSubtype(MessageTextContent::class.java, MessageType.MSGTYPE_TEXT)
- .registerSubtype(MessageNoticeContent::class.java, MessageType.MSGTYPE_NOTICE)
- .registerSubtype(MessageEmoteContent::class.java, MessageType.MSGTYPE_EMOTE)
- .registerSubtype(MessageAudioContent::class.java, MessageType.MSGTYPE_AUDIO)
- .registerSubtype(MessageImageContent::class.java, MessageType.MSGTYPE_IMAGE)
- .registerSubtype(MessageVideoContent::class.java, MessageType.MSGTYPE_VIDEO)
- .registerSubtype(MessageLocationContent::class.java, MessageType.MSGTYPE_LOCATION)
- .registerSubtype(MessageFileContent::class.java, MessageType.MSGTYPE_FILE)
- .registerSubtype(MessageVerificationRequestContent::class.java, MessageType.MSGTYPE_VERIFICATION_REQUEST)
- .registerSubtype(MessagePollResponseContent::class.java, MessageType.MSGTYPE_POLL_RESPONSE)
+ .add(
+ RuntimeJsonAdapterFactory.of(MessageContent::class.java, "msgtype", MessageDefaultContent::class.java)
+ .registerSubtype(MessageTextContent::class.java, MessageType.MSGTYPE_TEXT)
+ .registerSubtype(MessageNoticeContent::class.java, MessageType.MSGTYPE_NOTICE)
+ .registerSubtype(MessageEmoteContent::class.java, MessageType.MSGTYPE_EMOTE)
+ .registerSubtype(MessageAudioContent::class.java, MessageType.MSGTYPE_AUDIO)
+ .registerSubtype(MessageImageContent::class.java, MessageType.MSGTYPE_IMAGE)
+ .registerSubtype(MessageVideoContent::class.java, MessageType.MSGTYPE_VIDEO)
+ .registerSubtype(MessageLocationContent::class.java, MessageType.MSGTYPE_LOCATION)
+ .registerSubtype(MessageFileContent::class.java, MessageType.MSGTYPE_FILE)
+ .registerSubtype(MessageVerificationRequestContent::class.java, MessageType.MSGTYPE_VERIFICATION_REQUEST)
+ .registerSubtype(MessagePollResponseContent::class.java, MessageType.MSGTYPE_POLL_RESPONSE)
)
.add(SerializeNulls.JSON_ADAPTER_FACTORY)
.build()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
index fedd7d05f9..60760be29f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
@@ -84,9 +84,11 @@ internal class WorkManagerProvider @Inject constructor(
if (workInfo?.state?.isFinished == true) {
checkWorkerLiveState.removeObserver(this)
if (workInfo.state == WorkInfo.State.FAILED) {
- throw RuntimeException("MatrixWorkerFactory is not being set on your worker configuration.\n" +
- "Makes sure to add it to a DelegatingWorkerFactory if you have your own factory or use it directly.\n" +
- "You can grab the instance through the Matrix class.")
+ throw RuntimeException(
+ "MatrixWorkerFactory is not being set on your worker configuration.\n" +
+ "Makes sure to add it to a DelegatingWorkerFactory if you have your own factory or use it directly.\n" +
+ "You can grab the instance through the Matrix class."
+ )
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
index 0a76fb2eef..56d9cc2143 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
@@ -132,7 +132,7 @@ internal class DefaultLegacySessionImporter @Inject constructor(
bytes = it.bytes,
hashType = when (it.type) {
LegacyFingerprint.HashType.SHA1,
- null -> Fingerprint.HashType.SHA1
+ null -> Fingerprint.HashType.SHA1
LegacyFingerprint.HashType.SHA256 -> Fingerprint.HashType.SHA256
}
)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt
index 3b4bd1b1a3..087f99ba7e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt
@@ -76,10 +76,12 @@ class WellKnown {
if (apiUrl != null &&
apiUrl.startsWith("https://") &&
uiUrl!!.startsWith("https://")) {
- managers.add(WellKnownManagerConfig(
- apiUrl = apiUrl,
- uiUrl = uiUrl
- ))
+ managers.add(
+ WellKnownManagerConfig(
+ apiUrl = apiUrl,
+ uiUrl = uiUrl
+ )
+ )
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.kt
index 0aaa4991cd..40d174ee2d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.kt
@@ -63,8 +63,10 @@ internal class RuntimeJsonAdapterFactory<T>(
}
val fallbackAdapter = moshi.adapter<Any>(fallbackType)
val objectJsonAdapter = moshi.adapter(Any::class.java)
- return RuntimeJsonAdapter(labelKey, labelToAdapter, typeToLabel,
- objectJsonAdapter, fallbackAdapter).nullSafe()
+ return RuntimeJsonAdapter(
+ labelKey, labelToAdapter, typeToLabel,
+ objectJsonAdapter, fallbackAdapter
+ ).nullSafe()
}
@Suppress("UNCHECKED_CAST")
@@ -77,8 +79,10 @@ internal class RuntimeJsonAdapterFactory<T>(
override fun fromJson(reader: JsonReader): Any? {
val peekedToken = reader.peek()
if (peekedToken != JsonReader.Token.BEGIN_OBJECT) {
- throw JsonDataException("Expected BEGIN_OBJECT but was " + peekedToken +
- " at path " + reader.path)
+ throw JsonDataException(
+ "Expected BEGIN_OBJECT but was " + peekedToken +
+ " at path " + reader.path
+ )
}
val jsonValue = reader.readJsonValue()
val jsonObject = jsonValue as Map<String, Any>?
@@ -91,13 +95,15 @@ internal class RuntimeJsonAdapterFactory<T>(
override fun toJson(writer: JsonWriter, value: Any?) {
val type: Class<*> = value!!.javaClass
val label = typeToLabel[type]
- ?: throw IllegalArgumentException("Expected one of " +
- typeToLabel.keys +
- " but found " +
- value +
- ", a " +
- value.javaClass +
- ". Register this subtype.")
+ ?: throw IllegalArgumentException(
+ "Expected one of " +
+ typeToLabel.keys +
+ " but found " +
+ value +
+ ", a " +
+ value.javaClass +
+ ". Register this subtype."
+ )
val adapter = labelToAdapter[label]!!
val jsonValue = adapter.toJsonValue(value) as Map<String, Any>?
val valueWithLabel: MutableMap<String, Any> = LinkedHashMap(1 + jsonValue!!.size)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt
index 7294ce4abf..c5ea2d48ad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt
@@ -35,8 +35,10 @@ internal fun RealmQuery<RoomSummaryEntity>.process(sortOrder: RoomSortOrder): Re
arrayOf(
RoomSummaryEntityFields.IS_FAVOURITE,
RoomSummaryEntityFields.IS_LOW_PRIORITY,
- RoomSummaryEntityFields.LAST_ACTIVITY_TIME),
- arrayOf(Sort.DESCENDING, Sort.ASCENDING, Sort.DESCENDING))
+ RoomSummaryEntityFields.LAST_ACTIVITY_TIME
+ ),
+ arrayOf(Sort.DESCENDING, Sort.ASCENDING, Sort.DESCENDING)
+ )
}
RoomSortOrder.NONE -> {
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt
index 770a49c904..c95e4316e2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt
@@ -23,9 +23,11 @@ import org.matrix.android.sdk.internal.database.model.RawCacheEntity
/**
* Realm module for global classes
*/
-@RealmModule(library = true,
+@RealmModule(
+ library = true,
classes = [
RawCacheEntity::class,
KnownServerUrlEntity::class
- ])
+ ]
+)
internal class GlobalRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
index 76e5d84e56..fb9b2da6c1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
@@ -68,7 +68,8 @@ import org.matrix.android.sdk.internal.session.widgets.WidgetModule
import org.matrix.android.sdk.internal.task.TaskExecutor
import org.matrix.android.sdk.internal.util.system.SystemModule
-@Component(dependencies = [MatrixComponent::class],
+@Component(
+ dependencies = [MatrixComponent::class],
modules = [
SessionModule::class,
RoomModule::class,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
index 9f3f1f649e..5f4d3d5fbc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
@@ -60,10 +60,10 @@ internal class DefaultDeactivateAccountTask @Inject constructor(
execute(params.copy(userAuthParam = authUpdate))
}
)) {
- UiaResult.SUCCESS -> {
+ UiaResult.SUCCESS -> {
false
}
- UiaResult.FAILURE -> {
+ UiaResult.FAILURE -> {
Timber.d("## UIA: propagate failure")
throw throwable
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 75a79abcdb..d3de807b23 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -289,12 +289,14 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
val uploadThumbnailResult = dealWithThumbnail(params)
- handleSuccess(params,
+ handleSuccess(
+ params,
contentUploadResponse.contentUri,
uploadedFileEncryptedFileInfo,
uploadThumbnailResult?.uploadedThumbnailUrl,
uploadThumbnailResult?.uploadedThumbnailEncryptedFileInfo,
- newAttachmentAttributes)
+ newAttachmentAttributes
+ )
} catch (t: Throwable) {
Timber.e(t, "## ERROR ${t.localizedMessage}")
handleFailure(params, t)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerRealmModule.kt
index bb53140ad9..85c1947a80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerRealmModule.kt
@@ -21,9 +21,11 @@ import io.realm.annotations.RealmModule
/**
* Realm module for content scanner classes
*/
-@RealmModule(library = true,
+@RealmModule(
+ library = true,
classes = [
ContentScannerInfoEntity::class,
ContentScanResultEntity::class
- ])
+ ]
+)
internal class ContentScannerRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
index 44e13d971a..e9097e4d03 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@@ -94,10 +94,12 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
}.getOrNull()
val wellknownResult = runCatching {
- getWellknownTask.execute(GetWellknownTask.Params(
- domain = userId.getDomain(),
- homeServerConnectionConfig = homeServerConnectionConfig
- ))
+ getWellknownTask.execute(
+ GetWellknownTask.Params(
+ domain = userId.getDomain(),
+ homeServerConnectionConfig = homeServerConnectionConfig
+ )
+ )
}.getOrNull()
insertInDb(capabilities, mediaConfig, versions, wellknownResult)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
index 4285f38893..74838afc65 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
@@ -218,9 +218,11 @@ internal class DefaultIdentityService @Inject constructor(
listeners.toList().forEach { tryOrNull { it.onIdentityServerChange() } }
}
- updateUserAccountDataTask.execute(UpdateUserAccountDataTask.IdentityParams(
- identityContent = IdentityServerContent(baseUrl = url)
- ))
+ updateUserAccountDataTask.execute(
+ UpdateUserAccountDataTask.IdentityParams(
+ identityContent = IdentityServerContent(baseUrl = url)
+ )
+ )
}
override fun getUserConsent(): Boolean {
@@ -297,11 +299,13 @@ internal class DefaultIdentityService @Inject constructor(
}
override suspend fun sign3pidInvitation(identiyServer: String, token: String, secret: String): SignInvitationResult {
- return sign3pidInvitationTask.execute(Sign3pidInvitationTask.Params(
- url = identiyServer,
- token = token,
- privateKey = secret
- ))
+ return sign3pidInvitationTask.execute(
+ Sign3pidInvitationTask.Params(
+ url = identiyServer,
+ token = token,
+ privateKey = secret
+ )
+ )
}
override fun addListener(listener: IdentityServiceListener) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
index f6ef370f8d..f642ed4cf2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
@@ -83,11 +83,13 @@ internal class DefaultIdentityBulkLookupTask @Inject constructor(
return try {
LookUpData(hashedAddresses,
executeRequest(null) {
- identityAPI.lookup(IdentityLookUpParams(
- hashedAddresses,
- IdentityHashDetailResponse.ALGORITHM_SHA256,
- hashDetailResponse.pepper
- ))
+ identityAPI.lookup(
+ IdentityLookUpParams(
+ hashedAddresses,
+ IdentityHashDetailResponse.ALGORITHM_SHA256,
+ hashDetailResponse.pepper
+ )
+ )
})
} catch (failure: Throwable) {
// Catch invalid hash pepper and retry
@@ -117,8 +119,10 @@ internal class DefaultIdentityBulkLookupTask @Inject constructor(
return withOlmUtility { olmUtility ->
threePids.map { threePid ->
base64ToBase64Url(
- olmUtility.sha256(threePid.value.lowercase(Locale.ROOT) +
- " " + threePid.toMedium() + " " + pepper)
+ olmUtility.sha256(
+ threePid.value.lowercase(Locale.ROOT) +
+ " " + threePid.toMedium() + " " + pepper
+ )
)
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
index 9c89048176..fe12309650 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
@@ -57,18 +57,22 @@ internal class DefaultIdentityRequestTokenForBindingTask @Inject constructor(
val tokenResponse = executeRequest(null) {
when (params.threePid) {
- is ThreePid.Email -> identityAPI.requestTokenToBindEmail(IdentityRequestTokenForEmailBody(
- clientSecret = clientSecret,
- sendAttempt = sendAttempt,
- email = params.threePid.email
- ))
+ is ThreePid.Email -> identityAPI.requestTokenToBindEmail(
+ IdentityRequestTokenForEmailBody(
+ clientSecret = clientSecret,
+ sendAttempt = sendAttempt,
+ email = params.threePid.email
+ )
+ )
is ThreePid.Msisdn -> {
- identityAPI.requestTokenToBindMsisdn(IdentityRequestTokenForMsisdnBody(
- clientSecret = clientSecret,
- sendAttempt = sendAttempt,
- phoneNumber = params.threePid.msisdn,
- countryCode = params.threePid.getCountryCode()
- ))
+ identityAPI.requestTokenToBindMsisdn(
+ IdentityRequestTokenForMsisdnBody(
+ clientSecret = clientSecret,
+ sendAttempt = sendAttempt,
+ phoneNumber = params.threePid.msisdn,
+ countryCode = params.threePid.getCountryCode()
+ )
+ )
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
index f884e2816d..fcf8ce6317 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
@@ -50,7 +50,8 @@ internal class DefaultIdentitySubmitTokenForBindingTask @Inject constructor(
clientSecret = identityPendingBinding.clientSecret,
sid = identityPendingBinding.sid,
token = params.token
- ))
+ )
+ )
}
if (!tokenResponse.isSuccess()) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt
index 1f2cfad33c..5e9068ecf7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt
@@ -21,9 +21,11 @@ import io.realm.annotations.RealmModule
/**
* Realm module for identity server classes
*/
-@RealmModule(library = true,
+@RealmModule(
+ library = true,
classes = [
IdentityDataEntity::class,
IdentityPendingBindingEntity::class
- ])
+ ]
+)
internal class IdentityRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
index 87e51181e6..f630c2c225 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
@@ -50,7 +50,8 @@ internal class DefaultBindThreePidsTask @Inject constructor(private val profileA
identityServerUrlWithoutProtocol = identityServerUrlWithoutProtocol,
identityServerAccessToken = identityServerAccessToken,
sid = identityPendingBinding.sid
- ))
+ )
+ )
}
// Binding is over, cleanup the store
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
index 6f99577ac2..4827b86824 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
@@ -135,21 +135,25 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
override suspend fun finalizeAddingThreePid(threePid: ThreePid,
userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor) {
finalizeAddingThreePidTask
- .execute(FinalizeAddingThreePidTask.Params(
- threePid = threePid,
- userInteractiveAuthInterceptor = userInteractiveAuthInterceptor,
- userWantsToCancel = false
- ))
+ .execute(
+ FinalizeAddingThreePidTask.Params(
+ threePid = threePid,
+ userInteractiveAuthInterceptor = userInteractiveAuthInterceptor,
+ userWantsToCancel = false
+ )
+ )
refreshThreePids()
}
override suspend fun cancelAddingThreePid(threePid: ThreePid) {
finalizeAddingThreePidTask
- .execute(FinalizeAddingThreePidTask.Params(
- threePid = threePid,
- userInteractiveAuthInterceptor = null,
- userWantsToCancel = true
- ))
+ .execute(
+ FinalizeAddingThreePidTask.Params(
+ threePid = threePid,
+ userInteractiveAuthInterceptor = null,
+ userWantsToCancel = true
+ )
+ )
refreshThreePids()
}
@@ -161,8 +165,8 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
private fun UserThreePidEntity.asDomain(): ThreePid {
return when (medium) {
- ThirdPartyIdentifier.MEDIUM_EMAIL -> ThreePid.Email(address)
+ ThirdPartyIdentifier.MEDIUM_EMAIL -> ThreePid.Email(address)
ThirdPartyIdentifier.MEDIUM_MSISDN -> ThreePid.Msisdn(address)
- else -> error("Invalid medium type")
+ else -> error("Invalid medium type")
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
index df8a1c97ff..acbecc9fbe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
@@ -45,7 +45,8 @@ internal class DefaultUnbindThreePidsTask @Inject constructor(private val profil
identityServerUrlWithoutProtocol,
params.threePid.toMedium(),
params.threePid.value
- ))
+ )
+ )
}.isSuccess()
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index e87c27e601..13b990a9ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -85,17 +85,19 @@ internal class DefaultPushersService @Inject constructor(
deviceDisplayName: String,
append: Boolean) {
addPusherTask.execute(
- AddPusherTask.Params(JsonPusher(
- pushKey = email,
- kind = Pusher.KIND_EMAIL,
- appId = Pusher.APP_ID_EMAIL,
- profileTag = "",
- lang = lang,
- appDisplayName = appDisplayName,
- deviceDisplayName = deviceDisplayName,
- data = JsonPusherData(brand = emailBranding),
- append = append
- ))
+ AddPusherTask.Params(
+ JsonPusher(
+ pushKey = email,
+ kind = Pusher.KIND_EMAIL,
+ appId = Pusher.APP_ID_EMAIL,
+ profileTag = "",
+ lang = lang,
+ appDisplayName = appDisplayName,
+ deviceDisplayName = deviceDisplayName,
+ data = JsonPusherData(brand = emailBranding),
+ append = append
+ )
+ )
)
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/ProcessEventForPushTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/ProcessEventForPushTask.kt
index 91d092a2b4..60c1194708 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/ProcessEventForPushTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/ProcessEventForPushTask.kt
@@ -67,8 +67,10 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
}.filter {
it.senderId != userId
}
- Timber.v("[PushRules] Found ${allEvents.size} out of ${(newJoinEvents + inviteEvents).size}" +
- " to check for push rules with ${params.rules.size} rules")
+ Timber.v(
+ "[PushRules] Found ${allEvents.size} out of ${(newJoinEvents + inviteEvents).size}" +
+ " to check for push rules with ${params.rules.size} rules"
+ )
val matchedEvents = allEvents.mapNotNull { event ->
pushRuleFinder.fulfilledBingRule(event, params.rules)?.let {
Timber.v("[PushRules] Rule $it match for event ${event.eventId}")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
index 3b2e9d3d22..faf68d538f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
@@ -116,7 +116,8 @@ internal class CreateRoomBodyBuilder @Inject constructor(
fileUploader.uploadFromUri(
uri = avatarUri,
filename = UUID.randomUUID().toString(),
- mimeType = MimeTypes.Jpeg)
+ mimeType = MimeTypes.Jpeg
+ )
}
}?.let { response ->
Event(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
index 85300fa351..a1b30a0be5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
@@ -83,7 +83,8 @@ internal class RoomMemberEventHandler @Inject constructor(
roomMember,
// When an update is happening, insertOrUpdate replace existing values with null if they are not provided,
// but we want to preserve presence record value and not replace it with null
- getExistingPresenceState(realm, roomId, userId))
+ getExistingPresenceState(realm, roomId, userId)
+ )
realm.insertOrUpdate(roomMemberEntity)
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
index fe7dc28228..e926d6a785 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
@@ -148,7 +148,8 @@ internal class RedactionEventProcessor @Inject constructor() : EventInsertLivePr
EventType.STATE_ROOM_MEMBER -> listOf("membership")
EventType.STATE_ROOM_CREATE -> listOf("creator")
EventType.STATE_ROOM_JOIN_RULES -> listOf("join_rule")
- EventType.STATE_ROOM_POWER_LEVELS -> listOf("users",
+ EventType.STATE_ROOM_POWER_LEVELS -> listOf(
+ "users",
"users_default",
"events",
"events_default",
@@ -156,7 +157,8 @@ internal class RedactionEventProcessor @Inject constructor() : EventInsertLivePr
"ban",
"kick",
"redact",
- "invite")
+ "invite"
+ )
EventType.STATE_ROOM_ALIASES -> listOf("aliases")
EventType.STATE_ROOM_CANONICAL_ALIAS -> listOf("alias")
EventType.FEEDBACK -> listOf("type", "target_event_id")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
index ab514d31c8..7b68e2a74c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@@ -131,7 +131,8 @@ internal class DefaultRelationService @AssistedInject constructor(
replyText = replyText,
autoMarkdown = autoMarkdown,
rootThreadEventId = rootThreadEventId,
- showInThread = showInThread)
+ showInThread = showInThread
+ )
?.also { saveLocalEcho(it) }
?: return null
@@ -186,7 +187,8 @@ internal class DefaultRelationService @AssistedInject constructor(
text = replyInThreadText,
msgType = msgType,
autoMarkdown = autoMarkdown,
- formattedText = formattedText)
+ formattedText = formattedText
+ )
.also {
saveLocalEcho(it)
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
index 34e38581d1..9baaa9cd82 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
@@ -275,7 +275,8 @@ internal class DefaultSendService @AssistedInject constructor(
attachment = it,
compressBeforeSending = compressBeforeSending,
roomIds = roomIds,
- rootThreadEventId = rootThreadEventId)
+ rootThreadEventId = rootThreadEventId
+ )
}
}
@@ -297,7 +298,8 @@ internal class DefaultSendService @AssistedInject constructor(
localEchoEventFactory.createMediaEvent(
roomId = it,
attachment = attachment,
- rootThreadEventId = rootThreadId).also { event ->
+ rootThreadEventId = rootThreadId
+ ).also { event ->
createLocalEcho(event)
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
index 83c61d2845..db8d1b5674 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
@@ -74,9 +74,13 @@ internal class RedactEventWorker(context: Context, params: WorkerParameters, ses
else -> {
// TODO mark as failed to send?
// always return success, or the chain will be stuck for ever!
- Result.success(WorkerParamsFactory.toData(params.copy(
- lastFailureMessage = it.localizedMessage
- )))
+ Result.success(
+ WorkerParamsFactory.toData(
+ params.copy(
+ lastFailureMessage = it.localizedMessage
+ )
+ )
+ )
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContentExtension.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContentExtension.kt
index 8caa99d90a..49bc05f40c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContentExtension.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContentExtension.kt
@@ -54,7 +54,8 @@ internal fun TextContent.toThreadTextContent(
isFallingBack = true,
inReplyTo = ReplyToContent(
eventId = latestThreadEventId
- )),
+ )
+ ),
formattedBody = formattedText
)
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt
index a03ab778f6..a7863470f7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt
@@ -37,9 +37,10 @@ internal interface TaskInfo {
const val TYPE_REDACT = "TYPE_REDACT"
private val moshi = Moshi.Builder()
- .add(RuntimeJsonAdapterFactory.of(TaskInfo::class.java, "type", FallbackTaskInfo::class.java)
- .registerSubtype(SendEventTaskInfo::class.java, TYPE_SEND)
- .registerSubtype(RedactEventTaskInfo::class.java, TYPE_REDACT)
+ .add(
+ RuntimeJsonAdapterFactory.of(TaskInfo::class.java, "type", FallbackTaskInfo::class.java)
+ .registerSubtype(SendEventTaskInfo::class.java, TYPE_SEND)
+ .registerSubtype(RedactEventTaskInfo::class.java, TYPE_REDACT)
)
.add(SerializeNulls.JSON_ADAPTER_FACTORY)
.build()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt
index b65991347d..6c6d6368d1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt
@@ -72,17 +72,21 @@ internal class DefaultThreadsService @AssistedInject constructor(
}
override suspend fun fetchThreadTimeline(rootThreadEventId: String, from: String, limit: Int) {
- fetchThreadTimelineTask.execute(FetchThreadTimelineTask.Params(
- roomId = roomId,
- rootThreadEventId = rootThreadEventId,
- from = from,
- limit = limit
- ))
+ fetchThreadTimelineTask.execute(
+ FetchThreadTimelineTask.Params(
+ roomId = roomId,
+ rootThreadEventId = rootThreadEventId,
+ from = from,
+ limit = limit
+ )
+ )
}
override suspend fun fetchThreadSummaries() {
- fetchThreadSummariesTask.execute(FetchThreadSummariesTask.Params(
- roomId = roomId
- ))
+ fetchThreadSummariesTask.execute(
+ FetchThreadSummariesTask.Params(
+ roomId = roomId
+ )
+ )
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/local/DefaultThreadsLocalService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/local/DefaultThreadsLocalService.kt
index 3bc36fb2a8..296981dfc8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/local/DefaultThreadsLocalService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/local/DefaultThreadsLocalService.kt
@@ -83,7 +83,8 @@ internal class DefaultThreadsLocalService @AssistedInject constructor(
realm = it,
roomId = roomId,
rootThreadEventId = rootThreadEventId,
- senderId = userId)
+ senderId = userId
+ )
}
}
@@ -97,7 +98,8 @@ internal class DefaultThreadsLocalService @AssistedInject constructor(
monarchy.awaitTransaction {
EventEntity.where(
realm = it,
- eventId = rootThreadEventId).findFirst()?.threadNotificationState = ThreadNotificationState.NO_NEW_MESSAGE
+ eventId = rootThreadEventId
+ ).findFirst()?.threadNotificationState = ThreadNotificationState.NO_NEW_MESSAGE
}
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
index 849d7bd7ab..6d63b24cf5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
@@ -53,7 +53,7 @@ internal class DefaultTimelineService @AssistedInject constructor(
private val coroutineDispatchers: MatrixCoroutineDispatchers,
private val timelineEventDataSource: TimelineEventDataSource,
private val clock: Clock,
- ) : TimelineService {
+) : TimelineService {
@AssistedFactory
interface Factory {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
index 27f4245b22..8541c478ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
@@ -180,12 +180,14 @@ internal class TimelineChunk(
val rootThreadEventId = timelineSettings.rootThreadEventId ?: return LoadMoreResult.FAILURE
return if (direction == Timeline.Direction.BACKWARDS) {
try {
- fetchThreadTimelineTask.execute(FetchThreadTimelineTask.Params(
- roomId,
- rootThreadEventId,
- chunkEntity.prevToken,
- count
- )).toLoadMoreResult()
+ fetchThreadTimelineTask.execute(
+ FetchThreadTimelineTask.Params(
+ roomId,
+ rootThreadEventId,
+ chunkEntity.prevToken,
+ count
+ )
+ ).toLoadMoreResult()
} catch (failure: Throwable) {
Timber.e(failure, "Failed to fetch thread timeline events from the server")
LoadMoreResult.FAILURE
@@ -239,10 +241,12 @@ internal class TimelineChunk(
* Simple log that displays the number and timeline of loaded events
*/
private fun logLoadedFromStorage(loadedFromStorage: LoadedFromStorage, direction: Timeline.Direction) {
- Timber.v("[" +
- "${if (timelineSettings.isThreadTimeline()) "ThreadTimeLine" else "Timeline"}] Has loaded " +
- "${loadedFromStorage.numberOfEvents} items from storage in $direction " +
- if (timelineSettings.isThreadTimeline() && loadedFromStorage.threadReachedEnd) "[Reached End]" else "")
+ Timber.v(
+ "[" +
+ "${if (timelineSettings.isThreadTimeline()) "ThreadTimeLine" else "Timeline"}] Has loaded " +
+ "${loadedFromStorage.numberOfEvents} items from storage in $direction " +
+ if (timelineSettings.isThreadTimeline() && loadedFromStorage.threadReachedEnd) "[Reached End]" else ""
+ )
}
fun getBuiltEventIndex(eventId: String, searchInNext: Boolean, searchInPrev: Boolean): Int? {
@@ -361,7 +365,8 @@ internal class TimelineChunk(
}
return LoadedFromStorage(
threadReachedEnd = threadReachedEnd(timelineEvents),
- numberOfEvents = timelineEvents.size)
+ numberOfEvents = timelineEvents.size
+ )
}
/**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
index e5dd8aab30..96ceb6c6dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
@@ -230,7 +230,8 @@ internal class TokenChunkEventPersistor @Inject constructor(
roomId = roomId,
eventEntity = eventEntity,
direction = direction,
- roomMemberContentsByUser = roomMemberContentsByUser)
+ roomMemberContentsByUser = roomMemberContentsByUser
+ )
if (lightweightSettingsStorage.areThreadMessagesEnabled()) {
eventEntity.rootThreadEventId?.let {
// This is a thread event
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
index 8033b0654d..12ca36fa6b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
@@ -32,15 +32,17 @@ internal class DefaultSearchService @Inject constructor(
beforeLimit: Int,
afterLimit: Int,
includeProfile: Boolean): SearchResult {
- return searchTask.execute(SearchTask.Params(
- searchTerm = searchTerm,
- roomId = roomId,
- nextBatch = nextBatch,
- orderByRecent = orderByRecent,
- limit = limit,
- beforeLimit = beforeLimit,
- afterLimit = afterLimit,
- includeProfile = includeProfile
- ))
+ return searchTask.execute(
+ SearchTask.Params(
+ searchTerm = searchTerm,
+ roomId = roomId,
+ nextBatch = nextBatch,
+ orderByRecent = orderByRecent,
+ limit = limit,
+ beforeLimit = beforeLimit,
+ afterLimit = afterLimit,
+ includeProfile = includeProfile
+ )
+ )
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
index 17dc90fdb0..267023d186 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
@@ -169,8 +169,10 @@ internal class SecretStoringUtils @Inject constructor(
if (secretKeyEntry == null) {
// we generate it
val generator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, "AndroidKeyStore")
- val keyGenSpec = KeyGenParameterSpec.Builder(alias,
- KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
+ val keyGenSpec = KeyGenParameterSpec.Builder(
+ alias,
+ KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
+ )
.setBlockModes(KeyProperties.BLOCK_MODE_GCM)
.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
.setKeySize(128)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
index 7eeaed4ff6..a0925cabcc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
@@ -49,11 +49,13 @@ internal class DefaultJoinSpaceTask @Inject constructor(
override suspend fun execute(params: JoinSpaceTask.Params): JoinSpaceResult {
Timber.v("## Space: > Joining root space ${params.roomIdOrAlias} ...")
try {
- joinRoomTask.execute(JoinRoomTask.Params(
- params.roomIdOrAlias,
- params.reason,
- params.viaServers
- ))
+ joinRoomTask.execute(
+ JoinRoomTask.Params(
+ params.roomIdOrAlias,
+ params.reason,
+ params.viaServers
+ )
+ )
} catch (failure: Throwable) {
return JoinSpaceResult.Fail(failure)
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
index efc8e39a18..7b7df57bc5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
@@ -186,7 +186,8 @@ internal class ThreadsAwarenessHandler @Inject constructor(
eventBody = eventBody,
eventToInject = eventToInject,
eventToInjectBody = eventToInjectBody,
- threadRelation = threadRelation) ?: return null
+ threadRelation = threadRelation
+ ) ?: return null
// update the event
contentForNonEncrypted = updateEventEntity(event, eventEntity, eventPayload, messageTextContent)
@@ -253,7 +254,8 @@ internal class ThreadsAwarenessHandler @Inject constructor(
eventBody = newEventBody,
eventToInject = event,
eventToInjectBody = eventBody,
- threadRelation = threadRelation) ?: return null
+ threadRelation = threadRelation
+ ) ?: return null
return updateEventEntity(newEventFound, eventEntityFound, newEventPayload, messageTextContent)
}
@@ -309,7 +311,8 @@ internal class ThreadsAwarenessHandler @Inject constructor(
userLink,
eventIdToInjectSenderId,
eventToInjectBody,
- eventBody)
+ eventBody
+ )
return MessageTextContent(
relatesTo = threadRelation,
@@ -330,7 +333,8 @@ internal class ThreadsAwarenessHandler @Inject constructor(
threadRelation: RelationDefaultContent?): String? {
val replyFormatted = LocalEchoEventFactory.QUOTE_PATTERN.format(
"In reply to a thread",
- eventBody)
+ eventBody
+ )
val messageTextContent = MessageTextContent(
relatesTo = threadRelation,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
index 5f62f40ab3..5d2fa0fc5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
@@ -108,9 +108,11 @@ internal class DefaultTermsService @Inject constructor(
val newList = listOfAcceptedTerms.toMutableSet().apply { addAll(agreedUrls) }.toList()
- updateUserAccountDataTask.execute(UpdateUserAccountDataTask.AcceptedTermsParams(
- acceptedTermsContent = AcceptedTermsContent(newList)
- ))
+ updateUserAccountDataTask.execute(
+ UpdateUserAccountDataTask.AcceptedTermsParams(
+ acceptedTermsContent = AcceptedTermsContent(newList)
+ )
+ )
}
private suspend fun getToken(url: String): String {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
index 874c2741de..c4ea029cbb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
@@ -60,8 +60,10 @@ internal class DefaultUpdateBreadcrumbsTask @Inject constructor(
// FIXME It can remove the previous breadcrumbs, if not synced yet
// And update account data
- updateUserAccountDataTask.execute(UpdateUserAccountDataTask.BreadcrumbsParams(
- breadcrumbsContent = BreadcrumbsContent(newBreadcrumbs)
- ))
+ updateUserAccountDataTask.execute(
+ UpdateUserAccountDataTask.BreadcrumbsParams(
+ breadcrumbsContent = BreadcrumbsContent(newBreadcrumbs)
+ )
+ )
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
index e56b359f7a..6fce748091 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
@@ -96,9 +96,11 @@ internal class MatrixWorkerFactory @Inject constructor(private val sessionManage
CoroutineWorker(context, workerParameters) {
// Called by WorkManager if there is no MatrixWorkerFactory
- constructor(context: Context, workerParameters: WorkerParameters) : this(context,
+ constructor(context: Context, workerParameters: WorkerParameters) : this(
+ context,
workerParameters,
- isCreatedByMatrixWorkerFactory = false)
+ isCreatedByMatrixWorkerFactory = false
+ )
override suspend fun doWork(): Result {
return if (!isCreatedByMatrixWorkerFactory) {
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/session/pushrules/PushRulesConditionTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/session/pushrules/PushRulesConditionTest.kt
index 95787173da..c4a3404e80 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/session/pushrules/PushRulesConditionTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/session/pushrules/PushRulesConditionTest.kt
@@ -43,7 +43,8 @@ class PushRulesConditionTest : MatrixTest {
type = "m.room.message",
eventId = "mx0",
content = MessageTextContent("m.text", text).toContent(),
- originServerTs = 0)
+ originServerTs = 0
+ )
}
@Test
@@ -62,7 +63,8 @@ class PushRulesConditionTest : MatrixTest {
eventId = "mx0",
stateKey = "@foo:matrix.org",
content = rm.toContent(),
- originServerTs = 0)
+ originServerTs = 0
+ )
assert(condition.isSatisfied(simpleTextEvent))
assert(!condition.isSatisfied(simpleRoomMemberEvent))
@@ -131,7 +133,8 @@ class PushRulesConditionTest : MatrixTest {
eventId = "mx0",
content = MessageTextContent("m.notice", "A").toContent(),
originServerTs = 0,
- roomId = "2joined").also {
+ roomId = "2joined"
+ ).also {
assertTrue("Notice", conditionEqual.isSatisfied(it))
}
}
@@ -175,7 +178,8 @@ class PushRulesConditionTest : MatrixTest {
eventId = "mx0",
content = MessageTextContent("m.text", "A").toContent(),
originServerTs = 0,
- roomId = room2JoinedId).also {
+ roomId = room2JoinedId
+ ).also {
assertFalse("This room does not have 3 members", conditionEqual3.isSatisfied(it, roomGetterStub))
assertFalse("This room does not have 3 members", conditionEqual3Bis.isSatisfied(it, roomGetterStub))
assertTrue("This room has less than 3 members", conditionLessThan3.isSatisfied(it, roomGetterStub))
@@ -186,7 +190,8 @@ class PushRulesConditionTest : MatrixTest {
eventId = "mx0",
content = MessageTextContent("m.text", "A").toContent(),
originServerTs = 0,
- roomId = room3JoinedId).also {
+ roomId = room3JoinedId
+ ).also {
assertTrue("This room has 3 members", conditionEqual3.isSatisfied(it, roomGetterStub))
assertTrue("This room has 3 members", conditionEqual3Bis.isSatisfied(it, roomGetterStub))
assertFalse("This room has more than 3 members", conditionLessThan3.isSatisfied(it, roomGetterStub))
@@ -206,7 +211,8 @@ class PushRulesConditionTest : MatrixTest {
eventId = "mx0",
content = MessageTextContent("m.text", "How was the cake benoit?").toContent(),
originServerTs = 0,
- roomId = "2joined")
+ roomId = "2joined"
+ )
condition.isSatisfied(event, "how") shouldBe true
condition.isSatisfied(event, "How") shouldBe true
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt
index a93883a344..e6fe8fbb00 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt
@@ -41,13 +41,17 @@ class Base58Test : MatrixTest {
@Test
fun encode_curve25519() {
// Encode a 32 bytes key
- assertEquals("4F85ZySpwyY6FuH7mQYyyr5b8nV9zFRBLj92AJa37sMr",
- base58encode(("0123456789" + "0123456789" + "0123456789" + "01").toByteArray()))
+ assertEquals(
+ "4F85ZySpwyY6FuH7mQYyyr5b8nV9zFRBLj92AJa37sMr",
+ base58encode(("0123456789" + "0123456789" + "0123456789" + "01").toByteArray())
+ )
}
@Test
fun decode_curve25519() {
- assertArrayEquals(("0123456789" + "0123456789" + "0123456789" + "01").toByteArray(),
- base58decode("4F85ZySpwyY6FuH7mQYyyr5b8nV9zFRBLj92AJa37sMr"))
+ assertArrayEquals(
+ ("0123456789" + "0123456789" + "0123456789" + "01").toByteArray(),
+ base58decode("4F85ZySpwyY6FuH7mQYyyr5b8nV9zFRBLj92AJa37sMr")
+ )
}
}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
index d4c9da2986..4146e6b3b7 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
@@ -32,7 +32,8 @@ class RecoveryKeyTest : MatrixTest {
0x77.toByte(), 0x07.toByte(), 0x6D.toByte(), 0x0A.toByte(), 0x73.toByte(), 0x18.toByte(), 0xA5.toByte(), 0x7D.toByte(),
0x3C.toByte(), 0x16.toByte(), 0xC1.toByte(), 0x72.toByte(), 0x51.toByte(), 0xB2.toByte(), 0x66.toByte(), 0x45.toByte(),
0xDF.toByte(), 0x4C.toByte(), 0x2F.toByte(), 0x87.toByte(), 0xEB.toByte(), 0xC0.toByte(), 0x99.toByte(), 0x2A.toByte(),
- 0xB1.toByte(), 0x77.toByte(), 0xFB.toByte(), 0xA5.toByte(), 0x1D.toByte(), 0xB9.toByte(), 0x2C.toByte(), 0x2A.toByte())
+ 0xB1.toByte(), 0x77.toByte(), 0xFB.toByte(), 0xA5.toByte(), 0x1D.toByte(), 0xB9.toByte(), 0x2C.toByte(), 0x2A.toByte()
+ )
@Test
fun isValidRecoveryKey_valid_true() {
diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt b/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
index 76f09638be..c970d0049f 100644
--- a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
@@ -82,7 +82,8 @@ class VerifySessionInteractiveTest : VerificationTestBase() {
)
)
}
- }, it)
+ }, it
+ )
}
}
diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt b/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
index 76d5717000..7efae073e5 100644
--- a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
@@ -84,27 +84,30 @@ class VerifySessionPassphraseTest : VerificationTestBase() {
)
)
}
- }, it)
+ }, it
+ )
}
val task = BootstrapCrossSigningTask(existingSession!!, StringProvider(context.resources))
runBlocking {
- task.execute(Params(
- userInteractiveAuthInterceptor = object : UserInteractiveAuthInterceptor {
- override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
- promise.resume(
- UserPasswordAuth(
- user = existingSession!!.myUserId,
- password = password,
- session = flowResponse.session
+ task.execute(
+ Params(
+ userInteractiveAuthInterceptor = object : UserInteractiveAuthInterceptor {
+ override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+ promise.resume(
+ UserPasswordAuth(
+ user = existingSession!!.myUserId,
+ password = password,
+ session = flowResponse.session
+ )
)
- )
- }
- },
- passphrase = passphrase,
- setupMode = SetupMode.NORMAL
- ))
+ }
+ },
+ passphrase = passphrase,
+ setupMode = SetupMode.NORMAL
+ )
+ )
}
}
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index 07b7c9ebf9..d407fcb1f2 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -60,6 +60,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
@Inject
lateinit var activeSessionHolder: ActiveSessionHolder
+
@Inject
lateinit var clock: Clock
@@ -246,8 +247,10 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
private val qrStartForActivityResult = registerStartForActivityResult { activityResult ->
if (activityResult.resultCode == Activity.RESULT_OK) {
- toast("QrCode: " + QrCodeScannerActivity.getResultText(activityResult.data) +
- " is QRCode: " + QrCodeScannerActivity.getResultIsQrCode(activityResult.data))
+ toast(
+ "QrCode: " + QrCodeScannerActivity.getResultText(activityResult.data) +
+ " is QRCode: " + QrCodeScannerActivity.getResultIsQrCode(activityResult.data)
+ )
// Also update the current QR Code (reverse operation)
// renderQrCode(QrCodeScannerActivity.getResultText(data) ?: "")
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
index a35bb40f8f..0f00f2daa5 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
@@ -45,7 +45,8 @@ class DebugPermissionActivity : VectorBaseActivity<ActivityDebugPermissionBindin
Manifest.permission.RECORD_AUDIO,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_EXTERNAL_STORAGE,
- Manifest.permission.READ_CONTACTS)
+ Manifest.permission.READ_CONTACTS
+ )
private var lastPermissions = emptyList<String>()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt b/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
index 5b3ee30722..f2904e4b1a 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
@@ -28,43 +28,45 @@ class DebugFeaturesStateFactory @Inject constructor(
) {
fun create(): FeaturesState {
- return FeaturesState(listOf(
- createEnumFeature(
- label = "Onboarding variant",
- featureOverride = debugFeatures.onboardingVariant(),
- featureDefault = defaultFeatures.onboardingVariant()
- ),
- createBooleanFeature(
- label = "FTUE Splash - I already have an account",
- key = DebugFeatureKeys.onboardingAlreadyHaveAnAccount,
- factory = VectorFeatures::isOnboardingAlreadyHaveAccountSplashEnabled
- ),
- createBooleanFeature(
- label = "FTUE Splash - carousel",
- key = DebugFeatureKeys.onboardingSplashCarousel,
- factory = VectorFeatures::isOnboardingSplashCarouselEnabled
- ),
- createBooleanFeature(
- label = "FTUE Use Case",
- key = DebugFeatureKeys.onboardingUseCase,
- factory = VectorFeatures::isOnboardingUseCaseEnabled
- ),
- createBooleanFeature(
- label = "FTUE Personalize profile",
- key = DebugFeatureKeys.onboardingPersonalize,
- factory = VectorFeatures::isOnboardingPersonalizeEnabled
- ),
- createBooleanFeature(
- label = "FTUE Combined register",
- key = DebugFeatureKeys.onboardingCombinedRegister,
- factory = VectorFeatures::isOnboardingCombinedRegisterEnabled
- ),
- createBooleanFeature(
- label = "Live location sharing",
- key = DebugFeatureKeys.liveLocationSharing,
- factory = VectorFeatures::isLiveLocationEnabled
- ),
- ))
+ return FeaturesState(
+ listOf(
+ createEnumFeature(
+ label = "Onboarding variant",
+ featureOverride = debugFeatures.onboardingVariant(),
+ featureDefault = defaultFeatures.onboardingVariant()
+ ),
+ createBooleanFeature(
+ label = "FTUE Splash - I already have an account",
+ key = DebugFeatureKeys.onboardingAlreadyHaveAnAccount,
+ factory = VectorFeatures::isOnboardingAlreadyHaveAccountSplashEnabled
+ ),
+ createBooleanFeature(
+ label = "FTUE Splash - carousel",
+ key = DebugFeatureKeys.onboardingSplashCarousel,
+ factory = VectorFeatures::isOnboardingSplashCarouselEnabled
+ ),
+ createBooleanFeature(
+ label = "FTUE Use Case",
+ key = DebugFeatureKeys.onboardingUseCase,
+ factory = VectorFeatures::isOnboardingUseCaseEnabled
+ ),
+ createBooleanFeature(
+ label = "FTUE Personalize profile",
+ key = DebugFeatureKeys.onboardingPersonalize,
+ factory = VectorFeatures::isOnboardingPersonalizeEnabled
+ ),
+ createBooleanFeature(
+ label = "FTUE Combined register",
+ key = DebugFeatureKeys.onboardingCombinedRegister,
+ factory = VectorFeatures::isOnboardingCombinedRegisterEnabled
+ ),
+ createBooleanFeature(
+ label = "Live location sharing",
+ key = DebugFeatureKeys.liveLocationSharing,
+ factory = VectorFeatures::isLiveLocationEnabled
+ ),
+ )
+ )
}
private fun createBooleanFeature(key: Preferences.Key<Boolean>, label: String, factory: KFunction1<VectorFeatures, Boolean>): Feature {
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
index 1d77d031af..dfe412117f 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
@@ -57,10 +57,12 @@ class DebugPrivateSettingsViewModel @AssistedInject constructor(
debugVectorOverrides.forceHomeserverCapabilities.setOnEach {
val activeDisplayNameOption = BooleanHomeserverCapabilitiesOverride.from(it.canChangeDisplayName)
val activeAvatarOption = BooleanHomeserverCapabilitiesOverride.from(it.canChangeAvatar)
- copy(homeserverCapabilityOverrides = homeserverCapabilityOverrides.copy(
- displayName = homeserverCapabilityOverrides.displayName.copy(activeOption = activeDisplayNameOption),
- avatar = homeserverCapabilityOverrides.avatar.copy(activeOption = activeAvatarOption),
- ))
+ copy(
+ homeserverCapabilityOverrides = homeserverCapabilityOverrides.copy(
+ displayName = homeserverCapabilityOverrides.displayName.copy(activeOption = activeDisplayNameOption),
+ avatar = homeserverCapabilityOverrides.avatar.copy(activeOption = activeAvatarOption),
+ )
+ )
}
}
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
index f8c30f813d..5932d2c372 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
@@ -39,24 +39,30 @@ class TestBackgroundRestrictions @Inject constructor(private val context: Fragme
ConnectivityManagerCompat.RESTRICT_BACKGROUND_STATUS_ENABLED -> {
// Background data usage is blocked for this app. Wherever possible,
// the app should also use less data in the foreground.
- description = stringProvider.getString(R.string.settings_troubleshoot_test_bg_restricted_failed,
- "RESTRICT_BACKGROUND_STATUS_ENABLED")
+ description = stringProvider.getString(
+ R.string.settings_troubleshoot_test_bg_restricted_failed,
+ "RESTRICT_BACKGROUND_STATUS_ENABLED"
+ )
status = TestStatus.FAILED
quickFix = null
}
ConnectivityManagerCompat.RESTRICT_BACKGROUND_STATUS_WHITELISTED -> {
// The app is whitelisted. Wherever possible,
// the app should use less data in the foreground and background.
- description = stringProvider.getString(R.string.settings_troubleshoot_test_bg_restricted_success,
- "RESTRICT_BACKGROUND_STATUS_WHITELISTED")
+ description = stringProvider.getString(
+ R.string.settings_troubleshoot_test_bg_restricted_success,
+ "RESTRICT_BACKGROUND_STATUS_WHITELISTED"
+ )
status = TestStatus.SUCCESS
quickFix = null
}
ConnectivityManagerCompat.RESTRICT_BACKGROUND_STATUS_DISABLED -> {
// Data Saver is disabled. Since the device is connected to a
// metered network, the app should use less data wherever possible.
- description = stringProvider.getString(R.string.settings_troubleshoot_test_bg_restricted_success,
- "RESTRICT_BACKGROUND_STATUS_DISABLED")
+ description = stringProvider.getString(
+ R.string.settings_troubleshoot_test_bg_restricted_success,
+ "RESTRICT_BACKGROUND_STATUS_DISABLED"
+ )
status = TestStatus.SUCCESS
quickFix = null
}
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
index ec1b9ca7a2..2db03f3428 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
@@ -53,8 +53,10 @@ class TestTokenRegistration @Inject constructor(private val context: FragmentAct
it.pushKey == fcmToken && it.state == PusherState.REGISTERED
}
if (pushers.isEmpty()) {
- description = stringProvider.getString(R.string.settings_troubleshoot_test_token_registration_failed,
- stringProvider.getString(R.string.sas_error_unknown))
+ description = stringProvider.getString(
+ R.string.settings_troubleshoot_test_token_registration_failed,
+ stringProvider.getString(R.string.sas_error_unknown)
+ )
quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_token_registration_quick_fix) {
override fun doFix() {
val workId = pushersManager.enqueueRegisterPusherWithFcmKey(fcmToken)
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index 8917513537..0bf4eb13b6 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -213,10 +213,12 @@ class VectorApplication :
private fun enableStrictModeIfNeeded() {
if (BuildConfig.ENABLE_STRICT_MODE_LOGS) {
- StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder()
- .detectAll()
- .penaltyLog()
- .build())
+ StrictMode.setThreadPolicy(
+ StrictMode.ThreadPolicy.Builder()
+ .detectAll()
+ .penaltyLog()
+ .build()
+ )
}
}
diff --git a/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt b/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
index db0fab9c42..577533f758 100644
--- a/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
+++ b/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
@@ -83,14 +83,16 @@ class ContactsDataSource @Inject constructor(
// Get the phone numbers
if (withMsisdn) {
- contentResolver.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
+ contentResolver.query(
+ ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
arrayOf(
ContactsContract.CommonDataKinds.Phone.CONTACT_ID,
ContactsContract.CommonDataKinds.Phone.NUMBER
),
null,
null,
- null)
+ null
+ )
?.use { cursor ->
val idColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.CommonDataKinds.Phone.CONTACT_ID) ?: return@use
val phoneNumberColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.CommonDataKinds.Phone.NUMBER) ?: return@use
@@ -122,7 +124,8 @@ class ContactsDataSource @Inject constructor(
),
null,
null,
- null)
+ null
+ )
?.use { cursor ->
val idColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.CommonDataKinds.Email.CONTACT_ID) ?: return@use
val emailColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.CommonDataKinds.Email.DATA) ?: return@use
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt b/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt
index 757b415ce5..a9e223709a 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt
@@ -109,10 +109,12 @@ class GalleryOrCameraDialogHelper(
fun show() {
MaterialAlertDialogBuilder(activity)
.setTitle(R.string.attachment_type_dialog_title)
- .setItems(arrayOf(
- fragment.getString(R.string.attachment_type_camera),
- fragment.getString(R.string.attachment_type_gallery)
- )) { _, which ->
+ .setItems(
+ arrayOf(
+ fragment.getString(R.string.attachment_type_camera),
+ fragment.getString(R.string.attachment_type_gallery)
+ )
+ ) { _, which ->
onAvatarTypeSelected(if (which == 0) Type.Camera else Type.Gallery)
}
.setPositiveButton(R.string.action_cancel, null)
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
index 415c82b330..b594dbcac4 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
@@ -113,13 +113,17 @@ class UnrecognizedCertificateDialog @Inject constructor(
views.sslFingerprintTitle.text = stringProvider.getString(R.string.ssl_fingerprint_hash, unrecognizedFingerprint.hashType.toString())
views.sslFingerprint.text = unrecognizedFingerprint.displayableHexRepr
if (userId != null) {
- views.sslUserId.text = stringProvider.getString(R.string.generic_label_and_value,
+ views.sslUserId.text = stringProvider.getString(
+ R.string.generic_label_and_value,
stringProvider.getString(R.string.username),
- userId)
+ userId
+ )
} else {
- views.sslUserId.text = stringProvider.getString(R.string.generic_label_and_value,
+ views.sslUserId.text = stringProvider.getString(
+ R.string.generic_label_and_value,
stringProvider.getString(R.string.hs_url),
- homeServerUrl)
+ homeServerUrl
+ )
}
if (existing) {
if (homeServerConnectionConfigHasFingerprints) {
diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index 2eb36d758e..a6f80a256e 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -155,15 +155,17 @@ class DefaultErrorFormatter @Inject constructor(
}
private fun identityServerError(identityServiceError: IdentityServiceError): String {
- return stringProvider.getString(when (identityServiceError) {
- IdentityServiceError.OutdatedIdentityServer -> R.string.identity_server_error_outdated_identity_server
- IdentityServiceError.OutdatedHomeServer -> R.string.identity_server_error_outdated_home_server
- IdentityServiceError.NoIdentityServerConfigured -> R.string.identity_server_error_no_identity_server_configured
- IdentityServiceError.TermsNotSignedException -> R.string.identity_server_error_terms_not_signed
- IdentityServiceError.BulkLookupSha256NotSupported -> R.string.identity_server_error_bulk_sha256_not_supported
- IdentityServiceError.BindingError -> R.string.identity_server_error_binding_error
- IdentityServiceError.NoCurrentBindingError -> R.string.identity_server_error_no_current_binding_error
- IdentityServiceError.UserConsentNotProvided -> R.string.identity_server_user_consent_not_provided
- })
+ return stringProvider.getString(
+ when (identityServiceError) {
+ IdentityServiceError.OutdatedIdentityServer -> R.string.identity_server_error_outdated_identity_server
+ IdentityServiceError.OutdatedHomeServer -> R.string.identity_server_error_outdated_home_server
+ IdentityServiceError.NoIdentityServerConfigured -> R.string.identity_server_error_no_identity_server_configured
+ IdentityServiceError.TermsNotSignedException -> R.string.identity_server_error_terms_not_signed
+ IdentityServiceError.BulkLookupSha256NotSupported -> R.string.identity_server_error_bulk_sha256_not_supported
+ IdentityServiceError.BindingError -> R.string.identity_server_error_binding_error
+ IdentityServiceError.NoCurrentBindingError -> R.string.identity_server_error_no_current_binding_error
+ IdentityServiceError.UserConsentNotProvided -> R.string.identity_server_user_consent_not_provided
+ }
+ )
}
}
diff --git a/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt b/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt
index f4f854406e..04b351515a 100644
--- a/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt
@@ -22,4 +22,5 @@ import org.matrix.android.sdk.api.session.crypto.attachments.ElementToDecrypt
const val ElementToDecryptOptionKey = "im.vector.app.core.glide.ElementToDecrypt"
val ELEMENT_TO_DECRYPT = Option.memory(
- ElementToDecryptOptionKey, ElementToDecrypt("", "", ""))
+ ElementToDecryptOptionKey, ElementToDecrypt("", "", "")
+)
diff --git a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index c53db12b6b..a643ee908c 100644
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -121,7 +121,8 @@ class VectorGlideDataFetcher(context: Context,
fileName = data.filename,
mimeType = data.mimeType,
url = data.url,
- elementToDecrypt = data.elementToDecrypt)
+ elementToDecrypt = data.elementToDecrypt
+ )
}
withContext(Dispatchers.Main) {
result.fold(
diff --git a/vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt b/vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt
index bc45ab5676..b9fab37e43 100644
--- a/vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt
+++ b/vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt
@@ -24,14 +24,16 @@ object VectorAutoLinkPatterns {
private const val LAT_OR_LONG_OR_ALT_NUMBER = "-?\\d+(?:\\.\\d+)?"
private const val COORDINATE_SYSTEM = ";crs=[\\w-]+"
- val GEO_URI: Regex = Regex("(?:geo:)?" +
- "(" + LAT_OR_LONG_OR_ALT_NUMBER + ")" +
- "," +
- "(" + LAT_OR_LONG_OR_ALT_NUMBER + ")" +
- "(?:" + "," + LAT_OR_LONG_OR_ALT_NUMBER + ")?" + // altitude
- "(?:" + COORDINATE_SYSTEM + ")?" +
- "(?:" + ";u=\\d+(?:\\.\\d+)?" + ")?" + // uncertainty in meters
- "(?:" +
- ";[\\w-]+=(?:[\\w-_.!~*'()]|%[\\da-f][\\da-f])+" + // dafuk
- ")*", RegexOption.IGNORE_CASE)
+ val GEO_URI: Regex = Regex(
+ "(?:geo:)?" +
+ "(" + LAT_OR_LONG_OR_ALT_NUMBER + ")" +
+ "," +
+ "(" + LAT_OR_LONG_OR_ALT_NUMBER + ")" +
+ "(?:" + "," + LAT_OR_LONG_OR_ALT_NUMBER + ")?" + // altitude
+ "(?:" + COORDINATE_SYSTEM + ")?" +
+ "(?:" + ";u=\\d+(?:\\.\\d+)?" + ")?" + // uncertainty in meters
+ "(?:" +
+ ";[\\w-]+=(?:[\\w-_.!~*'()]|%[\\da-f][\\da-f])+" + // dafuk
+ ")*", RegexOption.IGNORE_CASE
+ )
}
diff --git a/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt b/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt
index 7bedeaa4ff..128591fd96 100755
--- a/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt
@@ -62,7 +62,8 @@ class ButtonStateView @JvmOverloads constructor(context: Context, attrs: Attribu
context.theme.obtainStyledAttributes(
attrs,
R.styleable.ButtonStateView,
- 0, 0)
+ 0, 0
+ )
.apply {
try {
if (getBoolean(R.styleable.ButtonStateView_bsv_use_flat_button, true)) {
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index febcfc5ef2..0d2315c1df 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -260,15 +260,17 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
private fun handleGlobalError(globalError: GlobalError) {
when (globalError) {
- is GlobalError.InvalidToken ->
+ is GlobalError.InvalidToken ->
handleInvalidToken(globalError)
is GlobalError.ConsentNotGivenError ->
- consentNotGivenHelper.displayDialog(globalError.consentUri,
- activeSessionHolder.getActiveSession().sessionParams.homeServerHost ?: "")
- is GlobalError.CertificateError ->
+ consentNotGivenHelper.displayDialog(
+ globalError.consentUri,
+ activeSessionHolder.getActiveSession().sessionParams.homeServerHost ?: ""
+ )
+ is GlobalError.CertificateError ->
handleCertificateError(globalError)
- GlobalError.ExpiredAccount -> Unit // TODO Handle account expiration
- is GlobalError.InitialSyncRequest -> handleInitialSyncRequest(globalError)
+ GlobalError.ExpiredAccount -> Unit // TODO Handle account expiration
+ is GlobalError.InitialSyncRequest -> handleInitialSyncRequest(globalError)
}
}
@@ -276,11 +278,13 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
MaterialAlertDialogBuilder(this)
.setTitle(R.string.initial_sync_request_title)
.setMessage(
- getString(R.string.initial_sync_request_content, getString(
+ getString(
+ R.string.initial_sync_request_content, getString(
when (initialSyncRequest.reason) {
InitialSyncRequestReason.IGNORED_USERS_LIST_CHANGE -> R.string.initial_sync_request_reason_unignored_users
}
- ))
+ )
+ )
)
.setPositiveButton(R.string.ok) { _, _ ->
MainActivity.restartApp(this, MainActivityArgs(clearCache = true))
@@ -318,7 +322,8 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
mainActivityStarted = true
- MainActivity.restartApp(this,
+ MainActivity.restartApp(
+ this,
MainActivityArgs(
clearCredentials = !globalError.softLogout,
isUserLoggedOut = true,
diff --git a/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt b/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
index 78266cf5ee..34def7e060 100644
--- a/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
@@ -56,11 +56,13 @@ class PushRulePreference : VectorPreference {
* Refresh the summary
*/
private fun refreshSummary() {
- summary = context.getString(when (index) {
- NotificationIndex.OFF -> R.string.notification_off
- NotificationIndex.SILENT -> R.string.notification_silent
- NotificationIndex.NOISY, null -> R.string.notification_noisy
- })
+ summary = context.getString(
+ when (index) {
+ NotificationIndex.OFF -> R.string.notification_off
+ NotificationIndex.SILENT -> R.string.notification_silent
+ NotificationIndex.NOISY, null -> R.string.notification_noisy
+ }
+ )
}
override fun onBindViewHolder(holder: PreferenceViewHolder) {
diff --git a/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt b/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
index b2d9382aae..702092679f 100644
--- a/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
+++ b/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
@@ -140,13 +140,15 @@ class CallRingPlayerOutgoing(
mediaPlayer.setOnErrorListener(MediaPlayerErrorListener())
mediaPlayer.isLooping = true
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
- mediaPlayer.setAudioAttributes(AudioAttributes.Builder()
- .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
- .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
- // TODO Change to ?
- // .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
- // .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
- .build())
+ mediaPlayer.setAudioAttributes(
+ AudioAttributes.Builder()
+ .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+ .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
+ // TODO Change to ?
+ // .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
+ // .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
+ .build()
+ )
} else {
@Suppress("DEPRECATION")
mediaPlayer.setAudioStreamType(AudioManager.STREAM_RING)
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
index 3a79e7e328..8477eddeea 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
@@ -107,11 +107,13 @@ class ReadReceiptsView @JvmOverloads constructor(
else ->
if (displayNames.size >= 2) {
val qty = readReceipts.size - 2
- context.resources.getQuantityString(R.plurals.two_and_some_others_read,
+ context.resources.getQuantityString(
+ R.plurals.two_and_some_others_read,
qty,
displayNames[0],
displayNames[1],
- qty)
+ qty
+ )
} else {
context.resources.getQuantityString(R.plurals.fallback_users_read, readReceipts.size)
}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
index 98440632d8..6734744c29 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
@@ -140,22 +140,26 @@ class AttachmentTypeSelectorView(context: Context,
private fun animateWindowInCircular(anchor: View, contentView: View) {
val coordinates = getClickCoordinates(anchor, contentView)
- val animator = ViewAnimationUtils.createCircularReveal(contentView,
+ val animator = ViewAnimationUtils.createCircularReveal(
+ contentView,
coordinates.first,
coordinates.second,
0f,
- max(contentView.width, contentView.height).toFloat())
+ max(contentView.width, contentView.height).toFloat()
+ )
animator.duration = ANIMATION_DURATION.toLong()
animator.start()
}
private fun animateWindowOutCircular(anchor: View, contentView: View) {
val coordinates = getClickCoordinates(anchor, contentView)
- val animator = ViewAnimationUtils.createCircularReveal(getContentView(),
+ val animator = ViewAnimationUtils.createCircularReveal(
+ getContentView(),
coordinates.first,
coordinates.second,
max(getContentView().width, getContentView().height).toFloat(),
- 0f)
+ 0f
+ )
animator.duration = ANIMATION_DURATION.toLong()
animator.addListener(object : AnimatorListenerAdapter() {
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
index fe12bf1ec7..10e822c947 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
@@ -215,9 +215,10 @@ class WebRtcCallManager @Inject constructor(
}
Timber.tag(loggerTag.value).v("PeerConnectionFactory.initialize")
- PeerConnectionFactory.initialize(PeerConnectionFactory
- .InitializationOptions.builder(context.applicationContext)
- .createInitializationOptions()
+ PeerConnectionFactory.initialize(
+ PeerConnectionFactory
+ .InitializationOptions.builder(context.applicationContext)
+ .createInitializationOptions()
)
val options = PeerConnectionFactory.Options()
@@ -226,7 +227,8 @@ class WebRtcCallManager @Inject constructor(
/* enableIntelVp8Encoder */
true,
/* enableH264HighProfile */
- true)
+ true
+ )
val defaultVideoDecoderFactory = DefaultVideoDecoderFactory(eglBaseContext)
Timber.tag(loggerTag.value).v("PeerConnectionFactory.createPeerConnectionFactory ...")
peerConnectionFactory = PeerConnectionFactory.builder()
@@ -304,7 +306,8 @@ class WebRtcCallManager @Inject constructor(
}
CallService.onOutgoingCallRinging(
context = context.applicationContext,
- callId = mxCall.callId)
+ callId = mxCall.callId
+ )
// start the activity now
context.startActivity(VectorCallActivity.newIntent(context, webRtcCall, VectorCallActivity.OUTGOING_CREATED))
diff --git a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
index 7425e0ae8a..8cd7f2de45 100644
--- a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
@@ -70,7 +70,7 @@ class ContactsBookFragment @Inject constructor(
.allowBack(useCross = true)
contactsBookViewModel.observeViewEvents {
when (it) {
- is ContactsBookViewEvents.Failure -> showFailure(it.throwable)
+ is ContactsBookViewEvents.Failure -> showFailure(it.throwable)
is ContactsBookViewEvents.OnPoliciesRetrieved -> showConsentDialog(it)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
index d016558764..402fc40c9a 100644
--- a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
@@ -160,10 +160,10 @@ class ContactsBookViewModel @AssistedInject constructor(
override fun handle(action: ContactsBookAction) {
when (action) {
- is ContactsBookAction.FilterWith -> handleFilterWith(action)
+ is ContactsBookAction.FilterWith -> handleFilterWith(action)
is ContactsBookAction.OnlyBoundContacts -> handleOnlyBoundContacts(action)
- ContactsBookAction.UserConsentGranted -> handleUserConsentGranted()
- ContactsBookAction.UserConsentRequest -> handleUserConsentRequest()
+ ContactsBookAction.UserConsentGranted -> handleUserConsentGranted()
+ ContactsBookAction.UserConsentRequest -> handleUserConsentRequest()
}
}
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
index 6cfe0bf686..df24666285 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
@@ -83,29 +83,45 @@ class KeysBackupRestoreSharedViewModel @Inject constructor(
val progressObserver = object : StepProgressListener {
override fun onStepProgress(step: StepProgressListener.Step) {
when (step) {
- is StepProgressListener.Step.ComputingKey -> {
- loadingEvent.postValue(WaitingViewData(stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
- "\n" + stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
- step.progress,
- step.total))
+ is StepProgressListener.Step.ComputingKey -> {
+ loadingEvent.postValue(
+ WaitingViewData(
+ stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
+ "\n" + stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
+ step.progress,
+ step.total
+ )
+ )
}
is StepProgressListener.Step.DownloadingKey -> {
- loadingEvent.postValue(WaitingViewData(stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
- "\n" + stringProvider.getString(R.string.keys_backup_restoring_downloading_backup_waiting_message),
- isIndeterminate = true))
+ loadingEvent.postValue(
+ WaitingViewData(
+ stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
+ "\n" + stringProvider.getString(R.string.keys_backup_restoring_downloading_backup_waiting_message),
+ isIndeterminate = true
+ )
+ )
}
- is StepProgressListener.Step.ImportingKey -> {
+ is StepProgressListener.Step.ImportingKey -> {
Timber.d("backupKeys.ImportingKey.progress: ${step.progress}")
// Progress 0 can take a while, display an indeterminate progress in this case
if (step.progress == 0) {
- loadingEvent.postValue(WaitingViewData(stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
- "\n" + stringProvider.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
- isIndeterminate = true))
+ loadingEvent.postValue(
+ WaitingViewData(
+ stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
+ "\n" + stringProvider.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
+ isIndeterminate = true
+ )
+ )
} else {
- loadingEvent.postValue(WaitingViewData(stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
- "\n" + stringProvider.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
- step.progress,
- step.total))
+ loadingEvent.postValue(
+ WaitingViewData(
+ stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
+ "\n" + stringProvider.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
+ step.progress,
+ step.total
+ )
+ )
}
}
}
@@ -205,7 +221,8 @@ class KeysBackupRestoreSharedViewModel @Inject constructor(
try {
val result = awaitCallback<ImportRoomKeysResult> {
- keysBackup.restoreKeyBackupWithPassword(keyVersion,
+ keysBackup.restoreKeyBackupWithPassword(
+ keyVersion,
passphrase,
null,
session.myUserId,
@@ -230,7 +247,8 @@ class KeysBackupRestoreSharedViewModel @Inject constructor(
try {
val result = awaitCallback<ImportRoomKeysResult> {
- keysBackup.restoreKeysWithRecoveryKey(keyVersion,
+ keysBackup.restoreKeysWithRecoveryKey(
+ keyVersion,
recoveryKey,
null,
session.myUserId,
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
index c4663fd3bc..d26c1e2134 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
@@ -40,10 +40,14 @@ class KeysBackupRestoreSuccessFragment @Inject constructor() : VectorBaseFragmen
if (compareValues(sharedViewModel.importKeyResult?.totalNumberOfKeys, 0) > 0) {
sharedViewModel.importKeyResult?.let {
- val part1 = resources.getQuantityString(R.plurals.keys_backup_restore_success_description_part1,
- it.totalNumberOfKeys, it.totalNumberOfKeys)
- val part2 = resources.getQuantityString(R.plurals.keys_backup_restore_success_description_part2,
- it.successfullyNumberOfImportedKeys, it.successfullyNumberOfImportedKeys)
+ val part1 = resources.getQuantityString(
+ R.plurals.keys_backup_restore_success_description_part1,
+ it.totalNumberOfKeys, it.totalNumberOfKeys
+ )
+ val part2 = resources.getQuantityString(
+ R.plurals.keys_backup_restore_success_description_part2,
+ it.successfullyNumberOfImportedKeys, it.successfullyNumberOfImportedKeys
+ )
views.successDetailsText.text = String.format("%s\n%s", part1, part2)
}
// We don't put emoji in string xml as it will crash on old devices
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
index 9bf8050939..d281360678 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
@@ -132,9 +132,11 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(
if (data.keysBackupVersionTrust()?.usable == false) {
description(host.stringProvider.getString(R.string.keys_backup_settings_untrusted_backup).toEpoxyCharSequence())
} else {
- description(host.stringProvider
- .getQuantityString(R.plurals.keys_backup_info_keys_backing_up, remainingKeysToBackup, remainingKeysToBackup)
- .toEpoxyCharSequence())
+ description(
+ host.stringProvider
+ .getQuantityString(R.plurals.keys_backup_info_keys_backing_up, remainingKeysToBackup, remainingKeysToBackup)
+ .toEpoxyCharSequence()
+ )
}
}
@@ -200,27 +202,35 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(
val deviceId: String = it.deviceId ?: ""
if (!isDeviceKnown) {
- description(host.stringProvider
- .getString(R.string.keys_backup_settings_signature_from_unknown_device, deviceId)
- .toEpoxyCharSequence())
+ description(
+ host.stringProvider
+ .getString(R.string.keys_backup_settings_signature_from_unknown_device, deviceId)
+ .toEpoxyCharSequence()
+ )
endIconResourceId(R.drawable.e2e_warning)
} else {
if (isSignatureValid) {
if (host.session.sessionParams.deviceId == it.deviceId) {
- description(host.stringProvider
- .getString(R.string.keys_backup_settings_valid_signature_from_this_device)
- .toEpoxyCharSequence())
+ description(
+ host.stringProvider
+ .getString(R.string.keys_backup_settings_valid_signature_from_this_device)
+ .toEpoxyCharSequence()
+ )
endIconResourceId(R.drawable.e2e_verified)
} else {
if (isDeviceVerified) {
- description(host.stringProvider
- .getString(R.string.keys_backup_settings_valid_signature_from_verified_device, deviceId)
- .toEpoxyCharSequence())
+ description(
+ host.stringProvider
+ .getString(R.string.keys_backup_settings_valid_signature_from_verified_device, deviceId)
+ .toEpoxyCharSequence()
+ )
endIconResourceId(R.drawable.e2e_verified)
} else {
- description(host.stringProvider
- .getString(R.string.keys_backup_settings_valid_signature_from_unverified_device, deviceId)
- .toEpoxyCharSequence())
+ description(
+ host.stringProvider
+ .getString(R.string.keys_backup_settings_valid_signature_from_unverified_device, deviceId)
+ .toEpoxyCharSequence()
+ )
endIconResourceId(R.drawable.e2e_warning)
}
}
@@ -228,13 +238,17 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(
// Invalid signature
endIconResourceId(R.drawable.e2e_warning)
if (isDeviceVerified) {
- description(host.stringProvider
- .getString(R.string.keys_backup_settings_invalid_signature_from_verified_device, deviceId)
- .toEpoxyCharSequence())
+ description(
+ host.stringProvider
+ .getString(R.string.keys_backup_settings_invalid_signature_from_verified_device, deviceId)
+ .toEpoxyCharSequence()
+ )
} else {
- description(host.stringProvider
- .getString(R.string.keys_backup_settings_invalid_signature_from_unverified_device, deviceId)
- .toEpoxyCharSequence())
+ description(
+ host.stringProvider
+ .getString(R.string.keys_backup_settings_invalid_signature_from_unverified_device, deviceId)
+ .toEpoxyCharSequence()
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
index e5d7ade3ce..61148f3aab 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@@ -146,7 +146,8 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment<Fr
activityResultLauncher = null,
chooserTitle = context?.getString(R.string.keys_backup_setup_step3_share_intent_chooser_title),
text = recoveryKey,
- subject = context?.getString(R.string.recovery_key))
+ subject = context?.getString(R.string.recovery_key)
+ )
viewModel.copyHasBeenMade = true
dialog.dismiss()
}
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
index 0a105064d5..8ca1dec6d7 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
@@ -154,11 +154,13 @@ class SharedSecureStorageActivity :
resultKeyStoreAlias: String = DEFAULT_RESULT_KEYSTORE_ALIAS): Intent {
require(requestedSecrets.isNotEmpty())
return Intent(context, SharedSecureStorageActivity::class.java).also {
- it.putExtra(Mavericks.KEY_ARG, Args(
+ it.putExtra(
+ Mavericks.KEY_ARG, Args(
keyId,
requestedSecrets,
resultKeyStoreAlias
- ))
+ )
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
index 445cc70527..7bafc2a2f6 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
@@ -134,13 +134,13 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
override fun handle(action: SharedSecureStorageAction) = withState {
when (action) {
- is SharedSecureStorageAction.Cancel -> handleCancel()
+ is SharedSecureStorageAction.Cancel -> handleCancel()
is SharedSecureStorageAction.SubmitPassphrase -> handleSubmitPassphrase(action)
- SharedSecureStorageAction.UseKey -> handleUseKey()
- is SharedSecureStorageAction.SubmitKey -> handleSubmitKey(action)
- SharedSecureStorageAction.Back -> handleBack()
- SharedSecureStorageAction.ForgotResetAll -> handleResetAll()
- SharedSecureStorageAction.DoResetAll -> handleDoResetAll()
+ SharedSecureStorageAction.UseKey -> handleUseKey()
+ is SharedSecureStorageAction.SubmitKey -> handleSubmitKey(action)
+ SharedSecureStorageAction.Back -> handleBack()
+ SharedSecureStorageAction.ForgotResetAll -> handleResetAll()
+ SharedSecureStorageAction.DoResetAll -> handleDoResetAll()
}
}
@@ -213,12 +213,14 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
}
val keyInfo = (keyInfoResult as KeyInfoResult.Success).keyInfo
- _viewEvents.post(SharedSecureStorageViewEvent.UpdateLoadingState(
- WaitingViewData(
- message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
- isIndeterminate = true
+ _viewEvents.post(
+ SharedSecureStorageViewEvent.UpdateLoadingState(
+ WaitingViewData(
+ message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
+ isIndeterminate = true
+ )
)
- ))
+ )
val keySpec = RawBytesKeySpec.fromRecoveryKey(recoveryKey) ?: return@launch Unit.also {
_viewEvents.post(SharedSecureStorageViewEvent.KeyInlineError(stringProvider.getString(R.string.bootstrap_invalid_recovery_key)))
_viewEvents.post(SharedSecureStorageViewEvent.HideModalLoading)
@@ -231,7 +233,8 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
val res = session.sharedSecretStorageService().getSecret(
name = it,
keyId = keyInfo.id,
- secretKey = keySpec)
+ secretKey = keySpec
+ )
decryptedSecretMap[it] = res
} else {
Timber.w("## Cannot find secret $it in SSSS, skip")
@@ -270,26 +273,30 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
}
val keyInfo = (keyInfoResult as KeyInfoResult.Success).keyInfo
- _viewEvents.post(SharedSecureStorageViewEvent.UpdateLoadingState(
- WaitingViewData(
- message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
- isIndeterminate = true
+ _viewEvents.post(
+ SharedSecureStorageViewEvent.UpdateLoadingState(
+ WaitingViewData(
+ message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
+ isIndeterminate = true
+ )
)
- ))
+ )
val keySpec = RawBytesKeySpec.fromPassphrase(
passphrase,
keyInfo.content.passphrase?.salt ?: "",
keyInfo.content.passphrase?.iterations ?: 0,
object : ProgressListener {
override fun onProgress(progress: Int, total: Int) {
- _viewEvents.post(SharedSecureStorageViewEvent.UpdateLoadingState(
- WaitingViewData(
- message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
- isIndeterminate = false,
- progress = progress,
- progressTotal = total
+ _viewEvents.post(
+ SharedSecureStorageViewEvent.UpdateLoadingState(
+ WaitingViewData(
+ message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
+ isIndeterminate = false,
+ progress = progress,
+ progressTotal = total
+ )
)
- ))
+ )
}
}
)
@@ -300,7 +307,8 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
val res = session.sharedSecretStorageService().getSecret(
name = it,
keyId = keyInfo.id,
- secretKey = keySpec)
+ secretKey = keySpec
+ )
decryptedSecretMap[it] = res
} else {
Timber.w("## Cannot find secret $it in SSSS, skip")
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
index 2092fe0f00..bc756974ad 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
@@ -77,10 +77,14 @@ class BackupToQuadSMigrationTask @Inject constructor(
authData.privateKeyIterations!!,
object : ProgressListener {
override fun onProgress(progress: Int, total: Int) {
- params.progressListener?.onProgress(WaitingViewData(
- stringProvider.getString(R.string.bootstrap_progress_checking_backup_with_info,
- "$progress/$total")
- ))
+ params.progressListener?.onProgress(
+ WaitingViewData(
+ stringProvider.getString(
+ R.string.bootstrap_progress_checking_backup_with_info,
+ "$progress/$total"
+ )
+ )
+ )
}
})
}
@@ -111,8 +115,10 @@ class BackupToQuadSMigrationTask @Inject constructor(
WaitingViewData(
stringProvider.getString(
R.string.bootstrap_progress_generating_ssss_with_info,
- "$progress/$total")
- ))
+ "$progress/$total"
+ )
+ )
+ )
}
}
)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
index 57a8ad68b7..b8d168cca5 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
@@ -102,10 +102,12 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
promptSkip()
}
is BootstrapViewEvents.RequestReAuth -> {
- ReAuthActivity.newIntent(requireContext(),
+ ReAuthActivity.newIntent(
+ requireContext(),
event.flowResponse,
event.lastErrorCode,
- getString(R.string.initialize_cross_signing)).let { intent ->
+ getString(R.string.initialize_cross_signing)
+ ).let { intent ->
reAuthActivityResultLauncher.launch(intent)
}
}
@@ -201,9 +203,11 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
val isKey = state.step.useKey()
val drawableRes = if (isKey) R.drawable.ic_security_key_24dp else R.drawable.ic_security_phrase_24dp
views.bootstrapIcon.isVisible = true
- views.bootstrapIcon.setImageDrawable(ContextCompat.getDrawable(
- requireContext(),
- drawableRes)
+ views.bootstrapIcon.setImageDrawable(
+ ContextCompat.getDrawable(
+ requireContext(),
+ drawableRes
+ )
)
views.bootstrapTitleText.text = getString(R.string.upgrade_security)
showFragment(BootstrapMigrateBackupFragment::class)
@@ -227,7 +231,8 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
private fun showFragment(fragmentClass: KClass<out Fragment>, argsParcelable: Parcelable? = null) {
if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
childFragmentManager.commitTransaction {
- replace(R.id.bottomSheetFragmentContainer,
+ replace(
+ R.id.bottomSheetFragmentContainer,
fragmentClass.java,
argsParcelable?.toMvRxBundle(),
fragmentClass.simpleName
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
index 753e9f1942..c26aec45dd 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
@@ -122,7 +122,8 @@ class BootstrapCrossSigningTask @Inject constructor(
params.progressListener?.onProgress(
WaitingViewData(
stringProvider.getString(R.string.bootstrap_crosssigning_progress_pbkdf2),
- isIndeterminate = true)
+ isIndeterminate = true
+ )
)
Timber.d("## BootstrapCrossSigningTask: Creating 4S key with pass: ${params.passphrase != null}")
@@ -151,7 +152,8 @@ class BootstrapCrossSigningTask @Inject constructor(
params.progressListener?.onProgress(
WaitingViewData(
stringProvider.getString(R.string.bootstrap_crosssigning_progress_default_key),
- isIndeterminate = true)
+ isIndeterminate = true
+ )
)
Timber.d("## BootstrapCrossSigningTask: Creating 4S - Set default key")
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
index a85c318a29..b67970e61f 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
@@ -404,7 +404,8 @@ class BootstrapSharedViewModel @AssistedInject constructor(
}
viewModelScope.launch(Dispatchers.IO) {
- bootstrapTask.invoke(this,
+ bootstrapTask.invoke(
+ this,
Params(
userInteractiveAuthInterceptor = interceptor,
progressListener = progressListener,
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
index 95378860e7..91bb3fa7f2 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -65,7 +65,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
// TODO maybe check also if
val uid = "kvr_${tx.transactionId}"
when (tx.state) {
- is VerificationTxState.OnStarted -> {
+ is VerificationTxState.OnStarted -> {
// Add a notification for every incoming request
val user = session?.userService()?.getUser(tx.otherUserId)
val name = user?.toMatrixItem()?.getBestName() ?: tx.otherUserId
@@ -116,7 +116,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
// cancel related notification
popupAlertManager.cancelAlert(uid)
}
- else -> Unit
+ else -> Unit
}
}
@@ -170,7 +170,8 @@ class IncomingVerificationRequestHandler @Inject constructor(
}
}
dismissedAction = Runnable {
- session?.cryptoService()?.verificationService()?.declineVerificationRequestInDMs(pr.otherUserId,
+ session?.cryptoService()?.verificationService()?.declineVerificationRequestInDMs(
+ pr.otherUserId,
pr.transactionId ?: "",
pr.roomId ?: ""
)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt
index 00ba676926..6bbd37a3a8 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt
@@ -33,7 +33,8 @@ class SupportedVerificationMethodsProvider @Inject constructor(
// Element supports SAS verification
VerificationMethod.SAS,
// Element is able to show QR codes
- VerificationMethod.QR_CODE_SHOW)
+ VerificationMethod.QR_CODE_SHOW
+ )
.apply {
if (hardwareInfo.hasBackCamera()) {
// Element is able to scan QR codes, and a Camera is available
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index 18a1363d71..9c6c22b6ca 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -95,12 +95,14 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
when (it) {
is VerificationBottomSheetViewEvents.Dismiss -> dismiss()
is VerificationBottomSheetViewEvents.AccessSecretStore -> {
- secretStartForActivityResult.launch(SharedSecureStorageActivity.newIntent(
- requireContext(),
- null, // use default key
- listOf(MASTER_KEY_SSSS_NAME, USER_SIGNING_KEY_SSSS_NAME, SELF_SIGNING_KEY_SSSS_NAME, KEYBACKUP_SECRET_SSSS_NAME),
- SharedSecureStorageActivity.DEFAULT_RESULT_KEYSTORE_ALIAS
- ))
+ secretStartForActivityResult.launch(
+ SharedSecureStorageActivity.newIntent(
+ requireContext(),
+ null, // use default key
+ listOf(MASTER_KEY_SSSS_NAME, USER_SIGNING_KEY_SSSS_NAME, SELF_SIGNING_KEY_SSSS_NAME, KEYBACKUP_SECRET_SSSS_NAME),
+ SharedSecureStorageActivity.DEFAULT_RESULT_KEYSTORE_ALIAS
+ )
+ )
}
is VerificationBottomSheetViewEvents.ModalError -> {
MaterialAlertDialogBuilder(requireContext())
@@ -183,7 +185,8 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
isSuccessFull = true,
isMe = true,
cancelReason = null
- ))
+ )
+ )
return@withState
}
@@ -348,7 +351,8 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
private fun showFragment(fragmentClass: KClass<out Fragment>, argsParcelable: Parcelable? = null) {
if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
childFragmentManager.commitTransaction {
- replace(R.id.bottomSheetFragmentContainer,
+ replace(
+ R.id.bottomSheetFragmentContainer,
fragmentClass.java,
argsParcelable?.toMvRxBundle(),
fragmentClass.simpleName
@@ -360,31 +364,37 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
companion object {
fun withArgs(roomId: String?, otherUserId: String, transactionId: String? = null): VerificationBottomSheet {
return VerificationBottomSheet().apply {
- setArguments(VerificationArgs(
- otherUserId = otherUserId,
- roomId = roomId,
- verificationId = transactionId,
- selfVerificationMode = false
- ))
+ setArguments(
+ VerificationArgs(
+ otherUserId = otherUserId,
+ roomId = roomId,
+ verificationId = transactionId,
+ selfVerificationMode = false
+ )
+ )
}
}
fun forSelfVerification(session: Session): VerificationBottomSheet {
return VerificationBottomSheet().apply {
- setArguments(VerificationArgs(
- otherUserId = session.myUserId,
- selfVerificationMode = true
- ))
+ setArguments(
+ VerificationArgs(
+ otherUserId = session.myUserId,
+ selfVerificationMode = true
+ )
+ )
}
}
fun forSelfVerification(session: Session, outgoingRequest: String): VerificationBottomSheet {
return VerificationBottomSheet().apply {
- setArguments(VerificationArgs(
- otherUserId = session.myUserId,
- selfVerificationMode = true,
- verificationId = outgoingRequest
- ))
+ setArguments(
+ VerificationArgs(
+ otherUserId = session.myUserId,
+ selfVerificationMode = true,
+ verificationId = outgoingRequest
+ )
+ )
}
}
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index a7998dc474..44694404bc 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -275,10 +275,11 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
} else {
setState {
copy(
- pendingRequest = Success(session
- .cryptoService()
- .verificationService()
- .requestKeyVerificationInDMs(supportedVerificationMethodsProvider.provide(), otherUserId, roomId)
+ pendingRequest = Success(
+ session
+ .cryptoService()
+ .verificationService()
+ .requestKeyVerificationInDMs(supportedVerificationMethodsProvider.provide(), otherUserId, roomId)
)
)
}
@@ -416,7 +417,8 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
)
}
_viewEvents.post(
- VerificationBottomSheetViewEvents.ModalError(failure.localizedMessage ?: stringProvider.getString(R.string.unexpected_error)))
+ VerificationBottomSheetViewEvents.ModalError(failure.localizedMessage ?: stringProvider.getString(R.string.unexpected_error))
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
index 31a7956db3..cf6bcc58c0 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
@@ -74,9 +74,12 @@ class VerificationChooseMethodFragment @Inject constructor(
}
override fun doVerifyBySas() = withState(sharedViewModel) { state ->
- sharedViewModel.handle(VerificationAction.StartSASVerification(
- state.otherUserMxItem?.id ?: "",
- state.pendingRequest.invoke()?.transactionId ?: ""))
+ sharedViewModel.handle(
+ VerificationAction.StartSASVerification(
+ state.otherUserMxItem?.id ?: "",
+ state.pendingRequest.invoke()?.transactionId ?: ""
+ )
+ )
}
private val openCameraActivityResultLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
@@ -115,10 +118,12 @@ class VerificationChooseMethodFragment @Inject constructor(
}
private fun onRemoteQrCodeScanned(remoteQrCode: String) = withState(sharedViewModel) { state ->
- sharedViewModel.handle(VerificationAction.RemoteQrCodeScanned(
- state.otherUserMxItem?.id ?: "",
- state.pendingRequest.invoke()?.transactionId ?: "",
- remoteQrCode
- ))
+ sharedViewModel.handle(
+ VerificationAction.RemoteQrCodeScanned(
+ state.otherUserMxItem?.id ?: "",
+ state.pendingRequest.invoke()?.transactionId ?: "",
+ remoteQrCode
+ )
+ )
}
}
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
index 7696bb8f5b..a1f902f8f4 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
@@ -102,7 +102,8 @@ class VerificationChooseMethodViewModel @AssistedInject constructor(
// Get the QR code now, because transaction is already created, so transactionCreated() will not be called
val qrCodeVerificationTransaction = verificationService.getExistingTransaction(args.otherUserId, args.verificationId ?: "")
- return VerificationChooseMethodViewState(otherUserId = args.otherUserId,
+ return VerificationChooseMethodViewState(
+ otherUserId = args.otherUserId,
isMe = session.myUserId == pvr?.otherUserId,
canCrossSign = session.cryptoService().crossSigningService().canCrossSign(),
transactionId = args.verificationId ?: "",
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
index ee77444b2e..7f6678a73c 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
@@ -52,10 +52,13 @@ class VerificationConclusionController @Inject constructor(
ConclusionState.SUCCESS -> {
bottomSheetVerificationNoticeItem {
id("notice")
- notice(host.stringProvider.getString(
- if (state.isSelfVerification) R.string.verification_conclusion_ok_self_notice
- else R.string.verification_conclusion_ok_notice)
- .toEpoxyCharSequence())
+ notice(
+ host.stringProvider.getString(
+ if (state.isSelfVerification) R.string.verification_conclusion_ok_self_notice
+ else R.string.verification_conclusion_ok_notice
+ )
+ .toEpoxyCharSequence()
+ )
}
bottomSheetVerificationBigImageItem {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
index 4b59e2e6fb..95dd4263f9 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
@@ -60,9 +60,13 @@ class VerificationEmojiCodeViewModel @AssistedInject constructor(
init {
withState { state ->
- refreshStateFromTx(session.cryptoService().verificationService()
- .getExistingTransaction(state.otherUser?.id ?: "", state.transactionId
- ?: "") as? SasVerificationTransaction)
+ refreshStateFromTx(
+ session.cryptoService().verificationService()
+ .getExistingTransaction(
+ state.otherUser?.id ?: "", state.transactionId
+ ?: ""
+ ) as? SasVerificationTransaction
+ )
}
session.cryptoService().verificationService().addListener(this)
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
index 2de03f296e..285d0f728f 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
@@ -117,7 +117,8 @@ class DiscoverySettingsFragment @Inject constructor(
termsActivityResultLauncher,
TermsService.ServiceType.IdentityService,
state.identityServer()?.serverUrl?.ensureProtocol() ?: "",
- null)
+ null
+ )
}
}
diff --git a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
index ca43e80ea6..fe2be713af 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
@@ -67,8 +67,10 @@ class SetIdentityServerFragment @Inject constructor(
state.defaultIdentityServerUrl.toReducedUrl()
)
.toSpannable()
- .colorizeMatchingText(state.defaultIdentityServerUrl.toReducedUrl(),
- colorProvider.getColorFromAttribute(R.attr.vctr_content_tertiary))
+ .colorizeMatchingText(
+ state.defaultIdentityServerUrl.toReducedUrl(),
+ colorProvider.getColorFromAttribute(R.attr.vctr_content_tertiary)
+ )
views.identityServerSetDefaultNotice.isVisible = true
views.identityServerSetDefaultSubmit.isVisible = true
@@ -129,7 +131,8 @@ class SetIdentityServerFragment @Inject constructor(
termsActivityResultLauncher,
TermsService.ServiceType.IdentityService,
it.identityServerUrl,
- null)
+ null
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
index 326b350f30..fd2862f5f0 100644
--- a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
@@ -66,9 +66,11 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
@UiThread
fun render(matrixItem: MatrixItem, imageView: ImageView) {
- render(GlideApp.with(imageView),
+ render(
+ GlideApp.with(imageView),
matrixItem,
- DrawableImageViewTarget(imageView))
+ DrawableImageViewTarget(imageView)
+ )
}
// fun renderSpace(matrixItem: MatrixItem, imageView: ImageView) {
@@ -97,9 +99,11 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
@UiThread
fun render(matrixItem: MatrixItem, imageView: ImageView, glideRequests: GlideRequests) {
- render(glideRequests,
+ render(
+ glideRequests,
matrixItem,
- DrawableImageViewTarget(imageView))
+ DrawableImageViewTarget(imageView)
+ )
}
@UiThread
@@ -200,12 +204,14 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
it.load(resolvedUrl)
} else {
val avatarColor = matrixItemColorProvider.getColor(matrixItem)
- it.load(TextDrawable.builder()
- .beginConfig()
- .bold()
- .endConfig()
- .buildRect(matrixItem.firstLetterOfDisplayName(), avatarColor)
- .toBitmap(width = iconSize, height = iconSize))
+ it.load(
+ TextDrawable.builder()
+ .beginConfig()
+ .bold()
+ .endConfig()
+ .buildRect(matrixItem.firstLetterOfDisplayName(), avatarColor)
+ .toBitmap(width = iconSize, height = iconSize)
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 12ae67fe6e..cc202868cc 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -142,9 +142,11 @@ class HomeActivity :
}
// Here we want to change current space to the newly created one, and then immediately open the default room
if (spaceId != null) {
- navigator.switchToSpace(context = this,
+ navigator.switchToSpace(
+ context = this,
spaceId = spaceId,
- postSwitchOption)
+ postSwitchOption
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index f0e27e2ee7..05973de49d 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -226,8 +226,8 @@ class HomeActivityViewModel @AssistedInject constructor(
val knownRooms = activeSessionHolder.getSafeActiveSession()
?.roomService()
?.getRoomSummaries(roomSummaryQueryParams {
- memberships = Membership.activeMemberships()
- })?.size ?: 0
+ memberships = Membership.activeMemberships()
+ })?.size ?: 0
// Prompt once to the user
if (knownRooms > 1 && !vectorPreferences.didAskUserToEnableSessionPush()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index f3973e5d4c..2753ba817d 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -444,7 +444,8 @@ class HomeDetailFragment @Inject constructor(
it.syncState,
it.incrementalSyncStatus,
it.pushCounter,
- vectorPreferences.developerShowDebugInfo())
+ vectorPreferences.developerShowDebugInfo()
+ )
hasUnreadRooms = it.hasUnreadMessages
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
index 193dc42f33..d75b9ff69d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
@@ -63,12 +63,14 @@ class StartCallActionsHandler(
if (currentCall?.signalingRoomId == roomId) {
onTapToReturnToCall()
} else if (!state.isAllowedToStartWebRTCCall) {
- showDialogWithMessage(fragment.getString(
- if (state.isDm()) {
- R.string.no_permissions_to_start_webrtc_call_in_direct_room
- } else {
- R.string.no_permissions_to_start_webrtc_call
- })
+ showDialogWithMessage(
+ fragment.getString(
+ if (state.isDm()) {
+ R.string.no_permissions_to_start_webrtc_call_in_direct_room
+ } else {
+ R.string.no_permissions_to_start_webrtc_call
+ }
+ )
)
} else {
safeStartCall(isVideoCall)
@@ -79,13 +81,15 @@ class StartCallActionsHandler(
// can you add widgets??
if (!state.isAllowedToManageWidgets) {
// You do not have permission to start a conference call in this room
- showDialogWithMessage(fragment.getString(
- if (state.isDm()) {
- R.string.no_permissions_to_start_conf_call_in_direct_room
- } else {
- R.string.no_permissions_to_start_conf_call
- }
- ))
+ showDialogWithMessage(
+ fragment.getString(
+ if (state.isDm()) {
+ R.string.no_permissions_to_start_conf_call_in_direct_room
+ } else {
+ R.string.no_permissions_to_start_conf_call
+ }
+ )
+ )
} else {
if (state.hasActiveJitsiWidget()) {
// A conference is already in progress, return
@@ -123,18 +127,22 @@ class StartCallActionsHandler(
val startCallAction = RoomDetailAction.StartCall(isVideoCall)
timelineViewModel.pendingAction = startCallAction
if (isVideoCall) {
- if (checkPermissions(PERMISSIONS_FOR_VIDEO_IP_CALL,
+ if (checkPermissions(
+ PERMISSIONS_FOR_VIDEO_IP_CALL,
fragment.requireActivity(),
startCallActivityResultLauncher,
- R.string.permissions_rationale_msg_camera_and_audio)) {
+ R.string.permissions_rationale_msg_camera_and_audio
+ )) {
timelineViewModel.pendingAction = null
timelineViewModel.handle(startCallAction)
}
} else {
- if (checkPermissions(PERMISSIONS_FOR_AUDIO_IP_CALL,
+ if (checkPermissions(
+ PERMISSIONS_FOR_AUDIO_IP_CALL,
fragment.requireActivity(),
startCallActivityResultLauncher,
- R.string.permissions_rationale_msg_record_audio)) {
+ R.string.permissions_rationale_msg_record_audio
+ )) {
timelineViewModel.pendingAction = null
timelineViewModel.handle(startCallAction)
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
index 7b46eed4f8..fc31c72df3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
@@ -218,7 +218,8 @@ class TimelineViewModel @AssistedInject constructor(
.flattenParentIds.firstOrNull { it.isNotBlank() },
// force persist, because if not on resume the AppStateHandler will resume
// the current space from what was persisted on enter background
- persistNow = true)
+ persistNow = true
+ )
}
}
}
@@ -373,9 +374,12 @@ class TimelineViewModel @AssistedInject constructor(
threadRootEvent.root.threadDetails?.threadNotificationState == ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE
}?.let { true } ?: false
val numberOfLocalUnreadThreads = threadList?.size ?: 0
- copy(threadNotificationBadgeState = ThreadNotificationBadgeState(
- numberOfLocalUnreadThreads = numberOfLocalUnreadThreads,
- isUserMentioned = isUserMentioned))
+ copy(
+ threadNotificationBadgeState = ThreadNotificationBadgeState(
+ numberOfLocalUnreadThreads = numberOfLocalUnreadThreads,
+ isUserMentioned = isUserMentioned
+ )
+ )
}
}
@@ -515,10 +519,13 @@ class TimelineViewModel @AssistedInject constructor(
private fun handleSendSticker(action: RoomDetailAction.SendSticker) {
val content = initialState.rootThreadEventId?.let {
- action.stickerContent.copy(relatesTo = RelationDefaultContent(
- type = RelationType.THREAD,
- isFallingBack = true,
- eventId = it))
+ action.stickerContent.copy(
+ relatesTo = RelationDefaultContent(
+ type = RelationType.THREAD,
+ isFallingBack = true,
+ eventId = it
+ )
+ )
} ?: action.stickerContent
room.sendService().sendEvent(EventType.STICKER, content.toContent())
@@ -846,10 +853,12 @@ class TimelineViewModel @AssistedInject constructor(
mxcUrl.startsWith("content://")
if (isLocalSendingFile) {
tryOrNull { Uri.parse(mxcUrl) }?.let {
- _viewEvents.post(RoomDetailViewEvents.OpenFile(
- it,
- action.messageFileContent.mimeType
- ))
+ _viewEvents.post(
+ RoomDetailViewEvents.OpenFile(
+ it,
+ action.messageFileContent.mimeType
+ )
+ )
}
} else {
viewModelScope.launch {
@@ -861,21 +870,25 @@ class TimelineViewModel @AssistedInject constructor(
session.fileService().downloadFile(messageContent = action.messageFileContent)
}
- _viewEvents.post(RoomDetailViewEvents.DownloadFileState(
- action.messageFileContent.mimeType,
- result.getOrNull(),
- result.exceptionOrNull()
- ))
+ _viewEvents.post(
+ RoomDetailViewEvents.DownloadFileState(
+ action.messageFileContent.mimeType,
+ result.getOrNull(),
+ result.exceptionOrNull()
+ )
+ )
canOpen = result.isSuccess
}
if (canOpen) {
// We can now open the file
session.fileService().getTemporarySharableURI(action.messageFileContent)?.let { uri ->
- _viewEvents.post(RoomDetailViewEvents.OpenFile(
- uri,
- action.messageFileContent.mimeType
- ))
+ _viewEvents.post(
+ RoomDetailViewEvents.OpenFile(
+ uri,
+ action.messageFileContent.mimeType
+ )
+ )
}
}
}
@@ -1024,7 +1037,8 @@ class TimelineViewModel @AssistedInject constructor(
supportedVerificationMethodsProvider.provide(),
action.otherUserId,
room.roomId,
- action.transactionId)) {
+ action.transactionId
+ )) {
_viewEvents.post(RoomDetailViewEvents.ActionSuccess(action))
} else {
// TODO
@@ -1035,7 +1049,8 @@ class TimelineViewModel @AssistedInject constructor(
session.cryptoService().verificationService().declineVerificationRequestInDMs(
action.otherUserId,
action.transactionId,
- room.roomId)
+ room.roomId
+ )
}
private fun handleRequestVerification(action: RoomDetailAction.RequestVerification) {
@@ -1048,9 +1063,13 @@ class TimelineViewModel @AssistedInject constructor(
session.cryptoService().verificationService().getExistingVerificationRequestInRoom(room.roomId, action.transactionId)?.let {
if (it.handledByOtherSession) return
if (!it.isFinished) {
- _viewEvents.post(RoomDetailViewEvents.ActionSuccess(action.copy(
- otherUserId = it.otherUserId
- )))
+ _viewEvents.post(
+ RoomDetailViewEvents.ActionSuccess(
+ action.copy(
+ otherUserId = it.otherUserId
+ )
+ )
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
index 8351af14dc..58ec9c76bc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
@@ -203,14 +203,16 @@ class MessageComposerViewModel @AssistedInject constructor(
is SendMode.Regular -> {
when (val parsedCommand = commandParser.parseSlashCommand(
textMessage = action.text,
- isInThreadTimeline = state.isInThreadTimeline())) {
+ isInThreadTimeline = state.isInThreadTimeline()
+ )) {
is ParsedCommand.ErrorNotACommand -> {
// Send the text message to the room
if (state.rootThreadEventId != null) {
room.relationService().replyInThread(
rootThreadEventId = state.rootThreadEventId,
replyInThreadText = action.text,
- autoMarkdown = action.autoMarkdown)
+ autoMarkdown = action.autoMarkdown
+ )
} else {
room.sendService().sendTextMessage(action.text, autoMarkdown = action.autoMarkdown)
}
@@ -236,7 +238,8 @@ class MessageComposerViewModel @AssistedInject constructor(
room.relationService().replyInThread(
rootThreadEventId = state.rootThreadEventId,
replyInThreadText = parsedCommand.message,
- autoMarkdown = false)
+ autoMarkdown = false
+ )
} else {
room.sendService().sendTextMessage(parsedCommand.message, autoMarkdown = false)
}
@@ -292,12 +295,14 @@ class MessageComposerViewModel @AssistedInject constructor(
rootThreadEventId = state.rootThreadEventId,
replyInThreadText = parsedCommand.message,
msgType = MessageType.MSGTYPE_EMOTE,
- autoMarkdown = action.autoMarkdown)
+ autoMarkdown = action.autoMarkdown
+ )
} else {
room.sendService().sendTextMessage(
text = parsedCommand.message,
msgType = MessageType.MSGTYPE_EMOTE,
- autoMarkdown = action.autoMarkdown)
+ autoMarkdown = action.autoMarkdown
+ )
}
_viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
popDraft()
@@ -308,7 +313,8 @@ class MessageComposerViewModel @AssistedInject constructor(
room.relationService().replyInThread(
rootThreadEventId = state.rootThreadEventId,
replyInThreadText = parsedCommand.message,
- formattedText = rainbowGenerator.generate(message))
+ formattedText = rainbowGenerator.generate(message)
+ )
} else {
room.sendService().sendFormattedTextMessage(message, rainbowGenerator.generate(message))
}
@@ -322,7 +328,8 @@ class MessageComposerViewModel @AssistedInject constructor(
rootThreadEventId = state.rootThreadEventId,
replyInThreadText = parsedCommand.message,
msgType = MessageType.MSGTYPE_EMOTE,
- formattedText = rainbowGenerator.generate(message))
+ formattedText = rainbowGenerator.generate(message)
+ )
} else {
room.sendService().sendFormattedTextMessage(message, rainbowGenerator.generate(message), MessageType.MSGTYPE_EMOTE)
}
@@ -337,11 +344,13 @@ class MessageComposerViewModel @AssistedInject constructor(
room.relationService().replyInThread(
rootThreadEventId = state.rootThreadEventId,
replyInThreadText = text,
- formattedText = formattedText)
+ formattedText = formattedText
+ )
} else {
room.sendService().sendFormattedTextMessage(
text,
- formattedText)
+ formattedText
+ )
}
_viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
popDraft()
@@ -500,10 +509,12 @@ class MessageComposerViewModel @AssistedInject constructor(
val messageContent = state.sendMode.timelineEvent.getLastMessageContent()
val existingBody = messageContent?.body ?: ""
if (existingBody != action.text) {
- room.relationService().editTextMessage(state.sendMode.timelineEvent,
+ room.relationService().editTextMessage(
+ state.sendMode.timelineEvent,
messageContent?.msgType ?: MessageType.MSGTYPE_TEXT,
action.text,
- action.autoMarkdown)
+ action.autoMarkdown
+ )
} else {
Timber.w("Same message content, do not send edition")
}
@@ -516,7 +527,8 @@ class MessageComposerViewModel @AssistedInject constructor(
quotedEvent = state.sendMode.timelineEvent,
text = action.text.toString(),
autoMarkdown = action.autoMarkdown,
- rootThreadEventId = state.rootThreadEventId)
+ rootThreadEventId = state.rootThreadEventId
+ )
_viewEvents.post(MessageComposerViewEvents.MessageSent)
popDraft()
}
@@ -530,7 +542,8 @@ class MessageComposerViewModel @AssistedInject constructor(
rootThreadEventId = it,
replyInThreadText = action.text.toString(),
autoMarkdown = action.autoMarkdown,
- eventReplied = timelineEvent)
+ eventReplied = timelineEvent
+ )
} ?: room.relationService().replyToMessage(
eventReplied = timelineEvent,
replyText = action.text.toString(),
@@ -604,10 +617,12 @@ class MessageComposerViewModel @AssistedInject constructor(
private fun sendChatEffect(sendChatEffect: ParsedCommand.SendChatEffect) {
// If message is blank, convert to an emote, with default message
if (sendChatEffect.message.isBlank()) {
- val defaultMessage = stringProvider.getString(when (sendChatEffect.chatEffect) {
- ChatEffect.CONFETTI -> R.string.default_message_emote_confetti
- ChatEffect.SNOWFALL -> R.string.default_message_emote_snow
- })
+ val defaultMessage = stringProvider.getString(
+ when (sendChatEffect.chatEffect) {
+ ChatEffect.CONFETTI -> R.string.default_message_emote_confetti
+ ChatEffect.SNOWFALL -> R.string.default_message_emote_snow
+ }
+ )
room.sendService().sendTextMessage(defaultMessage, MessageType.MSGTYPE_EMOTE)
} else {
room.sendService().sendTextMessage(sendChatEffect.message, sendChatEffect.chatEffect.toMessageType())
@@ -847,7 +862,8 @@ class MessageComposerViewModel @AssistedInject constructor(
attachment = audioType.toContentAttachmentData(isVoiceMessage = true),
compressBeforeSending = false,
roomIds = emptySet(),
- rootThreadEventId = rootThreadEventId)
+ rootThreadEventId = rootThreadEventId
+ )
} else {
audioMessageHelper.deleteRecording()
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index c11fa276f6..1952e598a6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -98,7 +98,8 @@ class SearchFragment @Inject constructor(
is Success -> {
views.stateView.state = StateView.State.Empty(
title = getString(R.string.search_no_results),
- image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_search_no_results))
+ image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_search_no_results)
+ )
}
else -> Unit
}
@@ -133,7 +134,8 @@ class SearchFragment @Inject constructor(
displayName = fragmentArgs.roomDisplayName,
avatarUrl = fragmentArgs.roomAvatarUrl,
roomEncryptionTrustLevel = null,
- rootThreadEventId = it)
+ rootThreadEventId = it
+ )
navigator.openThread(requireContext(), threadTimelineArgs, event.eventId)
} ?: openRoom(roomId, event.eventId)
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
index c77cdceed0..913e440a20 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
@@ -126,8 +126,9 @@ class SearchResultController @Inject constructor(
.avatarRenderer(avatarRenderer)
.formattedDate(dateFormatter.format(event.originServerTs, DateFormatKind.MESSAGE_SIMPLE))
.spannable(spannable.toEpoxyCharSequence())
- .sender(eventAndSender.sender
- ?: eventAndSender.event.senderId?.let { session.roomService().getRoomMember(it, data.roomId) }?.toMatrixItem()
+ .sender(
+ eventAndSender.sender
+ ?: eventAndSender.event.senderId?.let { session.roomService().getRoomMember(it, data.roomId) }?.toMatrixItem()
)
.threadDetails(event.threadDetails)
.threadSummaryFormatted(displayableEventFormatter.formatThreadSummary(event.threadDetails?.threadSummaryLatestEvent).toString())
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
index 0cf7e60eae..57b2912aff 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
@@ -57,7 +57,8 @@ data class MessageActionState(
roomId = args.roomId,
eventId = args.eventId,
informationData = args.informationData,
- isFromThreadTimeline = args.isFromThreadTimeline)
+ isFromThreadTimeline = args.isFromThreadTimeline
+ )
fun senderName(): String = informationData.memberName?.toString() ?: ""
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index df2a1fbe81..2f9f2331e0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -377,19 +377,23 @@ class MessageActionsViewModel @AssistedInject constructor(
if (canRedact(timelineEvent, actionPermissions)) {
if (timelineEvent.root.getClearType() in EventType.POLL_START) {
- add(EventSharedAction.Redact(
- eventId,
- askForReason = informationData.senderId != session.myUserId,
- dialogTitleRes = R.string.delete_poll_dialog_title,
- dialogDescriptionRes = R.string.delete_poll_dialog_content
- ))
+ add(
+ EventSharedAction.Redact(
+ eventId,
+ askForReason = informationData.senderId != session.myUserId,
+ dialogTitleRes = R.string.delete_poll_dialog_title,
+ dialogDescriptionRes = R.string.delete_poll_dialog_content
+ )
+ )
} else {
- add(EventSharedAction.Redact(
- eventId,
- askForReason = informationData.senderId != session.myUserId,
- dialogTitleRes = R.string.delete_event_dialog_title,
- dialogDescriptionRes = R.string.delete_event_dialog_content
- ))
+ add(
+ EventSharedAction.Redact(
+ eventId,
+ askForReason = informationData.senderId != session.myUserId,
+ dialogTitleRes = R.string.delete_event_dialog_title,
+ dialogDescriptionRes = R.string.delete_event_dialog_content
+ )
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
index 321745355e..0548a6ad18 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
@@ -51,7 +51,8 @@ class ViewEditHistoryBottomSheet :
views.bottomSheetRecyclerView.configureWith(
epoxyController,
dividerDrawable = R.drawable.divider_horizontal_on_secondary,
- hasFixedSize = false)
+ hasFixedSize = false
+ )
views.bottomSheetTitle.text = context?.getString(R.string.message_edits)
}
@@ -68,11 +69,13 @@ class ViewEditHistoryBottomSheet :
companion object {
fun newInstance(roomId: String, informationData: MessageInformationData): ViewEditHistoryBottomSheet {
return ViewEditHistoryBottomSheet().apply {
- setArguments(TimelineEventFragmentArgs(
- eventId = informationData.eventId,
- roomId = roomId,
- informationData = informationData
- ))
+ setArguments(
+ TimelineEventFragmentArgs(
+ eventId = informationData.eventId,
+ roomId = roomId,
+ informationData = informationData
+ )
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index 080a79829a..90823426bb 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -92,7 +92,8 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
2,
eventIdToHighlight,
partialState.rootThreadEventId,
- partialState.isFromThreadTimeline())
+ partialState.isFromThreadTimeline()
+ )
return if (mergedEvents.isEmpty()) {
null
} else {
@@ -126,9 +127,9 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
}
val mergeId = mergedEventIds.joinToString(separator = "_") { it.toString() }
val summaryTitleResId = when (event.root.getClearType()) {
- EventType.STATE_ROOM_MEMBER -> R.plurals.membership_changes
+ EventType.STATE_ROOM_MEMBER -> R.plurals.membership_changes
EventType.STATE_ROOM_SERVER_ACL -> R.plurals.notice_room_server_acl_changes
- else -> null
+ else -> null
}
summaryTitleResId?.let { summaryTitle ->
val attributes = MergedSimilarEventsItem.Attributes(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index edd2271550..b960e2c6a9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -209,15 +209,15 @@ class MessageItemFactory @Inject constructor(
is MessageAudioContent -> buildAudioContent(params, messageContent, informationData, highlight, attributes)
is MessageVerificationRequestContent -> buildVerificationRequestMessageItem(messageContent, informationData, highlight, callback, attributes)
is MessagePollContent -> buildPollItem(messageContent, informationData, highlight, callback, attributes)
- is MessageLocationContent -> {
+ is MessageLocationContent -> {
if (vectorPreferences.labsRenderLocationsInTimeline()) {
buildLocationItem(messageContent, informationData, highlight, attributes)
} else {
buildMessageTextItem(messageContent.body, false, informationData, highlight, callback, attributes)
}
}
- is MessageBeaconInfoContent -> liveLocationMessageItemFactory.create(messageContent, highlight, attributes)
- else -> buildNotHandledMessageItem(messageContent, informationData, highlight, callback, attributes)
+ is MessageBeaconInfoContent -> liveLocationMessageItemFactory.create(messageContent, highlight, attributes)
+ else -> buildNotHandledMessageItem(messageContent, informationData, highlight, callback, attributes)
}
return messageItem?.apply {
layout(informationData.messageLayout.layoutRes)
@@ -666,27 +666,31 @@ class MessageItemFactory @Inject constructor(
ForegroundColorSpan(color),
editStart,
editEnd,
- Spanned.SPAN_INCLUSIVE_EXCLUSIVE)
+ Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+ )
// Note: text size is set to 14sp
spannable.setSpan(
AbsoluteSizeSpan(dimensionConverter.spToPx(13)),
editStart,
editEnd,
- Spanned.SPAN_INCLUSIVE_EXCLUSIVE)
+ Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+ )
- spannable.setSpan(object : ClickableSpan() {
- override fun onClick(widget: View) {
- callback?.onEditedDecorationClicked(informationData)
- }
+ spannable.setSpan(
+ object : ClickableSpan() {
+ override fun onClick(widget: View) {
+ callback?.onEditedDecorationClicked(informationData)
+ }
- override fun updateDrawState(ds: TextPaint) {
- // nop
- }
- },
+ override fun updateDrawState(ds: TextPaint) {
+ // nop
+ }
+ },
editStart,
editEnd,
- Spanned.SPAN_INCLUSIVE_EXCLUSIVE)
+ Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+ )
return spannable
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index b5d620658e..f4bcc1ba65 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -50,13 +50,15 @@ class TimelineItemFactory @Inject constructor(
timelineEvent = event,
highlightedEventId = params.highlightedEventId,
isFromThreadTimeline = params.isFromThreadTimeline(),
- rootThreadEventId = params.rootThreadEventId)) {
+ rootThreadEventId = params.rootThreadEventId
+ )) {
return buildEmptyItem(
event,
params.prevEvent,
params.highlightedEventId,
params.rootThreadEventId,
- params.isFromThreadTimeline())
+ params.isFromThreadTimeline()
+ )
}
// Manage state event differently, to check validity
@@ -151,7 +153,8 @@ class TimelineItemFactory @Inject constructor(
params.prevEvent,
params.highlightedEventId,
params.rootThreadEventId,
- params.isFromThreadTimeline())
+ params.isFromThreadTimeline()
+ )
}
private fun buildEmptyItem(timelineEvent: TimelineEvent,
@@ -163,7 +166,8 @@ class TimelineItemFactory @Inject constructor(
timelineEvent = prevEvent,
highlightedEventId = highlightedEventId,
isFromThreadTimeline = isFromThreadTimeline,
- rootThreadEventId = rootThreadEventId)
+ rootThreadEventId = rootThreadEventId
+ )
return TimelineEmptyItem_()
.id(timelineEvent.localId)
.eventId(timelineEvent.eventId)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 51dc26247c..7ad0cb27c6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -276,11 +276,15 @@ class NoticeEventFormatter @Inject constructor(
val historyVisibilitySuffix = roomHistoryVisibilityFormatter.getNoticeSuffix(historyVisibility)
return if (event.isSentByCurrentUser()) {
- sp.getString(if (isDm) R.string.notice_made_future_direct_room_visibility_by_you else R.string.notice_made_future_room_visibility_by_you,
- historyVisibilitySuffix)
+ sp.getString(
+ if (isDm) R.string.notice_made_future_direct_room_visibility_by_you else R.string.notice_made_future_room_visibility_by_you,
+ historyVisibilitySuffix
+ )
} else {
- sp.getString(if (isDm) R.string.notice_made_future_direct_room_visibility else R.string.notice_made_future_room_visibility,
- senderName, historyVisibilitySuffix)
+ sp.getString(
+ if (isDm) R.string.notice_made_future_direct_room_visibility else R.string.notice_made_future_room_visibility,
+ senderName, historyVisibilitySuffix
+ )
}
}
@@ -298,20 +302,27 @@ class NoticeEventFormatter @Inject constructor(
} else {
R.string.notice_room_third_party_revoked_invite_by_you
},
- prevContent.displayName)
+ prevContent.displayName
+ )
} else {
- sp.getString(if (isDm) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
- senderName, prevContent.displayName)
+ sp.getString(
+ if (isDm) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
+ senderName, prevContent.displayName
+ )
}
}
content != null -> {
// Invitation case
if (event.isSentByCurrentUser()) {
- sp.getString(if (isDm) R.string.notice_direct_room_third_party_invite_by_you else R.string.notice_room_third_party_invite_by_you,
- content.displayName)
+ sp.getString(
+ if (isDm) R.string.notice_direct_room_third_party_invite_by_you else R.string.notice_room_third_party_invite_by_you,
+ content.displayName
+ )
} else {
- sp.getString(if (isDm) R.string.notice_direct_room_third_party_invite else R.string.notice_room_third_party_invite,
- senderName, content.displayName)
+ sp.getString(
+ if (isDm) R.string.notice_direct_room_third_party_invite else R.string.notice_room_third_party_invite,
+ senderName, content.displayName
+ )
}
}
else -> null
@@ -416,19 +427,21 @@ class NoticeEventFormatter @Inject constructor(
return buildString {
// Title
- append(if (prevEventContent == null) {
- if (event.isSentByCurrentUser()) {
- sp.getString(R.string.notice_room_server_acl_set_title_by_you)
- } else {
- sp.getString(R.string.notice_room_server_acl_set_title, senderName)
- }
- } else {
- if (event.isSentByCurrentUser()) {
- sp.getString(R.string.notice_room_server_acl_updated_title_by_you)
- } else {
- sp.getString(R.string.notice_room_server_acl_updated_title, senderName)
- }
- })
+ append(
+ if (prevEventContent == null) {
+ if (event.isSentByCurrentUser()) {
+ sp.getString(R.string.notice_room_server_acl_set_title_by_you)
+ } else {
+ sp.getString(R.string.notice_room_server_acl_set_title, senderName)
+ }
+ } else {
+ if (event.isSentByCurrentUser()) {
+ sp.getString(R.string.notice_room_server_acl_updated_title_by_you)
+ } else {
+ sp.getString(R.string.notice_room_server_acl_updated_title, senderName)
+ }
+ }
+ )
if (eventContent.allowList.isEmpty()) {
// Special case for stuck room
appendNl(sp.getString(R.string.notice_room_server_acl_allow_is_empty))
@@ -562,8 +575,10 @@ class NoticeEventFormatter @Inject constructor(
if (isDm) R.string.notice_direct_room_guest_access_can_join_by_you else R.string.notice_room_guest_access_can_join_by_you
)
} else {
- sp.getString(if (isDm) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
- senderName)
+ sp.getString(
+ if (isDm) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
+ senderName
+ )
}
GuestAccess.Forbidden ->
if (event.isSentByCurrentUser()) {
@@ -571,8 +586,10 @@ class NoticeEventFormatter @Inject constructor(
if (isDm) R.string.notice_direct_room_guest_access_forbidden_by_you else R.string.notice_room_guest_access_forbidden_by_you
)
} else {
- sp.getString(if (isDm) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
- senderName)
+ sp.getString(
+ if (isDm) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
+ senderName
+ )
}
else -> null
}
@@ -705,18 +722,24 @@ class NoticeEventFormatter @Inject constructor(
Membership.JOIN ->
eventContent.safeReason?.let { reason ->
if (event.isSentByCurrentUser()) {
- sp.getString(if (isDm) R.string.notice_direct_room_join_with_reason_by_you else R.string.notice_room_join_with_reason_by_you,
- reason)
+ sp.getString(
+ if (isDm) R.string.notice_direct_room_join_with_reason_by_you else R.string.notice_room_join_with_reason_by_you,
+ reason
+ )
} else {
- sp.getString(if (isDm) R.string.notice_direct_room_join_with_reason else R.string.notice_room_join_with_reason,
- senderDisplayName, reason)
+ sp.getString(
+ if (isDm) R.string.notice_direct_room_join_with_reason else R.string.notice_room_join_with_reason,
+ senderDisplayName, reason
+ )
}
} ?: run {
if (event.isSentByCurrentUser()) {
sp.getString(if (isDm) R.string.notice_direct_room_join_by_you else R.string.notice_room_join_by_you)
} else {
- sp.getString(if (isDm) R.string.notice_direct_room_join else R.string.notice_room_join,
- senderDisplayName)
+ sp.getString(
+ if (isDm) R.string.notice_direct_room_join else R.string.notice_room_join,
+ senderDisplayName
+ )
}
}
Membership.LEAVE ->
@@ -745,15 +768,19 @@ class NoticeEventFormatter @Inject constructor(
reason
)
} else {
- sp.getString(if (isDm) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
- senderDisplayName, reason)
+ sp.getString(
+ if (isDm) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
+ senderDisplayName, reason
+ )
}
} ?: run {
if (event.isSentByCurrentUser()) {
sp.getString(if (isDm) R.string.notice_direct_room_leave_by_you else R.string.notice_room_leave_by_you)
} else {
- sp.getString(if (isDm) R.string.notice_direct_room_leave else R.string.notice_room_leave,
- senderDisplayName)
+ sp.getString(
+ if (isDm) R.string.notice_direct_room_leave else R.string.notice_room_leave,
+ senderDisplayName
+ )
}
}
}
@@ -824,8 +851,10 @@ class NoticeEventFormatter @Inject constructor(
if (event.isSentByCurrentUser()) {
sp.getString(if (isDm) R.string.direct_room_join_rules_invite_by_you else R.string.room_join_rules_invite_by_you)
} else {
- sp.getString(if (isDm) R.string.direct_room_join_rules_invite else R.string.room_join_rules_invite,
- senderName)
+ sp.getString(
+ if (isDm) R.string.direct_room_join_rules_invite else R.string.room_join_rules_invite,
+ senderName
+ )
}
RoomJoinRules.PUBLIC ->
if (event.isSentByCurrentUser()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt
index 14769bc95b..c1ba085fd7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt
@@ -25,20 +25,24 @@ class RoomHistoryVisibilityFormatter @Inject constructor(
private val stringProvider: StringProvider
) {
fun getNoticeSuffix(roomHistoryVisibility: RoomHistoryVisibility): String {
- return stringProvider.getString(when (roomHistoryVisibility) {
- RoomHistoryVisibility.WORLD_READABLE -> R.string.notice_room_visibility_world_readable
- RoomHistoryVisibility.SHARED -> R.string.notice_room_visibility_shared
- RoomHistoryVisibility.INVITED -> R.string.notice_room_visibility_invited
- RoomHistoryVisibility.JOINED -> R.string.notice_room_visibility_joined
- })
+ return stringProvider.getString(
+ when (roomHistoryVisibility) {
+ RoomHistoryVisibility.WORLD_READABLE -> R.string.notice_room_visibility_world_readable
+ RoomHistoryVisibility.SHARED -> R.string.notice_room_visibility_shared
+ RoomHistoryVisibility.INVITED -> R.string.notice_room_visibility_invited
+ RoomHistoryVisibility.JOINED -> R.string.notice_room_visibility_joined
+ }
+ )
}
fun getSetting(roomHistoryVisibility: RoomHistoryVisibility): String {
- return stringProvider.getString(when (roomHistoryVisibility) {
- RoomHistoryVisibility.WORLD_READABLE -> R.string.room_settings_read_history_entry_anyone
- RoomHistoryVisibility.SHARED -> R.string.room_settings_read_history_entry_members_only_option_time_shared
- RoomHistoryVisibility.INVITED -> R.string.room_settings_read_history_entry_members_only_invited
- RoomHistoryVisibility.JOINED -> R.string.room_settings_read_history_entry_members_only_joined
- })
+ return stringProvider.getString(
+ when (roomHistoryVisibility) {
+ RoomHistoryVisibility.WORLD_READABLE -> R.string.room_settings_read_history_entry_anyone
+ RoomHistoryVisibility.SHARED -> R.string.room_settings_read_history_entry_members_only_option_time_shared
+ RoomHistoryVisibility.INVITED -> R.string.room_settings_read_history_entry_members_only_invited
+ RoomHistoryVisibility.JOINED -> R.string.room_settings_read_history_entry_members_only_joined
+ }
+ )
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
index 9ff8ddfbce..b8882b3f47 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
@@ -156,9 +156,11 @@ private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,
progressBar.isIndeterminate = false
progressBar.progress = percent.toInt()
progressTextView.isVisible = true
- progressTextView.text = progressLayout.context.getString(resId,
+ progressTextView.text = progressLayout.context.getString(
+ resId,
TextUtils.formatFileSize(progressLayout.context, current, true),
- TextUtils.formatFileSize(progressLayout.context, total, true))
+ TextUtils.formatFileSize(progressLayout.context, total, true)
+ )
progressTextView.setTextColor(messageColorProvider.getMessageTextColor(SendState.SENDING))
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt
index 55e0cce9f7..a517aab720 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt
@@ -81,14 +81,16 @@ class MergedTimelines(
timeline = mainTimeline,
wrappedListener = listener,
shouldFilterTypes = false,
- allowedTypes = emptyList()) {
+ allowedTypes = emptyList()
+ ) {
processTimelineUpdates(::mainIsInit, mainTimelineEvents, it)
}
val secondaryTimelineListener = ListenerInterceptor(
timeline = secondaryTimeline,
wrappedListener = listener,
shouldFilterTypes = secondaryTimelineParams.shouldFilterTypes,
- allowedTypes = secondaryTimelineParams.allowedTypes) {
+ allowedTypes = secondaryTimelineParams.allowedTypes
+ ) {
processTimelineUpdates(::secondaryIsInit, secondaryTimelineEvents, it)
}
listenersMapping[listener] = listOf(mainTimelineListener, secondaryTimelineListener)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
index 6ae3cd227f..57b2f2fd40 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
@@ -82,11 +82,13 @@ class ViewReactionsBottomSheet :
companion object {
fun newInstance(roomId: String, informationData: MessageInformationData): ViewReactionsBottomSheet {
return ViewReactionsBottomSheet().apply {
- setArguments(TimelineEventFragmentArgs(
- eventId = informationData.eventId,
- roomId = roomId,
- informationData = informationData
- ))
+ setArguments(
+ TimelineEventFragmentArgs(
+ eventId = informationData.eventId,
+ roomId = roomId,
+ informationData = informationData
+ )
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
index ff3fd7b637..a29016e883 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
@@ -153,7 +153,7 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
return when {
this == null || msgType == MessageType.MSGTYPE_BEACON_INFO -> false
msgType == MessageType.MSGTYPE_LOCATION -> vectorPreferences.labsRenderLocationsInTimeline()
- else -> msgType in MSG_TYPES_WITH_TIMESTAMP_INSIDE_MESSAGE
+ else -> msgType in MSG_TYPES_WITH_TIMESTAMP_INSIDE_MESSAGE
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
index 87ed9243a5..c9665a9125 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
@@ -91,7 +91,8 @@ class MessageBubbleView @JvmOverloads constructor(
background = RippleDrawable(
ContextCompat.getColorStateList(context, R.color.mtrl_btn_ripple_color) ?: ColorStateList.valueOf(Color.TRANSPARENT),
bubbleDrawable,
- rippleMaskDrawable)
+ rippleMaskDrawable
+ )
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomViewModel.kt
index 0e4aebecfc..50eecb90fb 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomViewModel.kt
@@ -60,7 +60,7 @@ class MigrateRoomViewModel @AssistedInject constructor(
override fun handle(action: MigrateRoomAction) {
when (action) {
- is MigrateRoomAction.SetAutoInvite -> {
+ is MigrateRoomAction.SetAutoInvite -> {
setState {
copy(shouldIssueInvites = action.autoInvite)
}
@@ -70,7 +70,7 @@ class MigrateRoomViewModel @AssistedInject constructor(
copy(shouldUpdateKnownParents = action.update)
}
}
- MigrateRoomAction.UpgradeRoom -> {
+ MigrateRoomAction.UpgradeRoom -> {
handleUpgradeRoom()
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index 426ceb5024..2be6130a5d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -481,7 +481,8 @@ class RoomListFragment @Inject constructor(
StateView.State.Empty(
title = getString(R.string.room_list_catchup_empty_title),
image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_noun_party_popper),
- message = getString(R.string.room_list_catchup_empty_body))
+ message = getString(R.string.room_list_catchup_empty_body)
+ )
}
RoomListDisplayMode.PEOPLE ->
StateView.State.Empty(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
index 0a31987ae5..80c7b4e921 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
@@ -197,7 +197,8 @@ class RoomListSectionBuilderGroup(
actualGroupId: String?
) {
if (autoAcceptInvites.showInvites()) {
- addSection(sections,
+ addSection(
+ sections,
activeSpaceAwareQueries,
R.string.invitations_header,
true
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
index 625118919b..21fbd8b914 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
@@ -54,11 +54,13 @@ sealed class RoomListQuickActionsSharedAction(
data class LowPriority(val roomId: String) : RoomListQuickActionsSharedAction(
R.string.room_list_quick_actions_low_priority_add,
- R.drawable.ic_low_priority_24)
+ R.drawable.ic_low_priority_24
+ )
data class Favorite(val roomId: String) : RoomListQuickActionsSharedAction(
R.string.room_list_quick_actions_favorite_add,
- R.drawable.ic_star_24dp)
+ R.drawable.ic_star_24dp
+ )
data class Leave(val roomId: String, val showIcon: Boolean = true) : RoomListQuickActionsSharedAction(
R.string.room_list_quick_actions_leave,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt
index 726138ed93..13a12106c7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt
@@ -76,7 +76,8 @@ class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>() {
replaceFragment(
views.threadsActivityFragmentContainer,
ThreadListFragment::class.java,
- threadListArgs)
+ threadListArgs
+ )
}
private fun initThreadTimelineFragment(threadTimelineArgs: ThreadTimelineArgs) =
@@ -87,7 +88,8 @@ class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>() {
roomId = threadTimelineArgs.roomId,
eventId = getEventIdToNavigate(),
threadTimelineArgs = threadTimelineArgs
- ))
+ )
+ )
/**
* This function is used to navigate to the selected thread timeline.
@@ -100,7 +102,8 @@ class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>() {
R.anim.animation_slide_in_right,
R.anim.animation_slide_out_left,
R.anim.animation_slide_in_left,
- R.anim.animation_slide_out_right)
+ R.anim.animation_slide_out_right
+ )
}
addFragmentToBackstack(
container = views.threadsActivityFragmentContainer,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt
index c90ad542c0..04889f375f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt
@@ -112,7 +112,8 @@ class ThreadListFragment @Inject constructor(
private fun initTextConstants() {
views.threadListEmptyNoticeTextView.text = String.format(
resources.getString(R.string.thread_list_empty_notice),
- resources.getString(R.string.reply_in_thread))
+ resources.getString(R.string.reply_in_thread)
+ )
}
private fun initBetaFeedback() {
@@ -149,7 +150,8 @@ class ThreadListFragment @Inject constructor(
displayName = threadSummary.rootThreadSenderInfo.displayName,
avatarUrl = threadSummary.rootThreadSenderInfo.avatarUrl,
roomEncryptionTrustLevel = null,
- rootThreadEventId = threadSummary.rootEventId)
+ rootThreadEventId = threadSummary.rootEventId
+ )
(activity as? ThreadsActivity)?.navigateToThreadTimeline(roomThreadDetailArgs)
}
@@ -159,7 +161,8 @@ class ThreadListFragment @Inject constructor(
displayName = timelineEvent.senderInfo.displayName,
avatarUrl = timelineEvent.senderInfo.avatarUrl,
roomEncryptionTrustLevel = null,
- rootThreadEventId = timelineEvent.eventId)
+ rootThreadEventId = timelineEvent.eventId
+ )
(activity as? ThreadsActivity)?.navigateToThreadTimeline(threadTimelineArgs)
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt
index ca948e6fdb..6cc72a4045 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt
@@ -33,13 +33,17 @@ class TypingHelper @Inject constructor(private val stringProvider: StringProvide
typingUsers.size == 1 ->
stringProvider.getString(R.string.room_one_user_is_typing, typingUsers[0].disambiguatedDisplayName)
typingUsers.size == 2 ->
- stringProvider.getString(R.string.room_two_users_are_typing,
+ stringProvider.getString(
+ R.string.room_two_users_are_typing,
typingUsers[0].disambiguatedDisplayName,
- typingUsers[1].disambiguatedDisplayName)
+ typingUsers[1].disambiguatedDisplayName
+ )
else ->
- stringProvider.getString(R.string.room_many_users_are_typing,
+ stringProvider.getString(
+ R.string.room_many_users_are_typing,
typingUsers[0].disambiguatedDisplayName,
- typingUsers[1].disambiguatedDisplayName)
+ typingUsers[1].disambiguatedDisplayName
+ )
}
}
@@ -47,10 +51,14 @@ class TypingHelper @Inject constructor(private val stringProvider: StringProvide
return when {
typingUsers.isEmpty() -> ""
typingUsers.size == 1 -> typingUsers[0].disambiguatedDisplayName
- typingUsers.size == 2 -> stringProvider.getString(R.string.room_notification_two_users_are_typing,
- typingUsers[0].disambiguatedDisplayName, typingUsers[1].disambiguatedDisplayName)
- else -> stringProvider.getString(R.string.room_notification_more_than_two_users_are_typing,
- typingUsers[0].disambiguatedDisplayName, typingUsers[1].disambiguatedDisplayName)
+ typingUsers.size == 2 -> stringProvider.getString(
+ R.string.room_notification_two_users_are_typing,
+ typingUsers[0].disambiguatedDisplayName, typingUsers[1].disambiguatedDisplayName
+ )
+ else -> stringProvider.getString(
+ R.string.room_notification_more_than_two_users_are_typing,
+ typingUsers[0].disambiguatedDisplayName, typingUsers[1].disambiguatedDisplayName
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt b/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
index 5f1c709082..e815b7b0f3 100644
--- a/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
@@ -67,9 +67,13 @@ object ServerUrlsRepository {
fun getLastHomeServerUrl(context: Context): String {
val prefs = DefaultSharedPreferences.getInstance(context)
- return prefs.getString(HOME_SERVER_URL_PREF,
- prefs.getString(DEFAULT_REFERRER_HOME_SERVER_URL_PREF,
- getDefaultHomeServerUrl(context))!!)!!
+ return prefs.getString(
+ HOME_SERVER_URL_PREF,
+ prefs.getString(
+ DEFAULT_REFERRER_HOME_SERVER_URL_PREF,
+ getDefaultHomeServerUrl(context)
+ )!!
+ )!!
}
/**
diff --git a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
index 776a887d5d..cad46e06a1 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
@@ -69,15 +69,21 @@ class InviteUsersToRoomViewModel @AssistedInject constructor(
}
.collect {
val successMessage = when (selections.size) {
- 1 -> stringProvider.getString(R.string.invitation_sent_to_one_user,
- selections.first().getBestName())
- 2 -> stringProvider.getString(R.string.invitations_sent_to_two_users,
+ 1 -> stringProvider.getString(
+ R.string.invitation_sent_to_one_user,
+ selections.first().getBestName()
+ )
+ 2 -> stringProvider.getString(
+ R.string.invitations_sent_to_two_users,
selections.first().getBestName(),
- selections.last().getBestName())
- else -> stringProvider.getQuantityString(R.plurals.invitations_sent_to_one_and_more_users,
+ selections.last().getBestName()
+ )
+ else -> stringProvider.getQuantityString(
+ R.plurals.invitations_sent_to_one_and_more_users,
selections.size - 1,
selections.first().getBestName(),
- selections.size - 1)
+ selections.size - 1
+ )
}
_viewEvents.post(InviteUsersToRoomViewEvents.Success(successMessage))
}
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
index c5cfe1ec75..231de00094 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
@@ -161,11 +161,13 @@ class LocationSharingViewModel @AssistedInject constructor(
}
private fun handleStartLiveLocationSharingAction(durationMillis: Long) {
- _viewEvents.post(LocationSharingViewEvents.StartLiveLocationService(
- sessionId = session.sessionId,
- roomId = room.roomId,
- durationMillis = durationMillis
- ))
+ _viewEvents.post(
+ LocationSharingViewEvents.StartLiveLocationService(
+ sessionId = session.sessionId,
+ roomId = room.roomId,
+ durationMillis = durationMillis
+ )
+ )
}
override fun onLocationUpdate(locationData: LocationData) {
diff --git a/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
index f5e48e84e7..52982740fd 100644
--- a/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
@@ -78,10 +78,10 @@ abstract class AbstractLoginFragment<VB : ViewBinding> : VectorBaseFragment<VB>(
}
when (throwable) {
- is CancellationException ->
+ is CancellationException ->
/* Ignore this error, user has cancelled the action */
Unit
- is Failure.ServerError ->
+ is Failure.ServerError ->
if (throwable.error.code == MatrixError.M_FORBIDDEN &&
throwable.httpCode == HttpsURLConnection.HTTP_FORBIDDEN /* 403 */) {
MaterialAlertDialogBuilder(requireActivity())
@@ -94,7 +94,7 @@ abstract class AbstractLoginFragment<VB : ViewBinding> : VectorBaseFragment<VB>(
}
is Failure.UnrecognizedCertificateFailure ->
showUnrecognizedCertificateFailure(throwable)
- else ->
+ else ->
onError(throwable)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
index 79d2d37c44..d4730ecc8b 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
@@ -119,7 +119,8 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
// First ask for login and password
// I add a tag to indicate that this fragment is a registration stage.
// This way it will be automatically popped in when starting the next registration stage
- addFragmentToBackstack(views.loginFragmentContainer,
+ addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginFragment::class.java,
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
option = commonOption
@@ -150,25 +151,33 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
is LoginViewEvents.OnServerSelectionDone -> onServerSelectionDone(loginViewEvents)
is LoginViewEvents.OnSignModeSelected -> onSignModeSelected(loginViewEvents)
is LoginViewEvents.OnLoginFlowRetrieved ->
- addFragmentToBackstack(views.loginFragmentContainer,
+ addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginSignUpSignInSelectionFragment::class.java,
- option = commonOption)
+ option = commonOption
+ )
is LoginViewEvents.OnWebLoginError -> onWebLoginError(loginViewEvents)
is LoginViewEvents.OnForgetPasswordClicked ->
- addFragmentToBackstack(views.loginFragmentContainer,
+ addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginResetPasswordFragment::class.java,
- option = commonOption)
+ option = commonOption
+ )
is LoginViewEvents.OnResetPasswordSendThreePidDone -> {
supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
- addFragmentToBackstack(views.loginFragmentContainer,
+ addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginResetPasswordMailConfirmationFragment::class.java,
- option = commonOption)
+ option = commonOption
+ )
}
is LoginViewEvents.OnResetPasswordMailConfirmationSuccess -> {
supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
- addFragmentToBackstack(views.loginFragmentContainer,
+ addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginResetPasswordSuccessFragment::class.java,
- option = commonOption)
+ option = commonOption
+ )
}
is LoginViewEvents.OnResetPasswordMailConfirmationSuccessDone -> {
// Go back to the login fragment
@@ -177,20 +186,24 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
is LoginViewEvents.OnSendEmailSuccess -> {
// Pop the enter email Fragment
supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
- addFragmentToBackstack(views.loginFragmentContainer,
+ addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginWaitForEmailFragment::class.java,
LoginWaitForEmailFragmentArgument(loginViewEvents.email),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
+ option = commonOption
+ )
}
is LoginViewEvents.OnSendMsisdnSuccess -> {
// Pop the enter Msisdn Fragment
supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
- addFragmentToBackstack(views.loginFragmentContainer,
+ addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginGenericTextInputFormFragment::class.java,
LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.ConfirmMsisdn, true, loginViewEvents.msisdn),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
+ option = commonOption
+ )
}
is LoginViewEvents.Failure,
is LoginViewEvents.Loading ->
@@ -234,9 +247,11 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
when (loginViewEvents.serverType) {
ServerType.MatrixOrg -> Unit // In this case, we wait for the login flow
ServerType.EMS,
- ServerType.Other -> addFragmentToBackstack(views.loginFragmentContainer,
+ ServerType.Other -> addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginServerUrlFormFragment::class.java,
- option = commonOption)
+ option = commonOption
+ )
ServerType.Unknown -> Unit /* Should not happen */
}
}
@@ -254,17 +269,21 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
LoginMode.Unknown,
is LoginMode.Sso -> error("Developer error")
is LoginMode.SsoAndPassword,
- LoginMode.Password -> addFragmentToBackstack(views.loginFragmentContainer,
+ LoginMode.Password -> addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginFragment::class.java,
tag = FRAGMENT_LOGIN_TAG,
- option = commonOption)
+ option = commonOption
+ )
LoginMode.Unsupported -> onLoginModeNotSupported(state.loginModeSupportedTypes)
}
}
- SignMode.SignInWithMatrixId -> addFragmentToBackstack(views.loginFragmentContainer,
+ SignMode.SignInWithMatrixId -> addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginFragment::class.java,
tag = FRAGMENT_LOGIN_TAG,
- option = commonOption)
+ option = commonOption
+ )
}
}
@@ -288,9 +307,11 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
.setTitle(R.string.app_name)
.setMessage(getString(R.string.login_registration_not_supported))
.setPositiveButton(R.string.yes) { _, _ ->
- addFragmentToBackstack(views.loginFragmentContainer,
+ addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginWebFragment::class.java,
- option = commonOption)
+ option = commonOption
+ )
}
.setNegativeButton(R.string.no, null)
.show()
@@ -301,9 +322,11 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
.setTitle(R.string.app_name)
.setMessage(getString(R.string.login_mode_not_supported, supportedTypes.joinToString { "'$it'" }))
.setPositiveButton(R.string.yes) { _, _ ->
- addFragmentToBackstack(views.loginFragmentContainer,
+ addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginWebFragment::class.java,
- option = commonOption)
+ option = commonOption
+ )
}
.setNegativeButton(R.string.no, null)
.show()
@@ -331,26 +354,34 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
when (stage) {
- is Stage.ReCaptcha -> addFragmentToBackstack(views.loginFragmentContainer,
+ is Stage.ReCaptcha -> addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginCaptchaFragment::class.java,
LoginCaptchaFragmentArgument(stage.publicKey),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
- is Stage.Email -> addFragmentToBackstack(views.loginFragmentContainer,
+ option = commonOption
+ )
+ is Stage.Email -> addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginGenericTextInputFormFragment::class.java,
LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.SetEmail, stage.mandatory),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
- is Stage.Msisdn -> addFragmentToBackstack(views.loginFragmentContainer,
+ option = commonOption
+ )
+ is Stage.Msisdn -> addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginGenericTextInputFormFragment::class.java,
LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.SetMsisdn, stage.mandatory),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
- is Stage.Terms -> addFragmentToBackstack(views.loginFragmentContainer,
+ option = commonOption
+ )
+ is Stage.Terms -> addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginTermsFragment::class.java,
LoginTermsFragmentArgument(stage.policies.toLocalizedLoginTerms(getString(R.string.resources_language))),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
+ option = commonOption
+ )
else -> Unit // Should not happen
}
}
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
index 49198087d9..14587b7c09 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
@@ -117,11 +117,13 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
// This can be called by the IME action, so deal with empty cases
var error = 0
if (login.isEmpty()) {
- views.loginFieldTil.error = getString(if (isSignupMode) {
- R.string.error_empty_field_choose_user_name
- } else {
- R.string.error_empty_field_enter_user_name
- })
+ views.loginFieldTil.error = getString(
+ if (isSignupMode) {
+ R.string.error_empty_field_choose_user_name
+ } else {
+ R.string.error_empty_field_enter_user_name
+ }
+ )
error++
}
if (isSignupMode && isNumericOnlyUserIdForbidden && login.isDigitsOnly()) {
@@ -129,11 +131,13 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
error++
}
if (password.isEmpty()) {
- views.passwordFieldTil.error = getString(if (isSignupMode) {
- R.string.error_empty_field_choose_password
- } else {
- R.string.error_empty_field_your_password
- })
+ views.passwordFieldTil.error = getString(
+ if (isSignupMode) {
+ R.string.error_empty_field_choose_password
+ } else {
+ R.string.error_empty_field_your_password
+ }
+ )
error++
}
@@ -149,12 +153,14 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
}
private fun setupUi(state: LoginViewState) {
- views.loginFieldTil.hint = getString(when (state.signMode) {
- SignMode.Unknown -> error("developer error")
- SignMode.SignUp -> R.string.login_signup_username_hint
- SignMode.SignIn -> R.string.login_signin_username_hint
- SignMode.SignInWithMatrixId -> R.string.login_signin_matrix_id_hint
- })
+ views.loginFieldTil.hint = getString(
+ when (state.signMode) {
+ SignMode.Unknown -> error("developer error")
+ SignMode.SignUp -> R.string.login_signup_username_hint
+ SignMode.SignIn -> R.string.login_signin_username_hint
+ SignMode.SignInWithMatrixId -> R.string.login_signin_matrix_id_hint
+ }
+ )
// Handle direct signin first
if (state.signMode == SignMode.SignInWithMatrixId) {
@@ -215,12 +221,14 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
private fun setupButtons(state: LoginViewState) {
views.forgetPasswordButton.isVisible = state.signMode == SignMode.SignIn
- views.loginSubmit.text = getString(when (state.signMode) {
- SignMode.Unknown -> error("developer error")
- SignMode.SignUp -> R.string.login_signup_submit
- SignMode.SignIn,
- SignMode.SignInWithMatrixId -> R.string.login_signin
- })
+ views.loginSubmit.text = getString(
+ when (state.signMode) {
+ SignMode.Unknown -> error("developer error")
+ SignMode.SignUp -> R.string.login_signup_submit
+ SignMode.SignIn,
+ SignMode.SignInWithMatrixId -> R.string.login_signin
+ }
+ )
}
private fun setupSubmitButton() {
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
index e2fcb2fd12..ca9582b44b 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
@@ -100,11 +100,13 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment<F
}
}
val completions = state.knownCustomHomeServersUrls + if (BuildConfig.DEBUG) listOf("http://10.0.2.2:8080") else emptyList()
- views.loginServerUrlFormHomeServerUrl.setAdapter(ArrayAdapter(
- requireContext(),
- R.layout.item_completion_homeserver,
- completions
- ))
+ views.loginServerUrlFormHomeServerUrl.setAdapter(
+ ArrayAdapter(
+ requireContext(),
+ R.layout.item_completion_homeserver,
+ completions
+ )
+ )
views.loginServerUrlFormHomeServerUrlTil.endIconMode = TextInputLayout.END_ICON_DROPDOWN_MENU
.takeIf { completions.isNotEmpty() }
?: TextInputLayout.END_ICON_NONE
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
index 73f5c064e7..c9cb4612a8 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -617,7 +617,8 @@ class LoginViewModel @AssistedInject constructor(
alteredHomeServerConnectionConfig,
action.username,
action.password,
- action.initialDeviceName)
+ action.initialDeviceName
+ )
} catch (failure: Throwable) {
onDirectLoginError(failure)
return
diff --git a/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt
index 68568d1420..f9758c01c3 100644
--- a/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt
@@ -76,12 +76,12 @@ abstract class AbstractLoginFragment2<VB : ViewBinding> : VectorBaseFragment<VB>
}
when (throwable) {
- is CancellationException ->
+ is CancellationException ->
/* Ignore this error, user has cancelled the action */
Unit
is Failure.UnrecognizedCertificateFailure ->
showUnrecognizedCertificateFailure(throwable)
- else ->
+ else ->
onError(throwable)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt
index 0732d176ac..b0201abc9a 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt
@@ -81,11 +81,13 @@ class LoginServerUrlFormFragment2 @Inject constructor() : AbstractLoginFragment2
private fun setupUi(state: LoginViewState2) {
val completions = state.knownCustomHomeServersUrls + if (BuildConfig.DEBUG) listOf("http://10.0.2.2:8080") else emptyList()
- views.loginServerUrlFormHomeServerUrl.setAdapter(ArrayAdapter(
- requireContext(),
- R.layout.item_completion_homeserver,
- completions
- ))
+ views.loginServerUrlFormHomeServerUrl.setAdapter(
+ ArrayAdapter(
+ requireContext(),
+ R.layout.item_completion_homeserver,
+ completions
+ )
+ )
views.loginServerUrlFormHomeServerUrlTil.endIconMode = TextInputLayout.END_ICON_DROPDOWN_MENU
.takeIf { completions.isNotEmpty() }
?: TextInputLayout.END_ICON_NONE
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
index b0caf80d82..87363854b1 100644
--- a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
@@ -115,9 +115,11 @@ class AccountCreatedFragment @Inject constructor(
override fun onImageReady(uri: Uri?) {
uri ?: return
- viewModel.handle(AccountCreatedAction.SetAvatar(
- avatarUri = uri,
- filename = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString())
+ viewModel.handle(
+ AccountCreatedAction.SetAvatar(
+ avatarUri = uri,
+ filename = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString()
+ )
)
}
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
index 57e48cac6d..8c685b8178 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
@@ -84,7 +84,8 @@ class MatrixToBottomSheet :
private fun showFragment(fragmentClass: KClass<out Fragment>, bundle: Bundle) {
if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
childFragmentManager.commitTransaction {
- replace(views.matrixToCardFragmentContainer.id,
+ replace(
+ views.matrixToCardFragmentContainer.id,
fragmentClass.java,
bundle,
fragmentClass.simpleName
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt b/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
index 2f71089a39..b72b36a564 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
@@ -140,7 +140,8 @@ class SpaceCardRenderer @Inject constructor(
avatarRenderer.render(item, images[index])
}
inCard.peopleYouMayKnowText.setTextOrHide(
- stringProvider.getQuantityString(R.plurals.space_people_you_know,
+ stringProvider.getQuantityString(
+ R.plurals.space_people_you_know,
peopleYouKnow.count(),
peopleYouKnow.count()
)
diff --git a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
index cd868c9f2f..e18a13a3e6 100644
--- a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
@@ -169,7 +169,8 @@ class RoomEventsAttachmentProvider(
fileName = messageContent.body,
mimeType = messageContent.mimeType,
url = messageContent.getFileUrl(),
- elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt())
+ elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt()
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
index 4e6d19686b..c7bb54fcf4 100644
--- a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
@@ -87,7 +87,8 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
fileName = data.filename,
mimeType = data.mimeType,
url = data.url,
- elementToDecrypt = data.elementToDecrypt)
+ elementToDecrypt = data.elementToDecrypt
+ )
}
withContext(Dispatchers.Main) {
result.fold(
@@ -130,7 +131,8 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
fileName = data.filename,
mimeType = data.mimeType,
url = data.url,
- elementToDecrypt = null)
+ elementToDecrypt = null
+ )
}
withContext(Dispatchers.Main) {
result.fold(
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 94aee1ba1a..7cc42ec57f 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -254,7 +254,8 @@ class DefaultNavigator @Inject constructor(
val pr = session.cryptoService().verificationService().requestKeyVerification(
supportedVerificationMethodsProvider.provide(),
session.myUserId,
- otherSessions)
+ otherSessions
+ )
VerificationBottomSheet.forSelfVerification(session, pr.transactionId ?: pr.localId)
.show(context.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
} else {
@@ -525,12 +526,14 @@ class DefaultNavigator @Inject constructor(
view: View,
inMemory: List<AttachmentData>,
options: ((MutableList<Pair<View, String>>) -> Unit)?) {
- VectorAttachmentViewerActivity.newIntent(activity,
+ VectorAttachmentViewerActivity.newIntent(
+ activity,
mediaData,
roomId,
mediaData.eventId,
inMemory,
- ViewCompat.getTransitionName(view)).let { intent ->
+ ViewCompat.getTransitionName(view)
+ ).let { intent ->
val pairs = ArrayList<Pair<View, String>>()
activity.window.decorView.findViewById<View>(android.R.id.statusBarBackground)?.let {
pairs.add(Pair(it, Window.STATUS_BAR_BACKGROUND_TRANSITION_NAME))
@@ -599,24 +602,29 @@ class DefaultNavigator @Inject constructor(
}
override fun openThread(context: Context, threadTimelineArgs: ThreadTimelineArgs, eventIdToNavigate: String?) {
- context.startActivity(ThreadsActivity.newIntent(
- context = context,
- threadTimelineArgs = threadTimelineArgs,
- threadListArgs = null,
- eventIdToNavigate = eventIdToNavigate
- ))
+ context.startActivity(
+ ThreadsActivity.newIntent(
+ context = context,
+ threadTimelineArgs = threadTimelineArgs,
+ threadListArgs = null,
+ eventIdToNavigate = eventIdToNavigate
+ )
+ )
}
override fun openThreadList(context: Context, threadTimelineArgs: ThreadTimelineArgs) {
- context.startActivity(ThreadsActivity.newIntent(
- context = context,
- threadTimelineArgs = null,
- threadListArgs = ThreadListArgs(
- roomId = threadTimelineArgs.roomId,
- displayName = threadTimelineArgs.displayName,
- avatarUrl = threadTimelineArgs.avatarUrl,
- roomEncryptionTrustLevel = threadTimelineArgs.roomEncryptionTrustLevel
- )))
+ context.startActivity(
+ ThreadsActivity.newIntent(
+ context = context,
+ threadTimelineArgs = null,
+ threadListArgs = ThreadListArgs(
+ roomId = threadTimelineArgs.roomId,
+ displayName = threadTimelineArgs.displayName,
+ avatarUrl = threadTimelineArgs.avatarUrl,
+ roomEncryptionTrustLevel = threadTimelineArgs.roomEncryptionTrustLevel
+ )
+ )
+ )
}
override fun openScreenSharingPermissionDialog(screenCaptureIntent: Intent,
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index 62cac7507f..1243d3f798 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -155,7 +155,8 @@ class NotificationDrawerManager @Inject constructor(
Timber.w(throwable, "refreshNotificationDrawerBg failure")
}
},
- canHandle.waitMillis())
+ canHandle.waitMillis()
+ )
}
@WorkerThread
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
index b95bbe1bf5..4b6815e7e4 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
@@ -96,7 +96,8 @@ class NotificationFactory @Inject constructor(
invitationNotifications = invitationMeta,
simpleNotifications = simpleMeta,
useCompleteNotificationFormat = useCompleteNotificationFormat
- ))
+ )
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index b480253636..78d771ee1c 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -174,9 +174,11 @@ class NotificationUtils @Inject constructor(
* Default notification importance: shows everywhere, makes noise, but does not visually
* intrude.
*/
- notificationManager.createNotificationChannel(NotificationChannel(NOISY_NOTIFICATION_CHANNEL_ID,
+ notificationManager.createNotificationChannel(NotificationChannel(
+ NOISY_NOTIFICATION_CHANNEL_ID,
stringProvider.getString(R.string.notification_noisy_notifications).ifEmpty { "Noisy notifications" },
- NotificationManager.IMPORTANCE_DEFAULT)
+ NotificationManager.IMPORTANCE_DEFAULT
+ )
.apply {
description = stringProvider.getString(R.string.notification_noisy_notifications)
enableVibration(true)
@@ -187,9 +189,11 @@ class NotificationUtils @Inject constructor(
/**
* Low notification importance: shows everywhere, but is not intrusive.
*/
- notificationManager.createNotificationChannel(NotificationChannel(SILENT_NOTIFICATION_CHANNEL_ID,
+ notificationManager.createNotificationChannel(NotificationChannel(
+ SILENT_NOTIFICATION_CHANNEL_ID,
stringProvider.getString(R.string.notification_silent_notifications).ifEmpty { "Silent notifications" },
- NotificationManager.IMPORTANCE_LOW)
+ NotificationManager.IMPORTANCE_LOW
+ )
.apply {
description = stringProvider.getString(R.string.notification_silent_notifications)
setSound(null, null)
@@ -197,18 +201,22 @@ class NotificationUtils @Inject constructor(
lightColor = accentColor
})
- notificationManager.createNotificationChannel(NotificationChannel(LISTENING_FOR_EVENTS_NOTIFICATION_CHANNEL_ID,
+ notificationManager.createNotificationChannel(NotificationChannel(
+ LISTENING_FOR_EVENTS_NOTIFICATION_CHANNEL_ID,
stringProvider.getString(R.string.notification_listening_for_events).ifEmpty { "Listening for events" },
- NotificationManager.IMPORTANCE_MIN)
+ NotificationManager.IMPORTANCE_MIN
+ )
.apply {
description = stringProvider.getString(R.string.notification_listening_for_events)
setSound(null, null)
setShowBadge(false)
})
- notificationManager.createNotificationChannel(NotificationChannel(CALL_NOTIFICATION_CHANNEL_ID,
+ notificationManager.createNotificationChannel(NotificationChannel(
+ CALL_NOTIFICATION_CHANNEL_ID,
stringProvider.getString(R.string.call).ifEmpty { "Call" },
- NotificationManager.IMPORTANCE_HIGH)
+ NotificationManager.IMPORTANCE_HIGH
+ )
.apply {
description = stringProvider.getString(R.string.call)
setSound(null, null)
@@ -266,11 +274,13 @@ class NotificationUtils @Inject constructor(
// reflection at runtime, to avoid compiler error: "Cannot resolve method.."
try {
val deprecatedMethod = notification.javaClass
- .getMethod("setLatestEventInfo",
+ .getMethod(
+ "setLatestEventInfo",
Context::class.java,
CharSequence::class.java,
CharSequence::class.java,
- PendingIntent::class.java)
+ PendingIntent::class.java
+ )
deprecatedMethod.invoke(notification, context, stringProvider.getString(R.string.app_name), stringProvider.getString(subTitleResId), pi)
} catch (ex: Exception) {
Timber.e(ex, "## buildNotification(): Exception - setLatestEventInfo() Msg=")
@@ -390,7 +400,8 @@ class NotificationUtils @Inject constructor(
val contentIntent = VectorCallActivity.newIntent(
context = context,
call = call,
- mode = null).apply {
+ mode = null
+ ).apply {
flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
data = createIgnoredUri(call.callId)
}
@@ -645,8 +656,10 @@ class NotificationUtils @Inject constructor(
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
)
- NotificationCompat.Action.Builder(R.drawable.ic_material_done_all_white,
- stringProvider.getString(R.string.action_mark_room_read), markRoomReadPendingIntent)
+ NotificationCompat.Action.Builder(
+ R.drawable.ic_material_done_all_white,
+ stringProvider.getString(R.string.action_mark_room_read), markRoomReadPendingIntent
+ )
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ)
.setShowsUserInterface(false)
.build()
@@ -658,8 +671,10 @@ class NotificationUtils @Inject constructor(
val remoteInput = RemoteInput.Builder(NotificationBroadcastReceiver.KEY_TEXT_REPLY)
.setLabel(stringProvider.getString(R.string.action_quick_reply))
.build()
- NotificationCompat.Action.Builder(R.drawable.vector_notification_quick_reply,
- stringProvider.getString(R.string.action_quick_reply), replyPendingIntent)
+ NotificationCompat.Action.Builder(
+ R.drawable.vector_notification_quick_reply,
+ stringProvider.getString(R.string.action_quick_reply), replyPendingIntent
+ )
.addRemoteInput(remoteInput)
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY)
.setShowsUserInterface(false)
diff --git a/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt b/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
index 535ac8b62e..9ef60e62c9 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
@@ -36,11 +36,12 @@ class RoomGroupMessageCreator @Inject constructor(
val firstKnownRoomEvent = events[0]
val roomName = firstKnownRoomEvent.roomName ?: firstKnownRoomEvent.senderName ?: ""
val roomIsGroup = !firstKnownRoomEvent.roomIsDirect
- val style = NotificationCompat.MessagingStyle(Person.Builder()
- .setName(userDisplayName)
- .setIcon(bitmapLoader.getUserIcon(userAvatarUrl))
- .setKey(firstKnownRoomEvent.matrixID)
- .build()
+ val style = NotificationCompat.MessagingStyle(
+ Person.Builder()
+ .setName(userDisplayName)
+ .setIcon(bitmapLoader.getUserIcon(userAvatarUrl))
+ .setKey(firstKnownRoomEvent.matrixID)
+ .build()
).also {
it.conversationTitle = roomName.takeIf { roomIsGroup }
it.isGroupConversation = roomIsGroup
@@ -111,7 +112,7 @@ class RoomGroupMessageCreator @Inject constructor(
private fun createRoomMessagesGroupSummaryLine(events: List<NotifiableMessageEvent>, roomName: String, roomIsDirect: Boolean): CharSequence {
return try {
when (events.size) {
- 1 -> createFirstMessageSummaryLine(events.first(), roomName, roomIsDirect)
+ 1 -> createFirstMessageSummaryLine(events.first(), roomName, roomIsDirect)
else -> {
stringProvider.getQuantityString(
R.plurals.notification_compat_summary_line_for_room,
diff --git a/vector/src/main/java/im/vector/app/features/notifications/SummaryGroupMessageCreator.kt b/vector/src/main/java/im/vector/app/features/notifications/SummaryGroupMessageCreator.kt
index 91163434c2..7d1cb074ec 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/SummaryGroupMessageCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/SummaryGroupMessageCreator.kt
@@ -99,12 +99,16 @@ class SummaryGroupMessageCreator @Inject constructor(
val invitationsStr = stringProvider.getQuantityString(R.plurals.notification_invitations, invitationEventsCount, invitationEventsCount)
if (messageNotificationCount > 0) {
// Invitation and message
- val messageStr = stringProvider.getQuantityString(R.plurals.room_new_messages_notification,
- messageNotificationCount, messageNotificationCount)
+ val messageStr = stringProvider.getQuantityString(
+ R.plurals.room_new_messages_notification,
+ messageNotificationCount, messageNotificationCount
+ )
if (roomCount > 1) {
// In several rooms
- val roomStr = stringProvider.getQuantityString(R.plurals.notification_unread_notified_messages_in_room_rooms,
- roomCount, roomCount)
+ val roomStr = stringProvider.getQuantityString(
+ R.plurals.notification_unread_notified_messages_in_room_rooms,
+ roomCount, roomCount
+ )
stringProvider.getString(
R.string.notification_unread_notified_messages_in_room_and_invitation,
messageStr,
@@ -125,8 +129,10 @@ class SummaryGroupMessageCreator @Inject constructor(
}
} else {
// No invitation, only messages
- val messageStr = stringProvider.getQuantityString(R.plurals.room_new_messages_notification,
- messageNotificationCount, messageNotificationCount)
+ val messageStr = stringProvider.getQuantityString(
+ R.plurals.room_new_messages_notification,
+ messageNotificationCount, messageNotificationCount
+ )
if (roomCount > 1) {
// In several rooms
val roomStr = stringProvider.getQuantityString(R.plurals.notification_unread_notified_messages_in_room_rooms, roomCount, roomCount)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/DirectLoginUseCase.kt b/vector/src/main/java/im/vector/app/features/onboarding/DirectLoginUseCase.kt
index 171d8f7bb5..504dc30263 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/DirectLoginUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/DirectLoginUseCase.kt
@@ -43,9 +43,9 @@ class DirectLoginUseCase @Inject constructor(
}
private suspend fun createSessionFor(data: WellknownResult, action: LoginOrRegister, config: HomeServerConnectionConfig?) = when (data) {
- is WellknownResult.Prompt -> loginDirect(action, data, config)
+ is WellknownResult.Prompt -> loginDirect(action, data, config)
is WellknownResult.FailPrompt -> handleFailPrompt(data, action, config)
- else -> onWellKnownError()
+ else -> onWellKnownError()
}
private suspend fun handleFailPrompt(data: WellknownResult.FailPrompt, action: LoginOrRegister, config: HomeServerConnectionConfig?): Result<Session> {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt b/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt
index 15d07a0197..9f63ff3e22 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt
@@ -169,9 +169,11 @@ class Login2Variant(
// ft.setCustomAnimations(enterAnim, exitAnim, popEnterAnim, popExitAnim)
})
is LoginViewEvents2.OpenHomeServerUrlFormScreen -> {
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginServerUrlFormFragment2::class.java,
- option = commonOption)
+ option = commonOption
+ )
}
is LoginViewEvents2.OpenSignInEnterIdentifierScreen -> {
activity.addFragmentToBackstack(views.loginFragmentContainer,
@@ -187,67 +189,87 @@ class Login2Variant(
})
}
is LoginViewEvents2.OpenSsoOnlyScreen -> {
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginSsoOnlyFragment2::class.java,
- option = commonOption)
+ option = commonOption
+ )
}
is LoginViewEvents2.OnWebLoginError -> onWebLoginError(event)
is LoginViewEvents2.OpenResetPasswordScreen ->
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginResetPasswordFragment2::class.java,
- option = commonOption)
+ option = commonOption
+ )
is LoginViewEvents2.OnResetPasswordSendThreePidDone -> {
supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginResetPasswordMailConfirmationFragment2::class.java,
- option = commonOption)
+ option = commonOption
+ )
}
is LoginViewEvents2.OnResetPasswordMailConfirmationSuccess -> {
supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginResetPasswordSuccessFragment2::class.java,
- option = commonOption)
+ option = commonOption
+ )
}
is LoginViewEvents2.OnResetPasswordMailConfirmationSuccessDone -> {
// Go back to the login fragment
supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
}
is LoginViewEvents2.OnSendEmailSuccess ->
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginWaitForEmailFragment2::class.java,
LoginWaitForEmailFragmentArgument(event.email),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
+ option = commonOption
+ )
is LoginViewEvents2.OpenSigninPasswordScreen -> {
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginFragmentSigninPassword2::class.java,
tag = FRAGMENT_LOGIN_TAG,
- option = commonOption)
+ option = commonOption
+ )
}
is LoginViewEvents2.OpenSignupPasswordScreen -> {
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginFragmentSignupPassword2::class.java,
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
+ option = commonOption
+ )
}
is LoginViewEvents2.OpenSignUpChooseUsernameScreen -> {
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginFragmentSignupUsername2::class.java,
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
+ option = commonOption
+ )
}
is LoginViewEvents2.OpenSignInWithAnythingScreen -> {
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginFragmentToAny2::class.java,
tag = FRAGMENT_LOGIN_TAG,
- option = commonOption)
+ option = commonOption
+ )
}
is LoginViewEvents2.OnSendMsisdnSuccess ->
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginGenericTextInputFormFragment2::class.java,
LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.ConfirmMsisdn, true, event.msisdn),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
+ option = commonOption
+ )
is LoginViewEvents2.Failure ->
// This is handled by the Fragments
Unit
@@ -268,9 +290,11 @@ class Login2Variant(
if (event.newAccount) {
// Propose to set avatar and display name
// Back on this Fragment will finish the Activity
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
AccountCreatedFragment::class.java,
- option = commonOption)
+ option = commonOption
+ )
} else {
terminate(false)
}
@@ -321,9 +345,11 @@ class Login2Variant(
.setTitle(R.string.app_name)
.setMessage(activity.getString(R.string.login_registration_not_supported))
.setPositiveButton(R.string.yes) { _, _ ->
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginWebFragment2::class.java,
- option = commonOption)
+ option = commonOption
+ )
}
.setNegativeButton(R.string.no, null)
.show()
@@ -334,9 +360,11 @@ class Login2Variant(
.setTitle(R.string.app_name)
.setMessage(activity.getString(R.string.login_mode_not_supported, supportedTypes.joinToString { "'$it'" }))
.setPositiveButton(R.string.yes) { _, _ ->
- activity.addFragmentToBackstack(views.loginFragmentContainer,
+ activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginWebFragment2::class.java,
- option = commonOption)
+ option = commonOption
+ )
}
.setNegativeButton(R.string.no, null)
.show()
@@ -364,26 +392,34 @@ class Login2Variant(
supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
when (stage) {
- is Stage.ReCaptcha -> activity.addFragmentToBackstack(views.loginFragmentContainer,
+ is Stage.ReCaptcha -> activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginCaptchaFragment2::class.java,
LoginCaptchaFragmentArgument(stage.publicKey),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
- is Stage.Email -> activity.addFragmentToBackstack(views.loginFragmentContainer,
+ option = commonOption
+ )
+ is Stage.Email -> activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginGenericTextInputFormFragment2::class.java,
LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.SetEmail, stage.mandatory),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
- is Stage.Msisdn -> activity.addFragmentToBackstack(views.loginFragmentContainer,
+ option = commonOption
+ )
+ is Stage.Msisdn -> activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginGenericTextInputFormFragment2::class.java,
LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.SetMsisdn, stage.mandatory),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
- is Stage.Terms -> activity.addFragmentToBackstack(views.loginFragmentContainer,
+ option = commonOption
+ )
+ is Stage.Terms -> activity.addFragmentToBackstack(
+ views.loginFragmentContainer,
LoginTermsFragment2::class.java,
LoginTermsFragmentArgument(stage.policies.toLocalizedLoginTerms(activity.getString(R.string.resources_language))),
tag = FRAGMENT_REGISTRATION_STAGE_TAG,
- option = commonOption)
+ option = commonOption
+ )
else -> Unit // Should not happen
}
}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
index 64e29766c5..2b8702ee2a 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
@@ -80,11 +80,11 @@ abstract class AbstractFtueAuthFragment<VB : ViewBinding> : VectorBaseFragment<V
}
when (throwable) {
- is CancellationException ->
+ is CancellationException ->
/* Ignore this error, user has cancelled the action */
Unit
is Failure.UnrecognizedCertificateFailure -> showUnrecognizedCertificateFailure(throwable)
- else -> onError(throwable)
+ else -> onError(throwable)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
index 0755f18c8c..7a7f630ba9 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
@@ -138,26 +138,26 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
// Trick to display the error without text.
views.createAccountInput.error = " "
when {
- throwable.isUsernameInUse() || throwable.isInvalidUsername() -> {
+ throwable.isUsernameInUse() || throwable.isInvalidUsername() -> {
views.createAccountInput.error = errorFormatter.toHumanReadable(throwable)
}
- throwable.isLoginEmailUnknown() -> {
+ throwable.isLoginEmailUnknown() -> {
views.createAccountInput.error = getString(R.string.login_login_with_email_error)
}
throwable.isInvalidPassword() && views.createAccountPasswordInput.hasSurroundingSpaces() -> {
views.createAccountPasswordInput.error = getString(R.string.auth_invalid_login_param_space_in_password)
}
- throwable.isWeakPassword() || throwable.isInvalidPassword() -> {
+ throwable.isWeakPassword() || throwable.isInvalidPassword() -> {
views.createAccountPasswordInput.error = errorFormatter.toHumanReadable(throwable)
}
- throwable.isRegistrationDisabled() -> {
+ throwable.isRegistrationDisabled() -> {
MaterialAlertDialogBuilder(requireActivity())
.setTitle(R.string.dialog_title_error)
.setMessage(getString(R.string.login_registration_disabled))
.setPositiveButton(R.string.ok, null)
.show()
}
- else -> {
+ else -> {
super.onError(throwable)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
index 4888b43946..696ebb4786 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
@@ -127,11 +127,13 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
// This can be called by the IME action, so deal with empty cases
var error = 0
if (login.isEmpty()) {
- views.loginFieldTil.error = getString(if (isSignupMode) {
- R.string.error_empty_field_choose_user_name
- } else {
- R.string.error_empty_field_enter_user_name
- })
+ views.loginFieldTil.error = getString(
+ if (isSignupMode) {
+ R.string.error_empty_field_choose_user_name
+ } else {
+ R.string.error_empty_field_enter_user_name
+ }
+ )
error++
}
if (isSignupMode && isNumericOnlyUserIdForbidden && login.isDigitsOnly()) {
@@ -139,11 +141,13 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
error++
}
if (password.isEmpty()) {
- views.passwordFieldTil.error = getString(if (isSignupMode) {
- R.string.error_empty_field_choose_password
- } else {
- R.string.error_empty_field_your_password
- })
+ views.passwordFieldTil.error = getString(
+ if (isSignupMode) {
+ R.string.error_empty_field_choose_password
+ } else {
+ R.string.error_empty_field_your_password
+ }
+ )
error++
}
@@ -159,12 +163,14 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
}
private fun setupUi(state: OnboardingViewState) {
- views.loginFieldTil.hint = getString(when (state.signMode) {
- SignMode.Unknown -> error("developer error")
- SignMode.SignUp -> R.string.login_signup_username_hint
- SignMode.SignIn -> R.string.login_signin_username_hint
- SignMode.SignInWithMatrixId -> R.string.login_signin_matrix_id_hint
- })
+ views.loginFieldTil.hint = getString(
+ when (state.signMode) {
+ SignMode.Unknown -> error("developer error")
+ SignMode.SignUp -> R.string.login_signup_username_hint
+ SignMode.SignIn -> R.string.login_signin_username_hint
+ SignMode.SignInWithMatrixId -> R.string.login_signin_matrix_id_hint
+ }
+ )
// Handle direct signin first
if (state.signMode == SignMode.SignInWithMatrixId) {
@@ -225,12 +231,14 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
private fun setupButtons(state: OnboardingViewState) {
views.forgetPasswordButton.isVisible = state.signMode == SignMode.SignIn
- views.loginSubmit.text = getString(when (state.signMode) {
- SignMode.Unknown -> error("developer error")
- SignMode.SignUp -> R.string.login_signup_submit
- SignMode.SignIn,
- SignMode.SignInWithMatrixId -> R.string.login_signin
- })
+ views.loginSubmit.text = getString(
+ when (state.signMode) {
+ SignMode.Unknown -> error("developer error")
+ SignMode.SignUp -> R.string.login_signup_submit
+ SignMode.SignIn,
+ SignMode.SignInWithMatrixId -> R.string.login_signin
+ }
+ )
}
private fun setupSubmitButton() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
index df304d028d..c542f80712 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
@@ -104,11 +104,13 @@ class FtueAuthServerUrlFormFragment @Inject constructor() : AbstractFtueAuthFrag
}
}
val completions = state.knownCustomHomeServersUrls + if (BuildConfig.DEBUG) listOf("http://10.0.2.2:8080") else emptyList()
- views.loginServerUrlFormHomeServerUrl.setAdapter(ArrayAdapter(
- requireContext(),
- R.layout.item_completion_homeserver,
- completions
- ))
+ views.loginServerUrlFormHomeServerUrl.setAdapter(
+ ArrayAdapter(
+ requireContext(),
+ R.layout.item_completion_homeserver,
+ completions
+ )
+ )
views.loginServerUrlFormHomeServerUrlTil.endIconMode = TextInputLayout.END_ICON_DROPDOWN_MENU
.takeIf { completions.isNotEmpty() }
?: TextInputLayout.END_ICON_NONE
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt
index 5325b25e93..6cfb7b8e34 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt
@@ -104,7 +104,7 @@ class FtueAuthUseCaseFragment @Inject constructor(
private fun createIcon(@ColorRes tint: Int, icon: Int, isLightMode: Boolean): Drawable {
val context = requireContext()
val alpha = when (isLightMode) {
- true -> LIGHT_MODE_ICON_BACKGROUND_ALPHA
+ true -> LIGHT_MODE_ICON_BACKGROUND_ALPHA
false -> DARK_MODE_ICON_BACKGROUND_ALPHA
}
val iconBackground = context.getResTintedDrawable(R.drawable.bg_feature_icon, tint, alpha = alpha)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt
index 006492f6dc..23f7014374 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt
@@ -41,32 +41,34 @@ class SplashCarouselStateFactory @Inject constructor(
val lightTheme = themeProvider.isLightTheme()
fun background(@DrawableRes lightDrawable: Int) = if (lightTheme) lightDrawable else R.drawable.bg_carousel_page_dark
fun hero(@DrawableRes lightDrawable: Int, @DrawableRes darkDrawable: Int) = if (lightTheme) lightDrawable else darkDrawable
- return SplashCarouselState(listOf(
- SplashCarouselState.Item(
- R.string.ftue_auth_carousel_secure_title.colorTerminatingFullStop(R.attr.colorAccent),
- R.string.ftue_auth_carousel_secure_body,
- hero(R.drawable.ic_splash_conversations, R.drawable.ic_splash_conversations_dark),
- background(R.drawable.bg_carousel_page_1)
- ),
- SplashCarouselState.Item(
- R.string.ftue_auth_carousel_control_title.colorTerminatingFullStop(R.attr.colorAccent),
- R.string.ftue_auth_carousel_control_body,
- hero(R.drawable.ic_splash_control, R.drawable.ic_splash_control_dark),
- background(R.drawable.bg_carousel_page_2)
- ),
- SplashCarouselState.Item(
- R.string.ftue_auth_carousel_encrypted_title.colorTerminatingFullStop(R.attr.colorAccent),
- R.string.ftue_auth_carousel_encrypted_body,
- hero(R.drawable.ic_splash_secure, R.drawable.ic_splash_secure_dark),
- background(R.drawable.bg_carousel_page_3)
- ),
- SplashCarouselState.Item(
- collaborationTitle().colorTerminatingFullStop(R.attr.colorAccent),
- R.string.ftue_auth_carousel_workplace_body,
- hero(R.drawable.ic_splash_collaboration, R.drawable.ic_splash_collaboration_dark),
- background(R.drawable.bg_carousel_page_4)
+ return SplashCarouselState(
+ listOf(
+ SplashCarouselState.Item(
+ R.string.ftue_auth_carousel_secure_title.colorTerminatingFullStop(R.attr.colorAccent),
+ R.string.ftue_auth_carousel_secure_body,
+ hero(R.drawable.ic_splash_conversations, R.drawable.ic_splash_conversations_dark),
+ background(R.drawable.bg_carousel_page_1)
+ ),
+ SplashCarouselState.Item(
+ R.string.ftue_auth_carousel_control_title.colorTerminatingFullStop(R.attr.colorAccent),
+ R.string.ftue_auth_carousel_control_body,
+ hero(R.drawable.ic_splash_control, R.drawable.ic_splash_control_dark),
+ background(R.drawable.bg_carousel_page_2)
+ ),
+ SplashCarouselState.Item(
+ R.string.ftue_auth_carousel_encrypted_title.colorTerminatingFullStop(R.attr.colorAccent),
+ R.string.ftue_auth_carousel_encrypted_body,
+ hero(R.drawable.ic_splash_secure, R.drawable.ic_splash_secure_dark),
+ background(R.drawable.bg_carousel_page_3)
+ ),
+ SplashCarouselState.Item(
+ collaborationTitle().colorTerminatingFullStop(R.attr.colorAccent),
+ R.string.ftue_auth_carousel_workplace_body,
+ hero(R.drawable.ic_splash_collaboration, R.drawable.ic_splash_collaboration_dark),
+ background(R.drawable.bg_carousel_page_4)
+ )
)
- ))
+ )
}
private fun collaborationTitle(): Int {
diff --git a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
index 26ff35cdbd..74b696510f 100644
--- a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
@@ -219,7 +219,8 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
displayName = roomSummary.displayName,
avatarUrl = roomSummary.avatarUrl,
roomEncryptionTrustLevel = roomSummary.roomEncryptionTrustLevel,
- rootThreadEventId = rootThreadEventId)
+ rootThreadEventId = rootThreadEventId
+ )
navigator.openThread(context, threadTimelineArgs, eventId)
} else {
navigator.openRoom(context, roomId, eventId, buildTask)
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
index f0edf6fd57..350dd13b22 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
@@ -176,16 +176,22 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
if (!reason.isNullOrEmpty()) {
when (reportType) {
ReportType.BUG_REPORT -> {
- Toast.makeText(this@BugReportActivity,
- getString(R.string.send_bug_report_failed, reason), Toast.LENGTH_LONG).show()
+ Toast.makeText(
+ this@BugReportActivity,
+ getString(R.string.send_bug_report_failed, reason), Toast.LENGTH_LONG
+ ).show()
}
ReportType.SUGGESTION -> {
- Toast.makeText(this@BugReportActivity,
- getString(R.string.send_suggestion_failed, reason), Toast.LENGTH_LONG).show()
+ Toast.makeText(
+ this@BugReportActivity,
+ getString(R.string.send_suggestion_failed, reason), Toast.LENGTH_LONG
+ ).show()
}
ReportType.SPACE_BETA_FEEDBACK -> {
- Toast.makeText(this@BugReportActivity,
- getString(R.string.feedback_failed, reason), Toast.LENGTH_LONG).show()
+ Toast.makeText(
+ this@BugReportActivity,
+ getString(R.string.feedback_failed, reason), Toast.LENGTH_LONG
+ ).show()
}
else -> {
// nop
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index 8b514f4003..f723a281a0 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -111,7 +111,8 @@ class BugReporter @Inject constructor(
private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
- private val LOGCAT_CMD_ERROR = arrayOf("logcat", // /< Run 'logcat' command
+ private val LOGCAT_CMD_ERROR = arrayOf(
+ "logcat", // /< Run 'logcat' command
"-d", // /< Dump the log rather than continue outputting it
"-v", // formatting
"threadtime", // include timestamps
@@ -278,8 +279,10 @@ class BugReporter @Inject constructor(
.addFormDataPart("device", Build.MODEL.trim())
.addFormDataPart("verbose_log", vectorPreferences.labAllowedExtendedLogging().toOnOff())
.addFormDataPart("multi_window", inMultiWindowMode.toOnOff())
- .addFormDataPart("os", Build.VERSION.RELEASE + " (API " + Build.VERSION.SDK_INT + ") " +
- Build.VERSION.INCREMENTAL + "-" + Build.VERSION.CODENAME)
+ .addFormDataPart(
+ "os", Build.VERSION.RELEASE + " (API " + Build.VERSION.SDK_INT + ") " +
+ Build.VERSION.INCREMENTAL + "-" + Build.VERSION.CODENAME
+ )
.addFormDataPart("locale", Locale.getDefault().toString())
.addFormDataPart("app_language", VectorLocale.applicationLocale.toString())
.addFormDataPart("default_app_language", systemLocaleProvider.getSystemLocale().toString())
@@ -317,8 +320,10 @@ class BugReporter @Inject constructor(
bitmap.compress(Bitmap.CompressFormat.PNG, 100, it)
}
- builder.addFormDataPart("file",
- logCatScreenshotFile.name, logCatScreenshotFile.asRequestBody(MimeTypes.OctetStream.toMediaTypeOrNull()))
+ builder.addFormDataPart(
+ "file",
+ logCatScreenshotFile.name, logCatScreenshotFile.asRequestBody(MimeTypes.OctetStream.toMediaTypeOrNull())
+ )
} catch (e: Exception) {
Timber.e(e, "## sendBugReport() : fail to write screenshot$e")
}
@@ -494,11 +499,13 @@ class BugReporter @Inject constructor(
// app: Identifier for the application (eg 'riot-web').
// Should correspond to a mapping configured in the configuration file for github issue reporting to work.
// (see R.string.bug_report_url for configured RS server)
- return context.getString(when (reportType) {
- ReportType.AUTO_UISI_SENDER,
- ReportType.AUTO_UISI -> R.string.bug_report_auto_uisi_app_name
- else -> R.string.bug_report_app_name
- })
+ return context.getString(
+ when (reportType) {
+ ReportType.AUTO_UISI_SENDER,
+ ReportType.AUTO_UISI -> R.string.bug_report_auto_uisi_app_name
+ else -> R.string.bug_report_app_name
+ }
+ )
}
// ==============================================================================================================
// crash report management
diff --git a/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
index c9283c663a..7b0052db0b 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
@@ -126,10 +126,12 @@ class DotsView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
this.currentDotSize2 = maxDotSize
} else if (currentProgress < 0.5) {
this.currentDotSize2 = CircleView.mapValueFromRangeToRange(
- currentProgress, 0.2f, 0.5f, maxDotSize, 0.3f * maxDotSize)
+ currentProgress, 0.2f, 0.5f, maxDotSize, 0.3f * maxDotSize
+ )
} else {
this.currentDotSize2 = CircleView.mapValueFromRangeToRange(
- currentProgress, 0.5f, 1f, maxDotSize * 0.3f, 0f)
+ currentProgress, 0.5f, 1f, maxDotSize * 0.3f, 0f
+ )
}
}
@@ -143,17 +145,20 @@ class DotsView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
private fun updateOuterDotsPosition() {
if (currentProgress < 0.3f) {
this.currentRadius1 = CircleView.mapValueFromRangeToRange(
- currentProgress, 0.0f, 0.3f, 0f, maxOuterDotsRadius * 0.8f)
+ currentProgress, 0.0f, 0.3f, 0f, maxOuterDotsRadius * 0.8f
+ )
} else {
this.currentRadius1 = CircleView.mapValueFromRangeToRange(
- currentProgress, 0.3f, 1f, 0.8f * maxOuterDotsRadius, maxOuterDotsRadius)
+ currentProgress, 0.3f, 1f, 0.8f * maxOuterDotsRadius, maxOuterDotsRadius
+ )
}
if (currentProgress < 0.7) {
this.currentDotSize1 = maxDotSize
} else {
this.currentDotSize1 = CircleView.mapValueFromRangeToRange(
- currentProgress, 0.7f, 1f, maxDotSize, 0f)
+ currentProgress, 0.7f, 1f, maxDotSize, 0f
+ )
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index e8540a6974..b2bfc53f96 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -166,7 +166,8 @@ class RoomDirectoryViewModel @AssistedInject constructor(
currentJob = viewModelScope.launch {
val data = try {
- session.roomDirectoryService().getPublicRooms(roomDirectoryData.homeServer,
+ session.roomDirectoryService().getPublicRooms(
+ roomDirectoryData.homeServer,
PublicRoomsParams(
limit = PUBLIC_ROOMS_LIMIT,
filter = PublicRoomsFilter(searchTerm = filter),
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
index e4c350b88e..d5ea954b64 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
@@ -87,12 +87,14 @@ class CreateRoomActivity : VectorBaseActivity<ActivitySimpleBinding>() {
openAfterCreate: Boolean = true,
currentSpaceId: String? = null): Intent {
return Intent(context, CreateRoomActivity::class.java).apply {
- putExtra(Mavericks.KEY_ARG, CreateRoomArgs(
+ putExtra(
+ Mavericks.KEY_ARG, CreateRoomArgs(
initialName = initialName,
isSpace = isSpace,
openAfterCreate = openAfterCreate,
parentSpaceId = currentSpaceId
- ))
+ )
+ )
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
index 7dd9cb4e00..71c83946d0 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
@@ -94,7 +94,7 @@ class CreateRoomController @Inject constructor(
}
when (viewState.roomJoinRules) {
- RoomJoinRules.INVITE -> {
+ RoomJoinRules.INVITE -> {
buildProfileAction(
id = "joinRule",
title = stringProvider.getString(R.string.room_settings_room_access_private_title),
@@ -104,7 +104,7 @@ class CreateRoomController @Inject constructor(
action = { host.listener?.selectVisibility() }
)
}
- RoomJoinRules.PUBLIC -> {
+ RoomJoinRules.PUBLIC -> {
buildProfileAction(
id = "joinRule",
title = stringProvider.getString(R.string.room_settings_room_access_public_title),
@@ -124,7 +124,7 @@ class CreateRoomController @Inject constructor(
action = { host.listener?.selectVisibility() }
)
}
- else -> {
+ else -> {
// not yet supported
}
}
@@ -146,7 +146,8 @@ class CreateRoomController @Inject constructor(
hint(host.stringProvider.getString(R.string.room_alias_address_hint))
errorMessage(
host.roomAliasErrorFormatter.format(
- (((viewState.asyncCreateRoomRequest as? Fail)?.error) as? CreateRoomFailure.AliasError)?.aliasError)
+ (((viewState.asyncCreateRoomRequest as? Fail)?.error) as? CreateRoomFailure.AliasError)?.aliasError
+ )
)
onTextChange { value ->
host.listener?.setAliasLocalPart(value)
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt
index e67b272c32..07f35956d7 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt
@@ -86,7 +86,8 @@ class CreateSubSpaceController @Inject constructor(
maxLength(MatrixConstants.maxAliasLocalPartLength(data.homeServerName))
errorMessage(
host.roomAliasErrorFormatter.format(
- (((data.asyncCreateRoomRequest as? Fail)?.error) as? CreateRoomFailure.AliasError)?.aliasError)
+ (((data.asyncCreateRoomRequest as? Fail)?.error) as? CreateRoomFailure.AliasError)?.aliasError
+ )
)
onTextChange { value ->
host.listener?.setAliasLocalPart(value)
@@ -111,7 +112,7 @@ class CreateSubSpaceController @Inject constructor(
}
when (data.roomJoinRules) {
- RoomJoinRules.INVITE -> {
+ RoomJoinRules.INVITE -> {
buildProfileAction(
id = "joinRule",
title = stringProvider.getString(R.string.room_settings_room_access_private_title),
@@ -121,7 +122,7 @@ class CreateSubSpaceController @Inject constructor(
action = { host.listener?.selectVisibility() }
)
}
- RoomJoinRules.PUBLIC -> {
+ RoomJoinRules.PUBLIC -> {
buildProfileAction(
id = "joinRule",
title = stringProvider.getString(R.string.room_settings_room_access_public_title),
@@ -141,7 +142,7 @@ class CreateSubSpaceController @Inject constructor(
action = { host.listener?.selectVisibility() }
)
}
- else -> {
+ else -> {
// not yet supported
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
index 7d121d1ff4..8c2eec86ae 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
@@ -135,7 +135,7 @@ class RoomDirectoryPickerController @Inject constructor(
}
when (data.addServerAsync) {
Uninitialized,
- is Fail -> settingsContinueCancelItem {
+ is Fail -> settingsContinueCancelItem {
id("continueCancel")
continueText(host.stringProvider.getString(R.string.ok))
canContinue(data.enteredServer.isNotEmpty())
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
index 545e9f7190..5b6bf85a77 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
@@ -276,7 +276,7 @@ class RoomMemberProfileController @Inject constructor(
if (canKick) {
when (membership) {
- Membership.JOIN -> {
+ Membership.JOIN -> {
buildProfileAction(
id = "kick",
editable = false,
@@ -296,7 +296,7 @@ class RoomMemberProfileController @Inject constructor(
action = { callback?.onCancelInviteClicked() }
)
}
- else -> Unit
+ else -> Unit
}
}
if (canBan) {
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
index 760bbe9353..032ab74153 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@@ -111,7 +111,8 @@ class RoomMemberProfileFragment @Inject constructor(
headerViews.memberProfileStateView.contentView = headerViews.memberProfileInfoContainer
views.matrixProfileRecyclerView.configureWith(roomMemberProfileController, hasFixedSize = true, disableItemAnimation = true)
roomMemberProfileController.callback = this
- appBarStateChangeListener = MatrixItemAppBarStateChangeListener(headerView,
+ appBarStateChangeListener = MatrixItemAppBarStateChangeListener(
+ headerView,
listOf(
views.matrixProfileToolbarAvatarImageView,
views.matrixProfileToolbarTitleView,
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
index 6d4ea45bac..fb1e222080 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
@@ -242,10 +242,12 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
if (state.isRoomEncrypted) {
if (!state.isMine && state.userMXCrossSigningInfo?.isTrusted() == false) {
// ok, let's find or create the DM room
- _viewEvents.post(RoomMemberProfileViewEvents.StartVerification(
- userId = state.userId,
- canCrossSign = session.cryptoService().crossSigningService().canCrossSign()
- ))
+ _viewEvents.post(
+ RoomMemberProfileViewEvents.StartVerification(
+ userId = state.userId,
+ canCrossSign = session.cryptoService().crossSigningService().canCrossSign()
+ )
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
index 8df0b3ffd5..35f431db1d 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
@@ -96,7 +96,8 @@ class DeviceListBottomSheet :
private fun showFragment(fragmentClass: KClass<out Fragment>, bundle: Bundle) {
if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
childFragmentManager.commitTransaction {
- replace(R.id.bottomSheetFragmentContainer,
+ replace(
+ R.id.bottomSheetFragmentContainer,
fragmentClass.java,
bundle,
fragmentClass.simpleName
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
index c3991cef99..0e25ec5f8f 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
@@ -65,14 +65,22 @@ class DeviceTrustInfoEpoxyController @Inject constructor(private val stringProvi
apply {
if (isVerified) {
// TODO FORMAT
- text(host.stringProvider.getString(R.string.verification_profile_device_verified_because,
- data.userItem?.displayName ?: "",
- data.userItem?.id ?: "").toEpoxyCharSequence())
+ text(
+ host.stringProvider.getString(
+ R.string.verification_profile_device_verified_because,
+ data.userItem?.displayName ?: "",
+ data.userItem?.id ?: ""
+ ).toEpoxyCharSequence()
+ )
} else {
// TODO what if mine
- text(host.stringProvider.getString(R.string.verification_profile_device_new_signing,
- data.userItem?.displayName ?: "",
- data.userItem?.id ?: "").toEpoxyCharSequence())
+ text(
+ host.stringProvider.getString(
+ R.string.verification_profile_device_new_signing,
+ data.userItem?.displayName ?: "",
+ data.userItem?.id ?: ""
+ ).toEpoxyCharSequence()
+ )
}
}
// text(stringProvider.getString(R.string.verification_profile_device_untrust_info))
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 372b4e5a70..06f56bff89 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -179,11 +179,13 @@ class RoomProfileController @Inject constructor(
buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
buildProfileAction(
id = "settings",
- title = stringProvider.getString(if (roomSummary.isDirect) {
- R.string.direct_room_profile_section_more_settings
- } else {
- R.string.room_profile_section_more_settings
- }),
+ title = stringProvider.getString(
+ if (roomSummary.isDirect) {
+ R.string.direct_room_profile_section_more_settings
+ } else {
+ R.string.room_profile_section_more_settings
+ }
+ ),
icon = R.drawable.ic_room_profile_settings,
action = { callback?.onSettingsClicked() }
)
@@ -228,11 +230,13 @@ class RoomProfileController @Inject constructor(
}
buildProfileAction(
id = "leave",
- title = stringProvider.getString(if (roomSummary.isDirect) {
- R.string.direct_room_profile_section_more_leave
- } else {
- R.string.room_profile_section_more_leave
- }),
+ title = stringProvider.getString(
+ if (roomSummary.isDirect) {
+ R.string.direct_room_profile_section_more_leave
+ } else {
+ R.string.room_profile_section_more_leave
+ }
+ ),
divider = false,
destructive = true,
icon = R.drawable.ic_room_actions_leave,
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index 3944066584..7be92bfdcf 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -113,9 +113,11 @@ class RoomProfileFragment @Inject constructor(
setupRecyclerView()
appBarStateChangeListener = MatrixItemAppBarStateChangeListener(
headerView,
- listOf(views.matrixProfileToolbarAvatarImageView,
+ listOf(
+ views.matrixProfileToolbarAvatarImageView,
views.matrixProfileToolbarTitleView,
- views.matrixProfileDecorationToolbarAvatarImageView)
+ views.matrixProfileDecorationToolbarAvatarImageView
+ )
)
views.matrixProfileAppBarLayout.addOnOffsetChangedListener(appBarStateChangeListener)
roomProfileViewModel.observeViewEvents {
@@ -269,11 +271,13 @@ class RoomProfileFragment @Inject constructor(
override fun createShortcut() {
// Ask the view model to prepare it...
roomProfileViewModel.handle(RoomProfileAction.CreateShortcut)
- analyticsTracker.capture(Interaction(
- index = null,
- interactionType = null,
- name = Interaction.Name.MobileRoomAddHome
- ))
+ analyticsTracker.capture(
+ Interaction(
+ index = null,
+ interactionType = null,
+ name = Interaction.Name.MobileRoomAddHome
+ )
+ )
}
private fun addShortcut(onShortcutReady: RoomProfileViewEvents.OnShortcutReady) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
index ec770f5af4..1428dc0cf0 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
@@ -191,11 +191,13 @@ class RoomProfileViewModel @AssistedInject constructor(
viewModelScope.launch {
try {
session.roomService().leaveRoom(room.roomId)
- analyticsTracker.capture(Interaction(
- index = null,
- interactionType = null,
- name = Interaction.Name.MobileRoomLeave
- ))
+ analyticsTracker.capture(
+ Interaction(
+ index = null,
+ interactionType = null,
+ name = Interaction.Name.MobileRoomLeave
+ )
+ )
// Do nothing, we will be closing the room automatically when it will get back from sync
} catch (failure: Throwable) {
_viewEvents.post(RoomProfileViewEvents.Failure(failure))
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
index fcf6bc3a47..3db1e384bc 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
@@ -98,8 +98,12 @@ class RoomAliasController @Inject constructor(
is Fail -> {
errorWithRetryItem {
id("rd_error")
- text(host.stringProvider.getString(R.string.room_alias_publish_to_directory_error,
- host.errorFormatter.toHumanReadable(data.roomDirectoryVisibility.error)))
+ text(
+ host.stringProvider.getString(
+ R.string.room_alias_publish_to_directory_error,
+ host.errorFormatter.toHumanReadable(data.roomDirectoryVisibility.error)
+ )
+ )
listener { host.callback?.retry() }
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheet.kt
index 56dbcbfba4..6e4613c03c 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheet.kt
@@ -92,13 +92,15 @@ class RoomAliasBottomSheet :
isLocal: Boolean,
canEditCanonicalAlias: Boolean): RoomAliasBottomSheet {
return RoomAliasBottomSheet().apply {
- setArguments(RoomAliasBottomSheetArgs(
- alias = alias,
- isPublished = isPublished,
- isMainAlias = isMainAlias,
- isLocal = isLocal,
- canEditCanonicalAlias = canEditCanonicalAlias
- ))
+ setArguments(
+ RoomAliasBottomSheetArgs(
+ alias = alias,
+ isPublished = isPublished,
+ isMainAlias = isMainAlias,
+ isLocal = isLocal,
+ canEditCanonicalAlias = canEditCanonicalAlias
+ )
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index c1e97f0416..951e3e1dcd 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -79,7 +79,7 @@ class RoomMemberListFragment @Inject constructor(
object : RecyclerView.OnScrollListener() {
override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
when (newState) {
- RecyclerView.SCROLL_STATE_IDLE -> {
+ RecyclerView.SCROLL_STATE_IDLE -> {
if (withState(viewModel) { it.actionsPermissions.canInvite }) {
views.inviteUsersButton.show()
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
index 9590d1bbc3..fffae6159c 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
@@ -132,12 +132,15 @@ class RoomPermissionsController @Inject constructor(
settingsInfoItem {
id("notice")
- helperText(host.stringProvider.getString(
- if (editable) {
- if (isSpace) R.string.space_permissions_notice else R.string.room_permissions_notice
- } else {
- if (isSpace) R.string.space_permissions_notice_read_only else R.string.room_permissions_notice_read_only
- }))
+ helperText(
+ host.stringProvider.getString(
+ if (editable) {
+ if (isSpace) R.string.space_permissions_notice else R.string.room_permissions_notice
+ } else {
+ if (isSpace) R.string.space_permissions_notice_read_only else R.string.room_permissions_notice_read_only
+ }
+ )
+ )
}
// Useful permissions
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt
index e387cca004..b808196515 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt
@@ -88,7 +88,7 @@ class RoomPermissionsViewModel @AssistedInject constructor(@Assisted initialStat
override fun handle(action: RoomPermissionsAction) {
when (action) {
- is RoomPermissionsAction.UpdatePermission -> updatePermission(action)
+ is RoomPermissionsAction.UpdatePermission -> updatePermission(action)
RoomPermissionsAction.ToggleShowAllPermissions -> toggleShowAllPermissions()
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index 2cbe75ae56..ee04d22ddc 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -90,12 +90,13 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
RoomSettingsViewState::newTopic,
RoomSettingsViewState::newHistoryVisibility,
RoomSettingsViewState::newRoomJoinRules,
- RoomSettingsViewState::roomSummary) { avatarAction,
- newName,
- newTopic,
- newHistoryVisibility,
- newJoinRule,
- asyncSummary ->
+ RoomSettingsViewState::roomSummary
+ ) { avatarAction,
+ newName,
+ newTopic,
+ newHistoryVisibility,
+ newJoinRule,
+ asyncSummary ->
val summary = asyncSummary()
setState {
copy(
@@ -130,14 +131,22 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
canChangeAvatar = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_AVATAR),
canChangeName = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_NAME),
canChangeTopic = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_TOPIC),
- canChangeHistoryVisibility = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
- EventType.STATE_ROOM_HISTORY_VISIBILITY),
- canChangeJoinRule = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
- EventType.STATE_ROOM_JOIN_RULES) &&
- powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
- EventType.STATE_ROOM_GUEST_ACCESS),
- canAddChildren = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
- EventType.STATE_SPACE_CHILD)
+ canChangeHistoryVisibility = powerLevelsHelper.isUserAllowedToSend(
+ session.myUserId, true,
+ EventType.STATE_ROOM_HISTORY_VISIBILITY
+ ),
+ canChangeJoinRule = powerLevelsHelper.isUserAllowedToSend(
+ session.myUserId, true,
+ EventType.STATE_ROOM_JOIN_RULES
+ ) &&
+ powerLevelsHelper.isUserAllowedToSend(
+ session.myUserId, true,
+ EventType.STATE_ROOM_GUEST_ACCESS
+ ),
+ canAddChildren = powerLevelsHelper.isUserAllowedToSend(
+ session.myUserId, true,
+ EventType.STATE_SPACE_CHILD
+ )
)
setState {
copy(actionPermissions = permissions)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt
index 7099d30862..d6e74c546d 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt
@@ -121,7 +121,8 @@ class RoomJoinRuleActivity : VectorBaseActivity<ActivitySimpleBinding>() {
supportFragmentManager.commitTransaction {
setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
val tag = RoomJoinRuleChooseRestrictedFragment::class.simpleName
- replace(views.simpleFragmentContainer.id,
+ replace(
+ views.simpleFragmentContainer.id,
RoomJoinRuleChooseRestrictedFragment::class.java,
this@RoomJoinRuleActivity.roomProfileArgs.toMvRxBundle(),
tag
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
index 5edca79699..9ea6fd2dc2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
@@ -117,7 +117,8 @@ class RoomUploadsViewModel @AssistedInject constructor(
viewModelScope.launch {
val event = try {
val file = session.fileService().downloadFile(
- messageContent = action.uploadEvent.contentWithAttachmentContent)
+ messageContent = action.uploadEvent.contentWithAttachmentContent
+ )
RoomUploadsViewEvents.FileReadyForSharing(file)
} catch (failure: Throwable) {
RoomUploadsViewEvents.Failure(failure)
@@ -130,7 +131,8 @@ class RoomUploadsViewModel @AssistedInject constructor(
viewModelScope.launch {
val event = try {
val file = session.fileService().downloadFile(
- messageContent = action.uploadEvent.contentWithAttachmentContent)
+ messageContent = action.uploadEvent.contentWithAttachmentContent
+ )
RoomUploadsViewEvents.FileReadyForSaving(file, action.uploadEvent.contentWithAttachmentContent.body)
} catch (failure: Throwable) {
RoomUploadsViewEvents.Failure(failure)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt
index 4d45c2ccfc..b741b5c652 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt
@@ -68,9 +68,13 @@ class UploadsFileController @Inject constructor(
uploadsFileItem {
id(uploadEvent.eventId)
title(uploadEvent.contentWithAttachmentContent.body)
- subtitle(host.stringProvider.getString(R.string.uploads_files_subtitle,
- uploadEvent.senderInfo.disambiguatedDisplayName,
- host.dateFormatter.format(uploadEvent.root.originServerTs, DateFormatKind.DEFAULT_DATE_AND_TIME)))
+ subtitle(
+ host.stringProvider.getString(
+ R.string.uploads_files_subtitle,
+ uploadEvent.senderInfo.disambiguatedDisplayName,
+ host.dateFormatter.format(uploadEvent.root.originServerTs, DateFormatKind.DEFAULT_DATE_AND_TIME)
+ )
+ )
listener(object : UploadsFileItem.Listener {
override fun onItemClicked() {
host.listener?.onOpenClicked(uploadEvent)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
index f558ba28c6..1c67b86493 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
@@ -62,7 +62,8 @@ object VectorLocale {
val preferences = DefaultSharedPreferences.getInstance(context)
if (preferences.contains(APPLICATION_LOCALE_LANGUAGE_KEY)) {
- applicationLocale = Locale(preferences.getString(APPLICATION_LOCALE_LANGUAGE_KEY, "")!!,
+ applicationLocale = Locale(
+ preferences.getString(APPLICATION_LOCALE_LANGUAGE_KEY, "")!!,
preferences.getString(APPLICATION_LOCALE_COUNTRY_KEY, "")!!,
preferences.getString(APPLICATION_LOCALE_VARIANT_KEY, "")!!
)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
index 725c4ceabc..dddda261cd 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
@@ -77,10 +77,12 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
SettingsActivityPayload.SecurityPrivacy ->
replaceFragment(views.vectorSettingsPage, VectorSettingsSecurityPrivacyFragment::class.java, null, FRAGMENT_TAG)
SettingsActivityPayload.SecurityPrivacyManageSessions ->
- replaceFragment(views.vectorSettingsPage,
+ replaceFragment(
+ views.vectorSettingsPage,
VectorSettingsDevicesFragment::class.java,
null,
- FRAGMENT_TAG)
+ FRAGMENT_TAG
+ )
SettingsActivityPayload.Notifications -> {
requestHighlightPreferenceKeyOnResume(VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)
replaceFragment(views.vectorSettingsPage, VectorSettingsNotificationPreferenceFragment::class.java, null, FRAGMENT_TAG)
@@ -161,7 +163,8 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
}
companion object {
- fun getIntent(context: Context, directAccess: Int) = Companion.getIntent(context, when (directAccess) {
+ fun getIntent(context: Context, directAccess: Int) = Companion.getIntent(
+ context, when (directAccess) {
EXTRA_DIRECT_ACCESS_ROOT -> SettingsActivityPayload.Root
EXTRA_DIRECT_ACCESS_ADVANCED_SETTINGS -> SettingsActivityPayload.AdvancedSettings
EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY -> SettingsActivityPayload.SecurityPrivacy
@@ -173,7 +176,8 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
Timber.w("Unknown directAccess: $directAccess defaulting to Root")
SettingsActivityPayload.Root
}
- })
+ }
+ )
fun getIntent(context: Context, payload: SettingsActivityPayload) = Intent(context, VectorSettingsActivity::class.java)
.applyPayload(payload)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
index af9ac52d1e..5033400425 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
@@ -147,8 +147,10 @@ class VectorSettingsPreferencesFragment @Inject constructor(
it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
context?.let { context: Context ->
MaterialAlertDialogBuilder(context)
- .setSingleChoiceItems(R.array.media_saving_choice,
- vectorPreferences.getSelectedMediasSavingPeriod()) { d, n ->
+ .setSingleChoiceItems(
+ R.array.media_saving_choice,
+ vectorPreferences.getSelectedMediasSavingPeriod()
+ ) { d, n ->
vectorPreferences.setSelectedMediasSavingPeriod(n)
d.cancel()
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index 70ed3f441e..bd4f556461 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -275,13 +275,17 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
refreshXSigningStatus()
secureBackupPreference.icon = activity?.let {
- ThemeUtils.tintDrawable(it,
- ContextCompat.getDrawable(it, R.drawable.ic_secure_backup)!!, R.attr.vctr_content_primary)
+ ThemeUtils.tintDrawable(
+ it,
+ ContextCompat.getDrawable(it, R.drawable.ic_secure_backup)!!, R.attr.vctr_content_primary
+ )
}
ignoredUsersPreference.icon = activity?.let {
- ThemeUtils.tintDrawable(it,
- ContextCompat.getDrawable(it, R.drawable.ic_settings_root_ignored_users)!!, R.attr.vctr_content_primary)
+ ThemeUtils.tintDrawable(
+ it,
+ ContextCompat.getDrawable(it, R.drawable.ic_settings_root_ignored_users)!!, R.attr.vctr_content_primary
+ )
}
findPreference<VectorPreference>(VectorPreferences.SETTINGS_CRYPTOGRAPHY_HS_ADMIN_DISABLED_E2E_DEFAULT)?.let {
@@ -398,7 +402,8 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
navigator.openPinCode(
requireContext(),
pinActivityResultLauncher,
- PinMode.AUTH)
+ PinMode.AUTH
+ )
} else {
doOpenPinCodePreferenceScreen()
}
@@ -512,10 +517,14 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
if (data != null) {
MaterialAlertDialogBuilder(thisActivity)
- .setMessage(resources.getQuantityString(R.plurals.encryption_import_room_keys_success,
- data.successfullyNumberOfImportedKeys,
- data.successfullyNumberOfImportedKeys,
- data.totalNumberOfKeys))
+ .setMessage(
+ resources.getQuantityString(
+ R.plurals.encryption_import_room_keys_success,
+ data.successfullyNumberOfImportedKeys,
+ data.successfullyNumberOfImportedKeys,
+ data.totalNumberOfKeys
+ )
+ )
.setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
.show()
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt
index ea182e7d6b..56c1fccb06 100644
--- a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt
@@ -95,8 +95,10 @@ class DeactivateAccountFragment @Inject constructor() : VectorBaseFragment<Fragm
private fun setupViewListeners() {
views.deactivateAccountSubmit.debouncedClicks {
- viewModel.handle(DeactivateAccountAction.DeactivateAccount(
- views.deactivateAccountEraseCheckbox.isChecked)
+ viewModel.handle(
+ DeactivateAccountAction.DeactivateAccount(
+ views.deactivateAccountEraseCheckbox.isChecked
+ )
)
}
}
@@ -123,7 +125,8 @@ class DeactivateAccountFragment @Inject constructor() : VectorBaseFragment<Fragm
MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCredentials = true, isAccountDeactivated = true))
}
is DeactivateAccountViewEvents.RequestReAuth -> {
- ReAuthActivity.newIntent(requireContext(),
+ ReAuthActivity.newIntent(
+ requireContext(),
it.registrationFlowResponse,
it.lastErrorCode,
getString(R.string.deactivate_account_title)
diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
index 51ab422935..6df92a0e5c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
@@ -85,10 +85,12 @@ class CrossSigningSettingsFragment @Inject constructor(
Unit
}
is CrossSigningSettingsViewEvents.RequestReAuth -> {
- ReAuthActivity.newIntent(requireContext(),
+ ReAuthActivity.newIntent(
+ requireContext(),
event.registrationFlowResponse,
event.lastErrorCode,
- getString(R.string.initialize_cross_signing)).let { intent ->
+ getString(R.string.initialize_cross_signing)
+ ).let { intent ->
reAuthActivityResultLauncher.launch(intent)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
index 94d6b8ff93..c81064c8d9 100644
--- a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
@@ -110,7 +110,8 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(
uiaContinuation = promise
}
}
- }, it)
+ }, it
+ )
}
} catch (failure: Throwable) {
handleInitializeXSigningError(failure)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
index 8f04534440..648e9b3261 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
@@ -99,9 +99,10 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
style(ItemStyle.BIG_TEXT)
titleIconResourceId(shield)
title(host.stringProvider.getString(R.string.crosssigning_verify_this_session).toEpoxyCharSequence())
- description(host.stringProvider
- .getString(if (data.hasOtherSessions) R.string.confirm_your_identity else R.string.confirm_your_identity_quad_s)
- .toEpoxyCharSequence()
+ description(
+ host.stringProvider
+ .getString(if (data.hasOtherSessions) R.string.confirm_your_identity else R.string.confirm_your_identity_quad_s)
+ .toEpoxyCharSequence()
)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index 4558c4bfb4..e56e08d19e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -244,10 +244,12 @@ class DevicesViewModel @AssistedInject constructor(
val txID = session.cryptoService()
.verificationService()
.beginKeyVerification(VerificationMethod.SAS, session.myUserId, action.deviceId, null)
- _viewEvents.post(DevicesViewEvents.ShowVerifyDevice(
- session.myUserId,
- txID
- ))
+ _viewEvents.post(
+ DevicesViewEvents.ShowVerifyDevice(
+ session.myUserId,
+ txID
+ )
+ )
}
private fun handleShowDeviceCryptoInfo(action: DevicesAction.VerifyMyDeviceManually) = withState { state ->
@@ -274,7 +276,8 @@ class DevicesViewModel @AssistedInject constructor(
session.cryptoService().setDeviceVerification(
DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true),
action.cryptoDeviceInfo.userId,
- action.cryptoDeviceInfo.deviceId)
+ action.cryptoDeviceInfo.deviceId
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
index e897cdccac..6e6556caaa 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
@@ -162,10 +162,12 @@ class VectorSettingsDevicesFragment @Inject constructor(
* Launch the re auth activity to get credentials
*/
private fun askForReAuthentication(reAuthReq: DevicesViewEvents.RequestReAuth) {
- ReAuthActivity.newIntent(requireContext(),
+ ReAuthActivity.newIntent(
+ requireContext(),
reAuthReq.registrationFlowResponse,
reAuthReq.lastErrorCode,
- getString(R.string.devices_delete_dialog_title)).let { intent ->
+ getString(R.string.devices_delete_dialog_title)
+ ).let { intent ->
reAuthActivityResultLauncher.launch(intent)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt
index a11bc9b0cf..8eccc8c593 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt
@@ -57,10 +57,12 @@ class VectorSettingsAdvancedNotificationPreferenceFragment @Inject constructor()
lifecycleScope.launch {
val result = runCatching {
- session.pushRuleService().updatePushRuleActions(ruleAndKind.kind,
+ session.pushRuleService().updatePushRuleActions(
+ ruleAndKind.kind,
ruleAndKind.pushRule.ruleId,
enabled,
- newActions)
+ newActions
+ )
}
if (!isAdded) {
return@launch
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
index fcad0820cc..d0a1bff50c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
@@ -119,10 +119,12 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment :
val results = keywords.map {
runCatching {
withContext(Dispatchers.Default) {
- session.pushRuleService().updatePushRuleActions(RuleKind.CONTENT,
+ session.pushRuleService().updatePushRuleActions(
+ RuleKind.CONTENT,
it,
enabled,
- newActions)
+ newActions
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
index d9cd5b3461..4e75c7ff82 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
@@ -373,9 +373,11 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
// Trick, we must enable this room to disable notifications
lifecycleScope.launch {
try {
- pushRuleService.updatePushRuleEnableStatus(RuleKind.OVERRIDE,
+ pushRuleService.updatePushRuleEnableStatus(
+ RuleKind.OVERRIDE,
it,
- !switchPref.isChecked)
+ !switchPref.isChecked
+ )
// Push rules will be updated from the sync
} catch (failure: Throwable) {
if (!isAdded) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt
index 1381dd79ae..7f856298ea 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt
@@ -58,10 +58,12 @@ abstract class VectorSettingsPushRuleNotificationPreferenceFragment :
lifecycleScope.launch {
val result = runCatching {
- session.pushRuleService().updatePushRuleActions(kind,
+ session.pushRuleService().updatePushRuleActions(
+ kind,
ruleId,
enabled,
- newActions)
+ newActions
+ )
}
hideLoadingView()
if (!isAdded) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
index 172764d87f..d56562a7dd 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
@@ -72,8 +72,10 @@ abstract class PushRuleItem : EpoxyModelWithHolder<PushRuleItem.Holder>() {
val description = StringBuffer()
pushRule.conditions?.forEachIndexed { i, condition ->
if (i > 0) description.append("\n")
- description.append(condition.asExecutableCondition(pushRule)?.technicalDescription()
- ?: "UNSUPPORTED")
+ description.append(
+ condition.asExecutableCondition(pushRule)?.technicalDescription()
+ ?: "UNSUPPORTED"
+ )
}
if (description.isBlank()) {
holder.description.text = "No Conditions"
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index 2a9db78121..4a3f895c51 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -68,10 +68,12 @@ class ThreePidsSettingsFragment @Inject constructor(
}
private fun askAuthentication(event: ThreePidsSettingsViewEvents.RequestReAuth) {
- ReAuthActivity.newIntent(requireContext(),
+ ReAuthActivity.newIntent(
+ requireContext(),
event.registrationFlowResponse,
event.lastErrorCode,
- getString(R.string.settings_add_email_address)).let { intent ->
+ getString(R.string.settings_add_email_address)
+ ).let { intent ->
reAuthActivityResultLauncher.launch(intent)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index 587337d210..6f26dd2b15 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -210,12 +210,18 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
withState { state ->
val allThreePids = state.threePids.invoke().orEmpty() + state.pendingThreePids.invoke().orEmpty()
if (allThreePids.any { it.value == action.threePid.value }) {
- _viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalArgumentException(stringProvider.getString(
- when (action.threePid) {
- is ThreePid.Email -> R.string.auth_email_already_defined
- is ThreePid.Msisdn -> R.string.auth_msisdn_already_defined
- }
- ))))
+ _viewEvents.post(
+ ThreePidsSettingsViewEvents.Failure(
+ IllegalArgumentException(
+ stringProvider.getString(
+ when (action.threePid) {
+ is ThreePid.Email -> R.string.auth_email_already_defined
+ is ThreePid.Msisdn -> R.string.auth_msisdn_already_defined
+ }
+ )
+ )
+ )
+ )
} else {
viewModelScope.launch {
loadingSuspendable {
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
index 69e3021738..ae57babf9a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
@@ -30,10 +30,12 @@ class TestPushRulesSettings @Inject constructor(private val activeSessionHolder:
TroubleshootTest(R.string.settings_troubleshoot_test_bing_settings_title) {
private val testedRules =
- listOf(RuleIds.RULE_ID_CONTAIN_DISPLAY_NAME,
+ listOf(
+ RuleIds.RULE_ID_CONTAIN_DISPLAY_NAME,
RuleIds.RULE_ID_CONTAIN_USER_NAME,
RuleIds.RULE_ID_ONE_TO_ONE_ROOM,
- RuleIds.RULE_ID_ALL_OTHER_MESSAGES_ROOMS)
+ RuleIds.RULE_ID_ALL_OTHER_MESSAGES_ROOMS
+ )
override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
val session = activeSessionHolder.getSafeActiveSession() ?: return
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
index 9acc81d0c2..d0d5bea536 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
@@ -66,10 +66,12 @@ class SoftLogoutActivity : LoginActivity() {
supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
// And inform the user
- showError(getString(
- R.string.soft_logout_sso_not_same_user_error,
- softLogoutViewEvents.currentUserId,
- softLogoutViewEvents.newUserId)
+ showError(
+ getString(
+ R.string.soft_logout_sso_not_same_user_error,
+ softLogoutViewEvents.currentUserId,
+ softLogoutViewEvents.newUserId
+ )
)
}
is SoftLogoutViewEvents.ClearData -> {
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
index e2f3c14e7d..daca308ac1 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
@@ -74,10 +74,14 @@ class SoftLogoutController @Inject constructor(
}
loginTextItem {
id("signText1")
- text(host.stringProvider.getString(R.string.soft_logout_signin_notice,
- state.homeServerUrl.toReducedUrl(),
- state.userDisplayName,
- state.userId))
+ text(
+ host.stringProvider.getString(
+ R.string.soft_logout_signin_notice,
+ state.homeServerUrl.toReducedUrl(),
+ state.userDisplayName,
+ state.userId
+ )
+ )
}
if (state.hasUnsavedKeys) {
loginTextItem {
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
index 8a682b4b5e..ea08640ab7 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
@@ -59,26 +59,32 @@ class SoftLogoutFragment @Inject constructor(
softLogoutController.update(softLogoutViewState)
when (val mode = softLogoutViewState.asyncHomeServerLoginFlowRequest.invoke()) {
is LoginMode.SsoAndPassword -> {
- loginViewModel.handle(LoginAction.SetupSsoForSessionRecovery(
- softLogoutViewState.homeServerUrl,
- softLogoutViewState.deviceId,
- mode.ssoIdentityProviders
- ))
+ loginViewModel.handle(
+ LoginAction.SetupSsoForSessionRecovery(
+ softLogoutViewState.homeServerUrl,
+ softLogoutViewState.deviceId,
+ mode.ssoIdentityProviders
+ )
+ )
}
is LoginMode.Sso -> {
- loginViewModel.handle(LoginAction.SetupSsoForSessionRecovery(
- softLogoutViewState.homeServerUrl,
- softLogoutViewState.deviceId,
- mode.ssoIdentityProviders
- ))
+ loginViewModel.handle(
+ LoginAction.SetupSsoForSessionRecovery(
+ softLogoutViewState.homeServerUrl,
+ softLogoutViewState.deviceId,
+ mode.ssoIdentityProviders
+ )
+ )
}
LoginMode.Unsupported -> {
// Prepare the loginViewModel for a SSO/login fallback recovery
- loginViewModel.handle(LoginAction.SetupSsoForSessionRecovery(
- softLogoutViewState.homeServerUrl,
- softLogoutViewState.deviceId,
- null
- ))
+ loginViewModel.handle(
+ LoginAction.SetupSsoForSessionRecovery(
+ softLogoutViewState.homeServerUrl,
+ softLogoutViewState.deviceId,
+ null
+ )
+ )
}
else -> Unit
}
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
index 5f31e6b508..1d67f1ec98 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
@@ -159,9 +159,12 @@ class SoftLogoutViewModel @AssistedInject constructor(
withState { softLogoutViewState ->
if (softLogoutViewState.userId != action.credentials.userId) {
Timber.w("User login again with SSO, but using another account")
- _viewEvents.post(SoftLogoutViewEvents.ErrorNotSameUser(
- softLogoutViewState.userId,
- action.credentials.userId))
+ _viewEvents.post(
+ SoftLogoutViewEvents.ErrorNotSameUser(
+ softLogoutViewState.userId,
+ action.credentials.userId
+ )
+ )
} else {
setState {
copy(
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index e8f3702efc..033e2ed667 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -123,7 +123,8 @@ class SpaceCreationActivity : SimpleFragmentActivity() {
val frag = supportFragmentManager.findFragmentByTag(fragmentClass.name) ?: createFragment(fragmentClass)
supportFragmentManager.beginTransaction()
.setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
- .replace(views.container.id,
+ .replace(
+ views.container.id,
frag,
fragmentClass.name
)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
index 680124e091..a46d38349d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
@@ -104,11 +104,13 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), Matrix
MatrixToBottomSheet.withLink(it.link, OriginOfMatrixTo.SPACE_EXPLORE).show(supportFragmentManager, "ShowChild")
}
is SpaceDirectoryViewEvents.NavigateToCreateNewRoom -> {
- createRoomResultLauncher.launch(CreateRoomActivity.getIntent(
- this,
- openAfterCreate = false,
- currentSpaceId = it.currentSpaceId
- ))
+ createRoomResultLauncher.launch(
+ CreateRoomActivity.getIntent(
+ this,
+ openAfterCreate = false,
+ currentSpaceId = it.currentSpaceId
+ )
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index 6cffabd851..cc75fd5b2e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -65,7 +65,8 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
if (hasChildren) {
holder.collapseIndicator.isVisible = true
holder.collapseIndicator.setImageDrawable(
- ContextCompat.getDrawable(holder.view.context,
+ ContextCompat.getDrawable(
+ holder.view.context,
if (expanded) R.drawable.ic_expand_less else R.drawable.ic_expand_more
)
)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
index f50d418de3..201282b113 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
@@ -57,7 +57,8 @@ abstract class SubSpaceSummaryItem : VectorEpoxyModel<SubSpaceSummaryItem.Holder
holder.moreView.onClick(onMore)
holder.collapseIndicator.setImageDrawable(
- ContextCompat.getDrawable(holder.view.context,
+ ContextCompat.getDrawable(
+ holder.view.context,
if (expanded) R.drawable.ic_expand_less else R.drawable.ic_expand_more
)
)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
index b25ae4f2c7..aee405388b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
@@ -102,7 +102,8 @@ class SpaceDetailEpoxyController @Inject constructor(
}
errorMessage(
host.roomAliasErrorFormatter.format(
- (((data.aliasVerificationTask as? Fail)?.error) as? RoomAliasError))
+ (((data.aliasVerificationTask as? Fail)?.error) as? RoomAliasError)
+ )
)
onTextChange(host.aliasTextWatcher)
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index 5993dd2c81..2ddcb42e2a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -111,8 +111,12 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
.onEach {
val powerLevelsHelper = PowerLevelsHelper(it)
setState {
- copy(canAddRooms = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
- EventType.STATE_SPACE_CHILD))
+ copy(
+ canAddRooms = powerLevelsHelper.isUserAllowedToSend(
+ session.myUserId, true,
+ EventType.STATE_SPACE_CHILD
+ )
+ )
}
}
.launchIn(viewModelScope)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
index 93bf51368b..4ca623bd06 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
@@ -101,7 +101,7 @@ class SpaceInviteBottomSheetViewModel @AssistedInject constructor(
override fun handle(action: SpaceInviteBottomSheetAction) {
when (action) {
- SpaceInviteBottomSheetAction.DoJoin -> {
+ SpaceInviteBottomSheetAction.DoJoin -> {
setState { copy(joinActionState = Loading()) }
session.coroutineScope.launch(Dispatchers.IO) {
try {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
index 1fbe9bbbf9..5e6efcc816 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
@@ -150,9 +150,9 @@ class SpacePeopleListController @Inject constructor(
private fun toPowerLevelLabel(categories: RoomMemberListCategories): String? {
return when (categories) {
- RoomMemberListCategories.ADMIN -> stringProvider.getString(R.string.power_level_admin)
+ RoomMemberListCategories.ADMIN -> stringProvider.getString(R.string.power_level_admin)
RoomMemberListCategories.MODERATOR -> stringProvider.getString(R.string.power_level_moderator)
- else -> null
+ else -> null
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
index 3a9b772630..28febdac37 100644
--- a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
@@ -111,7 +111,8 @@ class ReviewTermsViewModel @AssistedInject constructor(
try {
val data = session.termsService().getTerms(termsArgs.type, termsArgs.baseURL)
val terms = data.serverResponse.getLocalizedTerms(action.preferredLanguageCode).map {
- Term(it.localizedUrl ?: "",
+ Term(
+ it.localizedUrl ?: "",
it.localizedName ?: "",
it.version,
accepted = data.alreadyAcceptedTermUrls.contains(it.localizedUrl)
diff --git a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
index e46c3516ca..6693d7436c 100644
--- a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
@@ -50,12 +50,14 @@ class SharedPreferencesUiStateRepository @Inject constructor(
override fun storeDisplayMode(displayMode: RoomListDisplayMode) {
sharedPreferences.edit {
- putInt(KEY_DISPLAY_MODE,
+ putInt(
+ KEY_DISPLAY_MODE,
when (displayMode) {
RoomListDisplayMode.PEOPLE -> VALUE_DISPLAY_MODE_PEOPLE
RoomListDisplayMode.ROOMS -> VALUE_DISPLAY_MODE_ROOMS
else -> VALUE_DISPLAY_MODE_CATCHUP
- })
+ }
+ )
}
}
diff --git a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
index 02955cf2b3..505bbdd2dd 100644
--- a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
@@ -75,11 +75,13 @@ class UserCodeSharedViewModel @AssistedInject constructor(
private fun handleShareByText() {
session.permalinkService().createPermalink(session.myUserId)?.let { permalink ->
val text = stringProvider.getString(R.string.invite_friends_text, permalink)
- _viewEvents.post(UserCodeShareViewEvents.SharePlainText(
- text,
- stringProvider.getString(R.string.invite_friends),
- stringProvider.getString(R.string.invite_friends_rich_title)
- ))
+ _viewEvents.post(
+ UserCodeShareViewEvents.SharePlainText(
+ text,
+ stringProvider.getString(R.string.invite_friends),
+ stringProvider.getString(R.string.invite_friends_rich_title)
+ )
+ )
}
}
diff --git a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt
index 597486491c..264c788315 100644
--- a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt
@@ -59,9 +59,11 @@ class VectorWebViewClient(private val eventListener: WebViewEventListener) : Web
override fun onReceivedHttpError(view: WebView, request: WebResourceRequest, errorResponse: WebResourceResponse) {
super.onReceivedHttpError(view, request, errorResponse)
- eventListener.onHttpError(request.url.toString(),
+ eventListener.onHttpError(
+ request.url.toString(),
errorResponse.statusCode,
- errorResponse.reasonPhrase)
+ errorResponse.reasonPhrase
+ )
}
override fun onReceivedError(view: WebView, errorCode: Int, description: String, failingUrl: String) {
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
index dbd63186b6..cd2a4dcdf4 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
@@ -156,7 +156,8 @@ class WidgetFragment @Inject constructor() :
integrationManagerActivityResultLauncher,
state.roomId,
state.widgetId,
- state.widgetKind.screenId)
+ state.widgetKind.screenId
+ )
return@withState true
}
R.id.action_delete -> {
diff --git a/vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt b/vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt
index 7562dfdf14..abd730707d 100644
--- a/vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt
@@ -52,10 +52,12 @@ class SharedSecureStorageViewModelTest {
val viewModel = createViewModel()
viewModel
.test()
- .assertState(aViewState(
- hasPassphrase = true,
- step = SharedSecureStorageViewState.Step.EnterPassphrase
- ))
+ .assertState(
+ aViewState(
+ hasPassphrase = true,
+ step = SharedSecureStorageViewState.Step.EnterPassphrase
+ )
+ )
.finish()
}
@@ -67,10 +69,12 @@ class SharedSecureStorageViewModelTest {
viewModel
.test()
- .assertState(aViewState(
- hasPassphrase = false,
- step = SharedSecureStorageViewState.Step.EnterKey
- ))
+ .assertState(
+ aViewState(
+ hasPassphrase = false,
+ step = SharedSecureStorageViewState.Step.EnterKey
+ )
+ )
.finish()
}
diff --git a/vector/src/test/java/im/vector/app/features/notifications/NotificationEventQueueTest.kt b/vector/src/test/java/im/vector/app/features/notifications/NotificationEventQueueTest.kt
index e7349b6151..7499a2feae 100644
--- a/vector/src/test/java/im/vector/app/features/notifications/NotificationEventQueueTest.kt
+++ b/vector/src/test/java/im/vector/app/features/notifications/NotificationEventQueueTest.kt
@@ -28,12 +28,14 @@ class NotificationEventQueueTest {
@Test
fun `given events when redacting some then marks matching event ids as redacted`() {
- val queue = givenQueue(listOf(
- aSimpleNotifiableEvent(eventId = "redacted-id-1"),
- aNotifiableMessageEvent(eventId = "redacted-id-2"),
- anInviteNotifiableEvent(eventId = "redacted-id-3"),
- aSimpleNotifiableEvent(eventId = "kept-id"),
- ))
+ val queue = givenQueue(
+ listOf(
+ aSimpleNotifiableEvent(eventId = "redacted-id-1"),
+ aNotifiableMessageEvent(eventId = "redacted-id-2"),
+ anInviteNotifiableEvent(eventId = "redacted-id-3"),
+ aSimpleNotifiableEvent(eventId = "kept-id"),
+ )
+ )
queue.markRedacted(listOf("redacted-id-1", "redacted-id-2", "redacted-id-3"))
@@ -77,10 +79,12 @@ class NotificationEventQueueTest {
@Test
fun `given events when syncing without rooms left or joined ids then does not change the events`() {
- val queue = givenQueue(listOf(
- aNotifiableMessageEvent(roomId = "a-room-id"),
- anInviteNotifiableEvent(roomId = "a-room-id")
- ))
+ val queue = givenQueue(
+ listOf(
+ aNotifiableMessageEvent(roomId = "a-room-id"),
+ anInviteNotifiableEvent(roomId = "a-room-id")
+ )
+ )
queue.syncRoomEvents(roomsLeft = emptyList(), roomsJoined = emptyList())
@@ -189,10 +193,12 @@ class NotificationEventQueueTest {
@Test
fun `when clearing membership notification then removes invite events with matching room id`() {
val roomId = "a-room-id"
- val queue = givenQueue(listOf(
- anInviteNotifiableEvent(roomId = roomId),
- aNotifiableMessageEvent(roomId = roomId)
- ))
+ val queue = givenQueue(
+ listOf(
+ anInviteNotifiableEvent(roomId = roomId),
+ aNotifiableMessageEvent(roomId = roomId)
+ )
+ )
queue.clearMemberShipNotificationForRoom(roomId)
@@ -202,10 +208,12 @@ class NotificationEventQueueTest {
@Test
fun `when clearing messages for room then removes message events with matching room id`() {
val roomId = "a-room-id"
- val queue = givenQueue(listOf(
- anInviteNotifiableEvent(roomId = roomId),
- aNotifiableMessageEvent(roomId = roomId)
- ))
+ val queue = givenQueue(
+ listOf(
+ anInviteNotifiableEvent(roomId = roomId),
+ aNotifiableMessageEvent(roomId = roomId)
+ )
+ )
queue.clearMessagesForRoom(roomId)
diff --git a/vector/src/test/java/im/vector/app/features/notifications/NotificationFactoryTest.kt b/vector/src/test/java/im/vector/app/features/notifications/NotificationFactoryTest.kt
index f0f9a4dbc7..e88f01d4e3 100644
--- a/vector/src/test/java/im/vector/app/features/notifications/NotificationFactoryTest.kt
+++ b/vector/src/test/java/im/vector/app/features/notifications/NotificationFactoryTest.kt
@@ -54,14 +54,16 @@ class NotificationFactoryTest {
val result = roomInvitation.toNotifications(MY_USER_ID)
- result shouldBeEqualTo listOf(OneShotNotification.Append(
- notification = expectedNotification,
- meta = OneShotNotification.Append.Meta(
- key = A_ROOM_ID,
- summaryLine = AN_INVITATION_EVENT.description,
- isNoisy = AN_INVITATION_EVENT.noisy,
- timestamp = AN_INVITATION_EVENT.timestamp
- ))
+ result shouldBeEqualTo listOf(
+ OneShotNotification.Append(
+ notification = expectedNotification,
+ meta = OneShotNotification.Append.Meta(
+ key = A_ROOM_ID,
+ summaryLine = AN_INVITATION_EVENT.description,
+ isNoisy = AN_INVITATION_EVENT.noisy,
+ timestamp = AN_INVITATION_EVENT.timestamp
+ )
+ )
)
}
@@ -71,9 +73,11 @@ class NotificationFactoryTest {
val result = missingEventRoomInvitation.toNotifications(MY_USER_ID)
- result shouldBeEqualTo listOf(OneShotNotification.Removed(
- key = A_ROOM_ID
- ))
+ result shouldBeEqualTo listOf(
+ OneShotNotification.Removed(
+ key = A_ROOM_ID
+ )
+ )
}
@Test
@@ -83,14 +87,16 @@ class NotificationFactoryTest {
val result = roomInvitation.toNotifications(MY_USER_ID)
- result shouldBeEqualTo listOf(OneShotNotification.Append(
- notification = expectedNotification,
- meta = OneShotNotification.Append.Meta(
- key = AN_EVENT_ID,
- summaryLine = A_SIMPLE_EVENT.description,
- isNoisy = A_SIMPLE_EVENT.noisy,
- timestamp = AN_INVITATION_EVENT.timestamp
- ))
+ result shouldBeEqualTo listOf(
+ OneShotNotification.Append(
+ notification = expectedNotification,
+ meta = OneShotNotification.Append.Meta(
+ key = AN_EVENT_ID,
+ summaryLine = A_SIMPLE_EVENT.description,
+ isNoisy = A_SIMPLE_EVENT.noisy,
+ timestamp = AN_INVITATION_EVENT.timestamp
+ )
+ )
)
}
@@ -100,9 +106,11 @@ class NotificationFactoryTest {
val result = missingEventRoomInvitation.toNotifications(MY_USER_ID)
- result shouldBeEqualTo listOf(OneShotNotification.Removed(
- key = AN_EVENT_ID
- ))
+ result shouldBeEqualTo listOf(
+ OneShotNotification.Removed(
+ key = AN_EVENT_ID
+ )
+ )
}
@Test
@@ -123,9 +131,11 @@ class NotificationFactoryTest {
val result = emptyRoom.toNotifications(MY_USER_ID, MY_AVATAR_URL)
- result shouldBeEqualTo listOf(RoomNotification.Removed(
- roomId = A_ROOM_ID
- ))
+ result shouldBeEqualTo listOf(
+ RoomNotification.Removed(
+ roomId = A_ROOM_ID
+ )
+ )
}
@Test
@@ -134,17 +144,23 @@ class NotificationFactoryTest {
val result = redactedRoom.toNotifications(MY_USER_ID, MY_AVATAR_URL)
- result shouldBeEqualTo listOf(RoomNotification.Removed(
- roomId = A_ROOM_ID
- ))
+ result shouldBeEqualTo listOf(
+ RoomNotification.Removed(
+ roomId = A_ROOM_ID
+ )
+ )
}
@Test
- fun `given a room with redacted and non redacted message events when mapping to notification then redacted events are removed`() = testWith(notificationFactory) {
- val roomWithRedactedMessage = mapOf(A_ROOM_ID to listOf(
- ProcessedEvent(Type.KEEP, A_MESSAGE_EVENT.copy(isRedacted = true)),
- ProcessedEvent(Type.KEEP, A_MESSAGE_EVENT.copy(eventId = "not-redacted"))
- ))
+ fun `given a room with redacted and non redacted message events when mapping to notification then redacted events are removed`() = testWith(
+ notificationFactory
+ ) {
+ val roomWithRedactedMessage = mapOf(
+ A_ROOM_ID to listOf(
+ ProcessedEvent(Type.KEEP, A_MESSAGE_EVENT.copy(isRedacted = true)),
+ ProcessedEvent(Type.KEEP, A_MESSAGE_EVENT.copy(eventId = "not-redacted"))
+ )
+ )
val withRedactedRemoved = listOf(A_MESSAGE_EVENT.copy(eventId = "not-redacted"))
val expectedNotification = roomGroupMessageCreator.givenCreatesRoomMessageFor(withRedactedRemoved, A_ROOM_ID, MY_USER_ID, MY_AVATAR_URL)
diff --git a/vector/src/test/java/im/vector/app/features/notifications/NotificationRendererTest.kt b/vector/src/test/java/im/vector/app/features/notifications/NotificationRendererTest.kt
index 6dca0479e7..7bfdfdc40c 100644
--- a/vector/src/test/java/im/vector/app/features/notifications/NotificationRendererTest.kt
+++ b/vector/src/test/java/im/vector/app/features/notifications/NotificationRendererTest.kt
@@ -88,10 +88,14 @@ class NotificationRendererTest {
@Test
fun `given a room message group notification is added when rendering then show the message notification and update summary`() {
- givenNotifications(roomNotifications = listOf(RoomNotification.Message(
- A_NOTIFICATION,
- MESSAGE_META
- )))
+ givenNotifications(
+ roomNotifications = listOf(
+ RoomNotification.Message(
+ A_NOTIFICATION,
+ MESSAGE_META
+ )
+ )
+ )
renderEventsAsNotifications()
@@ -127,10 +131,14 @@ class NotificationRendererTest {
@Test
fun `given a simple notification is added when rendering then show the simple notification and update summary`() {
- givenNotifications(simpleNotifications = listOf(OneShotNotification.Append(
- A_NOTIFICATION,
- ONE_SHOT_META.copy(key = AN_EVENT_ID)
- )))
+ givenNotifications(
+ simpleNotifications = listOf(
+ OneShotNotification.Append(
+ A_NOTIFICATION,
+ ONE_SHOT_META.copy(key = AN_EVENT_ID)
+ )
+ )
+ )
renderEventsAsNotifications()
@@ -166,10 +174,14 @@ class NotificationRendererTest {
@Test
fun `given an invitation notification is added when rendering then show the invitation notification and update summary`() {
- givenNotifications(simpleNotifications = listOf(OneShotNotification.Append(
- A_NOTIFICATION,
- ONE_SHOT_META.copy(key = A_ROOM_ID)
- )))
+ givenNotifications(
+ simpleNotifications = listOf(
+ OneShotNotification.Append(
+ A_NOTIFICATION,
+ ONE_SHOT_META.copy(key = A_ROOM_ID)
+ )
+ )
+ )
renderEventsAsNotifications()
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/DirectLoginUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/DirectLoginUseCaseTest.kt
index 5a3c323316..6021b755f4 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/DirectLoginUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/DirectLoginUseCaseTest.kt
@@ -65,7 +65,11 @@ class DirectLoginUseCaseTest {
@Test
fun `given wellknown fails with content, when logging in directly, then returns success with direct session result`() = runTest {
- fakeAuthenticationService.givenWellKnown(A_LOGIN_OR_REGISTER_ACTION.username, config = NO_HOMESERVER_CONFIG, result = A_WELLKNOWN_FAILED_WITH_CONTENT_RESULT)
+ fakeAuthenticationService.givenWellKnown(
+ A_LOGIN_OR_REGISTER_ACTION.username,
+ config = NO_HOMESERVER_CONFIG,
+ result = A_WELLKNOWN_FAILED_WITH_CONTENT_RESULT
+ )
val (username, password, initialDeviceName) = A_LOGIN_OR_REGISTER_ACTION
fakeAuthenticationService.givenDirectAuthentication(A_FALLBACK_CONFIG, username, password, initialDeviceName, result = fakeSession)
@@ -76,7 +80,11 @@ class DirectLoginUseCaseTest {
@Test
fun `given wellknown fails without content, when logging in directly, then returns well known error`() = runTest {
- fakeAuthenticationService.givenWellKnown(A_LOGIN_OR_REGISTER_ACTION.username, config = NO_HOMESERVER_CONFIG, result = A_WELLKNOWN_FAILED_WITHOUT_CONTENT_RESULT)
+ fakeAuthenticationService.givenWellKnown(
+ A_LOGIN_OR_REGISTER_ACTION.username,
+ config = NO_HOMESERVER_CONFIG,
+ result = A_WELLKNOWN_FAILED_WITHOUT_CONTENT_RESULT
+ )
val (username, password, initialDeviceName) = A_LOGIN_OR_REGISTER_ACTION
fakeAuthenticationService.givenDirectAuthentication(A_FALLBACK_CONFIG, username, password, initialDeviceName, result = fakeSession)
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index 62fc9548b2..c26c73a9a7 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -105,7 +105,14 @@ class OnboardingViewModelTest {
@Test
fun `given supports changing display name, when handling PersonalizeProfile, then emits contents choose display name`() = runTest {
- viewModelWith(initialState.copy(personalizationState = PersonalizationState(supportsChangingDisplayName = true, supportsChangingProfilePicture = false)))
+ viewModelWith(
+ initialState.copy(
+ personalizationState = PersonalizationState(
+ supportsChangingDisplayName = true,
+ supportsChangingProfilePicture = false
+ )
+ )
+ )
val test = viewModel.test()
viewModel.handle(OnboardingAction.PersonalizeProfile)
@@ -117,7 +124,14 @@ class OnboardingViewModelTest {
@Test
fun `given only supports changing profile picture, when handling PersonalizeProfile, then emits contents choose profile picture`() = runTest {
- viewModelWith(initialState.copy(personalizationState = PersonalizationState(supportsChangingDisplayName = false, supportsChangingProfilePicture = true)))
+ viewModelWith(
+ initialState.copy(
+ personalizationState = PersonalizationState(
+ supportsChangingDisplayName = false,
+ supportsChangingProfilePicture = true
+ )
+ )
+ )
val test = viewModel.test()
viewModel.handle(OnboardingAction.PersonalizeProfile)
@@ -473,10 +487,12 @@ class OnboardingViewModelTest {
private fun givenSuccessfulRegistrationForStartAndDummySteps(missingStages: List<Stage>) {
val flowResult = FlowResult(missingStages = missingStages, completedStages = emptyList())
- givenRegistrationResultsFor(listOf(
- A_LOADABLE_REGISTER_ACTION to RegistrationResult.FlowResponse(flowResult),
- RegisterAction.RegisterDummy to RegistrationResult.Success(fakeSession)
- ))
+ givenRegistrationResultsFor(
+ listOf(
+ A_LOADABLE_REGISTER_ACTION to RegistrationResult.FlowResponse(flowResult),
+ RegisterAction.RegisterDummy to RegistrationResult.Success(fakeSession)
+ )
+ )
givenSuccessfullyCreatesAccount(A_HOMESERVER_CAPABILITIES)
}