mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Removed deprecated code
This commit is contained in:
parent
46c3ed0b0d
commit
3971b18b04
2 changed files with 1 additions and 15 deletions
|
|
@ -339,7 +339,7 @@ class SettingsViewModel @UiThread constructor() : ViewModel() {
|
|||
val name = ringtone.name
|
||||
.substringBefore(".")
|
||||
.replace("_", " ")
|
||||
.capitalize(Locale.getDefault())
|
||||
.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
|
||||
availableRingtonesNames.add(name)
|
||||
availableRingtonesPaths.add(ringtone.absolutePath)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,13 +19,10 @@
|
|||
*/
|
||||
package org.linphone.utils
|
||||
|
||||
import android.Manifest
|
||||
import android.app.Activity
|
||||
import android.bluetooth.BluetoothAdapter
|
||||
import android.content.ActivityNotFoundException
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.content.pm.PackageManager
|
||||
import android.os.Build
|
||||
import android.provider.Settings
|
||||
import android.util.DisplayMetrics
|
||||
|
|
@ -40,7 +37,6 @@ import androidx.annotation.DimenRes
|
|||
import androidx.annotation.DrawableRes
|
||||
import androidx.annotation.MainThread
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.core.app.ActivityCompat
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.databinding.DataBindingUtil
|
||||
import androidx.emoji2.text.EmojiCompat
|
||||
|
|
@ -162,16 +158,6 @@ class AppUtils {
|
|||
context.contentResolver,
|
||||
Settings.Global.DEVICE_NAME
|
||||
)
|
||||
if (name == null) {
|
||||
if (ActivityCompat.checkSelfPermission(
|
||||
context,
|
||||
Manifest.permission.BLUETOOTH_CONNECT
|
||||
) == PackageManager.PERMISSION_GRANTED
|
||||
) {
|
||||
val adapter = BluetoothAdapter.getDefaultAdapter()
|
||||
name = adapter?.name
|
||||
}
|
||||
}
|
||||
if (name == null) {
|
||||
name = Settings.Secure.getString(
|
||||
context.contentResolver,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue