diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-26 01:50:48 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-26 01:50:48 +0200 |
commit | 510ef40f556e59c37f42578ba8cb243f17f7e4e4 (patch) | |
tree | 4e17693b7b0d2cac0b0e8842ba2b2526abef1d97 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java | |
parent | 108b35cb50d3074e02812e2b333779466a1bf824 (diff) | |
download | open-keychain-510ef40f556e59c37f42578ba8cb243f17f7e4e4.tar.gz open-keychain-510ef40f556e59c37f42578ba8cb243f17f7e4e4.tar.bz2 open-keychain-510ef40f556e59c37f42578ba8cb243f17f7e4e4.zip |
implement upload of keyring after certification, check that option by default
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java index d2a3e632c..1691f23fe 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java @@ -61,6 +61,7 @@ import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner; import org.sufficientlysecure.keychain.ui.widget.KeySpinner; import org.sufficientlysecure.keychain.util.Log; +import org.sufficientlysecure.keychain.util.Preferences; import java.util.ArrayList; @@ -174,6 +175,11 @@ public class MultiCertifyKeyFragment extends LoaderFragment } }); + // If this is a debug build, don't upload by default + if (Constants.DEBUG) { + mUploadKeyCheckbox.setChecked(false); + } + return root; } @@ -354,6 +360,10 @@ public class MultiCertifyKeyFragment extends LoaderFragment Bundle data = new Bundle(); data.putParcelable(KeychainIntentService.CERTIFY_PARCEL, parcel); + if (mUploadKeyCheckbox.isChecked()) { + String keyserver = Preferences.getPreferences(getActivity()).getPreferredKeyserver(); + data.putString(KeychainIntentService.UPLOAD_KEY_SERVER, keyserver); + } intent.putExtra(KeychainIntentService.EXTRA_DATA, data); // Message is received after signing is done in KeychainIntentService @@ -371,15 +381,8 @@ public class MultiCertifyKeyFragment extends LoaderFragment Intent intent = new Intent(); intent.putExtra(CertifyResult.EXTRA_RESULT, result); mActivity.setResult(Activity.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 - // TODO implement - // uploadKey(); - } else { - mActivity.finish(); - } } } }; |