diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-15 15:35:32 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-15 15:35:32 +0100 |
commit | 8a2bd80d40e29980338e9e1f9d1b6732a3e2d51f (patch) | |
tree | 7d2445d075423df2aa6225ecaf7ca8aef4dcdd18 /OpenKeychain/src/main/java/org | |
parent | f1dc58ddfd6a26fa6670f0adeec515ac668194f6 (diff) | |
parent | 0fe060e88eb41ee0d5d7b26f452076a102dc9109 (diff) | |
download | open-keychain-8a2bd80d40e29980338e9e1f9d1b6732a3e2d51f.tar.gz open-keychain-8a2bd80d40e29980338e9e1f9d1b6732a3e2d51f.tar.bz2 open-keychain-8a2bd80d40e29980338e9e1f9d1b6732a3e2d51f.zip |
Merge pull request #1148 from manojkhannakm/development
Fixed a ClassCastException
Diffstat (limited to 'OpenKeychain/src/main/java/org')
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java index 940ae27d0..4bb64bcaa 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java @@ -28,8 +28,8 @@ import android.widget.TextView; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.operations.results.EditKeyResult; import org.sufficientlysecure.keychain.operations.results.OperationResult; -import org.sufficientlysecure.keychain.operations.results.SaveKeyringResult; import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.remote.AccountSettings; import org.sufficientlysecure.keychain.ui.CreateKeyActivity; @@ -106,8 +106,8 @@ public class AccountSettingsFragment extends Fragment { case REQUEST_CODE_CREATE_KEY: { if (resultCode == Activity.RESULT_OK) { if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { - SaveKeyringResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); - mSelectKeySpinner.setSelectedKeyId(result.mRingMasterKeyId); + EditKeyResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); + mSelectKeySpinner.setSelectedKeyId(result.mMasterKeyId); } else { Log.e(Constants.TAG, "missing result!"); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java index 8578bb384..5ec47f4c9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdActivity.java @@ -127,9 +127,9 @@ public class SelectSignKeyIdActivity extends BaseActivity { case REQUEST_CODE_CREATE_KEY: { if (resultCode == Activity.RESULT_OK) { if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { -// SaveKeyringResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); // TODO: select? -// mSelectKeySpinner.setSelectedKeyId(result.mRingMasterKeyId); +// EditKeyResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); +// mSelectKeySpinner.setSelectedKeyId(result.mMasterKeyId); } else { Log.e(Constants.TAG, "missing result!"); } |