mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-03 15:45:10 +00:00
Code Issues Releases Wiki Activity

Remove unneeded null check

Browse Source
This commit is contained in:
Albert Vaca Cintora
2024-05-17 10:47:20 +02:00
parent 768b02c173
commit 27075e89be
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@@ -178,7 +178,6 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
<string name="error_canceled_by_user">Canceled by user</string> <string name="error_canceled_by_user">Canceled by user</string>
<string name="error_canceled_by_other_peer">Canceled by other peer</string> <string name="error_canceled_by_other_peer">Canceled by other peer</string>
<string name="encryption_info_title">Encryption Info</string> <string name="encryption_info_title">Encryption Info</string>
<string name="encryption_info_msg_no_ssl">The other device doesn\'t use a recent version of KDE Connect, using the legacy encryption method.</string>
<string name="my_device_fingerprint">SHA256 fingerprint of your device certificate is:</string> <string name="my_device_fingerprint">SHA256 fingerprint of your device certificate is:</string>
<string name="remote_device_fingerprint">SHA256 fingerprint of remote device certificate is:</string> <string name="remote_device_fingerprint">SHA256 fingerprint of remote device certificate is:</string>
<string name="pair_requested">Pair requested</string> <string name="pair_requested">Pair requested</string>

26
src/org/kde/kdeconnect/UserInterface/DeviceFragment.kt
View File

@@ -204,21 +204,17 @@ class DeviceFragment : Fragment() {
builder.setPositiveButton(requireContext().resources.getString(R.string.ok)) { dialog, _ -> builder.setPositiveButton(requireContext().resources.getString(R.string.ok)) { dialog, _ ->
dialog.dismiss() dialog.dismiss()
} }
if (device.certificate == null) { builder.setMessage(
builder.setMessage(R.string.encryption_info_msg_no_ssl) "${
} else { requireContext().resources.getString(R.string.my_device_fingerprint)
builder.setMessage( } \n ${
"${ SslHelper.getCertificateHash(SslHelper.certificate)
requireContext().resources.getString(R.string.my_device_fingerprint) } \n\n ${
} \n ${ requireContext().resources.getString(R.string.remote_device_fingerprint)
SslHelper.getCertificateHash(SslHelper.certificate) } \n ${
} \n\n ${ SslHelper.getCertificateHash(device.certificate)
requireContext().resources.getString(R.string.remote_device_fingerprint) }"
} \n ${ )
SslHelper.getCertificateHash(device.certificate)
}"
)
}
menu.add(R.string.encryption_info_title).setOnMenuItemClickListener { menu.add(R.string.encryption_info_title).setOnMenuItemClickListener {
builder.show() builder.show()
true true