From 51d725c757d1228e14996a386200cbfeb63e1c18 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 10 Apr 2025 13:24:10 +0200 Subject: [PATCH] Quick code cleanup --- .../org/linphone/contacts/ContactsManager.kt | 12 ++--------- .../notifications/NotificationsManager.kt | 20 ------------------- .../contacts/fragment/ContactsListFragment.kt | 1 - .../RecordingMediaPlayerViewModel.kt | 3 ++- .../layout/settings_developer_fragment.xml | 3 +-- 5 files changed, 5 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt index 595019757..21130c6ed 100644 --- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt +++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt @@ -469,13 +469,13 @@ class ContactsManager Log.d( "$TAG Friend wasn't found using phone number [$username], looking in native address book directly" ) - findNativeContact(sipAddress, username, true) + null } } else { Log.d( "$TAG Friend wasn't found using SIP address [$sipAddress] and username [$username] isn't a phone number, looking in native address book directly" ) - findNativeContact(sipAddress, username.orEmpty(), false) + null } } @@ -644,14 +644,6 @@ class ContactsManager return temporaryFriendList } - @WorkerThread - fun findNativeContact(address: String, username: String, searchAsPhoneNumber: Boolean): Friend? { - // As long as read contacts permission is granted, friends will be stored in DB, - // so if Core didn't find a matching item it in the FriendList, there's no reason the native address book - // shall contain a matching contact. - return null - } - @WorkerThread fun getMePerson(localAddress: Address): Person { val account = coreContext.core.accountList.find { diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt index 7f60c7625..b8624bddc 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt +++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt @@ -31,9 +31,7 @@ import android.content.Intent import android.content.pm.PackageManager import android.graphics.Bitmap import android.media.AudioAttributes -import android.media.AudioManager import android.media.MediaPlayer -import android.media.RingtoneManager import android.net.Uri import android.os.Bundle import androidx.annotation.AnyThread @@ -1592,24 +1590,6 @@ class NotificationsManager currentKeepAliveThirdPartyAccountsForegroundServiceNotificationId = -1 } - @MainThread - private fun createIncomingCallNotificationChannel() { - val id = context.getString(R.string.notification_channel_incoming_call_id) - val name = context.getString(R.string.notification_channel_incoming_call_name) - - val ringtone = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE) - val audioAttributes = AudioAttributes.Builder() - .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) - .setLegacyStreamType(AudioManager.STREAM_RING) - .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE).build() - - val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH).apply { - description = name - setSound(ringtone, audioAttributes) - } - notificationManager.createNotificationChannel(channel) - } - @MainThread private fun createIncomingCallNotificationChannelWithoutRingtone() { val id = context.getString(R.string.notification_channel_without_ringtone_incoming_call_id) diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt index 8a372b1bb..cdf98eb85 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt @@ -37,7 +37,6 @@ import androidx.core.content.ContextCompat import androidx.core.content.FileProvider import androidx.databinding.DataBindingUtil import androidx.lifecycle.ViewModelProvider -import androidx.lifecycle.observe import androidx.navigation.findNavController import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager diff --git a/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingMediaPlayerViewModel.kt b/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingMediaPlayerViewModel.kt index b025be769..2440e7de5 100644 --- a/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingMediaPlayerViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingMediaPlayerViewModel.kt @@ -98,9 +98,10 @@ class RecordingMediaPlayerViewModel @UiThread fun setVideoRenderingSurface(textureView: TextureView) { + val texture = textureView.surfaceTexture coreContext.postOnCoreThread { Log.i("$TAG Setting window ID in player") - player.setWindowId(textureView.surfaceTexture) + player.setWindowId(texture) } } diff --git a/app/src/main/res/layout/settings_developer_fragment.xml b/app/src/main/res/layout/settings_developer_fragment.xml index 3c7fc9012..aa6267de0 100644 --- a/app/src/main/res/layout/settings_developer_fragment.xml +++ b/app/src/main/res/layout/settings_developer_fragment.xml @@ -1,7 +1,6 @@ + xmlns:app="http://schemas.android.com/apk/res-auto">