diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-10-05 08:30:01 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-10-05 08:30:01 -0300 |
| commit | c6eda4a2f48b9e58a4189e786cea086fbaeff621 (patch) | |
| tree | 8e1e24ca6d3ef082e4e39b26d27c37962ef44367 /android/src/main | |
| parent | 1a72258f2135a3504d69a28bbcb6bd5631abbbee (diff) | |
| parent | 63092ee341cea9ac00931b51b7e303da5ea4039d (diff) | |
| download | mullvadvpn-c6eda4a2f48b9e58a4189e786cea086fbaeff621.tar.xz mullvadvpn-c6eda4a2f48b9e58a4189e786cea086fbaeff621.zip | |
Merge branch 'update-kotlin-version'
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt index 36fea18303..28851a8641 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt @@ -135,7 +135,7 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager val clipData = ClipData.newPlainText(clipboardLabel, accountToken) - clipboard.primaryClip = clipData + clipboard.setPrimaryClip(clipData) Toast.makeText(context, toastMessage, Toast.LENGTH_SHORT).show() } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt index 33530283cb..348c8a2530 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt @@ -58,7 +58,7 @@ class CopyableInformationView : InformationView { val clipData = ClipData.newPlainText(clipboardLabel, information) val toastMessage = copiedToast ?: context.getString(R.string.copied_to_clipboard) - clipboard.primaryClip = clipData + clipboard.setPrimaryClip(clipData) Toast.makeText(context, toastMessage, Toast.LENGTH_SHORT).show() } |