cynic
/
Clover
mirror of https://github.com/kurisufriend/Clover
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a NPE

Browse Source
captchafix
Florens Douwes 11 years ago
parent 8258b53705
commit cce1200917
1 changed files with 35 additions and 31 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 66
      Clover/app/src/main/java/org/floens/chan/ui/activity/ImagePickActivity.java

66
Clover/app/src/main/java/org/floens/chan/ui/activity/ImagePickActivity.java
Unescape View File

@ -63,47 +63,51 @@ public class ImagePickActivity extends Activity {
final Uri uri = data.getData(); final Uri uri = data.getData();
Cursor returnCursor = getContentResolver().query(uri, null, null, null, null); Cursor returnCursor = getContentResolver().query(uri, null, null, null, null);
int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME); if (returnCursor != null) {
returnCursor.moveToFirst(); int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
String name = "image"; returnCursor.moveToFirst();
if (nameIndex > -1) { String name = "image";
name = returnCursor.getString(nameIndex); if (nameIndex > -1) {
} name = returnCursor.getString(nameIndex);
}
returnCursor.close(); returnCursor.close();
final String finalName = name; final String finalName = name;
ChanApplication.getReplyManager()._onPickedFileLoading(); ChanApplication.getReplyManager()._onPickedFileLoading();
// Async load the stream into "pickedFileCache", an file in the cache root // Async load the stream into "pickedFileCache", an file in the cache root
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
final File cacheFile = new File(getCacheDir() + File.separator + "pickedFileCache"); final File cacheFile = new File(getCacheDir() + File.separator + "pickedFileCache");
if (cacheFile.exists()) { if (cacheFile.exists()) {
cacheFile.delete(); cacheFile.delete();
} }
InputStream is = getContentResolver().openInputStream(uri); InputStream is = getContentResolver().openInputStream(uri);
FileOutputStream fos = new FileOutputStream(cacheFile); FileOutputStream fos = new FileOutputStream(cacheFile);
IOUtils.copy(is, fos); IOUtils.copy(is, fos);
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
ChanApplication.getReplyManager()._onPickedFile(finalName, cacheFile); ChanApplication.getReplyManager()._onPickedFile(finalName, cacheFile);
} }
}); });
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
}
} }
} }).start();
}).start(); } else {
Toast.makeText(this, R.string.image_open_failed, Toast.LENGTH_LONG).show();
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save