Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

BLUETOOTH_CONNECT permission is required starting Android 12

Browse source
This commit is contained in:
Sylvain Berfini 2022-02-28 11:18:00 +01:00
parent 9c881ca00e
commit 34e000e3bb
9 changed files with 73 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -16,6 +16,7 @@ Group changes to describe their impact on the project, as follows:
## [4.6.2] - Unreleased
### Added
- Request BLUETOOTH_CONNECT permission on Android 12+ devices, if not we won't be notified when a BT device is being connected/disconnected while app is alive.
- LDAP settings if SDK is built with OpenLDAP (requires 5.1.1 or higher linphone-sdk), will add contacts if any
- SIP addresses & phone numbers can be selected in history & contact details view
- Text can be selected in file viewer & config viewer

5
app/src/main/AndroidManifest.xml
View file

@ -32,6 +32,11 @@
<!-- Needed for overlay -->
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<!-- Needed starting Android 12 for broadcast receiver
to be triggered when BT device is connected / disconnected
(https://developer.android.com/guide/topics/connectivity/bluetooth/permissions) -->
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<application
android:name=".LinphoneApplication"
android:allowBackup="false"

12
app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
View file

@ -30,6 +30,7 @@ import org.linphone.R
import org.linphone.activities.GenericFragment
import org.linphone.activities.main.conference.viewmodels.ConferenceWaitingRoomViewModel
import org.linphone.activities.navigateToDialer
import org.linphone.compatibility.Compatibility
import org.linphone.core.tools.Log
import org.linphone.databinding.ConferenceWaitingRoomFragmentBinding
import org.linphone.mediastream.Version
@ -129,14 +130,22 @@ class ConferenceWaitingRoomFragment : GenericFragment<ConferenceWaitingRoomFragm
@TargetApi(Version.API23_MARSHMALLOW_60)
private fun checkPermissions() {
val permissionsRequiredList = arrayListOf<String>()
if (!PermissionHelper.get().hasRecordAudioPermission()) {
Log.i("[Conference Waiting Room] Asking for RECORD_AUDIO permission")
permissionsRequiredList.add(Manifest.permission.RECORD_AUDIO)
}
if (!PermissionHelper.get().hasCameraPermission()) {
Log.i("[Conference Waiting Room] Asking for CAMERA permission")
permissionsRequiredList.add(Manifest.permission.CAMERA)
}
if (Version.sdkAboveOrEqual(Version.API31_ANDROID_12) && !PermissionHelper.get().hasBluetoothConnectPermission()) {
Log.i("[Conference Waiting Room] Asking for BLUETOOTH_CONNECT permission")
permissionsRequiredList.add(Compatibility.BLUETOOTH_CONNECT)
}
if (permissionsRequiredList.isNotEmpty()) {
val permissionsRequired = arrayOfNulls<String>(permissionsRequiredList.size)
permissionsRequiredList.toArray(permissionsRequired)
@ -161,6 +170,9 @@ class ConferenceWaitingRoomFragment : GenericFragment<ConferenceWaitingRoomFragm
coreContext.core.reloadVideoDevices()
viewModel.enableVideo()
}
Compatibility.BLUETOOTH_CONNECT -> if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
Log.i("[Conference Waiting Room] BLUETOOTH_CONNECT permission has been granted")
}
}
}
}

2
app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt
View file

@ -119,7 +119,7 @@ class ConferenceWaitingRoomViewModel : ViewModel() {
} else {
setEarpieceAudioRoute()
}
updateAudioRouteState()
onAudioDevicesListUpdated()
}
override fun onCleared() {

11
app/src/main/java/org/linphone/activities/voip/CallActivity.kt
View file

@ -195,16 +195,24 @@ class CallActivity : ProximitySensorActivity() {
@TargetApi(Version.API23_MARSHMALLOW_60)
private fun checkPermissions() {
val permissionsRequiredList = arrayListOf<String>()
if (!PermissionHelper.get().hasRecordAudioPermission()) {
Log.i("[Call] Asking for RECORD_AUDIO permission")
permissionsRequiredList.add(Manifest.permission.RECORD_AUDIO)
}
if (callsViewModel.currentCallData.value?.call?.currentParams?.isVideoEnabled == true &&
!PermissionHelper.get().hasCameraPermission()
) {
Log.i("[Call] Asking for CAMERA permission")
permissionsRequiredList.add(Manifest.permission.CAMERA)
}
if (Version.sdkAboveOrEqual(Version.API31_ANDROID_12) && !PermissionHelper.get().hasBluetoothConnectPermission()) {
Log.i("[Call] Asking for BLUETOOTH_CONNECT permission")
permissionsRequiredList.add(Compatibility.BLUETOOTH_CONNECT)
}
if (permissionsRequiredList.isNotEmpty()) {
val permissionsRequired = arrayOfNulls<String>(permissionsRequiredList.size)
permissionsRequiredList.toArray(permissionsRequired)
@ -228,6 +236,9 @@ class CallActivity : ProximitySensorActivity() {
Log.i("[Call] CAMERA permission has been granted")
coreContext.core.reloadVideoDevices()
}
Compatibility.BLUETOOTH_CONNECT -> if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
Log.i("[Call] BLUETOOTH_CONNECT permission has been granted")
}
}
}
}

