aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-09-12 11:55:14 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-09-12 11:55:14 +0200
commit40c81c9429bf65d1e40cdfe745d4ca08d1d620e0 (patch)
tree1af21839b450c6a95f031187afa568b96e988774 /OpenKeychain/src/main/java/org
parent4e834d78335d8d375a8918be05ccd89a86d50863 (diff)
downloadopen-keychain-40c81c9429bf65d1e40cdfe745d4ca08d1d620e0.tar.gz
open-keychain-40c81c9429bf65d1e40cdfe745d4ca08d1d620e0.tar.bz2
open-keychain-40c81c9429bf65d1e40cdfe745d4ca08d1d620e0.zip
fix key upload after certification (hopefully?)
Diffstat (limited to 'OpenKeychain/src/main/java/org')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
index 0804ec0b4..d921f3cc0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
@@ -50,7 +50,6 @@ import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.helper.Preferences;
import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
-import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
@@ -335,14 +334,12 @@ public class CertifyKeyFragment extends LoaderFragment
Intent intent = new Intent();
intent.putExtra(OperationResultParcel.EXTRA_RESULT, result);
mActivity.setResult(CertifyKeyActivity.RESULT_OK, intent);
- mActivity.finish();
// check if we need to send the key to the server or not
if (mUploadKeyCheckbox.isChecked()) {
// upload the newly signed key to the keyserver
uploadKey();
} else {
- mActivity.setResult(CertifyKeyActivity.RESULT_OK);
mActivity.finish();
}
}
@@ -367,7 +364,7 @@ public class CertifyKeyFragment extends LoaderFragment
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