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

Remove the DeprecatedPersistentBlobProvider.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-04-08 16:59:48 -04:00
committed by jeffrey-signal
parent b054a7eb76
commit 281f062b29
3 changed files with 2 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
View File

@@ -69,7 +69,6 @@ import org.thoughtcrime.securesms.payments.preferences.model.PayeeParcelable;
import org.signal.core.util.permissions.PermissionCompat;
import org.signal.core.ui.permissions.Permissions;
import org.thoughtcrime.securesms.providers.BlobProvider;
import org.thoughtcrime.securesms.providers.DeprecatedPersistentBlobProvider;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.sms.MessageSender;
@@ -174,16 +173,14 @@ public class AttachmentManager {
}
private void cleanup(final @Nullable Uri uri) {
if (uri != null && DeprecatedPersistentBlobProvider.isAuthority(context, uri)) {
if (uri != null && BlobProvider.isAuthority(uri)) {
Log.d(TAG, "cleaning up " + uri);
DeprecatedPersistentBlobProvider.getInstance(context).delete(context, uri);
} else if (uri != null && BlobProvider.isAuthority(uri)) {
BlobProvider.getInstance().delete(context, uri);
}
}
private void markGarbage(@Nullable Uri uri) {
if (uri != null && (DeprecatedPersistentBlobProvider.isAuthority(context, uri) || BlobProvider.isAuthority(uri))) {
if (uri != null && BlobProvider.isAuthority(uri)) {
Log.d(TAG, "Marking garbage that needs cleaning: " + uri);
garbage.add(uri);
}

12
app/src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java
View File

@@ -20,7 +20,6 @@ import org.signal.core.models.media.TransformProperties;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.emoji.EmojiFiles;
import org.thoughtcrime.securesms.providers.BlobProvider;
import org.thoughtcrime.securesms.providers.DeprecatedPersistentBlobProvider;
import org.thoughtcrime.securesms.providers.PartProvider;
import java.io.FileNotFoundException;
@@ -42,7 +41,6 @@ public class PartAuthority {
private static final Uri AVATAR_PICKER_CONTENT_URI = Uri.parse(AVATAR_PICKER_URI_STRING);
private static final int PART_ROW = 1;
private static final int PERSISTENT_ROW = 2;
private static final int BLOB_ROW = 3;
private static final int STICKER_ROW = 4;
private static final int WALLPAPER_ROW = 5;
@@ -60,8 +58,6 @@ public class PartAuthority {
uriMatcher.addURI(AUTHORITY, "wallpaper/*", WALLPAPER_ROW);
uriMatcher.addURI(AUTHORITY, "emoji/*", EMOJI_ROW);
uriMatcher.addURI(AUTHORITY, "avatar_picker/*", AVATAR_PICKER_ROW);
uriMatcher.addURI(DeprecatedPersistentBlobProvider.AUTHORITY, DeprecatedPersistentBlobProvider.EXPECTED_PATH_OLD, PERSISTENT_ROW);
uriMatcher.addURI(DeprecatedPersistentBlobProvider.AUTHORITY, DeprecatedPersistentBlobProvider.EXPECTED_PATH_NEW, PERSISTENT_ROW);
uriMatcher.addURI(BlobProvider.AUTHORITY, BlobProvider.PATH, BLOB_ROW);
}
@@ -79,7 +75,6 @@ public class PartAuthority {
switch (match) {
case PART_ROW: return SignalDatabase.attachments().getAttachmentStream(new PartUriParser(uri).getPartId(), 0);
case STICKER_ROW: return SignalDatabase.stickers().getStickerStream(ContentUris.parseId(uri));
case PERSISTENT_ROW: return DeprecatedPersistentBlobProvider.getInstance(context).getStream(context, ContentUris.parseId(uri));
case BLOB_ROW: return BlobProvider.getInstance().getStream(context, uri);
case EMOJI_ROW: return EmojiFiles.openForReading(context, getEmojiFilename(uri));
case AVATAR_PICKER_ROW: return AvatarPickerStorage.read(context, getAvatarPickerFilename(uri));
@@ -100,8 +95,6 @@ public class PartAuthority {
if (attachment != null) return attachment.fileName;
else return null;
case PERSISTENT_ROW:
return DeprecatedPersistentBlobProvider.getFileName(context, uri);
case BLOB_ROW:
return BlobProvider.getFileName(uri);
default:
@@ -118,8 +111,6 @@ public class PartAuthority {
if (attachment != null) return attachment.size;
else return null;
case PERSISTENT_ROW:
return DeprecatedPersistentBlobProvider.getFileSize(context, uri);
case BLOB_ROW:
return BlobProvider.getFileSize(uri);
default:
@@ -136,8 +127,6 @@ public class PartAuthority {
if (attachment != null) return attachment.contentType;
else return null;
case PERSISTENT_ROW:
return DeprecatedPersistentBlobProvider.getMimeType(context, uri);
case BLOB_ROW:
return BlobProvider.getMimeType(uri);
default:
@@ -211,7 +200,6 @@ public class PartAuthority {
switch (match) {
case PART_ROW:
case THUMBNAIL_ROW:
case PERSISTENT_ROW:
case BLOB_ROW:
return true;
}