Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain

1 files changed, 11 insertions, 5 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index c7f26fe2b..87a50af2e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -652,12 +652,18 @@ public class KeychainIntentService extends IntentService implements ProgressDial
 
                     break;
                 case TARGET_FILE: /* import key from file */
-                    String inputFile = data.getString(IMPORT_FILENAME);
+                    // dataUri!
 
-                    inStream = new FileInputStream(inputFile);
-                    File file = new File(inputFile);
-                    inLength = file.length();
-                    inputData = new InputData(inStream, inLength);
+                    try {
+                        inStream = getContentResolver().openInputStream(dataUri);
+                        inLength = inStream.available();
+
+                        inputData = new InputData(inStream, inLength);
+                    } catch (FileNotFoundException e) {
+                        Log.e(Constants.TAG, "FileNotFoundException!", e);
+                    } catch (IOException e) {
+                        Log.e(Constants.TAG, "IOException!", e);
+                    }
 
                     break;