narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

catch illegal state exception when copying file

Browse source
This commit is contained in:
Daniel Gultsch 2022-09-07 16:29:51 +02:00
parent ecbfe33e8d
commit f7996a6c3c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
View file

@ -684,7 +684,7 @@ public class FileBackend {
} catch (final FileWriterException e) { } catch (final FileWriterException e) {
cleanup(file); cleanup(file);
throw new FileCopyException(R.string.error_unable_to_create_temporary_file); throw new FileCopyException(R.string.error_unable_to_create_temporary_file);
} catch (final SecurityException e) { } catch (final SecurityException | IllegalStateException e) {
cleanup(file); cleanup(file);
throw new FileCopyException(R.string.error_security_exception); throw new FileCopyException(R.string.error_security_exception);
} catch (final IOException e) { } catch (final IOException e) {
@ -1576,19 +1576,19 @@ public class FileBackend {
return 0; return 0;
} }
return Integer.parseInt(value); return Integer.parseInt(value);
} catch (final IllegalArgumentException e) { } catch (final Exception e) {
return 0; return 0;
} }
} }
private Dimensions getImageDimensions(File file) { private Dimensions getImageDimensions(File file) {
BitmapFactory.Options options = new BitmapFactory.Options(); final BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true; options.inJustDecodeBounds = true;
BitmapFactory.decodeFile(file.getAbsolutePath(), options); BitmapFactory.decodeFile(file.getAbsolutePath(), options);
int rotation = getRotation(file); final int rotation = getRotation(file);
boolean rotated = rotation == 90 || rotation == 270; final boolean rotated = rotation == 90 || rotation == 270;
int imageHeight = rotated ? options.outWidth : options.outHeight; final int imageHeight = rotated ? options.outWidth : options.outHeight;
int imageWidth = rotated ? options.outHeight : options.outWidth; final int imageWidth = rotated ? options.outHeight : options.outWidth;
return new Dimensions(imageHeight, imageWidth); return new Dimensions(imageHeight, imageWidth);
} }