diff options
author | William Faulk <wfaulk@webassign.net> | 2015-05-04 12:17:06 -0400 |
---|---|---|
committer | William Faulk <wfaulk@webassign.net> | 2015-05-04 16:46:15 -0400 |
commit | be3e52884f363de83fd058db1e99e55866413ba4 (patch) | |
tree | b0ce77f111306dc6fbe07d6143077b6a1313f266 /OpenKeychain/src | |
parent | 6383d19dd3921220633686e0e8e78d2d961e0aad (diff) | |
download | open-keychain-be3e52884f363de83fd058db1e99e55866413ba4.tar.gz open-keychain-be3e52884f363de83fd058db1e99e55866413ba4.tar.bz2 open-keychain-be3e52884f363de83fd058db1e99e55866413ba4.zip |
Use primary user ID for filename instead of short key ID
Diffstat (limited to 'OpenKeychain/src')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java index 81720d816..bbca45479 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java @@ -43,6 +43,8 @@ import android.widget.TextView; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.compatibility.ClipboardReflection; +import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; +import org.sufficientlysecure.keychain.pgp.UncachedPublicKey; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException; import org.sufficientlysecure.keychain.provider.KeychainContract; @@ -230,9 +232,10 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements // Add replacement extra to send a text/plain file instead. if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { try { + String primaryUserId = UncachedKeyRing.decodeFromData(content.getBytes()). + getPublicKey().getPrimaryUserIdWithFallback(); final File contentFile = new File(getActivity().getExternalCacheDir(), - "key-" + KeyFormattingUtils.getShortKeyIdAsHexFromFingerprint(fingerprintData, false) + - ".pgp.asc"); + primaryUserId + ".pgp.asc"); FileWriter contentFileWriter = new FileWriter(contentFile, false); BufferedWriter contentWriter = new BufferedWriter(contentFileWriter); contentWriter.write(content); |