diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-05 10:10:47 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-05 10:10:47 +0200 |
| commit | 6d10ca678a541dddb26f43c9d415d14f6f5eceaf (patch) | |
| tree | ee097be93497a90139f982bbf9851eeb2115dafd /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java | |
| parent | e48460bb7df8f2d40fe187f8c267fbba3fb43c75 (diff) | |
| parent | 90b4db07925ec4741fedfa75eed4ed6acc533696 (diff) | |
| download | open-keychain-6d10ca678a541dddb26f43c9d415d14f6f5eceaf.tar.gz open-keychain-6d10ca678a541dddb26f43c9d415d14f6f5eceaf.tar.bz2 open-keychain-6d10ca678a541dddb26f43c9d415d14f6f5eceaf.zip | |
Merge pull request #603 from timbray/master
Adds first level of keybase support
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java index dc5333a8f..51f961aab 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java @@ -85,7 +85,7 @@ public class ImportKeysFileFragment extends Fragment { if (resultCode == Activity.RESULT_OK && data != null) { // load data - mImportActivity.loadCallback(null, data.getData(), null, null); + mImportActivity.loadCallback(null, data.getData(), null, null, null); } break; |