davidliu
Committed by GitHub

Use forked version of audio switch to avoid BLUETOOTH_CONNECT (#172)

... ... @@ -118,7 +118,7 @@ dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0'
api 'com.github.webrtc-sdk:android:104.5112.05'
api "com.squareup.okhttp3:okhttp:4.10.0"
api "com.twilio:audioswitch:1.1.5"
api 'com.github.davidliu:audioswitch:c498d866c57f1d88056d5e7e7a78d622e3b0c046'
implementation "androidx.annotation:annotation:1.4.0"
implementation "androidx.core:core:${versions.androidx_core}"
implementation "com.google.protobuf:protobuf-javalite:${versions.protobuf}"
... ...
... ... @@ -2,7 +2,6 @@ package io.livekit.android.sample.basic
import android.Manifest
import android.content.pm.PackageManager
import android.os.Build
import android.os.Bundle
import android.view.View
import android.widget.Toast
... ... @@ -98,14 +97,6 @@ class MainActivity : AppCompatActivity() {
// Assemble the needed permissions to request
val neededPermissions = listOf(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
.let { perms ->
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
// Need BLUETOOTH_CONNECT permission on API S+ to output to bluetooth devices.
perms + listOf(Manifest.permission.BLUETOOTH_CONNECT)
} else {
perms
}
}
.filter { ContextCompat.checkSelfPermission(this, it) == PackageManager.PERMISSION_DENIED }
.toTypedArray()
... ...
... ... @@ -11,6 +11,5 @@
<uses-permission
android:name="android.permission.BLUETOOTH_ADMIN"
android:maxSdkVersion="30" />
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
</manifest>
\ No newline at end of file
... ...
... ... @@ -2,7 +2,6 @@ package io.livekit.android.sample.util
import android.Manifest
import android.content.pm.PackageManager
import android.os.Build
import android.widget.Toast
import androidx.activity.ComponentActivity
import androidx.activity.result.contract.ActivityResultContracts
... ... @@ -32,13 +31,6 @@ fun ComponentActivity.requestNeededPermissions(onPermissionsGranted: (() -> Unit
}
val neededPermissions = listOf(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
.let { perms ->
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
perms + listOf(Manifest.permission.BLUETOOTH_CONNECT)
} else {
perms
}
}
.filter { ContextCompat.checkSelfPermission(this, it) == PackageManager.PERMISSION_DENIED }
.toTypedArray()
... ...