aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-06-24 20:22:50 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-06-24 20:22:50 +0200
commit94bd2a675e1baa7b58b8211bdf14288c5255119e (patch)
tree8325bcef7edfaeecb9d65a3b5098e0d3ae6b770a /OpenKeychain/src/main/java/org
parentbfd9de4721ab16c4f362a0294ea248813ff810cd (diff)
parent02bcd391bfcc2f1bef65353ad1933129730581af (diff)
downloadopen-keychain-94bd2a675e1baa7b58b8211bdf14288c5255119e.tar.gz
open-keychain-94bd2a675e1baa7b58b8211bdf14288c5255119e.tar.bz2
open-keychain-94bd2a675e1baa7b58b8211bdf14288c5255119e.zip
Merge pull request #688 from da-kid/master
Fix for #687
Diffstat (limited to 'OpenKeychain/src/main/java/org')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java6
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);