cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import: use filesize from content provider on input uri

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-10-23 16:19:16 +02:00
parent eefb55e934
commit dafa604016
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
View File

@@ -40,6 +40,7 @@ import org.sufficientlysecure.keychain.ui.adapter.AsyncTaskResultWrapper;
import org.sufficientlysecure.keychain.ui.adapter.ImportKeysAdapter; import org.sufficientlysecure.keychain.ui.adapter.ImportKeysAdapter;
import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListCloudLoader; import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListCloudLoader;
import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListLoader; import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListLoader;
import org.sufficientlysecure.keychain.util.FileHelper;
import org.sufficientlysecure.keychain.util.InputData; import org.sufficientlysecure.keychain.util.InputData;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.ParcelableFileCache.IteratorWithSize; import org.sufficientlysecure.keychain.util.ParcelableFileCache.IteratorWithSize;
@@ -438,13 +439,12 @@ public class ImportKeysListFragment extends ListFragment implements
} else if (dataUri != null) { } else if (dataUri != null) {
try { try {
InputStream inputStream = getActivity().getContentResolver().openInputStream(dataUri); InputStream inputStream = getActivity().getContentResolver().openInputStream(dataUri);
int length = inputStream.available(); long length = FileHelper.getFileSize(getActivity(), dataUri, -1);
inputData = new InputData(inputStream, length); inputData = new InputData(inputStream, length);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
Log.e(Constants.TAG, "FileNotFoundException!", e); Log.e(Constants.TAG, "FileNotFoundException!", e);
} catch (IOException e) { return null;
Log.e(Constants.TAG, "IOException!", e);
} }
} }