diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 163fedee2..14af2afc8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -49,7 +49,7 @@ task("getGitVersion") { "git", "rev-list", gitVersionStream.toString().trim() + "..HEAD", - "--count" + "--count", ) standardOutput = gitCommitsCount } @@ -62,12 +62,14 @@ task("getGitVersion") { standardOutput = gitBranch } - gitVersion = if (gitCommitsCount.toString().trim().toInt() == 0) { - gitVersionStream.toString().trim() - } else { - gitVersionStream.toString().trim() + "." + gitCommitsCount.toString() - .trim() + "+" + gitCommitHash.toString().trim() - } + gitVersion = + if (gitCommitsCount.toString().trim().toInt() == 0) { + gitVersionStream.toString().trim() + } else { + gitVersionStream.toString().trim() + "." + + gitCommitsCount.toString() + .trim() + "+" + gitCommitHash.toString().trim() + } println("Git version: $gitVersion") } catch (e: Exception) { println("Git not found [$e], using $gitVersion") @@ -168,7 +170,7 @@ android { isMinifyEnabled = true proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" + "proguard-rules.pro", ) signingConfig = signingConfigs.getByName("release") @@ -251,25 +253,62 @@ dependencies { implementation(libs.linphone) } -ktlint { - android = true - ignoreFailures = true +configure { + android.set(true) + ignoreFailures.set(true) + additionalEditorconfig.set( + mapOf( + "max_line_length" to "120", + "ktlint_standard_max-line-length" to "disabled", + "ktlint_standard_function-signature" to "disabled", + "ktlint_standard_no-blank-line-before-rbrace" to "disabled", + "ktlint_standard_no-empty-class-body" to "disabled", + "ktlint_standard_annotation-spacing" to "disabled", + "ktlint_standard_class-signature" to "disabled", + "ktlint_standard_function-expression-body" to "disabled", + "ktlint_standard_function-type-modifier-spacing" to "disabled", + "ktlint_standard_if-else-wrapping" to "disabled", + "ktlint_standard_argument-list-wrapping" to "disabled", + "ktlint_standard_trailing-comma-on-call-site" to "disabled", + "ktlint_standard_trailing-comma-on-declaration-site" to "disabled", + "ktlint_standard_no-empty-first-line-in-class-body" to "disabled", + "ktlint_standard_no-empty-first-line-in-method-block" to "disabled", + "ktlint_standard_no-trailing-spaces" to "disabled", + "ktlint_standard_no-blank-line-in-list" to "disabled", + "ktlint_standard_no-multi-spaces" to "disabled", + "ktlint_standard_try-catch-finally-spacing" to "disabled", + "ktlint_standard_block-comment-initial-star-alignment" to "disabled", + "ktlint_standard_spacing-between-declarations-with-comments" to "disabled", + "ktlint_standard_no-consecutive-comments" to "disabled", + "ktlint_standard_multiline-expression-wrapping" to "disabled", + "ktlint_standard_parameter-list-wrapping" to "disabled", + "ktlint_standard_comment-wrapping" to "disabled", + "ktlint_standard_discouraged-comment-location" to "disabled", + "ktlint_standard_string-template-indent" to "disabled", + "ktlint_standard_parameter-list-spacing" to "disabled", + "ktlint_standard_statement-wrapping" to "disabled", + "ktlint_standard_import-ordering" to "disabled", + "ktlint_standard_paren-spacing" to "disabled", + "ktlint_standard_curly-spacing" to "disabled", + "ktlint_standard_indent" to "disabled", + ) + ) } project.tasks.preBuild.dependsOn("ktlintFormat") if (crashlyticsAvailable) { afterEvaluate { tasks.getByName("assembleDebug").finalizedBy( - tasks.getByName("uploadCrashlyticsSymbolFileDebug") + tasks.getByName("uploadCrashlyticsSymbolFileDebug"), ) tasks.getByName("packageDebug").finalizedBy( - tasks.getByName("uploadCrashlyticsSymbolFileDebug") + tasks.getByName("uploadCrashlyticsSymbolFileDebug"), ) tasks.getByName("assembleRelease").finalizedBy( - tasks.getByName("uploadCrashlyticsSymbolFileRelease") + tasks.getByName("uploadCrashlyticsSymbolFileRelease"), ) tasks.getByName("packageRelease").finalizedBy( - tasks.getByName("uploadCrashlyticsSymbolFileRelease") + tasks.getByName("uploadCrashlyticsSymbolFileRelease"), ) } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f2de33d2f..b8543bc29 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -123,13 +123,13 @@ diff --git a/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt b/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt index ab787addb..f2c8b97a0 100644 --- a/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt +++ b/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt @@ -20,7 +20,11 @@ package org.linphone.contacts import android.content.Context -import android.graphics.* +import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Rect +import android.graphics.RectF import android.graphics.drawable.BitmapDrawable import android.text.TextPaint import androidx.core.content.ContextCompat diff --git a/app/src/main/java/org/linphone/contacts/ContactLoader.kt b/app/src/main/java/org/linphone/contacts/ContactLoader.kt index 6e8843b3d..a6096c6a7 100644 --- a/app/src/main/java/org/linphone/contacts/ContactLoader.kt +++ b/app/src/main/java/org/linphone/contacts/ContactLoader.kt @@ -31,7 +31,11 @@ import androidx.loader.content.CursorLoader import androidx.loader.content.Loader import java.lang.Exception import org.linphone.LinphoneApplication.Companion.coreContext -import org.linphone.core.* +import org.linphone.core.Factory +import org.linphone.core.Friend +import org.linphone.core.FriendList +import org.linphone.core.GlobalState +import org.linphone.core.SubscribePolicy import org.linphone.core.tools.Log import org.linphone.utils.PhoneNumberUtils diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt index 9a8411cdf..e4aa53823 100644 --- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt +++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt @@ -67,7 +67,9 @@ import org.linphone.utils.LinphoneUtils import org.linphone.utils.PhoneNumberUtils import org.linphone.utils.ShortcutUtils -class ContactsManager @UiThread constructor() { +class ContactsManager + @UiThread + constructor() { companion object { private const val TAG = "[Contacts Manager]" @@ -101,7 +103,7 @@ class ContactsManager @UiThread constructor() { var found = false if (results.isNotEmpty()) { - val result = results.first() { + val result = results.first { it.friend != null } if (result != null) { diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt index e752d2b90..b9eaf9abe 100644 --- a/app/src/main/java/org/linphone/core/CoreContext.kt +++ b/app/src/main/java/org/linphone/core/CoreContext.kt @@ -48,7 +48,9 @@ import org.linphone.utils.AppUtils import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class CoreContext @UiThread constructor(val context: Context) : HandlerThread("Core Thread") { +class CoreContext + @UiThread + constructor(val context: Context) : HandlerThread("Core Thread") { companion object { private const val TAG = "[Core Context]" } diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt index 5ce0456b1..ecf1e2e35 100644 --- a/app/src/main/java/org/linphone/core/CorePreferences.kt +++ b/app/src/main/java/org/linphone/core/CorePreferences.kt @@ -28,7 +28,9 @@ import java.io.FileOutputStream import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.contacts.ContactLoader.Companion.LINPHONE_ADDRESS_BOOK_FRIEND_LIST -class CorePreferences @UiThread constructor(private val context: Context) { +class CorePreferences + @UiThread + constructor(private val context: Context) { companion object { private const val TAG = "[Preferences]" @@ -100,7 +102,7 @@ class CorePreferences @UiThread constructor(private val context: Context) { config.setString("app", "device", value.trim()) } - /* Call settings */ + // Call settings // This won't be done if bluetooth or wired headset is used @get:WorkerThread @set:WorkerThread @@ -124,7 +126,7 @@ class CorePreferences @UiThread constructor(private val context: Context) { config.setBool("app", "show_confirmation_dialog_zrtp_trust_call", value) } - /* Conversation related */ + // Conversation related var markConversationAsReadWhenDismissingMessageNotification: Boolean get() = config.getBool("app", "mark_as_read_notif_dismissal", false) @@ -132,7 +134,7 @@ class CorePreferences @UiThread constructor(private val context: Context) { config.setBool("app", "mark_as_read_notif_dismissal", value) } - /* Contacts related */ + // Contacts related @get:WorkerThread @set:WorkerThread var contactsFilter: String @@ -159,14 +161,14 @@ class CorePreferences @UiThread constructor(private val context: Context) { config.setString("app", "friend_list_to_store_newly_created_contacts", value) } - /* Voice recordings related */ + // Voice recordings related @get:WorkerThread @set:WorkerThread var voiceRecordingMaxDuration: Int get() = config.getInt("app", "voice_recording_max_duration", 600000) // in ms set(value) = config.setInt("app", "voice_recording_max_duration", value) - /* User interface related */ + // User interface related // -1 means auto, 0 no, 1 yes @get:WorkerThread @set:WorkerThread @@ -274,7 +276,7 @@ class CorePreferences @UiThread constructor(private val context: Context) { val automaticallyShowDialpad: Boolean get() = config.getBool("ui", "automatically_show_dialpad", false) - /* Paths */ + // Paths @get:WorkerThread val defaultDomain: String diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt index 0d4543bbe..52d8c1b6a 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt +++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt @@ -76,7 +76,9 @@ import org.linphone.utils.FileUtils import org.linphone.utils.LinphoneUtils import org.linphone.utils.ShortcutUtils -class NotificationsManager @MainThread constructor(private val context: Context) { +class NotificationsManager + @MainThread + constructor(private val context: Context) { companion object { private const val TAG = "[Notifications Manager]" @@ -876,7 +878,7 @@ class NotificationsManager @MainThread constructor(private val context: Context) contact, displayName, address.asStringUriOnly(), - message.time * 1000, /* Linphone timestamps are in seconds */ + message.time * 1000, // Linphone timestamps are in seconds isOutgoing = false, isReaction = true, reactionToMessageId = message.messageId, @@ -998,7 +1000,7 @@ class NotificationsManager @MainThread constructor(private val context: Context) contact, displayName, address.asStringUriOnly(), - message.time * 1000, /* Linphone timestamps are in seconds */ + message.time * 1000, // Linphone timestamps are in seconds isOutgoing = message.isOutgoing ) diff --git a/app/src/main/java/org/linphone/telecom/TelecomManager.kt b/app/src/main/java/org/linphone/telecom/TelecomManager.kt index 2b04dae99..16727b081 100644 --- a/app/src/main/java/org/linphone/telecom/TelecomManager.kt +++ b/app/src/main/java/org/linphone/telecom/TelecomManager.kt @@ -36,7 +36,9 @@ import org.linphone.core.CoreListenerStub import org.linphone.core.tools.Log import org.linphone.utils.LinphoneUtils -class TelecomManager @WorkerThread constructor(context: Context) { +class TelecomManager + @WorkerThread + constructor(context: Context) { companion object { private const val TAG = "[Telecom Manager]" } diff --git a/app/src/main/java/org/linphone/ui/assistant/model/AcceptConditionsAndPolicyDialogModel.kt b/app/src/main/java/org/linphone/ui/assistant/model/AcceptConditionsAndPolicyDialogModel.kt index 69069797e..d0276115e 100644 --- a/app/src/main/java/org/linphone/ui/assistant/model/AcceptConditionsAndPolicyDialogModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/model/AcceptConditionsAndPolicyDialogModel.kt @@ -32,7 +32,9 @@ import org.linphone.core.tools.Log import org.linphone.utils.AppUtils import org.linphone.utils.Event -class AcceptConditionsAndPolicyDialogModel @UiThread constructor() { +class AcceptConditionsAndPolicyDialogModel + @UiThread + constructor() { companion object { private const val TAG = "[Accept Terms & Policy Dialog Model]" } diff --git a/app/src/main/java/org/linphone/ui/assistant/model/ConfirmPhoneNumberDialogModel.kt b/app/src/main/java/org/linphone/ui/assistant/model/ConfirmPhoneNumberDialogModel.kt index 022bc63de..0aed9010e 100644 --- a/app/src/main/java/org/linphone/ui/assistant/model/ConfirmPhoneNumberDialogModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/model/ConfirmPhoneNumberDialogModel.kt @@ -23,7 +23,9 @@ import androidx.annotation.UiThread import androidx.lifecycle.MutableLiveData import org.linphone.utils.Event -class ConfirmPhoneNumberDialogModel @UiThread constructor(phoneNumber: String) { +class ConfirmPhoneNumberDialogModel + @UiThread + constructor(phoneNumber: String) { val message = MutableLiveData() val dismissEvent = MutableLiveData>() diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt index 708df4812..c8e86ed21 100644 --- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt @@ -50,7 +50,9 @@ import org.linphone.utils.AppUtils import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class AccountCreationViewModel @UiThread constructor() : GenericViewModel() { +class AccountCreationViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Account Creation ViewModel]" diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt index 8f9577d5c..629d73df5 100644 --- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt @@ -38,7 +38,9 @@ import org.linphone.ui.GenericViewModel import org.linphone.utils.AppUtils import org.linphone.utils.Event -open class AccountLoginViewModel @UiThread constructor() : GenericViewModel() { +open class AccountLoginViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Account Login ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/QrCodeViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/QrCodeViewModel.kt index 57073ff98..69146fabd 100644 --- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/QrCodeViewModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/QrCodeViewModel.kt @@ -31,7 +31,9 @@ import org.linphone.core.tools.Log import org.linphone.ui.GenericViewModel import org.linphone.utils.Event -class QrCodeViewModel @UiThread constructor() : GenericViewModel() { +class QrCodeViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Qr Code Scanner ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt index a866399a9..d20daf652 100644 --- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt @@ -40,7 +40,9 @@ import org.linphone.ui.GenericViewModel import org.linphone.utils.AppUtils import org.linphone.utils.Event -class ThirdPartySipAccountLoginViewModel @UiThread constructor() : GenericViewModel() { +class ThirdPartySipAccountLoginViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Third Party SIP Account Login ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceActiveSpeakerFragment.kt b/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceActiveSpeakerFragment.kt index 7816f4a89..651800fb2 100644 --- a/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceActiveSpeakerFragment.kt +++ b/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceActiveSpeakerFragment.kt @@ -33,6 +33,7 @@ import org.linphone.databinding.CallConferenceActiveSpeakerFragmentBinding import org.linphone.ui.call.conference.viewmodel.ConferenceViewModel import org.linphone.ui.call.fragment.GenericCallFragment import org.linphone.ui.call.viewmodel.CurrentCallViewModel + @UiThread class ConferenceActiveSpeakerFragment : GenericCallFragment() { companion object { diff --git a/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceAudioOnlyFragment.kt b/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceAudioOnlyFragment.kt index ba60fb21a..6f934b75e 100644 --- a/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceAudioOnlyFragment.kt +++ b/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceAudioOnlyFragment.kt @@ -32,6 +32,7 @@ import org.linphone.databinding.CallConferenceAudioOnlyFragmentBinding import org.linphone.ui.call.conference.viewmodel.ConferenceViewModel import org.linphone.ui.call.fragment.GenericCallFragment import org.linphone.ui.call.viewmodel.CurrentCallViewModel + @UiThread class ConferenceAudioOnlyFragment : GenericCallFragment() { companion object { diff --git a/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceGridFragment.kt b/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceGridFragment.kt index 5c13f73d1..497bd5558 100644 --- a/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceGridFragment.kt +++ b/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceGridFragment.kt @@ -32,6 +32,7 @@ import org.linphone.databinding.CallConferenceGridFragmentBinding import org.linphone.ui.call.conference.viewmodel.ConferenceViewModel import org.linphone.ui.call.fragment.GenericCallFragment import org.linphone.ui.call.viewmodel.CurrentCallViewModel + @UiThread class ConferenceGridFragment : GenericCallFragment() { companion object { diff --git a/app/src/main/java/org/linphone/ui/call/conference/model/ConferenceParticipantDeviceModel.kt b/app/src/main/java/org/linphone/ui/call/conference/model/ConferenceParticipantDeviceModel.kt index 145c0e3ce..dfd7a6a44 100644 --- a/app/src/main/java/org/linphone/ui/call/conference/model/ConferenceParticipantDeviceModel.kt +++ b/app/src/main/java/org/linphone/ui/call/conference/model/ConferenceParticipantDeviceModel.kt @@ -31,7 +31,9 @@ import org.linphone.core.StreamType import org.linphone.core.tools.Log import org.linphone.utils.LinphoneUtils -class ConferenceParticipantDeviceModel @WorkerThread constructor( +class ConferenceParticipantDeviceModel + @WorkerThread + constructor( val device: ParticipantDevice, val isMe: Boolean = false ) { diff --git a/app/src/main/java/org/linphone/ui/call/conference/model/ConferenceParticipantModel.kt b/app/src/main/java/org/linphone/ui/call/conference/model/ConferenceParticipantModel.kt index bad5f8f48..bf174b052 100644 --- a/app/src/main/java/org/linphone/ui/call/conference/model/ConferenceParticipantModel.kt +++ b/app/src/main/java/org/linphone/ui/call/conference/model/ConferenceParticipantModel.kt @@ -27,7 +27,9 @@ import org.linphone.core.Participant import org.linphone.core.tools.Log import org.linphone.ui.main.contacts.model.ContactAvatarModel -class ConferenceParticipantModel @WorkerThread constructor( +class ConferenceParticipantModel + @WorkerThread + constructor( val participant: Participant, val avatarModel: ContactAvatarModel, isMyselfAdmin: Boolean, diff --git a/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt b/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt index 5089c66d1..c904141bf 100644 --- a/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt @@ -40,7 +40,9 @@ import org.linphone.ui.call.conference.view.GridBoxLayout import org.linphone.utils.AppUtils import org.linphone.utils.Event -class ConferenceViewModel @UiThread constructor() : GenericViewModel() { +class ConferenceViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Conference ViewModel]" diff --git a/app/src/main/java/org/linphone/ui/call/model/AudioDeviceModel.kt b/app/src/main/java/org/linphone/ui/call/model/AudioDeviceModel.kt index d716b471c..e8602420a 100644 --- a/app/src/main/java/org/linphone/ui/call/model/AudioDeviceModel.kt +++ b/app/src/main/java/org/linphone/ui/call/model/AudioDeviceModel.kt @@ -22,7 +22,9 @@ package org.linphone.ui.call.model import androidx.annotation.WorkerThread import org.linphone.core.AudioDevice -data class AudioDeviceModel @WorkerThread constructor( +data class AudioDeviceModel + @WorkerThread + constructor( val audioDevice: AudioDevice, val name: String, val type: AudioDevice.Type, diff --git a/app/src/main/java/org/linphone/ui/call/model/CallMediaEncryptionModel.kt b/app/src/main/java/org/linphone/ui/call/model/CallMediaEncryptionModel.kt index 30df43516..ef80c81ab 100644 --- a/app/src/main/java/org/linphone/ui/call/model/CallMediaEncryptionModel.kt +++ b/app/src/main/java/org/linphone/ui/call/model/CallMediaEncryptionModel.kt @@ -27,7 +27,9 @@ import org.linphone.core.MediaEncryption import org.linphone.core.StreamType import org.linphone.utils.AppUtils -class CallMediaEncryptionModel @WorkerThread constructor( +class CallMediaEncryptionModel + @WorkerThread + constructor( private val showZrtpSasValidationDialog: () -> Unit ) { val mediaEncryption = MutableLiveData() diff --git a/app/src/main/java/org/linphone/ui/call/model/CallModel.kt b/app/src/main/java/org/linphone/ui/call/model/CallModel.kt index ecd03c6b7..1a9f36c70 100644 --- a/app/src/main/java/org/linphone/ui/call/model/CallModel.kt +++ b/app/src/main/java/org/linphone/ui/call/model/CallModel.kt @@ -29,7 +29,9 @@ import org.linphone.core.tools.Log import org.linphone.ui.main.contacts.model.ContactAvatarModel import org.linphone.utils.LinphoneUtils -class CallModel @WorkerThread constructor(val call: Call) { +class CallModel + @WorkerThread + constructor(val call: Call) { companion object { private const val TAG = "[Call Model]" } diff --git a/app/src/main/java/org/linphone/ui/call/model/CallStatsModel.kt b/app/src/main/java/org/linphone/ui/call/model/CallStatsModel.kt index a2e66aee9..f7a8d81bd 100644 --- a/app/src/main/java/org/linphone/ui/call/model/CallStatsModel.kt +++ b/app/src/main/java/org/linphone/ui/call/model/CallStatsModel.kt @@ -29,7 +29,9 @@ import org.linphone.core.MediaDirection import org.linphone.core.StreamType import org.linphone.utils.AppUtils -class CallStatsModel @WorkerThread constructor() { +class CallStatsModel + @WorkerThread + constructor() { val audioCodec = MutableLiveData() val audioBandwidth = MutableLiveData() val lossRate = MutableLiveData() diff --git a/app/src/main/java/org/linphone/ui/call/model/ConfirmCallTransferDialogModel.kt b/app/src/main/java/org/linphone/ui/call/model/ConfirmCallTransferDialogModel.kt index f1a5ad06e..5e2c69d55 100644 --- a/app/src/main/java/org/linphone/ui/call/model/ConfirmCallTransferDialogModel.kt +++ b/app/src/main/java/org/linphone/ui/call/model/ConfirmCallTransferDialogModel.kt @@ -24,7 +24,9 @@ import androidx.lifecycle.MutableLiveData import org.linphone.utils.AppUtils import org.linphone.utils.Event -class ConfirmCallTransferDialogModel @UiThread constructor( +class ConfirmCallTransferDialogModel + @UiThread + constructor( toTransfer: String, toReceiveTransfer: String ) { diff --git a/app/src/main/java/org/linphone/ui/call/model/ZrtpAlertDialogModel.kt b/app/src/main/java/org/linphone/ui/call/model/ZrtpAlertDialogModel.kt index 9a90ca36a..f879fbb90 100644 --- a/app/src/main/java/org/linphone/ui/call/model/ZrtpAlertDialogModel.kt +++ b/app/src/main/java/org/linphone/ui/call/model/ZrtpAlertDialogModel.kt @@ -24,7 +24,9 @@ import androidx.lifecycle.MutableLiveData import org.linphone.ui.GenericViewModel import org.linphone.utils.Event -class ZrtpAlertDialogModel @UiThread constructor(val allowTryAgain: Boolean) : GenericViewModel() { +class ZrtpAlertDialogModel + @UiThread + constructor(val allowTryAgain: Boolean) : GenericViewModel() { companion object { private const val TAG = "[ZRTP Alert Dialog]" } diff --git a/app/src/main/java/org/linphone/ui/call/model/ZrtpSasConfirmationDialogModel.kt b/app/src/main/java/org/linphone/ui/call/model/ZrtpSasConfirmationDialogModel.kt index 91f1c342a..bb40a7fdc 100644 --- a/app/src/main/java/org/linphone/ui/call/model/ZrtpSasConfirmationDialogModel.kt +++ b/app/src/main/java/org/linphone/ui/call/model/ZrtpSasConfirmationDialogModel.kt @@ -25,7 +25,9 @@ import org.linphone.core.tools.Log import org.linphone.ui.GenericViewModel import org.linphone.utils.Event -class ZrtpSasConfirmationDialogModel @UiThread constructor( +class ZrtpSasConfirmationDialogModel + @UiThread + constructor( authTokenToRead: String, authTokensToListen: List, val cacheMismatch: Boolean diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt index 1c33808e8..d2dcdcaec 100644 --- a/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt @@ -34,7 +34,9 @@ import org.linphone.utils.AppUtils import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class CallsViewModel @UiThread constructor() : GenericViewModel() { +class CallsViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Calls ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt index 92e87d982..d245c2d04 100644 --- a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt @@ -64,7 +64,9 @@ import org.linphone.utils.AudioUtils import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class CurrentCallViewModel @UiThread constructor() : GenericViewModel() { +class CurrentCallViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Current Call ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/SharedCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/SharedCallViewModel.kt index 5431099f7..c84e01c82 100644 --- a/app/src/main/java/org/linphone/ui/call/viewmodel/SharedCallViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/viewmodel/SharedCallViewModel.kt @@ -25,7 +25,9 @@ import androidx.window.layout.FoldingFeature import org.linphone.ui.GenericViewModel import org.linphone.utils.Event -class SharedCallViewModel @UiThread constructor() : GenericViewModel() { +class SharedCallViewModel + @UiThread + constructor() : GenericViewModel() { val toggleFullScreenEvent = MutableLiveData>() val foldingState = MutableLiveData() diff --git a/app/src/main/java/org/linphone/ui/file_viewer/FileViewerActivity.kt b/app/src/main/java/org/linphone/ui/fileviewer/FileViewerActivity.kt similarity index 97% rename from app/src/main/java/org/linphone/ui/file_viewer/FileViewerActivity.kt rename to app/src/main/java/org/linphone/ui/fileviewer/FileViewerActivity.kt index 96b5b1bdd..7b856d775 100644 --- a/app/src/main/java/org/linphone/ui/file_viewer/FileViewerActivity.kt +++ b/app/src/main/java/org/linphone/ui/fileviewer/FileViewerActivity.kt @@ -1,4 +1,4 @@ -package org.linphone.ui.file_viewer +package org.linphone.ui.fileviewer import android.content.Intent import android.net.Uri @@ -20,8 +20,8 @@ import org.linphone.R import org.linphone.core.tools.Log import org.linphone.databinding.FileViewerActivityBinding import org.linphone.ui.GenericActivity -import org.linphone.ui.file_viewer.adapter.PdfPagesListAdapter -import org.linphone.ui.file_viewer.viewmodel.FileViewModel +import org.linphone.ui.fileviewer.adapter.PdfPagesListAdapter +import org.linphone.ui.fileviewer.viewmodel.FileViewModel import org.linphone.utils.FileUtils @UiThread diff --git a/app/src/main/java/org/linphone/ui/file_viewer/MediaViewerActivity.kt b/app/src/main/java/org/linphone/ui/fileviewer/MediaViewerActivity.kt similarity index 98% rename from app/src/main/java/org/linphone/ui/file_viewer/MediaViewerActivity.kt rename to app/src/main/java/org/linphone/ui/fileviewer/MediaViewerActivity.kt index a9bdcf04f..6cc4e8d55 100644 --- a/app/src/main/java/org/linphone/ui/file_viewer/MediaViewerActivity.kt +++ b/app/src/main/java/org/linphone/ui/fileviewer/MediaViewerActivity.kt @@ -1,4 +1,4 @@ -package org.linphone.ui.file_viewer +package org.linphone.ui.fileviewer import android.content.Intent import android.net.Uri @@ -21,8 +21,8 @@ import org.linphone.R import org.linphone.core.tools.Log import org.linphone.databinding.FileMediaViewerActivityBinding import org.linphone.ui.GenericActivity -import org.linphone.ui.file_viewer.adapter.MediaListAdapter -import org.linphone.ui.file_viewer.viewmodel.MediaListViewModel +import org.linphone.ui.fileviewer.adapter.MediaListAdapter +import org.linphone.ui.fileviewer.viewmodel.MediaListViewModel import org.linphone.ui.main.chat.model.FileModel import org.linphone.ui.main.viewmodel.SharedMainViewModel import org.linphone.utils.AppUtils diff --git a/app/src/main/java/org/linphone/ui/file_viewer/adapter/MediaListAdapter.kt b/app/src/main/java/org/linphone/ui/fileviewer/adapter/MediaListAdapter.kt similarity index 92% rename from app/src/main/java/org/linphone/ui/file_viewer/adapter/MediaListAdapter.kt rename to app/src/main/java/org/linphone/ui/fileviewer/adapter/MediaListAdapter.kt index cdee1bc83..1bd3c86ca 100644 --- a/app/src/main/java/org/linphone/ui/file_viewer/adapter/MediaListAdapter.kt +++ b/app/src/main/java/org/linphone/ui/fileviewer/adapter/MediaListAdapter.kt @@ -17,15 +17,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.linphone.ui.file_viewer.adapter +package org.linphone.ui.fileviewer.adapter import android.os.Bundle import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.viewpager2.adapter.FragmentStateAdapter import org.linphone.core.tools.Log -import org.linphone.ui.file_viewer.fragment.MediaViewerFragment -import org.linphone.ui.file_viewer.viewmodel.MediaListViewModel +import org.linphone.ui.fileviewer.fragment.MediaViewerFragment +import org.linphone.ui.fileviewer.viewmodel.MediaListViewModel class MediaListAdapter( fragmentActivity: FragmentActivity, diff --git a/app/src/main/java/org/linphone/ui/file_viewer/adapter/PdfPagesListAdapter.kt b/app/src/main/java/org/linphone/ui/fileviewer/adapter/PdfPagesListAdapter.kt similarity index 95% rename from app/src/main/java/org/linphone/ui/file_viewer/adapter/PdfPagesListAdapter.kt rename to app/src/main/java/org/linphone/ui/fileviewer/adapter/PdfPagesListAdapter.kt index b61ed5b10..df22ee881 100644 --- a/app/src/main/java/org/linphone/ui/file_viewer/adapter/PdfPagesListAdapter.kt +++ b/app/src/main/java/org/linphone/ui/fileviewer/adapter/PdfPagesListAdapter.kt @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.linphone.ui.file_viewer.adapter +package org.linphone.ui.fileviewer.adapter import android.view.LayoutInflater import android.view.View @@ -25,7 +25,7 @@ import android.view.ViewGroup import android.widget.ImageView import androidx.recyclerview.widget.RecyclerView import org.linphone.R -import org.linphone.ui.file_viewer.viewmodel.FileViewModel +import org.linphone.ui.fileviewer.viewmodel.FileViewModel class PdfPagesListAdapter(private val viewModel: FileViewModel) : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PdfPageViewHolder { diff --git a/app/src/main/java/org/linphone/ui/file_viewer/fragment/MediaViewerFragment.kt b/app/src/main/java/org/linphone/ui/fileviewer/fragment/MediaViewerFragment.kt similarity index 98% rename from app/src/main/java/org/linphone/ui/file_viewer/fragment/MediaViewerFragment.kt rename to app/src/main/java/org/linphone/ui/fileviewer/fragment/MediaViewerFragment.kt index ba7fbf09a..9dcc8ba3f 100644 --- a/app/src/main/java/org/linphone/ui/file_viewer/fragment/MediaViewerFragment.kt +++ b/app/src/main/java/org/linphone/ui/fileviewer/fragment/MediaViewerFragment.kt @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.linphone.ui.file_viewer.fragment +package org.linphone.ui.fileviewer.fragment import android.graphics.SurfaceTexture import android.os.Bundle @@ -30,7 +30,7 @@ import androidx.annotation.UiThread import androidx.lifecycle.ViewModelProvider import org.linphone.core.tools.Log import org.linphone.databinding.FileMediaViewerChildFragmentBinding -import org.linphone.ui.file_viewer.viewmodel.MediaViewModel +import org.linphone.ui.fileviewer.viewmodel.MediaViewModel import org.linphone.ui.main.fragment.GenericMainFragment import org.linphone.ui.main.viewmodel.SharedMainViewModel import org.linphone.utils.FileUtils diff --git a/app/src/main/java/org/linphone/ui/file_viewer/view/RatioTextureView.kt b/app/src/main/java/org/linphone/ui/fileviewer/view/RatioTextureView.kt similarity index 98% rename from app/src/main/java/org/linphone/ui/file_viewer/view/RatioTextureView.kt rename to app/src/main/java/org/linphone/ui/fileviewer/view/RatioTextureView.kt index aa6bcc84b..256a51eaf 100644 --- a/app/src/main/java/org/linphone/ui/file_viewer/view/RatioTextureView.kt +++ b/app/src/main/java/org/linphone/ui/fileviewer/view/RatioTextureView.kt @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.linphone.ui.file_viewer.view +package org.linphone.ui.fileviewer.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/org/linphone/ui/file_viewer/viewmodel/FileViewModel.kt b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt similarity index 98% rename from app/src/main/java/org/linphone/ui/file_viewer/viewmodel/FileViewModel.kt rename to app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt index 27ae7b1e5..922dbf63e 100644 --- a/app/src/main/java/org/linphone/ui/file_viewer/viewmodel/FileViewModel.kt +++ b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.linphone.ui.file_viewer.viewmodel +package org.linphone.ui.fileviewer.viewmodel import android.graphics.Bitmap import android.graphics.pdf.PdfRenderer @@ -42,7 +42,9 @@ import org.linphone.utils.Event import org.linphone.utils.FileUtils import org.linphone.utils.TimestampUtils -class FileViewModel @UiThread constructor() : GenericViewModel() { +class FileViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[File ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/file_viewer/viewmodel/MediaListViewModel.kt b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaListViewModel.kt similarity index 96% rename from app/src/main/java/org/linphone/ui/file_viewer/viewmodel/MediaListViewModel.kt rename to app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaListViewModel.kt index 8c309f693..8307869cc 100644 --- a/app/src/main/java/org/linphone/ui/file_viewer/viewmodel/MediaListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaListViewModel.kt @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.linphone.ui.file_viewer.viewmodel +package org.linphone.ui.fileviewer.viewmodel import androidx.annotation.UiThread import androidx.annotation.WorkerThread @@ -28,7 +28,9 @@ import org.linphone.ui.main.chat.viewmodel.AbstractConversationViewModel import org.linphone.utils.FileUtils import org.linphone.utils.LinphoneUtils -class MediaListViewModel @UiThread constructor() : AbstractConversationViewModel() { +class MediaListViewModel + @UiThread + constructor() : AbstractConversationViewModel() { companion object { private const val TAG = "[Media List ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/file_viewer/viewmodel/MediaViewModel.kt b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaViewModel.kt similarity index 98% rename from app/src/main/java/org/linphone/ui/file_viewer/viewmodel/MediaViewModel.kt rename to app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaViewModel.kt index 00e975024..c8b15f3d1 100644 --- a/app/src/main/java/org/linphone/ui/file_viewer/viewmodel/MediaViewModel.kt +++ b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaViewModel.kt @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.linphone.ui.file_viewer.viewmodel +package org.linphone.ui.fileviewer.viewmodel import android.media.AudioAttributes import android.media.MediaPlayer @@ -35,7 +35,9 @@ import org.linphone.utils.Event import org.linphone.utils.FileUtils import org.linphone.utils.TimestampUtils -class MediaViewModel @UiThread constructor() : GenericViewModel() { +class MediaViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Media ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt index 90a15bf5a..bdf282863 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt @@ -220,6 +220,7 @@ class ConversationEventAdapter : } } } + inner class EventViewHolder( val binding: ChatConversationEventBinding ) : RecyclerView.ViewHolder(binding.root) { diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt index 9cb4eaf2e..8fa661c00 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt @@ -37,8 +37,8 @@ import org.linphone.R import org.linphone.core.tools.Log import org.linphone.databinding.ChatListFragmentBinding import org.linphone.ui.GenericActivity -import org.linphone.ui.file_viewer.FileViewerActivity -import org.linphone.ui.file_viewer.MediaViewerActivity +import org.linphone.ui.fileviewer.FileViewerActivity +import org.linphone.ui.fileviewer.MediaViewerActivity import org.linphone.ui.main.chat.adapter.ConversationsListAdapter import org.linphone.ui.main.chat.viewmodel.ConversationsListViewModel import org.linphone.ui.main.fragment.AbstractMainFragment diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt index 3f1da5cf2..5324963ee 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt @@ -40,7 +40,9 @@ import org.linphone.utils.LinphoneUtils import org.linphone.utils.ShortcutUtils import org.linphone.utils.TimestampUtils -class ConversationModel @WorkerThread constructor(val chatRoom: ChatRoom) { +class ConversationModel + @WorkerThread + constructor(val chatRoom: ChatRoom) { companion object { private const val TAG = "[Conversation Model]" } diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt index 527ae23a3..948ae8de8 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt @@ -25,7 +25,9 @@ import org.linphone.core.EventLog import org.linphone.core.tools.Log import org.linphone.utils.LinphoneUtils -class EventLogModel @WorkerThread constructor( +class EventLogModel + @WorkerThread + constructor( val eventLog: EventLog, isFromGroup: Boolean = false, isGroupedWithPreviousOne: Boolean = false, diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt index 45070f2b3..404f3f365 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt @@ -29,7 +29,9 @@ import org.linphone.core.EventLog import org.linphone.utils.AppUtils import org.linphone.utils.LinphoneUtils -class EventModel @WorkerThread constructor(private val eventLog: EventLog) { +class EventModel + @WorkerThread + constructor(private val eventLog: EventLog) { val text: String val icon: Drawable? diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt index 969bdd6d1..c8cc3c868 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt @@ -36,7 +36,9 @@ import org.linphone.core.tools.Log import org.linphone.utils.FileUtils import org.linphone.utils.TimestampUtils -class FileModel @AnyThread constructor( +class FileModel + @AnyThread + constructor( val path: String, val fileName: String, val fileSize: Long, diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageBottomSheetParticipantModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageBottomSheetParticipantModel.kt index 5827fbc7e..7983cb9cb 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageBottomSheetParticipantModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageBottomSheetParticipantModel.kt @@ -24,7 +24,9 @@ import androidx.annotation.WorkerThread import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.core.Address -class MessageBottomSheetParticipantModel @WorkerThread constructor( +class MessageBottomSheetParticipantModel + @WorkerThread + constructor( address: Address, val value: String, val timestamp: Long, diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageDeliveryModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageDeliveryModel.kt index bdea6b0af..afd0a7b49 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageDeliveryModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageDeliveryModel.kt @@ -31,7 +31,9 @@ import org.linphone.core.tools.Log import org.linphone.utils.AppUtils import org.linphone.utils.TimestampUtils -class MessageDeliveryModel @WorkerThread constructor( +class MessageDeliveryModel + @WorkerThread + constructor( private val chatMessage: ChatMessage, private val onDeliveryUpdated: ((model: MessageDeliveryModel) -> Unit)? = null ) { diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt index f58109ef8..795e97d7b 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt @@ -64,7 +64,9 @@ import org.linphone.utils.PatternClickableSpan import org.linphone.utils.SpannableClickedListener import org.linphone.utils.TimestampUtils -class MessageModel @WorkerThread constructor( +class MessageModel + @WorkerThread + constructor( val chatMessage: ChatMessage, val isFromGroup: Boolean, val isReply: Boolean, diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageReactionsModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageReactionsModel.kt index d3bc6ee7f..1c930d03a 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageReactionsModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageReactionsModel.kt @@ -28,7 +28,9 @@ import org.linphone.core.ChatMessageListenerStub import org.linphone.core.ChatMessageReaction import org.linphone.core.tools.Log -class MessageReactionsModel @WorkerThread constructor( +class MessageReactionsModel + @WorkerThread + constructor( private val chatMessage: ChatMessage, private val onReactionsUpdated: ((model: MessageReactionsModel) -> Unit)? = null ) { diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt index ae6ecef86..68ab1b36d 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt @@ -26,7 +26,9 @@ import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.core.Address import org.linphone.ui.main.contacts.model.ContactAvatarModel -class ParticipantModel @WorkerThread constructor( +class ParticipantModel + @WorkerThread + constructor( val address: Address, val isMyselfAdmin: Boolean = false, val isParticipantAdmin: Boolean = false, diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationDocumentsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationDocumentsListViewModel.kt index 7e4a99a0f..5c3710bf0 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationDocumentsListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationDocumentsListViewModel.kt @@ -27,7 +27,9 @@ import org.linphone.ui.main.chat.model.FileModel import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class ConversationDocumentsListViewModel @UiThread constructor() : AbstractConversationViewModel() { +class ConversationDocumentsListViewModel + @UiThread + constructor() : AbstractConversationViewModel() { companion object { private const val TAG = "[Conversation Documents List ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationEphemeralLifetimeViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationEphemeralLifetimeViewModel.kt index f648fc567..dd2100247 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationEphemeralLifetimeViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationEphemeralLifetimeViewModel.kt @@ -23,7 +23,9 @@ import androidx.annotation.UiThread import androidx.lifecycle.MutableLiveData import org.linphone.ui.GenericViewModel -class ConversationEphemeralLifetimeViewModel @UiThread constructor() : GenericViewModel() { +class ConversationEphemeralLifetimeViewModel + @UiThread + constructor() : GenericViewModel() { val currentlySelectedValue = MutableLiveData() init { diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt index 56cb0a4d4..495c3170e 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt @@ -39,7 +39,9 @@ import org.linphone.utils.AppUtils import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class ConversationForwardMessageViewModel @UiThread constructor() : AddressSelectionViewModel() { +class ConversationForwardMessageViewModel + @UiThread + constructor() : AddressSelectionViewModel() { companion object { private const val TAG = "[Conversation Forward Message ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt index c12359ce3..e9f1c2724 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt @@ -41,7 +41,9 @@ import org.linphone.utils.AppUtils import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class ConversationInfoViewModel @UiThread constructor() : AbstractConversationViewModel() { +class ConversationInfoViewModel + @UiThread + constructor() : AbstractConversationViewModel() { companion object { private const val TAG = "[Conversation Info ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationMediaListViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationMediaListViewModel.kt index 9df1594b5..1b8dea0d5 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationMediaListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationMediaListViewModel.kt @@ -27,7 +27,9 @@ import org.linphone.ui.main.chat.model.FileModel import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class ConversationMediaListViewModel @UiThread constructor() : AbstractConversationViewModel() { +class ConversationMediaListViewModel + @UiThread + constructor() : AbstractConversationViewModel() { companion object { private const val TAG = "[Conversation Media List ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt index b87c6747f..3e4338eea 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt @@ -49,7 +49,9 @@ import org.linphone.utils.Event import org.linphone.utils.FileUtils import org.linphone.utils.LinphoneUtils -class ConversationViewModel @UiThread constructor() : AbstractConversationViewModel() { +class ConversationViewModel + @UiThread + constructor() : AbstractConversationViewModel() { companion object { private const val TAG = "[Conversation ViewModel]" private const val MESSAGES_PER_PAGE = 30 diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt index 2ca3e9e9c..4f6dac7d6 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt @@ -36,7 +36,9 @@ import org.linphone.ui.main.viewmodel.AbstractMainViewModel import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class ConversationsListViewModel @UiThread constructor() : AbstractMainViewModel() { +class ConversationsListViewModel + @UiThread + constructor() : AbstractMainViewModel() { companion object { private const val TAG = "[Conversations List ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt index 7ced4921b..9702a26bb 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt @@ -57,7 +57,9 @@ import org.linphone.utils.Event import org.linphone.utils.FileUtils import org.linphone.utils.LinphoneUtils -class SendMessageInConversationViewModel @UiThread constructor() : GenericViewModel() { +class SendMessageInConversationViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Send Message In Conversation ViewModel]" diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt index 703b602e3..9ef149325 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt @@ -36,7 +36,9 @@ import org.linphone.utils.AppUtils import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class StartConversationViewModel @UiThread constructor() : AddressSelectionViewModel() { +class StartConversationViewModel + @UiThread + constructor() : AddressSelectionViewModel() { companion object { private const val TAG = "[Start Conversation ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactAvatarModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactAvatarModel.kt index 65fb8cd59..adcf4a3e4 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactAvatarModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactAvatarModel.kt @@ -36,7 +36,9 @@ import org.linphone.core.tools.Log import org.linphone.utils.AppUtils import org.linphone.utils.TimestampUtils -class ContactAvatarModel @WorkerThread constructor(val friend: Friend, val address: Address? = null) : AbstractAvatarModel() { +class ContactAvatarModel + @WorkerThread + constructor(val friend: Friend, val address: Address? = null) : AbstractAvatarModel() { companion object { private const val TAG = "[Contact Avatar Model]" } diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactDeviceModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactDeviceModel.kt index 10c747b78..839dda05f 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactDeviceModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactDeviceModel.kt @@ -23,7 +23,9 @@ import androidx.annotation.UiThread import androidx.annotation.WorkerThread import org.linphone.core.Address -class ContactDeviceModel @WorkerThread constructor( +class ContactDeviceModel + @WorkerThread + constructor( val name: String, val address: Address, val trusted: Boolean, diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactNumberOrAddressModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactNumberOrAddressModel.kt index 3b6349c6b..ffb1d8b80 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactNumberOrAddressModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactNumberOrAddressModel.kt @@ -25,7 +25,9 @@ import androidx.lifecycle.MutableLiveData import org.linphone.core.Address import org.linphone.core.Friend -class ContactNumberOrAddressModel @WorkerThread constructor( +class ContactNumberOrAddressModel + @WorkerThread + constructor( val friend: Friend, val address: Address?, val displayedValue: String, diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/NewOrEditNumberOrAddressModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/NewOrEditNumberOrAddressModel.kt index 0861e232b..00a91d2d3 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/model/NewOrEditNumberOrAddressModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/model/NewOrEditNumberOrAddressModel.kt @@ -23,7 +23,9 @@ import androidx.annotation.UiThread import androidx.annotation.WorkerThread import androidx.lifecycle.MutableLiveData -class NewOrEditNumberOrAddressModel @WorkerThread constructor( +class NewOrEditNumberOrAddressModel + @WorkerThread + constructor( defaultValue: String, val isSip: Boolean, val label: String? = "", diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/NumberOrAddressPickerDialogModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/NumberOrAddressPickerDialogModel.kt index acd4f34b3..cecf31c79 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/model/NumberOrAddressPickerDialogModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/model/NumberOrAddressPickerDialogModel.kt @@ -23,7 +23,9 @@ import androidx.annotation.UiThread import androidx.lifecycle.MutableLiveData import org.linphone.utils.Event -class NumberOrAddressPickerDialogModel @UiThread constructor( +class NumberOrAddressPickerDialogModel + @UiThread + constructor( list: List ) { val sipAddressesAndPhoneNumbers = MutableLiveData>() diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/TrustCallDialogModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/TrustCallDialogModel.kt index 62b6ce21c..47bd06491 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/model/TrustCallDialogModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/model/TrustCallDialogModel.kt @@ -24,7 +24,9 @@ import androidx.lifecycle.MutableLiveData import org.linphone.utils.AppUtils import org.linphone.utils.Event -class TrustCallDialogModel @UiThread constructor(contact: String, device: String) { +class TrustCallDialogModel + @UiThread + constructor(contact: String, device: String) { val message = MutableLiveData() val doNotShowAnymore = MutableLiveData() diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt index fba16db33..6a82e7d5c 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt @@ -43,7 +43,9 @@ import org.linphone.ui.main.contacts.model.NewOrEditNumberOrAddressModel import org.linphone.utils.Event import org.linphone.utils.FileUtils -class ContactNewOrEditViewModel @UiThread constructor() : GenericViewModel() { +class ContactNewOrEditViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Contact New/Edit View Model]" diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt index 0c6fd76f7..296f6a85d 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt @@ -53,7 +53,9 @@ import org.linphone.utils.Event import org.linphone.utils.FileUtils import org.linphone.utils.LinphoneUtils -class ContactViewModel @UiThread constructor() : GenericViewModel() { +class ContactViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Contact ViewModel]" diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt index b4d3488f1..67e4a2b55 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt @@ -43,7 +43,9 @@ import org.linphone.ui.main.viewmodel.AbstractMainViewModel import org.linphone.utils.Event import org.linphone.utils.FileUtils -class ContactsListViewModel @UiThread constructor() : AbstractMainViewModel() { +class ContactsListViewModel + @UiThread + constructor() : AbstractMainViewModel() { companion object { private const val TAG = "[Contacts List ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt b/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt index 018f81368..06dcf1ec3 100644 --- a/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt @@ -34,7 +34,7 @@ import org.linphone.R import org.linphone.core.tools.Log import org.linphone.databinding.HelpDebugFragmentBinding import org.linphone.ui.GenericActivity -import org.linphone.ui.file_viewer.FileViewerActivity +import org.linphone.ui.fileviewer.FileViewerActivity import org.linphone.ui.main.fragment.GenericMainFragment import org.linphone.ui.main.help.viewmodel.HelpViewModel diff --git a/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt b/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt index 7175b2e3e..52b39ee7f 100644 --- a/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt @@ -40,7 +40,9 @@ import org.linphone.utils.AppUtils import org.linphone.utils.Event import org.linphone.utils.FileUtils -class HelpViewModel @UiThread constructor() : GenericViewModel() { +class HelpViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Help ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/history/model/CallLogHistoryModel.kt b/app/src/main/java/org/linphone/ui/main/history/model/CallLogHistoryModel.kt index 17a4ea0d8..8530cab22 100644 --- a/app/src/main/java/org/linphone/ui/main/history/model/CallLogHistoryModel.kt +++ b/app/src/main/java/org/linphone/ui/main/history/model/CallLogHistoryModel.kt @@ -30,7 +30,9 @@ import org.linphone.utils.AppUtils import org.linphone.utils.LinphoneUtils import org.linphone.utils.TimestampUtils -class CallLogHistoryModel @WorkerThread constructor(val callLog: CallLog) { +class CallLogHistoryModel + @WorkerThread + constructor(val callLog: CallLog) { val id = callLog.callId ?: callLog.refKey val isOutgoing = MutableLiveData() diff --git a/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt b/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt index dfd605859..33e24fdfd 100644 --- a/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt +++ b/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt @@ -32,7 +32,9 @@ import org.linphone.utils.AppUtils import org.linphone.utils.LinphoneUtils import org.linphone.utils.TimestampUtils -class CallLogModel @WorkerThread constructor(private val callLog: CallLog) { +class CallLogModel + @WorkerThread + constructor(private val callLog: CallLog) { companion object { private const val TAG = "[Call Log Model]" } diff --git a/app/src/main/java/org/linphone/ui/main/history/model/ConfirmationDialogModel.kt b/app/src/main/java/org/linphone/ui/main/history/model/ConfirmationDialogModel.kt index 0b8e1e5a7..c8258aa0d 100644 --- a/app/src/main/java/org/linphone/ui/main/history/model/ConfirmationDialogModel.kt +++ b/app/src/main/java/org/linphone/ui/main/history/model/ConfirmationDialogModel.kt @@ -23,7 +23,9 @@ import androidx.annotation.UiThread import androidx.lifecycle.MutableLiveData import org.linphone.utils.Event -class ConfirmationDialogModel @UiThread constructor() { +class ConfirmationDialogModel + @UiThread + constructor() { val dismissEvent = MutableLiveData>() val cancelEvent = MutableLiveData>() diff --git a/app/src/main/java/org/linphone/ui/main/history/model/NumpadModel.kt b/app/src/main/java/org/linphone/ui/main/history/model/NumpadModel.kt index 26ba34be1..f92da154d 100644 --- a/app/src/main/java/org/linphone/ui/main/history/model/NumpadModel.kt +++ b/app/src/main/java/org/linphone/ui/main/history/model/NumpadModel.kt @@ -24,7 +24,9 @@ import androidx.lifecycle.MutableLiveData import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.core.tools.Log -open class NumpadModel @UiThread constructor( +open class NumpadModel + @UiThread + constructor( private val inCallNumpad: Boolean, private val onDigitClicked: (value: String) -> (Unit), private val onVoicemailClicked: () -> (Unit), diff --git a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt index 73d8b7f9c..13ed58d57 100644 --- a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt @@ -35,7 +35,9 @@ import org.linphone.ui.main.viewmodel.AbstractMainViewModel import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class HistoryListViewModel @UiThread constructor() : AbstractMainViewModel() { +class HistoryListViewModel + @UiThread + constructor() : AbstractMainViewModel() { companion object { private const val TAG = "[History List ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt index 807e398eb..2e8804040 100644 --- a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt @@ -40,7 +40,9 @@ import org.linphone.utils.AppUtils import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class HistoryViewModel @UiThread constructor() : GenericViewModel() { +class HistoryViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[History ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt b/app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt index 7a703b5ae..69778db44 100644 --- a/app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt @@ -40,7 +40,9 @@ import org.linphone.ui.main.viewmodel.AddressSelectionViewModel import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -class StartCallViewModel @UiThread constructor() : AddressSelectionViewModel() { +class StartCallViewModel + @UiThread + constructor() : AddressSelectionViewModel() { companion object { private const val TAG = "[Start Call ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/meetings/model/MeetingListItemModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/model/MeetingListItemModel.kt index 3e55b49ac..cebbbfa77 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/model/MeetingListItemModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/model/MeetingListItemModel.kt @@ -22,7 +22,9 @@ package org.linphone.ui.main.meetings.model import androidx.annotation.WorkerThread import org.linphone.utils.TimestampUtils -class MeetingListItemModel @WorkerThread constructor( +class MeetingListItemModel + @WorkerThread + constructor( meetingModel: MeetingModel?, val firstMeetingOfTheWeek: Boolean ) { diff --git a/app/src/main/java/org/linphone/ui/main/meetings/model/MeetingModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/model/MeetingModel.kt index e13f674f2..702d6ac3b 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/model/MeetingModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/model/MeetingModel.kt @@ -28,7 +28,9 @@ import org.linphone.core.Participant import org.linphone.core.tools.Log import org.linphone.utils.TimestampUtils -class MeetingModel @WorkerThread constructor(val conferenceInfo: ConferenceInfo) { +class MeetingModel + @WorkerThread + constructor(val conferenceInfo: ConferenceInfo) { companion object { private const val TAG = "[Meeting Model]" } diff --git a/app/src/main/java/org/linphone/ui/main/meetings/model/ParticipantModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/model/ParticipantModel.kt index 546cd0d0b..97735e0d9 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/model/ParticipantModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/model/ParticipantModel.kt @@ -23,7 +23,9 @@ import androidx.annotation.WorkerThread import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.core.Address -class ParticipantModel @WorkerThread constructor(address: Address, val isOrganizer: Boolean) { +class ParticipantModel + @WorkerThread + constructor(address: Address, val isOrganizer: Boolean) { val sipUri = address.asStringUriOnly() val avatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(address) diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt index 2d1fad61a..6b01b6a57 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt @@ -38,7 +38,9 @@ import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils import org.linphone.utils.TimestampUtils -class MeetingViewModel @UiThread constructor() : GenericViewModel() { +class MeetingViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Meeting ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt index ff8028eb8..92d612156 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt @@ -45,7 +45,9 @@ import org.linphone.utils.AppUtils import org.linphone.utils.Event import org.linphone.utils.TimestampUtils -class MeetingWaitingRoomViewModel @UiThread constructor() : GenericViewModel() { +class MeetingWaitingRoomViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Meeting Waiting Room ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt index 1f94bb15f..4496aa6d8 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt @@ -37,7 +37,9 @@ import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils import org.linphone.utils.TimestampUtils -class MeetingsListViewModel @UiThread constructor() : AbstractMainViewModel() { +class MeetingsListViewModel + @UiThread + constructor() : AbstractMainViewModel() { companion object { private const val TAG = "[Meetings List ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt index fc9ac8419..53d2b4c43 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt @@ -46,7 +46,9 @@ import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils import org.linphone.utils.TimestampUtils -class ScheduleMeetingViewModel @UiThread constructor() : GenericViewModel() { +class ScheduleMeetingViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Schedule Meeting ViewModel]" } @@ -514,9 +516,9 @@ class ScheduleMeetingViewModel @UiThread constructor() : GenericViewModel() { isBroadcastSelected.postValue(false) // TODO FIXME: not implemented yet - startTimestamp = conferenceInfo.dateTime * 1000 /* Linphone timestamps are in seconds */ + startTimestamp = conferenceInfo.dateTime * 1000 // Linphone timestamps are in seconds endTimestamp = - (conferenceInfo.dateTime + conferenceInfo.duration * 60) * 1000 /* Linphone timestamps are in seconds */ + (conferenceInfo.dateTime + conferenceInfo.duration * 60) * 1000 // Linphone timestamps are in seconds Log.i( "$TAG Loaded start date is [$startTimestamp], loaded end date is [$endTimestamp]" ) diff --git a/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt b/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt index a4902c587..588a49e87 100644 --- a/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt +++ b/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt @@ -40,7 +40,9 @@ import org.linphone.core.tools.Log import org.linphone.utils.AppUtils import org.linphone.utils.LinphoneUtils -class AccountModel @WorkerThread constructor( +class AccountModel + @WorkerThread + constructor( val account: Account, private val onMenuClicked: ((view: View, account: Account) -> Unit)? = null ) : AbstractAvatarModel() { diff --git a/app/src/main/java/org/linphone/ui/main/model/AuthRequestedDialogModel.kt b/app/src/main/java/org/linphone/ui/main/model/AuthRequestedDialogModel.kt index d2be0f9c7..2e9d87dcb 100644 --- a/app/src/main/java/org/linphone/ui/main/model/AuthRequestedDialogModel.kt +++ b/app/src/main/java/org/linphone/ui/main/model/AuthRequestedDialogModel.kt @@ -25,7 +25,9 @@ import org.linphone.R import org.linphone.utils.AppUtils import org.linphone.utils.Event -class AuthRequestedDialogModel @UiThread constructor(identity: String) { +class AuthRequestedDialogModel + @UiThread + constructor(identity: String) { val message = MutableLiveData() val password = MutableLiveData() diff --git a/app/src/main/java/org/linphone/ui/main/model/ConversationContactOrSuggestionModel.kt b/app/src/main/java/org/linphone/ui/main/model/ConversationContactOrSuggestionModel.kt index 02b7f9443..b12f5f8a5 100644 --- a/app/src/main/java/org/linphone/ui/main/model/ConversationContactOrSuggestionModel.kt +++ b/app/src/main/java/org/linphone/ui/main/model/ConversationContactOrSuggestionModel.kt @@ -28,7 +28,9 @@ import org.linphone.ui.main.contacts.model.ContactAvatarModel import org.linphone.utils.AppUtils import org.linphone.utils.LinphoneUtils -class ConversationContactOrSuggestionModel @WorkerThread constructor( +class ConversationContactOrSuggestionModel + @WorkerThread + constructor( val address: Address, val localAddress: Address? = null, conversationSubject: String? = null, diff --git a/app/src/main/java/org/linphone/ui/main/model/GroupSetOrEditSubjectDialogModel.kt b/app/src/main/java/org/linphone/ui/main/model/GroupSetOrEditSubjectDialogModel.kt index 055eeafc2..8d9537291 100644 --- a/app/src/main/java/org/linphone/ui/main/model/GroupSetOrEditSubjectDialogModel.kt +++ b/app/src/main/java/org/linphone/ui/main/model/GroupSetOrEditSubjectDialogModel.kt @@ -24,7 +24,9 @@ import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData import org.linphone.utils.Event -class GroupSetOrEditSubjectDialogModel @UiThread constructor( +class GroupSetOrEditSubjectDialogModel + @UiThread + constructor( initialSubject: String, val isGroupConversation: Boolean ) { diff --git a/app/src/main/java/org/linphone/ui/main/model/SelectedAddressModel.kt b/app/src/main/java/org/linphone/ui/main/model/SelectedAddressModel.kt index 391f331db..2c8562076 100644 --- a/app/src/main/java/org/linphone/ui/main/model/SelectedAddressModel.kt +++ b/app/src/main/java/org/linphone/ui/main/model/SelectedAddressModel.kt @@ -24,7 +24,9 @@ import androidx.annotation.WorkerThread import org.linphone.core.Address import org.linphone.ui.main.contacts.model.ContactAvatarModel -class SelectedAddressModel @WorkerThread constructor( +class SelectedAddressModel + @WorkerThread + constructor( val address: Address, val avatarModel: ContactAvatarModel?, private val onRemovedFromSelection: ((model: SelectedAddressModel) -> Unit)? = null diff --git a/app/src/main/java/org/linphone/ui/main/recordings/model/RecordingModel.kt b/app/src/main/java/org/linphone/ui/main/recordings/model/RecordingModel.kt index 93eaead80..4cc1500d4 100644 --- a/app/src/main/java/org/linphone/ui/main/recordings/model/RecordingModel.kt +++ b/app/src/main/java/org/linphone/ui/main/recordings/model/RecordingModel.kt @@ -30,7 +30,9 @@ import org.linphone.utils.FileUtils import org.linphone.utils.LinphoneUtils import org.linphone.utils.TimestampUtils -class RecordingModel @WorkerThread constructor( +class RecordingModel + @WorkerThread + constructor( val filePath: String, val fileName: String, isLegacy: Boolean = false 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 00c160ae5..9d1a017ee 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 @@ -40,7 +40,9 @@ import org.linphone.ui.main.recordings.model.RecordingModel import org.linphone.utils.AudioUtils import org.linphone.utils.Event -class RecordingMediaPlayerViewModel @UiThread constructor() : GenericViewModel() { +class RecordingMediaPlayerViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Recording Media Player ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingsListViewModel.kt index 688a25164..ad44756ea 100644 --- a/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingsListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingsListViewModel.kt @@ -30,7 +30,9 @@ import org.linphone.ui.main.recordings.model.RecordingModel import org.linphone.utils.Event import org.linphone.utils.FileUtils -class RecordingsListViewModel @UiThread constructor() : GenericViewModel() { +class RecordingsListViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Recordings List ViewModel]" diff --git a/app/src/main/java/org/linphone/ui/main/settings/model/AccountDeviceModel.kt b/app/src/main/java/org/linphone/ui/main/settings/model/AccountDeviceModel.kt index 537a9e1a5..cb94deb86 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/model/AccountDeviceModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/model/AccountDeviceModel.kt @@ -25,7 +25,9 @@ import org.linphone.core.AccountDevice import org.linphone.core.tools.Log import org.linphone.utils.TimestampUtils -class AccountDeviceModel @WorkerThread constructor( +class AccountDeviceModel + @WorkerThread + constructor( private val accountDevice: AccountDevice, private val onRemove: (model: AccountDeviceModel, accountDevice: AccountDevice) -> (Unit) ) { diff --git a/app/src/main/java/org/linphone/ui/main/settings/model/CodecModel.kt b/app/src/main/java/org/linphone/ui/main/settings/model/CodecModel.kt index a69cb3b5e..d6339cdf1 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/model/CodecModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/model/CodecModel.kt @@ -23,7 +23,9 @@ import androidx.annotation.UiThread import androidx.annotation.WorkerThread import androidx.lifecycle.MutableLiveData -class CodecModel @WorkerThread constructor( +class CodecModel + @WorkerThread + constructor( val mimeType: String, clockRate: Int, recvFmtp: String?, diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt index 0ac0422e5..c3d57d917 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt @@ -46,7 +46,9 @@ import org.linphone.ui.main.settings.model.AccountDeviceModel import org.linphone.utils.Event import org.linphone.utils.FileUtils -class AccountProfileViewModel @UiThread constructor() : GenericViewModel() { +class AccountProfileViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Account Profile ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt index 1d4668bda..ea3c01c3b 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt @@ -34,7 +34,9 @@ import org.linphone.core.tools.Log import org.linphone.ui.GenericViewModel import org.linphone.utils.Event -class AccountSettingsViewModel @UiThread constructor() : GenericViewModel() { +class AccountSettingsViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Account Settings ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt index 0e4a263f0..7ed1f7eb7 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt @@ -33,7 +33,9 @@ import org.linphone.core.tools.Log import org.linphone.ui.GenericViewModel import org.linphone.utils.Event -class CardDavViewModel @UiThread constructor() : GenericViewModel() { +class CardDavViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[CardDAV ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt index e638f31c2..53e7bd3ea 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt @@ -43,7 +43,9 @@ import org.linphone.ui.main.settings.model.CodecModel import org.linphone.utils.AppUtils import org.linphone.utils.Event -class SettingsViewModel @UiThread constructor() : GenericViewModel() { +class SettingsViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Settings ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt index 30cc516c4..4706be783 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt @@ -37,7 +37,9 @@ import org.linphone.ui.main.model.AccountModel import org.linphone.utils.Event import org.linphone.utils.LinphoneUtils -open class AbstractMainViewModel @UiThread constructor() : GenericViewModel() { +open class AbstractMainViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Abstract Main ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AddParticipantsViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AddParticipantsViewModel.kt index b5e8c1e6d..275f13f7f 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/AddParticipantsViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AddParticipantsViewModel.kt @@ -29,7 +29,9 @@ import org.linphone.ui.main.model.SelectedAddressModel import org.linphone.utils.AppUtils import org.linphone.utils.Event -class AddParticipantsViewModel @UiThread constructor() : AddressSelectionViewModel() { +class AddParticipantsViewModel + @UiThread + constructor() : AddressSelectionViewModel() { companion object { private const val TAG = "[Add Participants ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt index 0e17811a6..ed2efc56e 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt @@ -42,7 +42,9 @@ import org.linphone.ui.main.model.isEndToEndEncryptionMandatory import org.linphone.utils.AppUtils import org.linphone.utils.LinphoneUtils -abstract class AddressSelectionViewModel @UiThread constructor() : DefaultAccountChangedViewModel() { +abstract class AddressSelectionViewModel + @UiThread + constructor() : DefaultAccountChangedViewModel() { companion object { private const val TAG = "[Address Selection ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt index 79d761f68..fef062b8c 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt @@ -35,7 +35,9 @@ import org.linphone.ui.main.model.AccountModel import org.linphone.ui.main.model.ShortcutModel import org.linphone.utils.Event -class DrawerMenuViewModel @UiThread constructor() : GenericViewModel() { +class DrawerMenuViewModel + @UiThread + constructor() : GenericViewModel() { companion object { private const val TAG = "[Drawer Menu ViewModel]" } diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt index fc7184eba..da7391924 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt @@ -49,7 +49,9 @@ import org.linphone.utils.Event import org.linphone.utils.FileUtils import org.linphone.utils.LinphoneUtils -class MainViewModel @UiThread constructor() : ViewModel() { +class MainViewModel + @UiThread + constructor() : ViewModel() { companion object { private const val TAG = "[Main ViewModel]" diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt index f1a3dacf3..55ef4469b 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt @@ -31,8 +31,10 @@ import org.linphone.ui.main.chat.model.MessageModel import org.linphone.ui.main.recordings.model.RecordingModel import org.linphone.utils.Event -class SharedMainViewModel @UiThread constructor() : ViewModel() { - /* Sliding Pane & navigation related */ +class SharedMainViewModel + @UiThread + constructor() : ViewModel() { + // Sliding Pane & navigation related val isSlidingPaneSlideable = MutableLiveData() @@ -62,7 +64,7 @@ class SharedMainViewModel @UiThread constructor() : ViewModel() { var currentlyDisplayedFragment = MutableLiveData() - /* Top bar related */ + // Top bar related val searchFilter: MutableLiveData> by lazy { MutableLiveData>() @@ -76,13 +78,13 @@ class SharedMainViewModel @UiThread constructor() : ViewModel() { MutableLiveData>() } - /* Account Profile related */ + // Account Profile related val goToAccountProfileEvent: MutableLiveData> by lazy { MutableLiveData>() } - /* Contacts related */ + // Contacts related var displayedFriend: Friend? = null // Prevents the need to go look for the friend val showContactEvent: MutableLiveData> by lazy { @@ -95,7 +97,7 @@ class SharedMainViewModel @UiThread constructor() : ViewModel() { var sipAddressToAddToNewContact: String = "" - /* Call logs related */ + // Call logs related val forceRefreshCallLogsListEvent: MutableLiveData> by lazy { MutableLiveData>() @@ -105,7 +107,7 @@ class SharedMainViewModel @UiThread constructor() : ViewModel() { MutableLiveData>() } - /* Conversation related */ + // Conversation related val textToShareFromIntent = MutableLiveData() @@ -155,7 +157,7 @@ class SharedMainViewModel @UiThread constructor() : ViewModel() { MutableLiveData>() } - /* Meetings related */ + // Meetings related var displayedMeeting: ConferenceInfo? = null // Prevents the need to go look for the conference info @@ -175,11 +177,11 @@ class SharedMainViewModel @UiThread constructor() : ViewModel() { MutableLiveData>>>() } - /* Recordings related */ + // Recordings related var playingRecording: RecordingModel? = null - /* Other */ + // Other val mediaViewerFullScreenMode = MutableLiveData() diff --git a/app/src/main/java/org/linphone/utils/ActivityMonitor.kt b/app/src/main/java/org/linphone/utils/ActivityMonitor.kt index f2b4fa4d9..d0ecc5ac6 100644 --- a/app/src/main/java/org/linphone/utils/ActivityMonitor.kt +++ b/app/src/main/java/org/linphone/utils/ActivityMonitor.kt @@ -113,8 +113,10 @@ class ActivityMonitor : ActivityLifecycleCallbacks { } override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} + internal inner class InactivityChecker : Runnable { private var isCanceled = false + fun cancel() { isCanceled = true } diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt index 68527be8a..18904df0d 100644 --- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt +++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt @@ -608,7 +608,7 @@ fun validateOnInput(editText: EditText, onValidate: () -> (Unit)) { }) } -@BindingAdapter("app:layout_wrapBefore") +@BindingAdapter("layout_wrapBefore") fun setFlexboxLayoutWrapBefore(view: View, wrap: Boolean = false) { val params = view.layoutParams as FlexboxLayout.LayoutParams params.isWrapBefore = wrap diff --git a/app/src/main/java/org/linphone/utils/Event.kt b/app/src/main/java/org/linphone/utils/Event.kt index 5a08162b8..90ee17d40 100644 --- a/app/src/main/java/org/linphone/utils/Event.kt +++ b/app/src/main/java/org/linphone/utils/Event.kt @@ -27,7 +27,9 @@ import java.util.concurrent.atomic.AtomicBoolean * This class allows to limit the number of notification for an event. * The first one to consume the event will stop the dispatch. */ -open class Event @AnyThread constructor(private val content: T) { +open class Event + @AnyThread + constructor(private val content: T) { private val handled = AtomicBoolean(false) @UiThread diff --git a/app/src/main/java/org/linphone/utils/SlidingPaneBackPressCallback.kt b/app/src/main/java/org/linphone/utils/SlidingPaneBackPressedCallback.kt similarity index 100% rename from app/src/main/java/org/linphone/utils/SlidingPaneBackPressCallback.kt rename to app/src/main/java/org/linphone/utils/SlidingPaneBackPressedCallback.kt diff --git a/app/src/main/res/layout/file_media_viewer_activity.xml b/app/src/main/res/layout/file_media_viewer_activity.xml index 74b4dd773..e8876d093 100644 --- a/app/src/main/res/layout/file_media_viewer_activity.xml +++ b/app/src/main/res/layout/file_media_viewer_activity.xml @@ -15,7 +15,7 @@ type="View.OnClickListener" /> + type="org.linphone.ui.fileviewer.viewmodel.MediaListViewModel" /> diff --git a/app/src/main/res/layout/file_media_viewer_child_fragment.xml b/app/src/main/res/layout/file_media_viewer_child_fragment.xml index eeae9f024..82327af4a 100644 --- a/app/src/main/res/layout/file_media_viewer_child_fragment.xml +++ b/app/src/main/res/layout/file_media_viewer_child_fragment.xml @@ -10,7 +10,7 @@ type="View.OnClickListener" /> + type="org.linphone.ui.fileviewer.viewmodel.MediaViewModel" /> - + type="org.linphone.ui.fileviewer.viewmodel.FileViewModel" />