diff --git a/matrix-sdk-android/gradle-publish.gradle b/matrix-sdk-android/gradle-publish.gradle index eafbdd82a5ab8710e2ce76530b6e82717465cb01..7da05e8afdacdbc4bcb2a0a3b6e7fc5bc1c30bfa 100644 --- a/matrix-sdk-android/gradle-publish.gradle +++ b/matrix-sdk-android/gradle-publish.gradle @@ -3,7 +3,7 @@ apply plugin: 'maven-publish' def groupIdString = "org.matrix.android" def artifactIdString = "matrix-sdk-android" -def versionName = "1.5.11.3" +def versionName = "1.5.11.4" def artifactPath = "$buildDir/outputs/aar/$artifactIdString-release.aar" def publicationName = "release" def projectId = "16" diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt index e3728753adc6d9cea7003861ff88d6068bed0d7b..c6a9cadf9cf50c2110690692f320b432b688a84a 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt @@ -58,6 +58,6 @@ data class Credentials( @Json(name = "well_known") val discoveryInformation: DiscoveryInformation? = null ) -internal fun Credentials.sessionId(): String { +fun Credentials.sessionId(): String { return (if (deviceId.isNullOrBlank()) userId else "$userId|$deviceId").md5() }