From 1376bf4ad141997e56fe68bf4a6a705d4e0abca8 Mon Sep 17 00:00:00 2001 From: TPJ Schikhof Date: Fri, 12 Dec 2025 14:42:28 +0000 Subject: [PATCH] Migrate SinkItemCallback to Kotlin --- .../SystemVolumePlugin/SinkItemCallback.java | 27 ------------------- .../SystemVolumePlugin/SinkItemCallback.kt | 20 ++++++++++++++ 2 files changed, 20 insertions(+), 27 deletions(-) delete mode 100644 src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/SinkItemCallback.java create mode 100644 src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/SinkItemCallback.kt diff --git a/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/SinkItemCallback.java b/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/SinkItemCallback.java deleted file mode 100644 index bc6866f5..00000000 --- a/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/SinkItemCallback.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2021 Art Pinch - * - * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -*/ - -package org.kde.kdeconnect.Plugins.SystemVolumePlugin; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.DiffUtil; - -public class SinkItemCallback extends DiffUtil.ItemCallback { - - @Override - public boolean areItemsTheSame(@NonNull Sink oldItem, @NonNull Sink newItem) { - return oldItem.getName().equals(newItem.getName()); - } - - @Override - public boolean areContentsTheSame(@NonNull Sink oldItem, @NonNull Sink newItem) { - return oldItem.getVolume() == newItem.getVolume() - && oldItem.isMute() == newItem.isMute() - && oldItem.isDefault() == newItem.isDefault() - && oldItem.getMaxVolume() == newItem.getMaxVolume() // should this be checked? - && oldItem.getDescription().equals(newItem.getDescription()); // should this be checked? - } -} diff --git a/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/SinkItemCallback.kt b/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/SinkItemCallback.kt new file mode 100644 index 00000000..dfa95e18 --- /dev/null +++ b/src/org/kde/kdeconnect/Plugins/SystemVolumePlugin/SinkItemCallback.kt @@ -0,0 +1,20 @@ +/* + * SPDX-FileCopyrightText: 2021 Art Pinch + * + * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ +package org.kde.kdeconnect.Plugins.SystemVolumePlugin + +import androidx.recyclerview.widget.DiffUtil + +class SinkItemCallback : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: Sink, newItem: Sink): Boolean + = oldItem.name == newItem.name + + override fun areContentsTheSame(oldItem: Sink, newItem: Sink): Boolean + = oldItem.volume == newItem.volume + && oldItem.mute == newItem.mute + && oldItem.isDefault == newItem.isDefault + && oldItem.maxVolume == newItem.maxVolume // should this be checked? + && oldItem.description == newItem.description // should this be checked? +}