Update protocols and dependencies (#417)

davidliu · GitHub
Commit d8aba2fbeba57e7cfe7d164bb5ec537d5a55610d d8aba2fb 1 parent 163e5fd3
deps.gradle
gradle/libs.versions.toml
livekit-android-sdk/src/main/java/io/livekit/android/events/RoomEvent.kt
livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt
protocol
sample-app-compose/build.gradle
sample-app/build.gradle
--- a/deps.gradle
查看文件 @d8aba2f
+++ b/deps.gradle
查看文件 @d8aba2f
@@ -11,6 +11,6 @@ ext {
         minVersion    : 21,
     ]
     generated = [
-        protoSrc: "$projectDir/protocol",
+        protoSrc: "$projectDir/protocol/protobufs",
     ]
 }
--- a/gradle/libs.versions.toml
查看文件 @d8aba2f
+++ b/gradle/libs.versions.toml
查看文件 @d8aba2f
@@ -2,7 +2,9 @@
 webrtc = "114.5735.09"
 androidJainSipRi = "1.3.0-91"
-androidx-core = "1.10.1"
+androidx-activity = "1.9.0"
+androidx-core = "1.13.1"
+androidx-fragment = "1.5.1"
 androidx-lifecycle = "2.5.1"
 audioswitch = "89582c47c9a04c62f90aa5e57251af4800a62c9a"
 autoService = '1.0.1'
@@ -19,15 +21,18 @@ preferenceKtx = "1.2.1"
 protobuf = "3.22.0"
 protobufJavalite = "3.22.0"
 semver4j = "3.1.0"
-core-ktx = "1.12.0"
 appcompat = "1.6.1"
-material = "1.11.0"
+material = "1.12.0"
+viewpager2 = "1.0.0"
 [libraries]
 android-jain-sip-ri = { module = "javax.sip:android-jain-sip-ri", version.ref = "androidJainSipRi" }
+androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
 androidx-core = { module = "androidx.core:core", version.ref = "androidx-core" }
-androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core" }
+androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment" }
 androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
+androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" }
 audioswitch = { module = "com.github.davidliu:audioswitch", version.ref = "audioswitch" }
 dagger-lib = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
@@ -43,8 +48,8 @@ protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.
 semver4j = { module = "com.vdurmont:semver4j", version.ref = "semver4j" }
 webrtc = { module = "io.github.webrtc-sdk:android-prefixed", version.ref = "webrtc" }
-androidx-annotation = { module = "androidx.annotation:annotation", version = "1.6.0" }
-androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.7.1" }
+androidx-annotation = { module = "androidx.annotation:annotation", version = "1.7.1" }
+androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.9.0" }
 androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version = "1.0.1" }
 auto-service-compiler = { module = "com.google.auto.service:auto-service", version.ref = "autoService" }
 auto-service-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoService" }
