Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Use getFilename() instead of the actual filename on disk #3521

Merged
merged 9 commits into from
Jan 15, 2025
Merged

fix: Use getFilename() instead of the actual filename on disk #3521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c7e97d
fix: Use msg.getFilename() instead of the file's name in some cases
Hocuri Dec 27, 2024
c3a4e53
fix: Use msg.getFilename() instead of the file's name in initializeDr…
Hocuri Dec 27, 2024
0044490
fix: Use msg.getFilename() instead of the file's name in MediaItem
Hocuri Dec 27, 2024
357b59e
fix: Use the correct file name in MediaView
Hocuri Jan 6, 2025
3088987
refactor: `msg` param of `getManuallyCalculatedSlideInfo()` was alway…
Hocuri Jan 6, 2025
ebe9735
Improve comment
Hocuri Jan 6, 2025
a72d66e
Revert "refactor: `msg` param of `getManuallyCalculatedSlideInfo()` w…
Hocuri Jan 7, 2025
414a2a8
fix: Fix drafting images
Hocuri Jan 7, 2025
bec0c6f
fix: Use the original message's filemime if there is one
Hocuri Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/androidTest/java/com/b44t/messenger/uitests/offline/SharingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void testShareFromScreenshot() {
}
}
Uri uri = Uri.parse("content://" + BuildConfig.APPLICATION_ID + ".attachments/" + Uri.encode(pngImage));
DcHelper.sharedFiles.put("/" + pngImage, 1);
DcHelper.sharedFiles.put(pngImage, 1);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For explanation: Since AttachmentsContentProvider.openFile() (which checks sharedFiles) now uses getPathSegments().get(0); instead of getPath();, the leading / won't be included there. So, it's easier for AttachmentsContentProvider.openFile() to have it without the leading /.


Intent i = new Intent(Intent.ACTION_SEND);
i.setType("image/png");
Expand Down
20 changes: 7 additions & 13 deletions src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
import org.thoughtcrime.securesms.util.guava.Optional;
import org.thoughtcrime.securesms.util.views.ProgressDialog;
import org.thoughtcrime.securesms.util.views.Stub;
import org.thoughtcrime.securesms.video.recode.VideoRecoder;
import org.thoughtcrime.securesms.videochat.VideochatUtil;

Expand Down Expand Up @@ -746,8 +745,8 @@ private ListenableFuture<Boolean> initializeDraft() {
handleReplyMessage(quote);
}

