davidliu
Committed by GitHub

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

@@ -118,7 +118,7 @@ dependencies { @@ -118,7 +118,7 @@ dependencies {
118 implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0' 118 implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0'
119 api 'com.github.webrtc-sdk:android:104.5112.05' 119 api 'com.github.webrtc-sdk:android:104.5112.05'
120 api "com.squareup.okhttp3:okhttp:4.10.0" 120 api "com.squareup.okhttp3:okhttp:4.10.0"
121 - api "com.twilio:audioswitch:1.1.5" 121 + api 'com.github.davidliu:audioswitch:c498d866c57f1d88056d5e7e7a78d622e3b0c046'
122 implementation "androidx.annotation:annotation:1.4.0" 122 implementation "androidx.annotation:annotation:1.4.0"
123 implementation "androidx.core:core:${versions.androidx_core}" 123 implementation "androidx.core:core:${versions.androidx_core}"
124 implementation "com.google.protobuf:protobuf-javalite:${versions.protobuf}" 124 implementation "com.google.protobuf:protobuf-javalite:${versions.protobuf}"
@@ -2,7 +2,6 @@ package io.livekit.android.sample.basic @@ -2,7 +2,6 @@ package io.livekit.android.sample.basic
2 2
3 import android.Manifest 3 import android.Manifest
4 import android.content.pm.PackageManager 4 import android.content.pm.PackageManager
5 -import android.os.Build  
6 import android.os.Bundle 5 import android.os.Bundle
7 import android.view.View 6 import android.view.View
8 import android.widget.Toast 7 import android.widget.Toast
@@ -98,14 +97,6 @@ class MainActivity : AppCompatActivity() { @@ -98,14 +97,6 @@ class MainActivity : AppCompatActivity() {
98 97
99 // Assemble the needed permissions to request 98 // Assemble the needed permissions to request
100 val neededPermissions = listOf(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA) 99 val neededPermissions = listOf(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
101 - .let { perms ->  
102 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {  
103 - // Need BLUETOOTH_CONNECT permission on API S+ to output to bluetooth devices.  
104 - perms + listOf(Manifest.permission.BLUETOOTH_CONNECT)  
105 - } else {  
106 - perms  
107 - }  
108 - }  
109 .filter { ContextCompat.checkSelfPermission(this, it) == PackageManager.PERMISSION_DENIED } 100 .filter { ContextCompat.checkSelfPermission(this, it) == PackageManager.PERMISSION_DENIED }
110 .toTypedArray() 101 .toTypedArray()
111 102
@@ -11,6 +11,5 @@ @@ -11,6 +11,5 @@
11 <uses-permission 11 <uses-permission
12 android:name="android.permission.BLUETOOTH_ADMIN" 12 android:name="android.permission.BLUETOOTH_ADMIN"
13 android:maxSdkVersion="30" /> 13 android:maxSdkVersion="30" />
14 - <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />  
15 14
16 </manifest> 15 </manifest>
@@ -2,7 +2,6 @@ package io.livekit.android.sample.util @@ -2,7 +2,6 @@ package io.livekit.android.sample.util
2 2
3 import android.Manifest 3 import android.Manifest
4 import android.content.pm.PackageManager 4 import android.content.pm.PackageManager
5 -import android.os.Build  
6 import android.widget.Toast 5 import android.widget.Toast
7 import androidx.activity.ComponentActivity 6 import androidx.activity.ComponentActivity
8 import androidx.activity.result.contract.ActivityResultContracts 7 import androidx.activity.result.contract.ActivityResultContracts
@@ -32,13 +31,6 @@ fun ComponentActivity.requestNeededPermissions(onPermissionsGranted: (() -> Unit @@ -32,13 +31,6 @@ fun ComponentActivity.requestNeededPermissions(onPermissionsGranted: (() -> Unit
32 } 31 }
33 32
34 val neededPermissions = listOf(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA) 33 val neededPermissions = listOf(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
35 - .let { perms ->  
36 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {  
37 - perms + listOf(Manifest.permission.BLUETOOTH_CONNECT)  
38 - } else {  
39 - perms  
40 - }  
41 - }  
42 .filter { ContextCompat.checkSelfPermission(this, it) == PackageManager.PERMISSION_DENIED } 34 .filter { ContextCompat.checkSelfPermission(this, it) == PackageManager.PERMISSION_DENIED }
43 .toTypedArray() 35 .toTypedArray()
44 36