diff --git a/jni/messenger-backend b/jni/messenger-backend index f576a7c39..f6c3c8e72 160000 --- a/jni/messenger-backend +++ b/jni/messenger-backend @@ -1 +1 @@ -Subproject commit f576a7c392c50d79c41422b1f3e8bba61b77cfb8 +Subproject commit f6c3c8e72dc604802468319992bbf75052c582c0 diff --git a/src/com/b44t/messenger/DcMediaGalleryElement.java b/src/com/b44t/messenger/DcMediaGalleryElement.java new file mode 100644 index 000000000..288ae7f82 --- /dev/null +++ b/src/com/b44t/messenger/DcMediaGalleryElement.java @@ -0,0 +1,44 @@ +package com.b44t.messenger; + +/** + * Contains a list of media entries, their respective positions and ability to move through it. + */ +public class DcMediaGalleryElement { + + final int[] mediaMsgs; + int position; + final DcContext context; + public DcMediaGalleryElement(int[] mediaMsgs, int position, DcContext context, boolean leftIsRecent) { + this.mediaMsgs = mediaMsgs; + this.position = position; + this.context = context; + + // normal state is left is recent. If the ui needs right to be recent we reverse the order here. + if (!leftIsRecent) { + for (int ii = 0; ii < mediaMsgs.length / 2; ii++) { + int tmp = mediaMsgs[ii]; + int opposite = mediaMsgs.length - 1 - ii; + mediaMsgs[ii] = mediaMsgs[opposite]; + mediaMsgs[opposite] = tmp; + } + } + } + + public int getCount() { + return mediaMsgs.length; + } + + public int getPosition() { + return position; + } + + public void moveToPosition(int newPosition) { + if(newPosition < 0 || newPosition >= mediaMsgs.length) + throw new IllegalArgumentException("can't move outside of known area."); + position = newPosition; + } + + public DcMsg getMessage() { + return context.getMsg(mediaMsgs[position]); + } +} diff --git a/src/com/b44t/messenger/DcMsg.java b/src/com/b44t/messenger/DcMsg.java index 012c6584f..6620e212a 100644 --- a/src/com/b44t/messenger/DcMsg.java +++ b/src/com/b44t/messenger/DcMsg.java @@ -31,8 +31,7 @@ import org.thoughtcrime.securesms.database.model.Quote; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientProvider; -import java.util.Collections; -import java.util.List; +import java.io.File; import java.util.Set; public class DcMsg { @@ -54,6 +53,7 @@ public class DcMsg { public final static int DC_STATE_OUT_DELIVERED = 26; public final static int DC_STATE_OUT_MDN_RCVD = 28; + public static final int DC_MSG_NO_ID = 0; public final static int DC_MSG_ID_MARKER1 = 1; public final static int DC_MSG_ID_DAYMARKER = 9; @@ -111,6 +111,12 @@ public class DcMsg { public native void setDimension (int width, int height); public native void setDuration (int duration); + public File getFileAsFile() { + if(getFile()==null) + throw new AssertionError("expected a file to be present."); + return new File(getFile()); + } + // aliases and higher-level tools public static int[] msgSetToIds(final Set dcMsgs) { int cnt = dcMsgs==null? 0 : dcMsgs.size(); diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index 0de9d7524..d9f2e90cd 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -683,11 +683,9 @@ public class ConversationItem extends LinearLayout } else if (MediaPreviewActivity.isContentTypeSupported(slide.getContentType()) && slide.getUri() != null) { Intent intent = new Intent(context, MediaPreviewActivity.class); intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - intent.setDataAndType(slide.getUri(), slide.getContentType()); + intent.putExtra(MediaPreviewActivity.DC_MSG_ID, slide.getDcMsgId()); intent.putExtra(MediaPreviewActivity.ADDRESS_EXTRA, conversationRecipient.getAddress()); intent.putExtra(MediaPreviewActivity.OUTGOING_EXTRA, messageRecord.isOutgoing()); - intent.putExtra(MediaPreviewActivity.DATE_EXTRA, messageRecord.getTimestamp()); - intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, slide.asAttachment().getSize()); intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, false); context.startActivity(intent); diff --git a/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java b/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java index 526531e0d..7a7811cbe 100644 --- a/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java +++ b/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java @@ -23,10 +23,10 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.b44t.messenger.DcMsg; import com.codewaves.stickyheadergrid.StickyHeaderGridAdapter; import org.thoughtcrime.securesms.components.ThumbnailView; -import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord; import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader.BucketedThreadMedia; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.Slide; @@ -46,7 +46,7 @@ class MediaGalleryAdapter extends StickyHeaderGridAdapter { private final GlideRequests glideRequests; private final Locale locale; private final ItemClickListener itemClickListener; - private final Set selected; + private final Set selected; private BucketedThreadMedia media; @@ -105,10 +105,10 @@ class MediaGalleryAdapter extends StickyHeaderGridAdapter { @Override public void onBindItemViewHolder(ItemViewHolder viewHolder, int section, int offset) { - MediaRecord mediaRecord = media.get(section, offset); + DcMsg mediaRecord = media.get(section, offset); ThumbnailView thumbnailView = ((ViewHolder)viewHolder).imageView; View selectedIndicator = ((ViewHolder)viewHolder).selectedIndicator; - Slide slide = MediaUtil.getSlideForAttachment(context, mediaRecord.getAttachment()); + Slide slide = MediaUtil.getSlideForMsg(context, mediaRecord); if (slide != null) { thumbnailView.setImageResource(glideRequests, slide, false, false); @@ -133,7 +133,7 @@ class MediaGalleryAdapter extends StickyHeaderGridAdapter { return media.getSectionItemCount(section); } - public void toggleSelection(@NonNull MediaRecord mediaRecord) { + public void toggleSelection(@NonNull DcMsg mediaRecord) { if (!selected.remove(mediaRecord)) { selected.add(mediaRecord); } @@ -145,7 +145,7 @@ class MediaGalleryAdapter extends StickyHeaderGridAdapter { } @NonNull - public Collection getSelectedMedia() { + public Collection getSelectedMedia() { return new HashSet<>(selected); } @@ -155,7 +155,7 @@ class MediaGalleryAdapter extends StickyHeaderGridAdapter { } interface ItemClickListener { - void onMediaClicked(@NonNull MediaRecord mediaRecord); - void onMediaLongClicked(MediaRecord mediaRecord); + void onMediaClicked(@NonNull DcMsg mediaRecord); + void onMediaLongClicked(DcMsg mediaRecord); } } diff --git a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java index 8ef9455c9..2c3150cec 100644 --- a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java +++ b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java @@ -47,17 +47,18 @@ import android.view.ViewGroup; import android.view.Window; import android.widget.TextView; +import com.b44t.messenger.DcContext; +import com.b44t.messenger.DcMsg; import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager; +import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter; -import org.thoughtcrime.securesms.database.MediaDatabase; import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader; import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader.BucketedThreadMedia; import org.thoughtcrime.securesms.database.loaders.ThreadMediaLoader; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.util.AttachmentUtil; import org.thoughtcrime.securesms.util.DynamicLanguage; import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.DynamicTheme; @@ -257,7 +258,7 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity } @Override - public void onMediaClicked(@NonNull MediaDatabase.MediaRecord mediaRecord) { + public void onMediaClicked(@NonNull DcMsg mediaRecord) { if (actionMode != null) { handleMediaMultiSelectClick(mediaRecord); } else { @@ -265,7 +266,7 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity } } - private void handleMediaMultiSelectClick(@NonNull MediaDatabase.MediaRecord mediaRecord) { + private void handleMediaMultiSelectClick(@NonNull DcMsg mediaRecord) { MediaGalleryAdapter adapter = getListAdapter(); adapter.toggleSelection(mediaRecord); @@ -277,8 +278,8 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity } } - private void handleMediaPreviewClick(@NonNull MediaDatabase.MediaRecord mediaRecord) { - if (mediaRecord.getAttachment().getDataUri() == null) { + private void handleMediaPreviewClick(@NonNull DcMsg mediaRecord) { + if (mediaRecord.getFile() == null) { return; } @@ -288,18 +289,15 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity } Intent intent = new Intent(context, MediaPreviewActivity.class); - intent.putExtra(MediaPreviewActivity.DATE_EXTRA, mediaRecord.getDate()); - intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, mediaRecord.getAttachment().getSize()); + intent.putExtra(MediaPreviewActivity.DC_MSG_ID, mediaRecord.getId()); intent.putExtra(MediaPreviewActivity.ADDRESS_EXTRA, recipient.getAddress()); intent.putExtra(MediaPreviewActivity.OUTGOING_EXTRA, mediaRecord.isOutgoing()); intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, true); - - intent.setDataAndType(mediaRecord.getAttachment().getDataUri(), mediaRecord.getContentType()); context.startActivity(intent); } @Override - public void onMediaLongClicked(MediaDatabase.MediaRecord mediaRecord) { + public void onMediaLongClicked(DcMsg mediaRecord) { if (actionMode == null) { ((MediaGalleryAdapter) recyclerView.getAdapter()).toggleSelection(mediaRecord); recyclerView.getAdapter().notifyDataSetChanged(); @@ -309,7 +307,7 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity } @SuppressLint("StaticFieldLeak") - private void handleDeleteMedia(@NonNull Collection mediaRecords) { + private void handleDeleteMedia(@NonNull Collection mediaRecords) { int recordCount = mediaRecords.size(); Resources res = getContext().getResources(); String confirmTitle = res.getQuantityString(R.plurals.MediaOverviewActivity_Media_delete_confirm_title, @@ -324,25 +322,26 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity builder.setTitle(confirmTitle); builder.setMessage(confirmMessage); builder.setCancelable(true); + final DcContext dcContext = DcHelper.getContext(getContext()); builder.setPositiveButton(R.string.delete, (dialogInterface, i) -> { - new ProgressDialogAsyncTask(getContext(), + new ProgressDialogAsyncTask(getContext(), R.string.MediaOverviewActivity_Media_delete_progress_title, R.string.MediaOverviewActivity_Media_delete_progress_message) { @Override - protected Void doInBackground(MediaDatabase.MediaRecord... records) { + protected Void doInBackground(DcMsg... records) { if (records == null || records.length == 0) { return null; } - for (MediaDatabase.MediaRecord record : records) { - AttachmentUtil.deleteAttachment(getContext(), record.getAttachment()); + for (DcMsg record : records) { + dcContext.deleteMsgs(new int[]{record.getId()}); } return null; } - }.execute(mediaRecords.toArray(new MediaDatabase.MediaRecord[mediaRecords.size()])); + }.execute(mediaRecords.toArray(new DcMsg[mediaRecords.size()])); }); builder.setNegativeButton(android.R.string.cancel, null); builder.show(); diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java index 2290fc054..b9414b5c2 100644 --- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -20,9 +20,7 @@ import android.Manifest; import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; -import android.database.Cursor; import android.net.Uri; import android.os.AsyncTask; import android.os.Build.VERSION; @@ -32,7 +30,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.LoaderManager; import android.support.v4.content.Loader; -import android.support.v4.util.Pair; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.support.v7.app.AlertDialog; @@ -48,21 +45,20 @@ import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.Toast; -import org.thoughtcrime.securesms.attachments.AttachmentId; -import org.thoughtcrime.securesms.attachments.DatabaseAttachment; +import com.b44t.messenger.DcContext; +import com.b44t.messenger.DcMediaGalleryElement; +import com.b44t.messenger.DcMsg; + import org.thoughtcrime.securesms.components.MediaView; import org.thoughtcrime.securesms.components.viewpager.ExtendedOnPageChangedListener; +import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.database.Address; -import org.thoughtcrime.securesms.database.AttachmentDatabase; -import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord; import org.thoughtcrime.securesms.database.loaders.PagingMediaLoader; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientModifiedListener; -import org.thoughtcrime.securesms.util.AttachmentUtil; import org.thoughtcrime.securesms.util.DateUtils; import org.thoughtcrime.securesms.util.DynamicLanguage; import org.thoughtcrime.securesms.util.SaveAttachmentTask; @@ -75,22 +71,29 @@ import java.util.WeakHashMap; /** * Activity for displaying media attachments in-app */ -public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity implements RecipientModifiedListener, LoaderManager.LoaderCallbacks> { +public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity + implements RecipientModifiedListener, LoaderManager.LoaderCallbacks { private final static String TAG = MediaPreviewActivity.class.getSimpleName(); public static final String ADDRESS_EXTRA = "address"; - public static final String DATE_EXTRA = "date"; - public static final String SIZE_EXTRA = "size"; public static final String OUTGOING_EXTRA = "outgoing"; public static final String LEFT_IS_RECENT_EXTRA = "left_is_recent"; + public static final String DC_MSG_ID = "dc_msg_id"; + + /** USE ONLY IF YOU HAVE NO MESSAGE ID! */ + public static final String DATE_EXTRA = "date"; + + /** USE ONLY IF YOU HAVE NO MESSAGE ID! */ + public static final String SIZE_EXTRA = "size"; private final DynamicLanguage dynamicLanguage = new DynamicLanguage(); + @Nullable + private DcMsg messageRecord; + private DcContext dcContext; + private MediaItem initialMedia; private ViewPager mediaPager; - private Uri initialMediaUri; - private String initialMediaType; - private long initialMediaSize; private Recipient conversationRecipient; private boolean leftIsRecent; @@ -181,32 +184,51 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im private void initializeResources() { Address address = getIntent().getParcelableExtra(ADDRESS_EXTRA); - initialMediaUri = getIntent().getData(); - initialMediaType = getIntent().getType(); - initialMediaSize = getIntent().getLongExtra(SIZE_EXTRA, 0); + final Context context = getApplicationContext(); + this.dcContext = DcHelper.getContext(context); + final int msgId = getIntent().getIntExtra(DC_MSG_ID, DcMsg.DC_MSG_NO_ID); + + if(msgId == DcMsg.DC_MSG_NO_ID) { + messageRecord = null; + long date = getIntent().getLongExtra(DATE_EXTRA, 0); + long size = getIntent().getLongExtra(SIZE_EXTRA, 0); + initialMedia = new MediaItem(null, getIntent().getData(), getIntent().getType(), + DcMsg.DC_MSG_NO_ID, date, size, false); + + if (address != null) { + conversationRecipient = Recipient.from(context, address, false); + } else { + conversationRecipient = null; + } + } else { + messageRecord = dcContext.getMsg(msgId); + initialMedia = new MediaItem(Recipient.from(context, msgId), Uri.fromFile(messageRecord.getFileAsFile()), + messageRecord.getFilemime(), messageRecord.getId(), messageRecord.getDateReceived(), + messageRecord.getFilebytes(), messageRecord.isOutgoing()); + conversationRecipient = Recipient.from(context, msgId); + } leftIsRecent = getIntent().getBooleanExtra(LEFT_IS_RECENT_EXTRA, false); restartItem = -1; - if (address != null) { - conversationRecipient = Recipient.from(this, address, true); - } else { - conversationRecipient = null; - } } private void initializeMedia() { - if (!isContentTypeSupported(initialMediaType)) { + + // if you search for the place where the media are loaded, go to 'onCreateLoader'. + + if (!isContentTypeSupported(initialMedia.type)) { Log.w(TAG, "Unsupported media type sent to MediaPreviewActivity, finishing."); Toast.makeText(getApplicationContext(), R.string.MediaPreviewActivity_unssuported_media_type, Toast.LENGTH_LONG).show(); finish(); } - Log.w(TAG, "Loading Part URI: " + initialMediaUri); + Log.w(TAG, "Loading Part URI: " + initialMedia); - if (conversationRecipient != null) { + if (messageRecord != null) { getSupportLoaderManager().restartLoader(0, null, this); } else { - mediaPager.setAdapter(new SingleItemPagerAdapter(this, GlideApp.with(this), getWindow(), initialMediaUri, initialMediaType, initialMediaSize)); + mediaPager.setAdapter(new SingleItemPagerAdapter(this, GlideApp.with(this), + getWindow(), initialMedia.uri, initialMedia.type, initialMedia.size)); } } @@ -261,7 +283,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im @SuppressLint("StaticFieldLeak") private void deleteMedia() { MediaItem mediaItem = getCurrentMediaItem(); - if (mediaItem == null || mediaItem.attachment == null) { + if (mediaItem == null || mediaItem.msgId == DcMsg.DC_MSG_NO_ID) { return; } @@ -275,11 +297,10 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im new AsyncTask() { @Override protected Void doInBackground(Void... voids) { - if (mediaItem.attachment == null) { + if (mediaItem.msgId == DcMsg.DC_MSG_NO_ID) { return null; } - AttachmentUtil.deleteAttachment(MediaPreviewActivity.this.getApplicationContext(), - mediaItem.attachment); + dcContext.deleteMsgs(new int[]{mediaItem.msgId}); return null; } }.execute(); @@ -340,25 +361,26 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im } @Override - public Loader> onCreateLoader(int id, Bundle args) { - return new PagingMediaLoader(this, conversationRecipient, initialMediaUri, leftIsRecent); + public Loader onCreateLoader(int id, Bundle args) { + return new PagingMediaLoader(this, messageRecord, false); } @Override - public void onLoadFinished(Loader> loader, @Nullable Pair data) { + public void onLoadFinished(Loader loader, @Nullable DcMediaGalleryElement data) { if (data != null) { @SuppressWarnings("ConstantConditions") - CursorPagerAdapter adapter = new CursorPagerAdapter(this, GlideApp.with(this), getWindow(), data.first, data.second, leftIsRecent); + DcMediaPagerAdapter adapter = new DcMediaPagerAdapter(this, GlideApp.with(this), + getWindow(), data, leftIsRecent); mediaPager.setAdapter(adapter); adapter.setActive(true); - if (restartItem < 0) mediaPager.setCurrentItem(data.second); + if (restartItem < 0) mediaPager.setCurrentItem(data.getPosition()); else mediaPager.setCurrentItem(restartItem); } } @Override - public void onLoaderReset(Loader> loader) { + public void onLoaderReset(Loader loader) { } @@ -450,7 +472,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im @Override public MediaItem getMediaItemFor(int position) { - return new MediaItem(null, null, uri, mediaType, -1, true); + return new MediaItem(null, uri, mediaType, DcMsg.DC_MSG_NO_ID, -1, -1, true); } @Override @@ -459,29 +481,29 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im } } - private static class CursorPagerAdapter extends PagerAdapter implements MediaItemAdapter { + private static class DcMediaPagerAdapter extends PagerAdapter implements MediaItemAdapter { private final WeakHashMap mediaViews = new WeakHashMap<>(); private final Context context; private final GlideRequests glideRequests; private final Window window; - private final Cursor cursor; + private final DcMediaGalleryElement gallery; private final boolean leftIsRecent; private boolean active; private int autoPlayPosition; - CursorPagerAdapter(@NonNull Context context, @NonNull GlideRequests glideRequests, - @NonNull Window window, @NonNull Cursor cursor, int autoPlayPosition, + DcMediaPagerAdapter(@NonNull Context context, @NonNull GlideRequests glideRequests, + @NonNull Window window, @NonNull DcMediaGalleryElement gallery, boolean leftIsRecent) { this.context = context.getApplicationContext(); this.glideRequests = glideRequests; this.window = window; - this.cursor = cursor; - this.autoPlayPosition = autoPlayPosition; + this.gallery = gallery; this.leftIsRecent = leftIsRecent; + this.autoPlayPosition = gallery.getPosition(); } public void setActive(boolean active) { @@ -492,7 +514,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im @Override public int getCount() { if (!active) return 0; - else return cursor.getCount(); + else return gallery.getCount(); } @Override @@ -509,13 +531,14 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im autoPlayPosition = -1; - cursor.moveToPosition(cursorPosition); + gallery.moveToPosition(cursorPosition); - MediaRecord mediaRecord = MediaRecord.from(context, cursor); + DcMsg msg = gallery.getMessage(); try { //noinspection ConstantConditions - mediaView.set(glideRequests, window, mediaRecord.getAttachment().getDataUri(), mediaRecord.getAttachment().getContentType(), mediaRecord.getAttachment().getSize(), autoplay); + mediaView.set(glideRequests, window, Uri.fromFile(msg.getFileAsFile()), + msg.getFilemime(), msg.getFilebytes(), autoplay); } catch (IOException e) { Log.w(TAG, e); } @@ -536,18 +559,18 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im } public MediaItem getMediaItemFor(int position) { - cursor.moveToPosition(getCursorPosition(position)); - MediaRecord mediaRecord = MediaRecord.from(context, cursor); - Address address = mediaRecord.getAddress(); + gallery.moveToPosition(getCursorPosition(position)); + DcMsg msg = gallery.getMessage(); - if (mediaRecord.getAttachment().getDataUri() == null) throw new AssertionError(); + if (msg.getFile() == null) throw new AssertionError(); - return new MediaItem(address != null ? Recipient.from(context, address,true) : null, - mediaRecord.getAttachment(), - mediaRecord.getAttachment().getDataUri(), - mediaRecord.getContentType(), - mediaRecord.getDate(), - mediaRecord.isOutgoing()); + return new MediaItem(Recipient.from(context, msg.getId()), + Uri.fromFile(msg.getFileAsFile()), + msg.getFilemime(), + msg.getId(), + msg.getDateReceived(), + msg.getFilebytes(), + msg.isOutgoing()); } @Override @@ -558,30 +581,33 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im private int getCursorPosition(int position) { if (leftIsRecent) return position; - else return cursor.getCount() - 1 - position; + else return gallery.getCount() - 1 - position; } } private static class MediaItem { private final @Nullable Recipient recipient; - private final @Nullable DatabaseAttachment attachment; private final @NonNull Uri uri; private final @NonNull String type; + private final int msgId; private final long date; + private final long size; private final boolean outgoing; private MediaItem(@Nullable Recipient recipient, - @Nullable DatabaseAttachment attachment, @NonNull Uri uri, @NonNull String type, + int msgId, long date, + long size, boolean outgoing) { this.recipient = recipient; - this.attachment = attachment; this.uri = uri; this.type = type; + this.msgId = msgId; this.date = date; + this.size = size; this.outgoing = outgoing; } } diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java index 7178245d3..e5abeb4bd 100644 --- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java +++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java @@ -167,8 +167,11 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi Intent intent = new Intent(RecipientPreferenceActivity.this, MediaPreviewActivity.class); intent.putExtra(MediaPreviewActivity.ADDRESS_EXTRA, address); intent.putExtra(MediaPreviewActivity.OUTGOING_EXTRA, mediaRecord.isOutgoing()); - intent.putExtra(MediaPreviewActivity.DATE_EXTRA, mediaRecord.getDate()); - intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, mediaRecord.getAttachment().getSize()); + Log.e(TAG, "MEDIA PREVIEW NOT IMPLEMENTED HERE must have dcMsgId in Media Record first!"); + if(true) + throw new IllegalStateException("Media Preview not implemented"); +/* intent.putExtra(MediaPreviewActivity.DATE_EXTRA, mediaRecord.getDate()); + intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, mediaRecord.getAttachment().getSize());*/ intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, ViewCompat.getLayoutDirection(threadPhotoRailView) == ViewCompat.LAYOUT_DIRECTION_LTR); intent.setDataAndType(mediaRecord.getAttachment().getDataUri(), mediaRecord.getContentType()); startActivity(intent); diff --git a/src/org/thoughtcrime/securesms/database/Address.java b/src/org/thoughtcrime/securesms/database/Address.java index 6edabade2..7bb1c213f 100644 --- a/src/org/thoughtcrime/securesms/database/Address.java +++ b/src/org/thoughtcrime/securesms/database/Address.java @@ -47,6 +47,9 @@ public class Address implements Parcelable, Comparable
{ public static final Address UNKNOWN = new Address("Unknown"); + private final static String DC_CHAT_PREFIX = "dc:"; + private final static String DC_CONTACT_PREFIX = "dcc:"; + private static final String TAG = Address.class.getSimpleName(); private static final AtomicReference> cachedFormatter = new AtomicReference<>(); @@ -54,11 +57,11 @@ public class Address implements Parcelable, Comparable
{ private final String address; public static Address fromChat(int chatId) { - return new Address("dc:" + chatId); + return new Address(DC_CHAT_PREFIX + chatId); } public static Address fromContact(int contactId) { - return new Address("dcc:" + contactId); + return new Address(DC_CONTACT_PREFIX + contactId); } private Address(@NonNull String address) { @@ -134,9 +137,9 @@ public class Address implements Parcelable, Comparable
{ return !isGroup() && !isEmail(); } - public boolean isDcChat() { return address.startsWith("dc:"); }; + public boolean isDcChat() { return address.startsWith(DC_CHAT_PREFIX); }; - public boolean isDcContact() { return address.startsWith("dcc:"); }; + public boolean isDcContact() { return address.startsWith(DC_CONTACT_PREFIX); }; public @NonNull String toGroupString() { if (!isGroup()) throw new AssertionError("Not group: " + address); @@ -155,12 +158,12 @@ public class Address implements Parcelable, Comparable
{ public int getDcChatId() { if(!isDcChat()) throw new AssertionError("Not dc chat: " + address); - return Integer.valueOf(address.substring("dc:".length())); + return Integer.valueOf(address.substring(DC_CHAT_PREFIX.length())); } public int getDcContactId() { if(!isDcContact()) throw new AssertionError("Not dc contact: " + address); - return Integer.valueOf(address.substring("dcc:".length())); + return Integer.valueOf(address.substring(DC_CONTACT_PREFIX.length())); } @Override diff --git a/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java b/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java index b6b7ed1be..1493eb52a 100644 --- a/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java +++ b/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java @@ -2,19 +2,16 @@ package org.thoughtcrime.securesms.database.loaders; import android.content.Context; -import android.database.ContentObserver; -import android.database.Cursor; import android.support.annotation.NonNull; import android.support.v4.content.AsyncTaskLoader; import com.annimon.stream.Stream; +import com.b44t.messenger.DcContext; +import com.b44t.messenger.DcMsg; import org.thoughtcrime.securesms.R; +import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.database.Address; -import org.thoughtcrime.securesms.database.Database; -import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.MediaDatabase; -import org.thoughtcrime.securesms.recipients.Recipient; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -33,12 +30,10 @@ public class BucketedThreadMediaLoader extends AsyncTaskLoader activeTimeBuckets = Stream.of(TIME_SECTIONS).filter(timeBucket -> !timeBucket.isEmpty()).toList(); if (section < activeTimeBuckets.size()) return activeTimeBuckets.get(section).getItem(item); @@ -136,24 +125,24 @@ public class BucketedThreadMediaLoader extends AsyncTaskLoader records = new LinkedList<>(); + private final List records = new LinkedList<>(); private final long startTime; - private final long endtime; + private final long endTime; private final String name; - TimeBucket(String name, long startTime, long endtime) { + TimeBucket(String name, long startTime, long endTime) { this.name = name; this.startTime = startTime; - this.endtime = endtime; + this.endTime = endTime; } - void add(MediaDatabase.MediaRecord record) { + void add(DcMsg record) { this.records.add(record); } boolean inRange(long timestamp) { - return timestamp > startTime && timestamp <= endtime; + return timestamp > startTime && timestamp <= endTime; } boolean isEmpty() { @@ -164,7 +153,7 @@ public class BucketedThreadMediaLoader extends AsyncTaskLoader> months = new HashMap<>(); + private final Map> months = new HashMap<>(); - void add(MediaDatabase.MediaRecord record) { + void add(DcMsg record) { Calendar calendar = Calendar.getInstance(); - calendar.setTimeInMillis(record.getDate()); + calendar.setTimeInMillis(record.getTimestamp()); int year = calendar.get(Calendar.YEAR) - 1900; int month = calendar.get(Calendar.MONTH); @@ -194,7 +183,7 @@ public class BucketedThreadMediaLoader extends AsyncTaskLoader list = new LinkedList<>(); + List list = new LinkedList<>(); list.add(record); months.put(date, list); } @@ -208,7 +197,7 @@ public class BucketedThreadMediaLoader extends AsyncTaskLoader> { +public class PagingMediaLoader extends AsyncLoader { @SuppressWarnings("unused") private static final String TAG = PagingMediaLoader.class.getSimpleName(); - private final Recipient recipient; - private final Uri uri; + private final DcMsg msg; private final boolean leftIsRecent; - public PagingMediaLoader(@NonNull Context context, @NonNull Recipient recipient, @NonNull Uri uri, boolean leftIsRecent) { + public PagingMediaLoader(@NonNull Context context, @NonNull DcMsg msg, boolean leftIsRecent) { super(context); - this.recipient = recipient; - this.uri = uri; + this.msg = msg; this.leftIsRecent = leftIsRecent; } @Nullable @Override - public Pair loadInBackground() { - long threadId = DatabaseFactory.getThreadDatabase(getContext()).getThreadIdFor(recipient); - Cursor cursor = DatabaseFactory.getMediaDatabase(getContext()).getGalleryMediaForThread(threadId); - - while (cursor != null && cursor.moveToNext()) { - AttachmentId attachmentId = new AttachmentId(cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.ROW_ID)), cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.UNIQUE_ID))); - Uri attachmentUri = PartAuthority.getAttachmentDataUri(attachmentId); - - if (attachmentUri.equals(uri)) { - return new Pair<>(cursor, leftIsRecent ? cursor.getPosition() : cursor.getCount() - 1 - cursor.getPosition()); + public DcMediaGalleryElement loadInBackground() { + DcContext context = DcHelper.getContext(getContext()); + int[] mediaMessages = context.getChatMedia(msg.getChatId(), DcMsg.DC_MSG_GIF, DcMsg.DC_MSG_IMAGE); + // first id is the oldest message. + int currentIndex = -1; + for(int ii = 0; ii < mediaMessages.length; ii++) { + if(mediaMessages[ii] == msg.getId()) { + currentIndex = ii; + break; } } - - return null; + if(currentIndex == -1) { + currentIndex = 0; + DcMsg unfound = context.getMsg(msg.getId()); + Log.d(TAG, "did not find message in list: " + unfound.getId() + " / " + unfound.getFile() + " / " + unfound.getText()); + } + DcMediaGalleryElement retVal = new DcMediaGalleryElement(mediaMessages, currentIndex, context, leftIsRecent); + return retVal; } } diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java index 20d23d415..6e86bb140 100644 --- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -486,9 +486,8 @@ public class AttachmentManager { if (MediaPreviewActivity.isContentTypeSupported(slide.getContentType()) && slide.getUri() != null) { Intent intent = new Intent(context, MediaPreviewActivity.class); intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, slide.asAttachment().getSize()); + intent.putExtra(MediaPreviewActivity.DC_MSG_ID, slide.getDcMsgId()); intent.putExtra(MediaPreviewActivity.OUTGOING_EXTRA, true); - intent.setDataAndType(slide.getUri(), slide.getContentType()); context.startActivity(intent); } diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java index c588409c6..fb22ef0b0 100644 --- a/src/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java @@ -94,6 +94,10 @@ public class Recipient implements RecipientModifiedListener { private @Nullable String profileAvatar; private boolean profileSharing; + public static @NonNull Recipient from(@NonNull Context context, int dcMsgId) { + ApplicationDcContext dcContext = DcHelper.getContext(context); + return dcContext.getRecipient(dcContext.getChat(dcContext.getMsg(dcMsgId).getChatId())); + } @SuppressWarnings("ConstantConditions") public static @NonNull Recipient from(@NonNull Context context, @NonNull Address address, boolean asynchronous) { @@ -101,6 +105,8 @@ public class Recipient implements RecipientModifiedListener { ApplicationDcContext dcContext = DcHelper.getContext(context); if(address.isDcContact()) { return dcContext.getRecipient(dcContext.getContact(address.getDcContactId())); + } else if (address.isDcChat()) { + return dcContext.getRecipient(dcContext.getChat(address.getDcChatId())); } else if(address.isEmail()) { int contactId = dcContext.lookupContactIdByAddr(address.toEmailString()); diff --git a/src/org/thoughtcrime/securesms/util/MediaUtil.java b/src/org/thoughtcrime/securesms/util/MediaUtil.java index 43d39823e..4d0e9dd58 100644 --- a/src/org/thoughtcrime/securesms/util/MediaUtil.java +++ b/src/org/thoughtcrime/securesms/util/MediaUtil.java @@ -67,6 +67,10 @@ public class MediaUtil { return slide; } + /** + * @deprecated use getSlideForMsg instead. + */ + @Deprecated public static Slide getSlideForAttachment(Context context, Attachment attachment) { Slide slide = null; if (isGif(attachment.getContentType())) {