feat: E2EE. #238
Merged
feat: E2EE. #238
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davidliu
reviewed
Jul 10, 2023
| * @param participantId | ||
| * @param keyIndex | ||
| */ | ||
| override fun setKey(key: String, participantId: String?, keyIndex: Int?) { |
There was a problem hiding this comment.
Suggested change
| override fun setKey(key: String, participantId: String?, keyIndex: Int?) { | |
| override fun setKey(key: String, participantId: String, keyIndex: Int) { |
davidliu
requested changes
Jul 10, 2023
livekit-android-sdk/src/main/java/io/livekit/android/e2ee/KeyProvider.kt
Outdated
Show resolved
Hide resolved
livekit-android-sdk/src/main/java/io/livekit/android/e2ee/KeyProvider.kt
Outdated
Show resolved
Hide resolved
livekit-android-sdk/src/main/java/io/livekit/android/e2ee/KeyProvider.kt
Outdated
Show resolved
Hide resolved
livekit-android-sdk/src/main/java/io/livekit/android/room/Room.kt
Outdated
Show resolved
Hide resolved
| /** | ||
| * @suppress | ||
| */ | ||
| override fun onTrackPublished(publication: LocalTrackPublication, participant: LocalParticipant) { |
There was a problem hiding this comment.
This is already handled elsewhere, I think we can remove this.
livekit-android-sdk/src/main/java/io/livekit/android/room/track/RemoteAudioTrack.kt
Outdated
Show resolved
Hide resolved
sample-app-common/src/main/java/io/livekit/android/sample/CallViewModel.kt
Outdated
Show resolved
Hide resolved
sample-app-common/src/main/java/io/livekit/android/sample/CallViewModel.kt
Outdated
Show resolved
Hide resolved
| @@ -185,7 +191,7 @@ constructor( | |||
| videoTrackPublishDefaults = videoTrackPublishDefaults, | |||
There was a problem hiding this comment.
need to capture e2eeOptions in the Room (also in LiveKit.kt)
| this.keyProvider = keyProvider | ||
| } | ||
|
|
||
| suspend fun setup(room: Room, emitEvent: (roomEvent: RoomEvent) -> Unit) { |
There was a problem hiding this comment.
Looks like these can be put in the constructor?
There was a problem hiding this comment.
It was discussed with Lukas here that we can enter a certain room without enabling e2ee, and use setup to switch to encrypted mode halfway, so I suggest to keep
…rovider.kt Co-authored-by: davidliu <[email protected]>
…rovider.kt Co-authored-by: davidliu <[email protected]>
…ViewModel.kt Co-authored-by: davidliu <[email protected]>
Co-authored-by: davidliu <[email protected]>
…k/LocalAudioTrack.kt Co-authored-by: davidliu <[email protected]>
…k/LocalVideoTrack.kt Co-authored-by: davidliu <[email protected]>
…k/RemoteAudioTrack.kt Co-authored-by: davidliu <[email protected]>
navin-kumar-sheoran
approved these changes
Jul 26, 2023
davidliu
approved these changes
Aug 25, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Frame Cryptor support for Android.