Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	plugin.xml
This commit is contained in:
EddyVerbruggen
2015-10-28 20:20:40 +01:00
@@ -626,7 +626,7 @@ public class MultiImageChooserActivity extends Activity implements OnItemClickLi
int index = fileName.lastIndexOf('.');
String name = fileName.substring(0, index);
String ext = fileName.substring(index);
File file = File.createTempFile(name, ext);
File file = File.createTempFile("tmp_" + name, ext);
OutputStream outStream = new FileOutputStream(file);
if (ext.compareToIgnoreCase(".png") == 0) {
bmp.compress(Bitmap.CompressFormat.PNG, quality, outStream);