Treat SVGs as document attachments.

fork-5.53.8
Rashad Sookram 2021-12-13 12:51:53 -05:00 zatwierdzone przez Cody Henthorne
rodzic 4ae129d2af
commit b94624fd5a
3 zmienionych plików z 7 dodań i 2 usunięć

Wyświetl plik

@ -73,6 +73,7 @@ import org.thoughtcrime.securesms.sharing.ShareActivity;
import org.thoughtcrime.securesms.util.AttachmentUtil;
import org.thoughtcrime.securesms.util.DateUtils;
import org.thoughtcrime.securesms.util.FullscreenHelper;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.SaveAttachmentTask;
import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
import org.thoughtcrime.securesms.util.StorageUtil;
@ -534,7 +535,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
}
public static boolean isContentTypeSupported(final String contentType) {
return contentType != null && (contentType.startsWith("image/") || contentType.startsWith("video/"));
return MediaUtil.isImageType(contentType) || MediaUtil.isVideoType(contentType);
}
@Override

Wyświetl plik

@ -293,7 +293,7 @@ public class MediaUtil {
return false;
}
return contentType.startsWith("image/") ||
return (contentType.startsWith("image/") && !contentType.equals("image/svg+xml")) ||
contentType.equals(MediaStore.Images.Media.CONTENT_TYPE);
}

Wyświetl plik

@ -71,6 +71,10 @@ final class MemoryFileDescriptorProxy {
try {
InputStream inputStream = memoryFile.getInputStream();
if(inputStream.skip(offset) != offset){
if (offset > memoryFile.length()) {
throw new ErrnoException("onRead", OsConstants.EIO);
}
throw new AssertionError();
}
return inputStream.read(data, 0, size);