mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix crash when forwarding unknown media types.

fork-5.53.8
Cody Henthorne 2021-09-29 12:12:32 -04:00
rodzic 6625ac02d5
commit 705839068a
1 zmienionych plików z 12 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
app/src/main/java/org/thoughtcrime/securesms/mms/SlideFactory.java
Wyświetl plik

@ -58,13 +58,10 @@ public final class SlideFactory {
} }
} }
private static @Nullable Slide getContentResolverSlideInfo(@NonNull Context context, @NonNull MediaType mediaType, @NonNull Uri uri, int width, int height) { private static @Nullable Slide getContentResolverSlideInfo(@NonNull Context context, @Nullable MediaType mediaType, @NonNull Uri uri, int width, int height) {
Cursor cursor = null; long start = System.currentTimeMillis();
long start = System.currentTimeMillis();
try {
cursor = context.getContentResolver().query(uri, null, null, null, null);
try (Cursor cursor = context.getContentResolver().query(uri, null, null, null, null)) {
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
String fileName = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)); String fileName = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME));
long fileSize = cursor.getLong(cursor.getColumnIndexOrThrow(OpenableColumns.SIZE)); long fileSize = cursor.getLong(cursor.getColumnIndexOrThrow(OpenableColumns.SIZE));
@ -76,17 +73,19 @@ public final class SlideFactory {
height = dimens.second; height = dimens.second;
} }
if (mediaType == null) {
mediaType = MediaType.DOCUMENT;
}
Log.d(TAG, "remote slide with size " + fileSize + " took " + (System.currentTimeMillis() - start) + "ms"); Log.d(TAG, "remote slide with size " + fileSize + " took " + (System.currentTimeMillis() - start) + "ms");
return mediaType.createSlide(context, uri, fileName, mimeType, null, fileSize, width, height, false); return mediaType.createSlide(context, uri, fileName, mimeType, null, fileSize, width, height, false);
} }
} finally {
if (cursor != null) cursor.close();
} }
return null; return null;
} }
private static @NonNull Slide getManuallyCalculatedSlideInfo(@NonNull Context context, @NonNull MediaType mediaType, @NonNull Uri uri, int width, int height) throws IOException { private static @NonNull Slide getManuallyCalculatedSlideInfo(@NonNull Context context, @Nullable MediaType mediaType, @NonNull Uri uri, int width, int height) throws IOException {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Long mediaSize = null; Long mediaSize = null;
String fileName = null; String fileName = null;
@ -114,6 +113,10 @@ public final class SlideFactory {
height = dimens.second; height = dimens.second;
} }
if (mediaType == null) {
mediaType = MediaType.DOCUMENT;
}
Log.d(TAG, "local slide with size " + mediaSize + " took " + (System.currentTimeMillis() - start) + "ms"); Log.d(TAG, "local slide with size " + mediaSize + " took " + (System.currentTimeMillis() - start) + "ms");
return mediaType.createSlide(context, uri, fileName, mimeType, null, mediaSize, width, height, gif); return mediaType.createSlide(context, uri, fileName, mimeType, null, mediaSize, width, height, gif);
} }