Release 1.24.1

Dismissing the notification caused the alarm to keep playing without a
way to stop it.

BUG: 446349

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.kde.kdeconnect_tp"
-    android:versionCode="12400"
+    android:versionCode="12401"
-    android:versionName="1.24.0">
+    android:versionName="1.24.1">
 
     <supports-screens
         android:anyDensity="true"

build.gradle

@@ -4,7 +4,7 @@ import com.android.build.gradle.api.ApplicationVariant
 import com.github.jk1.license.render.TextReportRenderer
 
 buildscript {
-    ext.kotlin_version = '1.8.0'
+    ext.kotlin_version = '1.8.10'
     dependencies {
         classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -136,19 +136,19 @@ ext {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
     implementation 'androidx.media:media:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.3.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.1'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'com.jakewharton:disklrucache:2.0.2' //For caching album art bitmaps

src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java

@@ -209,7 +209,7 @@ public class SslHelper {
             trustManagerFactory.init(keyStore);
 
             // Setup custom trust manager if device not trusted
-            SSLContext tlsContext = SSLContext.getInstance("TLSv1"); //Newer TLS versions are only supported on API 16+
+            SSLContext tlsContext = SSLContext.getInstance("TLS");
             if (isDeviceTrusted) {
                 tlsContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), RandomHelper.secureRandom);
             } else {

src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhonePlugin.java

@@ -151,6 +151,7 @@ public class FindMyPhonePlugin extends Plugin {
                 .setFullScreenIntent(pendingIntent, true)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setAutoCancel(true)
+                .setOngoing(true)
                 .setContentTitle(context.getString(R.string.findmyphone_found));
         notification.setGroup("BackgroundService");
 

src/org/kde/kdeconnect/UserInterface/DeviceFragment.kt

@@ -61,8 +61,8 @@ class DeviceFragment : Fragment() {
      *
      * Used to start and retry pairing.
      */
-    private var binding: ViewPairRequestBinding? = null
+    private var pairingBinding: ViewPairRequestBinding? = null
-    private fun requireBinding() = binding ?: throw IllegalStateException("binding is not set")
+    private fun requirePairingBinding() = pairingBinding ?: throw IllegalStateException("binding is not set")
 
     /**
      * Cannot-communicate ViewBinding.
@@ -94,7 +94,7 @@ class DeviceFragment : Fragment() {
         val deviceBinding = deviceBinding ?: return null
 
         // Inner binding for the layout shown when we're not paired yet...
-        binding = deviceBinding.pairRequest
+        pairingBinding = deviceBinding.pairRequest
         // ...and for when pairing doesn't (or can't) work
         errorBinding = deviceBinding.pairError
 
@@ -102,8 +102,8 @@ class DeviceFragment : Fragment() {
             device = it.getDevice(deviceId)
         }
 
-        requireBinding().pairButton.setOnClickListener {
+        requirePairingBinding().pairButton.setOnClickListener {
-            with(requireBinding()) {
+            with(requirePairingBinding()) {
                 pairButton.visibility = View.GONE
                 pairMessage.text = null
                 pairVerification.visibility = View.VISIBLE
@@ -112,13 +112,13 @@ class DeviceFragment : Fragment() {
             }
             device?.requestPairing()
         }
-        requireBinding().acceptButton.setOnClickListener {
+        requirePairingBinding().acceptButton.setOnClickListener {
             device?.apply {
                 acceptPairing()
-                requireBinding().pairingButtons.visibility = View.GONE
+                requirePairingBinding().pairingButtons.visibility = View.GONE
             }
         }
-        requireBinding().rejectButton.setOnClickListener {
+        requirePairingBinding().rejectButton.setOnClickListener {
             device?.apply {
                 //Remove listener so buttons don't show for a while before changing the view
                 removePluginsChangedListener(pluginsChangedListener)
@@ -155,7 +155,7 @@ class DeviceFragment : Fragment() {
             device.removePairingCallback(pairingCallback)
         }
         super.onDestroyView()
-        binding = null
+        pairingBinding = null
         errorBinding = null
         deviceBinding = null
     }
@@ -243,28 +243,36 @@ class DeviceFragment : Fragment() {
         mActivity?.runOnUiThread(object : Runnable {
             override fun run() {
                 if (device.isPairRequestedByPeer) {
-                    requireBinding().pairMessage.setText(R.string.pair_requested)
+                    with (requirePairingBinding()) {
-                    requireBinding().pairVerification.visibility = View.VISIBLE
+                        pairMessage.setText(R.string.pair_requested)
-                    requireBinding().pairVerification.text =
+                        pairVerification.visibility = View.VISIBLE
-                        SslHelper.getVerificationKey(SslHelper.certificate, device.certificate)
+                        pairVerification.text = SslHelper.getVerificationKey(SslHelper.certificate, device.certificate)
-                    requireBinding().pairingButtons.visibility = View.VISIBLE
+                        pairingButtons.visibility = View.VISIBLE
-                    requireBinding().pairProgress.visibility = View.GONE
+                        pairProgress.visibility = View.GONE
-                    requireBinding().pairButton.visibility = View.GONE
+                        pairButton.visibility = View.GONE
-                    requireBinding().pairRequestButtons.visibility = View.VISIBLE
+                        pairRequestButtons.visibility = View.VISIBLE
+                    }
+                    with (requireDeviceBinding()) {
+                        permissionsList.visibility = View.GONE
+                        pluginsList.visibility = View.GONE
+                    }
                 } else {
                     val paired = device.isPaired
                     val reachable = device.isReachable
-                    requireBinding().pairingButtons.visibility = if (paired) View.GONE else View.VISIBLE
+                    requirePairingBinding().pairingButtons.visibility = if (paired) View.GONE else View.VISIBLE
                     if (paired && !reachable) {
                         requireErrorBinding().errorMessageContainer.visibility = View.VISIBLE
                         requireErrorBinding().notReachableMessage.visibility = View.VISIBLE
                         requireDeviceBinding().permissionsList.visibility = View.GONE
                         requireDeviceBinding().pluginsList.visibility = View.GONE
-                    } else {
+                    } else if (paired) {
                         requireErrorBinding().errorMessageContainer.visibility = View.GONE
                         requireErrorBinding().notReachableMessage.visibility = View.GONE
                         requireDeviceBinding().permissionsList.visibility = View.VISIBLE
                         requireDeviceBinding().pluginsList.visibility = View.VISIBLE
+                    } else {
+                        requireDeviceBinding().permissionsList.visibility = View.GONE
+                        requireDeviceBinding().pluginsList.visibility = View.GONE
                     }
                     try {
                         if (paired && reachable) {
@@ -332,7 +340,7 @@ class DeviceFragment : Fragment() {
 
         override fun pairingFailed(error: String) {
             mActivity?.runOnUiThread {
-                with(requireBinding()) {
+                with(requirePairingBinding()) {
                     pairMessage.text = error
                     pairVerification.text = null
                     pairVerification.visibility = View.GONE
@@ -346,7 +354,7 @@ class DeviceFragment : Fragment() {
 
         override fun unpaired() {
             mActivity?.runOnUiThread {
-                with(requireBinding()) {
+                with(requirePairingBinding()) {
                     pairMessage.setText(R.string.device_not_paired)
                     pairVerification.visibility = View.GONE
                     pairProgress.visibility = View.GONE