5
app/src/main/java/org/linphone/compatibility/Api31Compatibility.kt
View file

@ -19,6 +19,7 @@
*/
package org.linphone.compatibility
import android.Manifest
import android.annotation.TargetApi
import android.app.*
import android.content.Context
@ -173,5 +174,9 @@ class Api31Compatibility {
Log.i("[Call] PiP auto enter enabled params set to $enable")
}
}
fun hasBluetoothConnectPermission(context: Context): Boolean {
return Compatibility.hasPermission(context, Manifest.permission.BLUETOOTH_CONNECT)
}
}
}

9
app/src/main/java/org/linphone/compatibility/Compatibility.kt
View file

@ -48,6 +48,8 @@ import org.linphone.telecom.NativeCallWrapper
@Suppress("DEPRECATION")
class Compatibility {
companion object {
const val BLUETOOTH_CONNECT = "android.permission.BLUETOOTH_CONNECT"
fun hasPermission(context: Context, permission: String): Boolean {
return when (Version.sdkAboveOrEqual(Version.API23_MARSHMALLOW_60)) {
true -> Api23Compatibility.hasPermission(context, permission)
@ -73,6 +75,13 @@ class Compatibility {
}
}
fun hasBluetoothConnectPermission(context: Context): Boolean {
if (Version.sdkAboveOrEqual(Version.API31_ANDROID_12)) {
return Api31Compatibility.hasBluetoothConnectPermission(context)
}
return true
}
// See https://developer.android.com/about/versions/11/privacy/permissions#phone-numbers
fun hasTelecomManagerPermissions(context: Context): Boolean {
return if (Version.sdkAboveOrEqual(Version.API30_ANDROID_11)) {

4
app/src/main/java/org/linphone/utils/PermissionHelper.kt
View file

@ -73,4 +73,8 @@ class PermissionHelper private constructor(private val context: Context) {
fun hasRecordAudioPermission(): Boolean {
return hasPermission(Manifest.permission.RECORD_AUDIO)
}
fun hasBluetoothConnectPermission(): Boolean {
return Compatibility.hasBluetoothConnectPermission(context)
}
}

49
app/src/main/res/layout/conference_waiting_room_fragment.xml
View file

@ -224,37 +224,38 @@
app:layout_constraintDimensionRatio="W,1:1"
app:layout_constraintEnd_toStartOf="@id/speaker" />
<ImageView
<RelativeLayout
android:id="@+id/speaker"
android:contentDescription="@{viewModel.isSpeakerSelected ? @string/content_description_disable_speaker : @string/content_description_enable_speaker}"
android:onClick="@{() -> viewModel.toggleSpeaker()}"
android:selected="@{viewModel.isSpeakerSelected}"
android:visibility="@{viewModel.audioRoutesEnabled ? View.GONE : View.VISIBLE}"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="5dp"
android:background="@drawable/button_background_reverse"
android:padding="5dp"
android:src="@drawable/icon_toggle_speaker"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="W,1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent">
<ImageView
android:onClick="@{() -> viewModel.toggleAudioRoutesMenu()}"
android:selected="@{viewModel.audioRoutesSelected}"
android:visibility="@{viewModel.audioRoutesEnabled ? View.VISIBLE : View.GONE, default=gone}"
android:layout_height="match_parent"
android:layout_width="0dp"
android:background="@drawable/button_toggle_background_reverse"
android:src="@drawable/icon_audio_routes"
android:padding="5dp"
android:contentDescription="@string/content_description_toggle_audio_menu"
app:layout_constraintDimensionRatio="W,1:1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/button_background_reverse"
android:contentDescription="@{viewModel.isSpeakerSelected ? @string/content_description_disable_speaker : @string/content_description_enable_speaker}"
android:onClick="@{() -> viewModel.toggleSpeaker()}"
android:padding="5dp"
android:selected="@{viewModel.isSpeakerSelected}"
android:src="@drawable/icon_toggle_speaker"
android:visibility="@{viewModel.audioRoutesEnabled ? View.GONE : View.VISIBLE}" />
<ImageView
android:onClick="@{() -> viewModel.toggleAudioRoutesMenu()}"
android:selected="@{viewModel.audioRoutesSelected}"
android:visibility="@{viewModel.audioRoutesEnabled ? View.VISIBLE : View.GONE, default=gone}"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:background="@drawable/button_toggle_background_reverse"
android:src="@drawable/icon_audio_routes"
android:padding="5dp"
android:contentDescription="@string/content_description_toggle_audio_menu"/>
</RelativeLayout>
<ImageView
android:contentDescription="@{viewModel.isVideoEnabled ? @string/content_description_disable_video : @string/content_description_enable_video}"