diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-02-28 15:58:26 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-02-28 15:58:26 +0100 |
| commit | 0557e0680e3cdedc32f8ebe35105b772c7b3935b (patch) | |
| tree | e957e9d06e11e5956f958fab08136d6aa8a9b76c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | |
| parent | 2ae4d6ce05e6ca1585239b779b1dd6f39f58050a (diff) | |
| download | open-keychain-0557e0680e3cdedc32f8ebe35105b772c7b3935b.tar.gz open-keychain-0557e0680e3cdedc32f8ebe35105b772c7b3935b.tar.bz2 open-keychain-0557e0680e3cdedc32f8ebe35105b772c7b3935b.zip | |
some changes to qr scan logic
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java index 496048582..b56da463a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -527,7 +527,7 @@ public class KeyListFragment extends LoaderFragment private void scanQrCode() { Intent scanQrCode = new Intent(getActivity(), ImportKeysProxyActivity.class); - scanQrCode.setAction(ImportKeysProxyActivity.ACTION_SCAN_WITH_RESULT); + scanQrCode.setAction(ImportKeysProxyActivity.ACTION_SCAN_IMPORT); startActivityForResult(scanQrCode, 0); } |