aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
diff options
context:
space:
mode:
authormar-v-in <github@rvin.mooo.com>2014-06-22 16:45:07 +0200
committermar-v-in <github@rvin.mooo.com>2014-06-22 16:45:07 +0200
commit9e7e0be82cafc6dc98bbc31099ce0efc36a789a0 (patch)
tree1a3fa3971d953b1bd8a57479e216ad01e153868a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
parent79fb23b095fba273d77066204ee44d2b8d1edf8d (diff)
parent9f947aefe63055045b4dfa7087b858f8f3d2987e (diff)
downloadopen-keychain-9e7e0be82cafc6dc98bbc31099ce0efc36a789a0.tar.gz
open-keychain-9e7e0be82cafc6dc98bbc31099ce0efc36a789a0.tar.bz2
open-keychain-9e7e0be82cafc6dc98bbc31099ce0efc36a789a0.zip
Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-more
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.java2
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 f24cb379e..cb53647f6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
@@ -81,7 +81,7 @@ public class ImportKeysFileFragment extends Fragment {
if (clipboardText != null) {
sendText = clipboardText.toString();
if (sendText.toLowerCase(Locale.ENGLISH).startsWith(Constants.FINGERPRINT_SCHEME)) {
- mImportActivity.loadFromFingerprintUri(null, Uri.parse(sendText));
+ mImportActivity.loadFromFingerprintUri(Uri.parse(sendText));
return;
}
}