Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Treat SVGs as document attachments.

Browse Source
This commit is contained in:
Rashad Sookram
2021-12-13 12:51:53 -05:00
committed by Cody Henthorne
parent 4ae129d2af
commit b94624fd5a
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
View File

@@ -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

2
app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
View File

@@ -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);
}

4
app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileDescriptorProxy.java
View File

@@ -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);