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-19 13:57:35 +0200
committermar-v-in <github@rvin.mooo.com>2014-06-19 13:57:35 +0200
commit58706425d62e40c0ecc9164a8fee089ca471e1fe (patch)
treed250292332dce208760847f150c4e627607d8028 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
parentd9c937bbe762736d9f0c45d5ba0083555c8da2e1 (diff)
parent48c96184dcf2837f9be2e5bdb116bedd86098eb3 (diff)
downloadopen-keychain-58706425d62e40c0ecc9164a8fee089ca471e1fe.tar.gz
open-keychain-58706425d62e40c0ecc9164a8fee089ca471e1fe.tar.bz2
open-keychain-58706425d62e40c0ecc9164a8fee089ca471e1fe.zip
Merge branch 'master' of https://github.com/open-keychain/open-keychain into improve-file
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.java4
1 files changed, 2 insertions, 2 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 060e9bab2..60e5324c5 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 {
return;
}
}
- mImportActivity.loadCallback(sendText.getBytes(), null, null, null, null);
+ mImportActivity.loadCallback(new ImportKeysListFragment.BytesLoaderState(sendText.getBytes(), null));
}
});
@@ -107,7 +107,7 @@ public class ImportKeysFileFragment extends Fragment {
if (resultCode == Activity.RESULT_OK && data != null) {
// load data
- mImportActivity.loadCallback(null, data.getData(), null, null, null);
+ mImportActivity.loadCallback(new ImportKeysListFragment.BytesLoaderState(null, data.getData()));
}
break;