diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-23 16:19:16 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-23 16:19:16 +0200 |
commit | dafa604016fe6ec251ba229c97fd6f3c75d3d5af (patch) | |
tree | 85390c99b730c61ac0b913a23f8332d67a1c53e5 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
parent | eefb55e93444dac53595d7e6b1852d5a8c58c336 (diff) | |
download | open-keychain-dafa604016fe6ec251ba229c97fd6f3c75d3d5af.tar.gz open-keychain-dafa604016fe6ec251ba229c97fd6f3c75d3d5af.tar.bz2 open-keychain-dafa604016fe6ec251ba229c97fd6f3c75d3d5af.zip |
import: use filesize from content provider on input uri
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java index 8502798cd..864283b0a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java @@ -40,6 +40,7 @@ import org.sufficientlysecure.keychain.ui.adapter.AsyncTaskResultWrapper; import org.sufficientlysecure.keychain.ui.adapter.ImportKeysAdapter; import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListCloudLoader; import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListLoader; +import org.sufficientlysecure.keychain.util.FileHelper; import org.sufficientlysecure.keychain.util.InputData; import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.ParcelableFileCache.IteratorWithSize; @@ -438,13 +439,12 @@ public class ImportKeysListFragment extends ListFragment implements } else if (dataUri != null) { try { InputStream inputStream = getActivity().getContentResolver().openInputStream(dataUri); - int length = inputStream.available(); + long length = FileHelper.getFileSize(getActivity(), dataUri, -1); inputData = new InputData(inputStream, length); } catch (FileNotFoundException e) { Log.e(Constants.TAG, "FileNotFoundException!", e); - } catch (IOException e) { - Log.e(Constants.TAG, "IOException!", e); + return null; } } |