diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-31 23:13:33 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-31 23:13:33 +0200 |
| commit | 38120ae77c27b21c123c25078ae54b7b4bbc9c7d (patch) | |
| tree | 498d752a710dc31472fcf0104a15c6af087abc29 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | |
| parent | db70fcfdbf63a604ccd4c8977888937161a5a9f1 (diff) | |
| parent | caad5d1fc15312da3cc665bf7a5c42b64306c140 (diff) | |
| download | open-keychain-38120ae77c27b21c123c25078ae54b7b4bbc9c7d.tar.gz open-keychain-38120ae77c27b21c123c25078ae54b7b4bbc9c7d.tar.bz2 open-keychain-38120ae77c27b21c123c25078ae54b7b4bbc9c7d.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java index dbd1b7507..a2c5a0d90 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java @@ -36,6 +36,7 @@ import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.Preferences; import org.sufficientlysecure.keychain.provider.KeychainContract; +import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.service.KeychainIntentService; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; import org.sufficientlysecure.keychain.util.Log; @@ -92,7 +93,7 @@ public class UploadKeyActivity extends ActionBarActivity { intent.setAction(KeychainIntentService.ACTION_UPLOAD_KEYRING); // set data uri as path to keyring - Uri blobUri = KeychainContract.KeyRingData.buildPublicKeyRingUri(mDataUri); + Uri blobUri = KeyRings.buildUnifiedKeyRingUri(mDataUri); intent.setData(blobUri); // fill values for this action |