diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-10-28 13:46:57 +0000 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-10-28 13:46:57 +0000 |
| commit | 1489fb51df56a4b1d20a98f4823102c523a5cc4f (patch) | |
| tree | f8f78141cc1170d35a7df6e66cb341a857d0fcc1 | |
| parent | 871233b0e56ae513f56ead22d11ebd174a01415e (diff) | |
| parent | b554a4c9f68cde0e124d0db9d5e50d3134038fd6 (diff) | |
| download | mullvadvpn-1489fb51df56a4b1d20a98f4823102c523a5cc4f.tar.xz mullvadvpn-1489fb51df56a4b1d20a98f4823102c523a5cc4f.zip | |
Merge branch 'android-improve-keygen-frag'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt | 15 | ||||
| -rw-r--r-- | android/src/main/res/values/strings.xml | 3 |
3 files changed, 17 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 888ecdbf09..6ab87cd50d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ Line wrap the file at 100 chars. Th #### Android - Use authenticated URLs to go to wireguard key page on website. +- WireGuard key fragment has been made more similar to it's desktop counterpart. ### Changed - Notifications shown when connecting to a server include its location. diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt index 3ebb9d6dbf..e51e43630f 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt @@ -1,5 +1,7 @@ package net.mullvad.mullvadvpn +import android.content.ClipData +import android.content.ClipboardManager import android.content.Context import android.content.Intent import android.net.Uri @@ -136,7 +138,18 @@ class WireguardKeyFragment : Fragment() { val key = keyState.publicKey val publicKeyString = Base64.encodeToString(key.key, Base64.NO_WRAP) publicKey.visibility = View.VISIBLE - publicKey.setText(publicKeyString) + 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)) if (keyState.verified != null) { diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 42ec2eb403..02064541a1 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -113,10 +113,11 @@ 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="wireguard_verify_key">Verify key</string> <string name="wireguard_generate_key">Generate key</string> - <string name="wireguard_replace_key">Replace key</string> + <string name="wireguard_replace_key">Regenerate key</string> <string name="wireguard_manage_keys">Manage keys</string> <string name="wireguard_key_age">Key generated on</string> <string name="wireguard_key_connectivity"> |