diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-27 21:40:26 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-27 21:40:26 +0200 |
| commit | 8bfba0826f38dd5bb15326505e176bcfb109f950 (patch) | |
| tree | d6dac37c626a23e9de807066f5f1077b36563f37 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
| parent | 9fe07478e7fe683223310d017f162f5bcb467d15 (diff) | |
| parent | bd487bf732129b5ab36ff6a3eb653dc62ec70d84 (diff) | |
| download | open-keychain-8bfba0826f38dd5bb15326505e176bcfb109f950.tar.gz open-keychain-8bfba0826f38dd5bb15326505e176bcfb109f950.tar.bz2 open-keychain-8bfba0826f38dd5bb15326505e176bcfb109f950.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java index eccd2a5e5..52b573f47 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java @@ -152,7 +152,11 @@ public class ViewKeyShareFragment extends LoaderFragment implements KeyRings.buildUnifiedKeyRingUri(dataUri), Keys.FINGERPRINT, ProviderHelper.FIELD_TYPE_BLOB); String fingerprint = PgpKeyHelper.convertFingerprintToHex(data); - content = Constants.FINGERPRINT_SCHEME + ":" + fingerprint; + if(!toClipboard){ + content = Constants.FINGERPRINT_SCHEME + ":" + fingerprint; + } else { + content = fingerprint; + } } else { // get public keyring as ascii armored string Uri uri = KeychainContract.KeyRingData.buildPublicKeyRingUri(dataUri); |