--- a/livekit-android-sdk/src/main/java/io/livekit/android/events/RoomEvent.kt
查看文件 @d8aba2f
+++ b/livekit-android-sdk/src/main/java/io/livekit/android/events/RoomEvent.kt
查看文件 @d8aba2f
@@ -230,6 +230,8 @@ enum class DisconnectReason {
     ROOM_DELETED,
     STATE_MISMATCH,
     JOIN_FAILURE,
+    MIGRATION,
+    SIGNAL_CLOSE,
 }
 /**
@@ -244,6 +246,8 @@ fun LivekitModels.DisconnectReason?.convert(): DisconnectReason {
         LivekitModels.DisconnectReason.ROOM_DELETED -> DisconnectReason.ROOM_DELETED
         LivekitModels.DisconnectReason.STATE_MISMATCH -> DisconnectReason.STATE_MISMATCH
         LivekitModels.DisconnectReason.JOIN_FAILURE -> DisconnectReason.JOIN_FAILURE
+        LivekitModels.DisconnectReason.MIGRATION -> DisconnectReason.MIGRATION
+        LivekitModels.DisconnectReason.SIGNAL_CLOSE -> DisconnectReason.SIGNAL_CLOSE
         LivekitModels.DisconnectReason.UNKNOWN_REASON,
         LivekitModels.DisconnectReason.UNRECOGNIZED,
         null,
--- a/livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt
查看文件 @d8aba2f
+++ b/livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt
查看文件 @d8aba2f
@@ -43,16 +43,35 @@ import io.livekit.android.webrtc.isDisconnected
 import io.livekit.android.webrtc.peerconnection.executeBlockingOnRTCThread
 import io.livekit.android.webrtc.peerconnection.launchBlockingOnRTCThread
 import io.livekit.android.webrtc.toProtoSessionDescription
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.yield
 import livekit.LivekitModels
 import livekit.LivekitRtc
 import livekit.LivekitRtc.JoinResponse
 import livekit.LivekitRtc.ReconnectResponse
-import livekit.org.webrtc.*
+import livekit.org.webrtc.DataChannel
+import livekit.org.webrtc.IceCandidate
+import livekit.org.webrtc.MediaConstraints
+import livekit.org.webrtc.MediaStream
+import livekit.org.webrtc.MediaStreamTrack
+import livekit.org.webrtc.PeerConnection
 import livekit.org.webrtc.PeerConnection.RTCConfiguration
+import livekit.org.webrtc.RTCStatsCollectorCallback
+import livekit.org.webrtc.RTCStatsReport
+import livekit.org.webrtc.RtpReceiver
+import livekit.org.webrtc.RtpSender
+import livekit.org.webrtc.RtpTransceiver
 import livekit.org.webrtc.RtpTransceiver.RtpTransceiverInit
+import livekit.org.webrtc.SessionDescription
 import java.net.ConnectException
 import java.nio.ByteBuffer
 import javax.inject.Inject
@@ -957,6 +976,14 @@ internal constructor(
                 listener?.onUserPacket(dp.user, dp.kind)
             }
+            LivekitModels.DataPacket.ValueCase.SIP_DTMF -> {
+                // TODO
+            }
+
+            LivekitModels.DataPacket.ValueCase.TRANSCRIPTION -> {
+                // TODO
+            }
+
             LivekitModels.DataPacket.ValueCase.VALUE_NOT_SET,
             null,
             -> {
--- a/protocol @ 5f0256e1
+++ b/protocol @ 5f0256e1
-Subproject commit ec88d89da1d3f590db4205ec2bc22de3dd5bae5e
+Subproject commit 5f0256e10a8d35851a5502a83c00070934c980e3
--- a/sample-app-compose/build.gradle
查看文件 @d8aba2f
+++ b/sample-app-compose/build.gradle
查看文件 @d8aba2f
@@ -58,8 +58,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation libs.coroutines.lib
     implementation libs.androidx.core
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation libs.appcompat
+    implementation libs.material
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
@@ -73,8 +73,8 @@ dependencies {
     implementation 'com.google.accompanist:accompanist-pager-indicators:0.19.0'
     implementation libs.timber
     testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation libs.androidx.test.junit
+    androidTestImplementation libs.espresso
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
 }
--- a/sample-app/build.gradle
查看文件 @d8aba2f
+++ b/sample-app/build.gradle
查看文件 @d8aba2f
@@ -42,20 +42,19 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation libs.coroutines.lib
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation libs.appcompat
+    implementation libs.material
     implementation libs.androidx.core
-    implementation "androidx.activity:activity-ktx:1.5.1"
-    implementation 'androidx.fragment:fragment-ktx:1.5.1'
-    implementation "androidx.viewpager2:viewpager2:1.0.0"
+    implementation libs.androidx.activity.ktx
+    implementation libs.androidx.fragment.ktx
+    implementation libs.androidx.viewpager2
     implementation libs.androidx.lifecycle.runtime.ktx
     implementation libs.androidx.lifecycle.viewmodel.ktx
     implementation libs.androidx.lifecycle.common.java8
-    implementation 'com.google.android.material:material:1.6.1'
     implementation libs.groupie
     implementation libs.groupie.viewbinding
     implementation libs.timber
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.test.junit
+    androidTestImplementation libs.espresso
 }