mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 19:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Social login: cleanup

Browse source
This commit is contained in:
Benoit Marty 2020-12-14 14:10:04 +01:00
parent 0fd8641cf6
commit 23e05200b5
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -7,6 +7,7 @@ Features ✨:
- Url preview (#481) - Url preview (#481)
- Store encrypted file in cache and cleanup decrypted file at each app start (#2512) - Store encrypted file in cache and cleanup decrypted file at each app start (#2512)
- Emoji Keyboard (#2520) - Emoji Keyboard (#2520)
- Social login (#2452)
Improvements 🙌: Improvements 🙌:
- Add Setting Item to Change PIN (#2462) - Add Setting Item to Change PIN (#2462)

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt
View file

@ -19,7 +19,7 @@ package org.matrix.android.sdk.api.auth
/** /**
* Path to use when the client does not supported any or all login flows * Path to use when the client does not supported any or all login flows
* Ref: https://matrix.org/docs/spec/client_server/latest#login-fallback * Ref: https://matrix.org/docs/spec/client_server/latest#login-fallback
* */ */
const val LOGIN_FALLBACK_PATH = "/_matrix/static/client/login/" const val LOGIN_FALLBACK_PATH = "/_matrix/static/client/login/"
/** /**

8
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/IdentityProvider.kt
View file

@ -31,12 +31,12 @@ data class IdentityProvider(
@Json(name = "id") val id: String, @Json(name = "id") val id: String,
/** /**
* The name field should be the human readable string intended for printing by the client. * The name field should be the human readable string intended for printing by the client.
* */ */
@Json(name = "name") val name: String?, @Json(name = "name") val name: String?,
/** /**
* The icon field is the only optional field and should point to an icon representing the IdP. * The icon field is the only optional field and should point to an icon representing the IdP.
* If present then it must be an HTTPS URL to an image resource. * If present then it must be an HTTPS URL to an image resource.
* This should be hosted by the homeserver service provider to not leak the client's IP address unnecessarily. * This should be hosted by the homeserver service provider to not leak the client's IP address unnecessarily.
*/ */
@Json(name = "icon") val icon: String? @Json(name = "icon") val iconUrl: String?
) : Parcelable ) : Parcelable

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt
View file

@ -36,7 +36,7 @@ sealed class CallState {
* Connected. Incoming/Outgoing call, ice layer connecting or connected * Connected. Incoming/Outgoing call, ice layer connecting or connected
* Notice that the PeerState failed is not always final, if you switch network, new ice candidtates * Notice that the PeerState failed is not always final, if you switch network, new ice candidtates
* could be exchanged, and the connection could go back to connected * could be exchanged, and the connection could go back to connected
* */ */
data class Connected(val iceConnectionState: PeerConnection.PeerConnectionState) : CallState() data class Connected(val iceConnectionState: PeerConnection.PeerConnectionState) : CallState()
/** Terminated. Incoming/Outgoing call, the call is terminated */ /** Terminated. Incoming/Outgoing call, the call is terminated */