diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-02 17:19:31 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-02 17:19:31 +0100 |
| commit | c763ea35035be678bedacea13ec4c2b7c51f9943 (patch) | |
| tree | 12df989068b08859cc2f4a282a3dad473813fabd /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java | |
| parent | 95e534e1f5c8494d745b6fec016b21b754fa108e (diff) | |
| parent | d125149bf77769c45c9c896e4475b04ed444e5cd (diff) | |
| download | open-keychain-c763ea35035be678bedacea13ec4c2b7c51f9943.tar.gz open-keychain-c763ea35035be678bedacea13ec4c2b7c51f9943.tar.bz2 open-keychain-c763ea35035be678bedacea13ec4c2b7c51f9943.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java index 0d8905c5b..f0ef8b9ef 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java @@ -61,7 +61,7 @@ public class ConsolidateDialogActivity extends FragmentActivity { /* don't care about the results (for now?) // get returned data bundle - Bundle returnData = message.getData(); + Bundle returnData = message.getInputData(); if (returnData == null) { return; } |