Skip to content

Commit 3e5116c

Browse files
authored
Is/bug fix/jvm signature (#344)
* Update build.gradle * Fix. SocketObserver onChanged method * Version Update * Remove Unused Dep (Volley) * Update target SDK * Fix Test Cases
1 parent 0ac0ef4 commit 3e5116c

File tree

8 files changed

+25
-32
lines changed

8 files changed

+25
-32
lines changed

app/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ def localProperties = new Properties()
1212
localProperties.load(new FileInputStream(rootProject.file("local.properties")))
1313

1414
android {
15-
compileSdkVersion 33
15+
compileSdkVersion 34
1616
buildToolsVersion "30.0.3"
1717

1818
defaultConfig {
1919
applicationId "com.telnyx.webrtc.sdk"
2020
minSdkVersion 23
21-
targetSdkVersion 33
21+
targetSdkVersion 34
2222
versionCode 1
2323
versionName "1.0"
2424

@@ -120,9 +120,6 @@ dependencies {
120120
implementation deps.ktor.gson
121121
implementation deps.ktor.websockets
122122

123-
// Volley
124-
implementation deps.volley
125-
126123
// Firebase
127124
implementation platform(deps.firebasebom)
128125
implementation deps.firebase_analytics

app/src/main/java/com/telnyx/webrtc/sdk/ui/MainActivity.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,11 @@ class MainActivity : AppCompatActivity() {
225225
Timber.i("Loading...")
226226
}
227227

228+
override fun onChanged(value: SocketResponse<ReceivedMessageBody>) {
229+
super.onChanged(value)
230+
// Do Nothing
231+
}
232+
228233
override fun onError(message: String?) {
229234
Timber.e("onError: %s", message)
230235
Toast.makeText(

telnyx_rtc/build.gradle

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ apply plugin: 'maven-publish'
1313
apply plugin: "com.bugsnag.android.gradle"
1414

1515
def getVersionName = { ->
16-
return "1.3.3"
16+
return "1.3.5"
1717
}
1818

1919
def getArtifactId = { ->
@@ -78,7 +78,7 @@ dokkaHtml.configure {
7878

7979

8080
android {
81-
compileSdkVersion 33
81+
compileSdkVersion 34
8282
buildToolsVersion "30.0.3"
8383

8484
androidExtensions {
@@ -87,7 +87,7 @@ android {
8787

8888
defaultConfig {
8989
minSdkVersion 23
90-
targetSdkVersion 33
90+
targetSdkVersion 34
9191
versionCode 1
9292
versionName "1.0"
9393

@@ -198,7 +198,7 @@ dependencies {
198198
implementation deps.ktor.gson
199199
implementation deps.ktor.websockets
200200
implementation deps.ktor.okhttp
201-
implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
201+
implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
202202
testImplementation deps.ktor.client_test
203203

204204
implementation 'org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.7.10'
@@ -207,8 +207,6 @@ dependencies {
207207
//BugSnag:
208208
implementation "com.bugsnag:bugsnag-android:5.+"
209209

210-
// Volley
211-
implementation deps.volley
212210

213211
// Firebase
214212
implementation platform(deps.firebasebom)
@@ -266,7 +264,7 @@ dependencies {
266264
androidTestImplementation 'androidx.test.ext:truth:1.4.0'
267265
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
268266
androidTestImplementation 'androidx.work:work-testing:2.7.1'
269-
androidTestImplementation "io.mockk:mockk-android:1.12.5"
267+
androidTestImplementation "io.mockk:mockk-androitd:1.12.5"
270268
debugImplementation 'androidx.fragment:fragment-testing:1.5.2'
271269
debugImplementation 'androidx.test:core-ktx:1.4.0'
272270

@@ -276,7 +274,6 @@ dependencies {
276274
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
277275
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
278276

279-
def lifecycle_version = "2.4.0"
280-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
277+
def lifecycle_version = "2.7.0"
281278
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
282279
}

telnyx_rtc/src/main/java/com/telnyx/webrtc/sdk/TelnyxClient.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,6 @@ class TelnyxClient(
804804
SpeakerMode.EARPIECE -> {
805805
audioManager?.isSpeakerphoneOn = false
806806
}
807-
808807
SpeakerMode.UNASSIGNED -> audioManager?.isSpeakerphoneOn = false
809808
}
810809
}

telnyx_rtc/src/main/java/com/telnyx/webrtc/sdk/verto/receive/SocketObserver.kt

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,13 @@ abstract class SocketObserver<T> : Observer<SocketResponse<T>> {
1515
abstract fun onError(message: String?)
1616
abstract fun onSocketDisconnect()
1717

18-
override fun onChanged(t: SocketResponse<T>?) {
19-
if (t == null) {
20-
onError("Socket Error")
21-
} else {
22-
when (t.status) {
23-
SocketStatus.ESTABLISHED -> onConnectionEstablished()
24-
SocketStatus.MESSAGERECEIVED -> onMessageReceived(t.data)
25-
SocketStatus.LOADING -> onLoading()
26-
SocketStatus.ERROR -> onError(t.errorMessage)
27-
SocketStatus.DISCONNECT -> onSocketDisconnect()
28-
}
18+
override fun onChanged(value: SocketResponse<T>) {
19+
when (value.status) {
20+
SocketStatus.ESTABLISHED -> onConnectionEstablished()
21+
SocketStatus.MESSAGERECEIVED -> onMessageReceived(value.data)
22+
SocketStatus.LOADING -> onLoading()
23+
SocketStatus.ERROR -> onError(value.errorMessage)
24+
SocketStatus.DISCONNECT -> onSocketDisconnect()
2925
}
3026
}
3127
}

telnyx_rtc/src/test/java/com/telnyx/webrtc/sdk/CallTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,11 +287,12 @@ fun <T> LiveData<T>.getOrAwaitValue(
287287
var data: T? = null
288288
val latch = CountDownLatch(1)
289289
val observer = object : Observer<T> {
290-
override fun onChanged(o: T?) {
291-
data = o
290+
override fun onChanged(value: T) {
291+
data = value
292292
latch.countDown()
293293
this@getOrAwaitValue.removeObserver(this)
294294
}
295+
295296
}
296297

297298
this.observeForever(observer)

telnyx_rtc/src/test/java/com/telnyx/webrtc/sdk/TelnyxClientTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,8 +649,8 @@ class TelnyxClientTest : BaseTest() {
649649
var data: T? = null
650650
val latch = CountDownLatch(1)
651651
val observer = object : Observer<T> {
652-
override fun onChanged(o: T?) {
653-
data = o
652+
override fun onChanged(value: T) {
653+
data = value
654654
latch.countDown()
655655
this@getOrAwaitValue.removeObserver(this)
656656
}

versions.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ versions.ktor = "1.5.3"
1919
versions.timber = "4.5.1"
2020
versions.dexter = "6.2.2"
2121
versions.googleservices = "4.3.8"
22-
versions.volley = "1.1.1"
2322
versions.firebasebom = "28.2.1"
2423
versions.hilt = "2.43.2"
2524
versions.bugsnag = "7.+"
@@ -37,7 +36,6 @@ deps.androidx_fragment = "androidx.fragment:fragment-ktx:$versions.androidx_frag
3736
deps.appcompat = "androidx.appcompat:appcompat:$versions.androidx_appcompat"
3837
deps.material = "com.google.android.material:material:$versions.material"
3938
deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.androidx_constraint_layout"
40-
deps.volley = "com.android.volley:volley:$versions.volley"
4139
deps.webrtc = "org.webrtc:google-webrtc:$versions.webrtc"
4240
deps.gson = "com.google.code.gson:gson:$versions.gson"
4341
deps.websocket = "org.java-websocket:Java-WebSocket:$versions.websocket"

0 commit comments

Comments
 (0)