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

Convert AttachmentTable and models to kotlin.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-01-03 14:43:05 -05:00
committed by Alex Hart
parent 888a40a5c4
commit 3554f82ea3
62 changed files with 2626 additions and 2986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java
View File

@@ -134,8 +134,8 @@ public final class PartProvider extends BaseContentProvider {
DatabaseAttachment attachment = SignalDatabase.attachments().getAttachment(partUriParser.getPartId());
if (attachment != null) {
Log.i(TAG, "getType() called: " + uri + " It's " + attachment.getContentType());
return attachment.getContentType();
Log.i(TAG, "getType() called: " + uri + " It's " + attachment.contentType);
return attachment.contentType;
}
}
@@ -163,15 +163,15 @@ public final class PartProvider extends BaseContentProvider {
if (attachment == null) return null;
long fileSize = attachment.getSize();
long fileSize = attachment.size;
if (fileSize <= 0) {
Log.w(TAG, "Empty file " + fileSize);
return null;
}
String fileName = attachment.getFileName() != null ? attachment.getFileName()
: createFileNameForMimeType(attachment.getContentType());
String fileName = attachment.fileName != null ? attachment.fileName
: createFileNameForMimeType(attachment.contentType);
return createCursor(projection, fileName, fileSize);
} else {
@@ -229,9 +229,9 @@ public final class PartProvider extends BaseContentProvider {
@Override
public long onGetSize() throws ErrnoException {
DatabaseAttachment attachment = attachments.getAttachment(attachmentId);
if (attachment != null && attachment.getSize() > 0) {
if (attachment != null && attachment.size > 0) {
Log.i(TAG, attachmentId + ":getSize");
return attachment.getSize();
return attachment.size;
} else {
Log.w(TAG, attachmentId + ":getSize:attachment is null or size is 0");
throw new ErrnoException("Attachment is invalid", OsConstants.ENOENT);
@@ -242,7 +242,7 @@ public final class PartProvider extends BaseContentProvider {
public int onRead(long offset, int size, byte[] data) throws ErrnoException {
try {
DatabaseAttachment attachment = attachments.getAttachment(attachmentId);
if (attachment == null || attachment.getSize() <= 0) {
if (attachment == null || attachment.size <= 0) {
Log.w(TAG, attachmentId + ":onRead:attachment is null or size is 0");
throw new ErrnoException("Attachment is invalid", OsConstants.ENOENT);
}