String filename = draft.getFile();
if (filename.isEmpty() || !new File(filename).exists()) {
String file = draft.getFile();
if (file.isEmpty() || !new File(file).exists()) {
future.set(!text.isEmpty());
updateToggleButtonState();
return future;
Expand All @@ -767,26 +766,21 @@ public void onFailure(ExecutionException e) {
}
};

File file = new File(filename);
Uri uri = Uri.fromFile(file);
switch (draft.getType()) {
case DcMsg.DC_MSG_IMAGE:
setMedia(uri, MediaType.IMAGE).addListener(listener);
setMedia(draft, MediaType.IMAGE).addListener(listener);
break;
case DcMsg.DC_MSG_GIF:
setMedia(uri, MediaType.GIF).addListener(listener);
setMedia(draft, MediaType.GIF).addListener(listener);
break;
case DcMsg.DC_MSG_AUDIO:
setMedia(uri, MediaType.AUDIO).addListener(listener);
setMedia(draft, MediaType.AUDIO).addListener(listener);
break;
case DcMsg.DC_MSG_VIDEO:
setMedia(uri, MediaType.VIDEO).addListener(listener);
break;
case DcMsg.DC_MSG_WEBXDC:
setMedia(draft, MediaType.DOCUMENT).addListener(listener);
setMedia(draft, MediaType.VIDEO).addListener(listener);
break;
default:
setMedia(uri, MediaType.DOCUMENT).addListener(listener);
setMedia(draft, MediaType.DOCUMENT).addListener(listener);
break;
}

Expand Down
23 changes: 14 additions & 9 deletions src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ private void initializeResources() {
messageRecord = null;
long date = getIntent().getLongExtra(DATE_EXTRA, 0);
long size = getIntent().getLongExtra(SIZE_EXTRA, 0);
initialMedia = new MediaItem(null, getIntent().getData(), getIntent().getType(),
initialMedia = new MediaItem(null, getIntent().getData(), null, getIntent().getType(),
DcMsg.DC_MSG_NO_ID, date, size, false);

if (address != null) {
Expand All @@ -218,7 +218,7 @@ private void initializeResources() {
} else {
messageRecord = dcContext.getMsg(msgId);
initialMedia = new MediaItem(Recipient.fromChat(context, msgId), Uri.fromFile(messageRecord.getFileAsFile()),
messageRecord.getFilemime(), messageRecord.getId(), messageRecord.getDateReceived(),
messageRecord.getFilename(), messageRecord.getFilemime(), messageRecord.getId(), messageRecord.getDateReceived(),
messageRecord.getFilebytes(), messageRecord.isOutgoing());
conversationRecipient = Recipient.fromChat(context, msgId);
}
Expand All @@ -232,12 +232,11 @@ private void initializeMedia() {
// if you search for the place where the media are loaded, go to 'onCreateLoader'.

Log.w(TAG, "Loading Part URI: " + initialMedia);

if (messageRecord != null) {
getSupportLoaderManager().restartLoader(0, null, this);
} else {
mediaPager.setAdapter(new SingleItemPagerAdapter(this, GlideApp.with(this),
getWindow(), initialMedia.uri, initialMedia.type, initialMedia.size));
getWindow(), initialMedia.uri, initialMedia.name, initialMedia.type, initialMedia.size));
}
}

Expand Down Expand Up @@ -313,7 +312,7 @@ private void saveToDisk() {
private void performSavetoDisk(@NonNull MediaItem mediaItem) {
SaveAttachmentTask saveTask = new SaveAttachmentTask(MediaPreviewActivity.this);
long saveDate = (mediaItem.date > 0) ? mediaItem.date : System.currentTimeMillis();
saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Attachment(mediaItem.uri, mediaItem.type, saveDate, null));
saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Attachment(mediaItem.uri, mediaItem.type, saveDate, mediaItem.name));
}

private void showInChat() {
Expand Down Expand Up @@ -486,18 +485,20 @@ private static class SingleItemPagerAdapter extends PagerAdapter implements Medi
private final GlideRequests glideRequests;
private final Window window;
private final Uri uri;
private final String name;
private final String mediaType;
private final long size;

private final LayoutInflater inflater;

SingleItemPagerAdapter(@NonNull Context context, @NonNull GlideRequests glideRequests,
@NonNull Window window, @NonNull Uri uri, @NonNull String mediaType,
@NonNull Window window, @NonNull Uri uri, @Nullable String name, @NonNull String mediaType,
long size)
{
this.glideRequests = glideRequests;
this.window = window;
this.uri = uri;
this.name = name;
this.mediaType = mediaType;
this.size = size;
this.inflater = LayoutInflater.from(context);
Expand All @@ -519,7 +520,7 @@ public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
MediaView mediaView = itemView.findViewById(R.id.media_view);

try {
mediaView.set(glideRequests, window, uri, mediaType, size, true);
mediaView.set(glideRequests, window, uri, name, mediaType, size, true);
} catch (IOException e) {
Log.w(TAG, e);
}
Expand All @@ -539,7 +540,7 @@ public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Obj

@Override
public MediaItem getMediaItemFor(int position) {
return new MediaItem(null, uri, mediaType, DcMsg.DC_MSG_NO_ID, -1, -1, true);
return new MediaItem(null, uri, name, mediaType, DcMsg.DC_MSG_NO_ID, -1, -1, true);
}

@Override
Expand Down Expand Up @@ -604,7 +605,7 @@ public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {

try {
//noinspection ConstantConditions
mediaView.set(glideRequests, window, Uri.fromFile(msg.getFileAsFile()),
mediaView.set(glideRequests, window, Uri.fromFile(msg.getFileAsFile()), msg.getFilename(),
msg.getFilemime(), msg.getFilebytes(), autoplay);
} catch (IOException e) {
Log.w(TAG, e);
Expand Down Expand Up @@ -633,6 +634,7 @@ public MediaItem getMediaItemFor(int position) {

return new MediaItem(Recipient.fromChat(context, msg.getId()),
Uri.fromFile(msg.getFileAsFile()),
msg.getFilename(),
msg.getFilemime(),
msg.getId(),
msg.getDateReceived(),
Expand All @@ -655,6 +657,7 @@ private int getCursorPosition(int position) {
private static class MediaItem {
private final @Nullable Recipient recipient;
private final @NonNull Uri uri;
private final @Nullable String name;
private final @NonNull String type;
private final int msgId;
private final long date;
Expand All @@ -663,6 +666,7 @@ private static class MediaItem {

private MediaItem(@Nullable Recipient recipient,
@NonNull Uri uri,
@Nullable String name,
@NonNull String type,
int msgId,
long date,
Expand All @@ -671,6 +675,7 @@ private MediaItem(@Nullable Recipient recipient,
{
this.recipient = recipient;
this.uri = uri;
this.name = name;
this.type = type;
this.msgId = msgId;
this.date = date;
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/org/thoughtcrime/securesms/components/MediaView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

import android.content.Context;
import android.net.Uri;
import android.os.Build;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;

import android.util.AttributeSet;
import android.view.View;
import android.view.Window;
Expand Down Expand Up @@ -55,6 +55,7 @@ private void initialize() {
public void set(@NonNull GlideRequests glideRequests,
@NonNull Window window,
@NonNull Uri source,
@Nullable String fileName,
@NonNull String mediaType,
long size,
boolean autoplay)
Expand All @@ -68,7 +69,7 @@ public void set(@NonNull GlideRequests glideRequests,
imageView.setVisibility(View.GONE);
videoView.get().setVisibility(View.VISIBLE);
videoView.get().setWindow(window);
videoView.get().setVideoSource(new VideoSlide(getContext(), source, size), autoplay);
videoView.get().setVideoSource(new VideoSlide(getContext(), source, fileName, size), autoplay);
} else {
throw new IOException("Unsupported media type: " + mediaType);
}
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/org/thoughtcrime/securesms/connect/AttachmentsContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ public class AttachmentsContentProvider extends ContentProvider {
public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
DcContext dcContext = DcHelper.getContext(getContext());

String path = uri.getPath();
// `uri` originally comes from DcHelper.openForViewOrShare() and
// looks like `content://chat.delta.attachments/ef39a39/text.txt`
// where ef39a39 is the file in the blob directory
// and text.txt is the original name of the file, as returned by `msg.getFilename()`.
// `uri.getPathSegments()` returns ["ef39a39", "text.txt"] in this example.
String path = uri.getPathSegments().get(0);
if (!DcHelper.sharedFiles.containsKey(path)) {
throw new FileNotFoundException("File was not shared before.");
}
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ public static void openForViewOrShare(Context activity, int msg_id, String cmd)

DcMsg msg = dcContext.getMsg(msg_id);
String path = msg.getFile();
String filename = msg.getFilename();
String mimeType = msg.getFilemime();
try {
File file = new File(path);
Expand All @@ -291,8 +292,11 @@ public static void openForViewOrShare(Context activity, int msg_id, String cmd)

Uri uri;
if (path.startsWith(dcContext.getBlobdir())) {
uri = Uri.parse("content://" + BuildConfig.APPLICATION_ID + ".attachments/" + Uri.encode(file.getName()));
sharedFiles.put("/" + file.getName(), 1); // as different Android version handle uris in putExtra differently, we also check them on our own
// Build a Uri that will later be passed to AttachmentsContentProvider.openFile().
// The last part needs to be `filename`, i.e. the original, user-visible name of the file,
// so that the external apps show the name of the file correctly.
uri = Uri.parse("content://" + BuildConfig.APPLICATION_ID + ".attachments/" + Uri.encode(file.getName()) + "/" + Uri.encode(filename));
sharedFiles.put(file.getName(), 1); // as different Android version handle uris in putExtra differently, we also check them on our own
} else {
if (Build.VERSION.SDK_INT >= 24) {
uri = FileProvider.getUriForFile(activity, BuildConfig.APPLICATION_ID + ".fileprovider", file);
Expand All @@ -302,7 +306,7 @@ public static void openForViewOrShare(Context activity, int msg_id, String cmd)
}

if (cmd.equals(Intent.ACTION_VIEW)) {
mimeType = checkMime(path, mimeType);
mimeType = checkMime(filename, mimeType);
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(uri, mimeType);
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
Expand Down
21 changes: 13 additions & 8 deletions src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,11 @@ protected void onPreExecute() {
return new DocumentSlide(context, msg);
}
else if (PartAuthority.isLocalUri(uri)) {
return getManuallyCalculatedSlideInfo(uri, width, height);
return getManuallyCalculatedSlideInfo(uri, width, height, msg);
} else {
Slide result = getContentResolverSlideInfo(uri, width, height, chatId);

if (result == null) return getManuallyCalculatedSlideInfo(uri, width, height);
if (result == null) return getManuallyCalculatedSlideInfo(uri, width, height, msg);
else return result;
}
} catch (IOException e) {
Expand Down Expand Up @@ -362,16 +362,21 @@ public void onReceivedDuration(int millis) {
return null;
}

private @NonNull Slide getManuallyCalculatedSlideInfo(Uri uri, int width, int height) throws IOException {
private @NonNull Slide getManuallyCalculatedSlideInfo(Uri uri, int width, int height, @Nullable DcMsg msg) throws IOException {
long start = System.currentTimeMillis();
Long mediaSize = null;
String fileName = null;
String mimeType = null;

if (msg != null) {
fileName = msg.getFilename();
mimeType = msg.getFilemime();
}

if (PartAuthority.isLocalUri(uri)) {
mediaSize = PartAuthority.getAttachmentSize(context, uri);
fileName = PartAuthority.getAttachmentFileName(context, uri);
mimeType = PartAuthority.getAttachmentContentType(context, uri);
if (fileName == null) fileName = PartAuthority.getAttachmentFileName(context, uri);
if (mimeType == null) mimeType = PartAuthority.getAttachmentContentType(context, uri);
}

if (mediaSize == null) {
Expand Down Expand Up @@ -676,10 +681,10 @@ public enum MediaType {
}

switch (this) {
case IMAGE: return new ImageSlide(context, uri, dataSize, width, height);
case GIF: return new GifSlide(context, uri, dataSize, width, height);
case IMAGE: return new ImageSlide(context, uri, fileName, dataSize, width, height);
case GIF: return new GifSlide(context, uri, fileName, dataSize, width, height);
case AUDIO: return new AudioSlide(context, uri, dataSize, false, fileName);
case VIDEO: return new VideoSlide(context, uri, dataSize);
case VIDEO: return new VideoSlide(context, uri, fileName, dataSize);
case DOCUMENT:
// We have to special-case Webxdc slides: The user can interact with them as soon as a draft
// is set. Therefore we need to create a DcMsg already now.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/thoughtcrime/securesms/mms/GifSlide.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ public GifSlide(Context context, DcMsg dcMsg) {
super(context, dcMsg);
}

public GifSlide(Context context, Uri uri, long size, int width, int height) {
super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_GIF, size, width, height, uri, null, false));
public GifSlide(Context context, Uri uri, String fileName, long size, int width, int height) {
super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_GIF, size, width, height, uri, fileName, false));
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public ImageSlide(@NonNull Context context, @NonNull Attachment attachment) {
super(context, attachment);
}

public ImageSlide(Context context, Uri uri, long size, int width, int height) {
super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_JPEG, size, width, height, uri, null, false));
public ImageSlide(Context context, Uri uri, String fileName, long size, int width, int height) {
super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_JPEG, size, width, height, uri, fileName, false));
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@

public class VideoSlide extends Slide {

private static Attachment constructVideoAttachment(Context context, Uri uri, long dataSize)
private static Attachment constructVideoAttachment(Context context, Uri uri, String fileName, long dataSize)
{
Uri thumbnailUri = Uri.fromFile(new File(DcHelper.getBlobdirFile(DcHelper.getContext(context), "temp-preview.jpg")));
MediaUtil.ThumbnailSize retWh = new MediaUtil.ThumbnailSize(0, 0);
MediaUtil.createVideoThumbnailIfNeeded(context, uri, thumbnailUri, retWh);
return constructAttachmentFromUri(context, uri, MediaUtil.VIDEO_UNSPECIFIED, dataSize, retWh.width, retWh.height, thumbnailUri, null, false);
return constructAttachmentFromUri(context, uri, MediaUtil.VIDEO_UNSPECIFIED, dataSize, retWh.width, retWh.height, thumbnailUri, fileName, false);
}

public VideoSlide(Context context, Uri uri, long dataSize) {
super(context, constructVideoAttachment(context, uri, dataSize));
public VideoSlide(Context context, Uri uri, String fileName, long dataSize) {
super(context, constructVideoAttachment(context, uri, fileName, dataSize));
}

public VideoSlide(Context context, DcMsg dcMsg) {
Expand Down
Loading