Change how public key is copied to the clipboard

3 files changed, 24 insertions, 14 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
index e07cf0988f..7fa9f2e39d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
@@ -84,6 +84,12 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
         publicKey = view.findViewById<TextView>(R.id.wireguard_public_key)
         publicKeyAge = view.findViewById<TextView>(R.id.wireguard_key_age)
 
+        view.findViewById<View>(R.id.public_key_container).apply {
+            setOnClickListener {
+                copyPublicKeyToClipboard()
+            }
+        }
+
         generateKeyButton = view.findViewById<Button>(R.id.generate_key).apply {
             setOnClickListener {
                 onGenerateKeyPress()
@@ -144,16 +150,6 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
                 publicKey.visibility = View.VISIBLE
                 publicKey.setText(publicKeyString.substring(0, 20) + "...")
 
-                publicKey.setOnClickListener {
-                    val label = parentActivity.getString(R.string.wireguard_key_copied_to_clibpoard)
-                    val clipboard = parentActivity
-                        .getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-                    clipboard.setPrimaryClip(ClipData.newPlainText(label, publicKeyString))
-
-                    Toast.makeText(parentActivity, label, Toast.LENGTH_SHORT)
-                        .show()
-                }
-
                 publicKeyAge.setText(formatKeyDateCreated(key.dateCreated))
 
                 keyState.verified?.let { verified ->
@@ -229,6 +225,18 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
         }
     }
 
+    private fun copyPublicKeyToClipboard() {
+        val clipboard =
+            parentActivity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clipLabel = parentActivity.resources.getString(R.string.wireguard_public_key)
+        val clipData = ClipData.newPlainText(clipLabel, publicKey.text)
+
+        clipboard.primaryClip = clipData
+
+        Toast.makeText(parentActivity, R.string.copied_wireguard_public_key, Toast.LENGTH_SHORT)
+            .show()
+    }
+
     private fun onGenerateKeyPress() {
         currentJob?.cancel()
 
diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml
index 701ad24b1b..c611cab3ae 100644
--- a/android/src/main/res/layout/wireguard_key.xml
+++ b/android/src/main/res/layout/wireguard_key.xml
@@ -48,7 +48,7 @@
         <TextView android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:layout_marginBottom="9dp"
-                  android:text="@string/wireguard_public_key"
+                  android:text="@string/public_key"
                   android:textColor="@color/white60"
                   android:textSize="13sp"
                   android:textStyle="bold" />
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index 8bcbbf3cd9..0d97b2ba9c 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -150,9 +150,7 @@
     your real location is masked with a private and secure location
     in the selected region</string>
     <string name="wireguard_key">WireGuard key</string>
-    <string name="wireguard_key_copied_to_clibpoard">Key copied to
-    clipboard</string>
-    <string name="wireguard_public_key">Public key</string>
+    <string name="public_key">Public key</string>
     <string name="wireguard_key_generated">Key generated</string>
     <string name="wireguard_verify_key">Verify key</string>
     <string name="wireguard_generate_key">Generate key</string>
@@ -167,6 +165,10 @@
     <string name="wireguard_key_invalid">Key is invalid</string>
     <string name="wireguard_key_verification_failure">Failed to
     validate key</string>
+    <string name="wireguard_public_key">WireGuard public key
+    </string>
+    <string name="copied_wireguard_public_key">Copied WireGuard
+    public key to clipboard</string>
     <string name="account_url">
     https://mullvad.net/en/account</string>
     <string name="wg_key_url">