aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
diff options
context:
space:
mode:
authorTim Bray <timbray@gmail.com>2014-04-18 12:44:42 -0700
committerTim Bray <timbray@gmail.com>2014-04-29 15:04:05 -0700
commite663dadc32633dc12f846539196276265ccc3534 (patch)
tree4f3569105bba19ce7dbc93e53dabb147b2e83142 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
parente0a0bf04ee6fa4794a82b44dae905bc814d85491 (diff)
downloadopen-keychain-e663dadc32633dc12f846539196276265ccc3534.tar.gz
open-keychain-e663dadc32633dc12f846539196276265ccc3534.tar.bz2
open-keychain-e663dadc32633dc12f846539196276265ccc3534.zip
can search openkeychain, retrieve & install & use keys from there
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
index 65d463456..22b56e1ab 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
@@ -117,7 +117,7 @@ public class ImportKeysQrCodeFragment extends Fragment {
// is this a full key encoded as qr code?
if (scannedContent.startsWith("-----BEGIN PGP")) {
- mImportActivity.loadCallback(scannedContent.getBytes(), null, null, null);
+ mImportActivity.loadCallback(scannedContent.getBytes(), null, null, null, null);
return;
}
@@ -197,7 +197,7 @@ public class ImportKeysQrCodeFragment extends Fragment {
for (String in : mScannedContent) {
result += in;
}
- mImportActivity.loadCallback(result.getBytes(), null, null, null);
+ mImportActivity.loadCallback(result.getBytes(), null, null, null, null);
}
}