diff --git a/res/values/strings.xml b/res/values/strings.xml index 23d4e2df..6703826f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -178,7 +178,6 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted Canceled by user Canceled by other peer Encryption Info - The other device doesn\'t use a recent version of KDE Connect, using the legacy encryption method. SHA256 fingerprint of your device certificate is: SHA256 fingerprint of remote device certificate is: Pair requested diff --git a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.kt b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.kt index 36bced33..5494455c 100644 --- a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.kt +++ b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.kt @@ -204,21 +204,17 @@ class DeviceFragment : Fragment() { builder.setPositiveButton(requireContext().resources.getString(R.string.ok)) { dialog, _ -> dialog.dismiss() } - if (device.certificate == null) { - builder.setMessage(R.string.encryption_info_msg_no_ssl) - } else { - builder.setMessage( - "${ - requireContext().resources.getString(R.string.my_device_fingerprint) - } \n ${ - SslHelper.getCertificateHash(SslHelper.certificate) - } \n\n ${ - requireContext().resources.getString(R.string.remote_device_fingerprint) - } \n ${ - SslHelper.getCertificateHash(device.certificate) - }" - ) - } + builder.setMessage( + "${ + requireContext().resources.getString(R.string.my_device_fingerprint) + } \n ${ + SslHelper.getCertificateHash(SslHelper.certificate) + } \n\n ${ + requireContext().resources.getString(R.string.remote_device_fingerprint) + } \n ${ + SslHelper.getCertificateHash(device.certificate) + }" + ) menu.add(R.string.encryption_info_title).setOnMenuItemClickListener { builder.show() true