From b75088874e696856f47b846bfe3dfae15998da20 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 6 May 2020 21:03:00 -0400 Subject: [PATCH] Migrate conversation rendering to the paging library. --- app/build.gradle | 3 + .../conversation/ConversationActivity.java | 1 - .../conversation/ConversationAdapter.java | 863 ++++++++++-------- .../conversation/ConversationData.java | 79 +- .../conversation/ConversationDataSource.java | 95 ++ .../conversation/ConversationFragment.java | 104 +-- .../conversation/ConversationRepository.java | 34 +- .../conversation/ConversationViewModel.java | 143 +-- .../conversation/LastSeenHeader.java | 58 ++ .../FastCursorRecyclerViewAdapter.java | 110 --- .../securesms/database/MmsSmsDatabase.java | 4 +- .../conversation/ConversationAdapterTest.java | 41 - app/witness-verifications.gradle | 6 + 13 files changed, 744 insertions(+), 797 deletions(-) create mode 100644 app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java create mode 100644 app/src/main/java/org/thoughtcrime/securesms/conversation/LastSeenHeader.java delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java delete mode 100644 app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationAdapterTest.java diff --git a/app/build.gradle b/app/build.gradle index a151fa84f4..5da524da0c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -278,6 +278,9 @@ dependencies { implementation "androidx.camera:camera-lifecycle:1.0.0-beta01" implementation "androidx.concurrent:concurrent-futures:1.0.0" implementation "androidx.autofill:autofill:1.0.0" + implementation "androidx.paging:paging-common:2.1.2" + implementation "androidx.paging:paging-runtime:2.1.2" + implementation('com.google.firebase:firebase-messaging:17.3.4') { exclude group: 'com.google.firebase', module: 'firebase-core' diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index ed12dc4926..b0d624ede0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -596,7 +596,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity break; case ADD_CONTACT: onRecipientChanged(recipient.get()); - fragment.reloadList(); break; case PICK_LOCATION: SignalPlace place = new SignalPlace(PlacePickerActivity.addressFromData(data)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java index ddd095883e..ebe143fd69 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java @@ -16,117 +16,482 @@ */ package org.thoughtcrime.securesms.conversation; -import android.content.Context; -import android.database.Cursor; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.FrameLayout; import android.widget.TextView; -import com.annimon.stream.Stream; +import androidx.annotation.AnyThread; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.paging.PagedList; +import androidx.paging.PagedListAdapter; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.RecyclerView; import org.thoughtcrime.securesms.BindableConversationItem; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.attachments.DatabaseAttachment; -import org.thoughtcrime.securesms.conversation.ConversationAdapter.HeaderViewHolder; -import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.FastCursorRecyclerViewAdapter; -import org.thoughtcrime.securesms.database.MmsSmsColumns; -import org.thoughtcrime.securesms.database.MmsSmsDatabase; import org.thoughtcrime.securesms.database.model.MessageRecord; -import org.thoughtcrime.securesms.database.model.MmsMessageRecord; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.GlideRequests; -import org.thoughtcrime.securesms.mms.SlideDeck; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.Conversions; import org.thoughtcrime.securesms.util.DateUtils; -import org.thoughtcrime.securesms.util.LRUCache; import org.thoughtcrime.securesms.util.StickyHeaderDecoration; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; import org.whispersystems.libsignal.util.guava.Optional; -import java.lang.ref.SoftReference; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; import java.util.Calendar; -import java.util.Collections; import java.util.Date; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.Map; +import java.util.Objects; import java.util.Set; /** - * A cursor adapter for a conversation thread. Ultimately - * used by ComposeMessageActivity to display a conversation - * thread in a ListActivity. - * - * @author Moxie Marlinspike + * Adapter that renders a conversation. * + * Important spacial thing to keep in mind: The adapter is intended to be shown on a reversed layout + * manager, so position 0 is at the bottom of the screen. That's why the "header" is at the bottom, + * the "footer" is at the top, and we refer to the "next" record as having a lower index. */ -public class ConversationAdapter - extends FastCursorRecyclerViewAdapter - implements StickyHeaderDecoration.StickyHeaderAdapter +public class ConversationAdapter + extends PagedListAdapter + implements StickyHeaderDecoration.StickyHeaderAdapter { - private static final int MAX_CACHE_SIZE = 40; - private static final String TAG = ConversationAdapter.class.getSimpleName(); - private final Map> messageRecordCache = - Collections.synchronizedMap(new LRUCache>(MAX_CACHE_SIZE)); + private static final String TAG = Log.tag(ConversationAdapter.class); - private static final int MESSAGE_TYPE_OUTGOING = 0; - private static final int MESSAGE_TYPE_INCOMING = 1; - private static final int MESSAGE_TYPE_UPDATE = 2; - private static final int MESSAGE_TYPE_AUDIO_OUTGOING = 3; - private static final int MESSAGE_TYPE_AUDIO_INCOMING = 4; - private static final int MESSAGE_TYPE_THUMBNAIL_OUTGOING = 5; - private static final int MESSAGE_TYPE_THUMBNAIL_INCOMING = 6; - private static final int MESSAGE_TYPE_DOCUMENT_OUTGOING = 7; - private static final int MESSAGE_TYPE_DOCUMENT_INCOMING = 8; + private static final int MESSAGE_TYPE_OUTGOING = 0; + private static final int MESSAGE_TYPE_INCOMING = 1; + private static final int MESSAGE_TYPE_UPDATE = 2; + private static final int MESSAGE_TYPE_HEADER = 3; + private static final int MESSAGE_TYPE_FOOTER = 4; + private static final int MESSAGE_TYPE_PLACEHOLDER = 5; - private final Set batchSelected = Collections.synchronizedSet(new HashSet()); + private static final long HEADER_ID = Long.MIN_VALUE; + private static final long FOOTER_ID = Long.MIN_VALUE + 1; - private final @Nullable ItemClickListener clickListener; - private final @NonNull GlideRequests glideRequests; - private final @NonNull Locale locale; - private final @NonNull Recipient recipient; - private final @NonNull MmsSmsDatabase db; - private final @NonNull LayoutInflater inflater; - private final @NonNull Calendar calendar; - private final @NonNull MessageDigest digest; + private final ItemClickListener clickListener; + private final GlideRequests glideRequests; + private final Locale locale; + private final Recipient recipient; + + private final Set selected; + private final List fastRecords; + private final Set releasedFastRecords; + private final Calendar calendar; + private final MessageDigest digest; - private MessageRecord recordToPulseHighlight; private String searchQuery; + private MessageRecord recordToPulseHighlight; + private View headerView; + private View footerView; - protected static class ViewHolder extends RecyclerView.ViewHolder { - public ViewHolder(final @NonNull V itemView) { + + ConversationAdapter(@NonNull GlideRequests glideRequests, + @NonNull Locale locale, + @Nullable ItemClickListener clickListener, + @NonNull Recipient recipient) + { + super(new DiffCallback()); + + this.glideRequests = glideRequests; + this.locale = locale; + this.clickListener = clickListener; + this.recipient = recipient; + this.selected = new HashSet<>(); + this.fastRecords = new ArrayList<>(); + this.releasedFastRecords = new HashSet<>(); + this.calendar = Calendar.getInstance(); + this.digest = getMessageDigestOrThrow(); + + setHasStableIds(true); + } + + @Override + public int getItemViewType(int position) { + if (hasHeader() && position == 0) { + return MESSAGE_TYPE_HEADER; + } + + if (hasFooter() && position == getItemCount() - 1) { + return MESSAGE_TYPE_FOOTER; + } + + MessageRecord messageRecord = getItem(position); + + if (messageRecord == null) { + return MESSAGE_TYPE_PLACEHOLDER; + } else if (messageRecord.isUpdate()) { + return MESSAGE_TYPE_UPDATE; + } else if (messageRecord.isOutgoing()) { + return MESSAGE_TYPE_OUTGOING; + } else { + return MESSAGE_TYPE_INCOMING; + } + } + + @Override + public long getItemId(int position) { + if (hasHeader() && position == 0) { + return HEADER_ID; + } + + if (hasFooter() && position == getItemCount() - 1) { + return FOOTER_ID; + } + + MessageRecord record = getItem(position); + + if (record == null) { + return -1; + } + + String unique = (record.isMms() ? "MMS::" : "SMS::") + record.getId(); + byte[] bytes = digest.digest(unique.getBytes()); + + return Conversions.byteArrayToLong(bytes); + } + + @Override + public @NonNull RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + switch (viewType) { + case MESSAGE_TYPE_INCOMING: + case MESSAGE_TYPE_OUTGOING: + case MESSAGE_TYPE_UPDATE: + long start = System.currentTimeMillis(); + + LayoutInflater inflater = LayoutInflater.from(parent.getContext()); + V itemView = ViewUtil.inflate(inflater, parent, getLayoutForViewType(viewType)); + + itemView.setOnClickListener(view -> { + if (clickListener != null) { + clickListener.onItemClick(itemView.getMessageRecord()); + } + }); + + itemView.setOnLongClickListener(view -> { + if (clickListener != null) { + clickListener.onItemLongClick(itemView, itemView.getMessageRecord()); + } + return true; + }); + + itemView.setEventListener(clickListener); + + Log.d(TAG, "Inflate time: " + (System.currentTimeMillis() - start)); + return new ConversationViewHolder(itemView); + case MESSAGE_TYPE_PLACEHOLDER: + View v = new FrameLayout(parent.getContext()); + v.setLayoutParams(new FrameLayout.LayoutParams(1, ViewUtil.dpToPx(100))); + return new PlaceholderViewHolder(v); + case MESSAGE_TYPE_HEADER: + case MESSAGE_TYPE_FOOTER: + return new HeaderFooterViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.cursor_adapter_header_footer_view, parent, false)); + default: + throw new IllegalStateException("Cannot create viewholder for type: " + viewType); + } + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + switch (getItemViewType(position)) { + case MESSAGE_TYPE_INCOMING: + case MESSAGE_TYPE_OUTGOING: + case MESSAGE_TYPE_UPDATE: + ConversationViewHolder conversationViewHolder = (ConversationViewHolder) holder; + MessageRecord messageRecord = Objects.requireNonNull(getItem(position)); + int adapterPosition = holder.getAdapterPosition(); + + MessageRecord previousRecord = adapterPosition < getItemCount() - 1 && !isFooterPosition(adapterPosition + 1) ? getItem(adapterPosition + 1) : null; + MessageRecord nextRecord = adapterPosition > 0 && !isHeaderPosition(adapterPosition - 1) ? getItem(adapterPosition - 1) : null; + + conversationViewHolder.getView().bind(messageRecord, + Optional.fromNullable(previousRecord), + Optional.fromNullable(nextRecord), + glideRequests, + locale, + selected, + recipient, + searchQuery, + messageRecord == recordToPulseHighlight); + + if (messageRecord == recordToPulseHighlight) { + recordToPulseHighlight = null; + } + break; + case MESSAGE_TYPE_HEADER: + ((HeaderFooterViewHolder) holder).bind(headerView); + break; + case MESSAGE_TYPE_FOOTER: + ((HeaderFooterViewHolder) holder).bind(footerView); + break; + } + } + + @Override + public void submitList(@Nullable PagedList pagedList) { + cleanFastRecords(); + super.submitList(pagedList); + notifyDataSetChanged(); + } + + @Override + protected @Nullable MessageRecord getItem(int position) { + if (position < fastRecords.size()) { + return fastRecords.get(position); + } else { + int correctedPosition = position - fastRecords.size() - (hasHeader() ? 1 : 0); + return super.getItem(correctedPosition); + } + } + + @Override + public int getItemCount() { + boolean hasHeader = headerView != null; + boolean hasFooter = footerView != null; + return super.getItemCount() + fastRecords.size() + (hasHeader ? 1 : 0) + (hasFooter ? 1 : 0); + } + + @Override + public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) { + if (holder instanceof ConversationViewHolder) { + ((ConversationViewHolder) holder).getView().unbind(); + } else if (holder instanceof HeaderFooterViewHolder) { + ((HeaderFooterViewHolder) holder).unbind(); + } + } + + @Override + public long getHeaderId(int position) { + if (isHeaderPosition(position)) return -1; + if (isFooterPosition(position)) return -1; + if (position >= getItemCount()) return -1; + if (position < 0) return -1; + + MessageRecord record = getItem(position); + + if (record == null) return -1; + + calendar.setTime(new Date(record.getDateSent())); + return Util.hashCode(calendar.get(Calendar.YEAR), calendar.get(Calendar.DAY_OF_YEAR)); + } + + @Override + public StickyHeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent, int position) { + return new StickyHeaderViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.conversation_item_header, parent, false)); + } + + @Override + public void onBindHeaderViewHolder(StickyHeaderViewHolder viewHolder, int position) { + MessageRecord messageRecord = Objects.requireNonNull(getItem(position)); + viewHolder.setText(DateUtils.getRelativeDate(viewHolder.itemView.getContext(), locale, messageRecord.getDateReceived())); + } + + void onBindLastSeenViewHolder(StickyHeaderViewHolder viewHolder, int position) { + viewHolder.setText(viewHolder.itemView.getContext().getResources().getQuantityString(R.plurals.ConversationAdapter_n_unread_messages, (position + 1), (position + 1))); + } + + /** + * Given a timestamp, this will return the position in the adapter of the message with the + * nearest received timestamp, or -1 if none is found. + */ + int findLastSeenPosition(long lastSeen) { + if (lastSeen <= 0) { + return -1; + } + + int count = getItemCount() - (hasFooter() ? 1 : 0); + + for (int i = (hasHeader() ? 1 : 0); i < count; i++) { + MessageRecord messageRecord = getItem(i); + + if (messageRecord == null || messageRecord.isOutgoing() || messageRecord.getDateReceived() <= lastSeen) { + return i; + } + } + + return -1; + } + + /** + * Finds the received timestamp for the item at the requested adapter position. Will return 0 if + * the position doesn't refer to an incoming message. + */ + long getReceivedTimestamp(int position) { + if (isHeaderPosition(position)) return 0; + if (isFooterPosition(position)) return 0; + if (position >= getItemCount()) return 0; + if (position < 0) return 0; + + MessageRecord messageRecord = getItem(position); + + if (messageRecord == null || messageRecord.isOutgoing()) { + return 0; + } else { + return messageRecord.getDateReceived(); + } + } + + /** + * Sets the view the appears at the top of the list (because the list is reversed). + */ + void setFooterView(View view) { + this.footerView = view; + } + + /** + * Sets the view that appears at the bottom of the list (because the list is reversed). + */ + void setHeaderView(View view) { + this.headerView = view; + } + + /** + * Returns the header view, if one was set. + */ + @Nullable View getHeaderView() { + return headerView; + } + + /** + * Momentarily highlights a row at the requested position. + */ + void pulseHighlightItem(int position) { + if (position < getItemCount()) { + recordToPulseHighlight = getItem(position); + notifyItemChanged(position); + } + } + + /** + * Conversation search query updated. Allows rendering of text highlighting. + */ + void onSearchQueryUpdated(String query) { + this.searchQuery = query; + notifyDataSetChanged(); + } + + /** + * Adds a record to a memory cache to allow it to be rendered immediately, as opposed to waiting + * for a database change. + */ + void addFastRecord(MessageRecord record) { + fastRecords.add(record); + notifyDataSetChanged(); + } + + /** + * Marks a record as no-longer-needed. Will be removed from the adapter the next time the database + * changes. + */ + @AnyThread + void releaseFastRecord(long id) { + synchronized (releasedFastRecords) { + releasedFastRecords.add(id); + } + } + + /** + * Returns set of records that are selected in multi-select mode. + */ + Set getSelectedItems() { + return new HashSet<>(selected); + } + + /** + * Clears all selected records from multi-select mode. + */ + void clearSelection() { + selected.clear(); + } + + /** + * Toggles the selected state of a record in multi-select mode. + */ + void toggleSelection(MessageRecord record) { + if (selected.contains(record)) { + selected.remove(record); + } else { + selected.add(record); + } + } + + private void cleanFastRecords() { + synchronized (releasedFastRecords) { + Iterator recordIterator = fastRecords.iterator(); + while (recordIterator.hasNext()) { + long id = recordIterator.next().getId(); + if (releasedFastRecords.contains(id)) { + recordIterator.remove(); + releasedFastRecords.remove(id); + } + } + } + } + + private boolean hasHeader() { + return headerView != null; + } + + private boolean hasFooter() { + return footerView != null; + } + + private boolean isHeaderPosition(int position) { + return hasHeader() && position == 0; + } + + private boolean isFooterPosition(int position) { + return hasFooter() && position == (getItemCount() - 1); + } + + private @LayoutRes int getLayoutForViewType(int viewType) { + switch (viewType) { + case MESSAGE_TYPE_OUTGOING: return R.layout.conversation_item_sent; + case MESSAGE_TYPE_INCOMING: return R.layout.conversation_item_received; + case MESSAGE_TYPE_UPDATE: return R.layout.conversation_item_update; + default: throw new IllegalArgumentException("Unknown type!"); + } + } + + private static MessageDigest getMessageDigestOrThrow() { + try { + return MessageDigest.getInstance("SHA1"); + } catch (NoSuchAlgorithmException e) { + throw new AssertionError(e); + } + } + + static class ConversationViewHolder extends RecyclerView.ViewHolder { + public ConversationViewHolder(final @NonNull V itemView) { super(itemView); } - @SuppressWarnings("unchecked") public V getView() { + //noinspection unchecked return (V)itemView; } } - - static class HeaderViewHolder extends RecyclerView.ViewHolder { + static class StickyHeaderViewHolder extends RecyclerView.ViewHolder { TextView textView; - HeaderViewHolder(View itemView) { + StickyHeaderViewHolder(View itemView) { super(itemView); textView = ViewUtil.findById(itemView, R.id.text); } - HeaderViewHolder(TextView textView) { + StickyHeaderViewHolder(TextView textView) { super(textView); this.textView = textView; } @@ -136,351 +501,49 @@ public class ConversationAdapter } } + private static class HeaderFooterViewHolder extends RecyclerView.ViewHolder { + + private ViewGroup container; + + HeaderFooterViewHolder(@NonNull View itemView) { + super(itemView); + this.container = (ViewGroup) itemView; + } + + void bind(@Nullable View view) { + unbind(); + + if (view != null) { + container.addView(view); + } + } + + void unbind() { + container.removeAllViews(); + } + } + + private static class PlaceholderViewHolder extends RecyclerView.ViewHolder { + PlaceholderViewHolder(@NonNull View itemView) { + super(itemView); + } + } + + private static class DiffCallback extends DiffUtil.ItemCallback { + @Override + public boolean areItemsTheSame(@NonNull MessageRecord oldItem, @NonNull MessageRecord newItem) { + return oldItem.isMms() == newItem.isMms() && oldItem.getId() == newItem.getId(); + } + + @Override + public boolean areContentsTheSame(@NonNull MessageRecord oldItem, @NonNull MessageRecord newItem) { + // Corner rounding is not part of the model, so we can't use this yet + return false; + } + } interface ItemClickListener extends BindableConversationItem.EventListener { void onItemClick(MessageRecord item); void onItemLongClick(View maskTarget, MessageRecord item); } - - @SuppressWarnings("ConstantConditions") - @VisibleForTesting - ConversationAdapter(Context context, Cursor cursor) { - super(context, cursor); - try { - this.glideRequests = null; - this.locale = null; - this.clickListener = null; - this.recipient = null; - this.inflater = null; - this.db = null; - this.calendar = null; - this.digest = MessageDigest.getInstance("SHA1"); - } catch (NoSuchAlgorithmException nsae) { - throw new AssertionError("SHA1 isn't supported!"); - } - } - - public ConversationAdapter(@NonNull Context context, - @NonNull GlideRequests glideRequests, - @NonNull Locale locale, - @Nullable ItemClickListener clickListener, - @Nullable Cursor cursor, - @NonNull Recipient recipient) - { - super(context, cursor); - - try { - this.glideRequests = glideRequests; - this.locale = locale; - this.clickListener = clickListener; - this.recipient = recipient; - this.inflater = LayoutInflater.from(context); - this.db = DatabaseFactory.getMmsSmsDatabase(context); - this.calendar = Calendar.getInstance(); - this.digest = MessageDigest.getInstance("SHA1"); - - setHasStableIds(true); - } catch (NoSuchAlgorithmException nsae) { - throw new AssertionError("SHA1 isn't supported!"); - } - } - - @Override - public void changeCursor(Cursor cursor) { - messageRecordCache.clear(); - super.cleanFastRecords(); - super.changeCursor(cursor); - } - - @Override - protected void onBindItemViewHolder(ViewHolder viewHolder, @NonNull MessageRecord messageRecord) { - int adapterPosition = viewHolder.getAdapterPosition(); - MessageRecord previousRecord = adapterPosition < getItemCount() - 1 && !isFooterPosition(adapterPosition + 1) ? getRecordForPositionOrThrow(adapterPosition + 1) : null; - MessageRecord nextRecord = adapterPosition > 0 && !isHeaderPosition(adapterPosition - 1) ? getRecordForPositionOrThrow(adapterPosition - 1) : null; - - viewHolder.getView().bind(messageRecord, - Optional.fromNullable(previousRecord), - Optional.fromNullable(nextRecord), - glideRequests, - locale, - batchSelected, - recipient, - searchQuery, - messageRecord == recordToPulseHighlight); - - if (messageRecord == recordToPulseHighlight) { - recordToPulseHighlight = null; - } - } - - @Override - public ViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) { - long start = System.currentTimeMillis(); - final V itemView = ViewUtil.inflate(inflater, parent, getLayoutForViewType(viewType)); - itemView.setOnClickListener(view -> { - if (clickListener != null) { - clickListener.onItemClick(itemView.getMessageRecord()); - } - }); - itemView.setOnLongClickListener(view -> { - if (clickListener != null) { - clickListener.onItemLongClick(itemView, itemView.getMessageRecord()); - } - return true; - }); - itemView.setEventListener(clickListener); - Log.d(TAG, "Inflate time: " + (System.currentTimeMillis() - start)); - return new ViewHolder(itemView); - } - - @Override - public void onItemViewRecycled(ViewHolder holder) { - holder.getView().unbind(); - } - - private @LayoutRes int getLayoutForViewType(int viewType) { - switch (viewType) { - case MESSAGE_TYPE_AUDIO_OUTGOING: - case MESSAGE_TYPE_THUMBNAIL_OUTGOING: - case MESSAGE_TYPE_DOCUMENT_OUTGOING: - case MESSAGE_TYPE_OUTGOING: return R.layout.conversation_item_sent; - case MESSAGE_TYPE_AUDIO_INCOMING: - case MESSAGE_TYPE_THUMBNAIL_INCOMING: - case MESSAGE_TYPE_DOCUMENT_INCOMING: - case MESSAGE_TYPE_INCOMING: return R.layout.conversation_item_received; - case MESSAGE_TYPE_UPDATE: return R.layout.conversation_item_update; - default: throw new IllegalArgumentException("unsupported item view type given to ConversationAdapter"); - } - } - - @Override - public int getItemViewType(@NonNull MessageRecord messageRecord) { - if (messageRecord.isUpdate()) { - return MESSAGE_TYPE_UPDATE; - } else if (hasAudio(messageRecord)) { - if (messageRecord.isOutgoing()) return MESSAGE_TYPE_AUDIO_OUTGOING; - else return MESSAGE_TYPE_AUDIO_INCOMING; - } else if (hasDocument(messageRecord)) { - if (messageRecord.isOutgoing()) return MESSAGE_TYPE_DOCUMENT_OUTGOING; - else return MESSAGE_TYPE_DOCUMENT_INCOMING; - } else if (hasThumbnail(messageRecord)) { - if (messageRecord.isOutgoing()) return MESSAGE_TYPE_THUMBNAIL_OUTGOING; - else return MESSAGE_TYPE_THUMBNAIL_INCOMING; - } else if (messageRecord.isOutgoing()) { - return MESSAGE_TYPE_OUTGOING; - } else { - return MESSAGE_TYPE_INCOMING; - } - } - - @Override - protected boolean isRecordForId(@NonNull MessageRecord record, long id) { - return record.getId() == id; - } - - @Override - public long getItemId(@NonNull Cursor cursor) { - List attachments = DatabaseFactory.getAttachmentDatabase(getContext()).getAttachment(cursor); - List messageAttachments = Stream.of(attachments).filterNot(DatabaseAttachment::isQuote).toList(); - - if (messageAttachments.size() > 0 && messageAttachments.get(0).getFastPreflightId() != null) { - return Long.valueOf(messageAttachments.get(0).getFastPreflightId()); - } - - final String unique = cursor.getString(cursor.getColumnIndexOrThrow(MmsSmsColumns.UNIQUE_ROW_ID)); - final byte[] bytes = digest.digest(unique.getBytes()); - return Conversions.byteArrayToLong(bytes); - } - - @Override - protected long getItemId(@NonNull MessageRecord record) { - if (record.isOutgoing() && record.isMms()) { - MmsMessageRecord mmsRecord = (MmsMessageRecord) record; - SlideDeck slideDeck = mmsRecord.getSlideDeck(); - - if (slideDeck.getThumbnailSlide() != null && slideDeck.getThumbnailSlide().getFastPreflightId() != null) { - return Long.valueOf(slideDeck.getThumbnailSlide().getFastPreflightId()); - } - - if (slideDeck.getStickerSlide() != null && slideDeck.getStickerSlide().getFastPreflightId() != null) { - return Long.valueOf(slideDeck.getStickerSlide().getFastPreflightId()); - } - } - - return record.getId(); - } - - @Override - protected MessageRecord getRecordFromCursor(@NonNull Cursor cursor) { - long messageId = cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.ID)); - String type = cursor.getString(cursor.getColumnIndexOrThrow(MmsSmsDatabase.TRANSPORT)); - - final SoftReference reference = messageRecordCache.get(type + messageId); - if (reference != null) { - final MessageRecord record = reference.get(); - if (record != null) return record; - } - - final MessageRecord messageRecord = db.readerFor(cursor).getCurrent(); - messageRecordCache.put(type + messageId, new SoftReference<>(messageRecord)); - - return messageRecord; - } - - public void close() { - getCursor().close(); - } - - public int findLastSeenPosition(long lastSeen) { - if (lastSeen <= 0) return -1; - if (!isActiveCursor()) return -1; - - int count = getItemCount() - (hasFooterView() ? 1 : 0); - - for (int i=(hasHeaderView() ? 1 : 0);i getSelectedItems() { - return Collections.unmodifiableSet(new HashSet<>(batchSelected)); - } - - public void pulseHighlightItem(int position) { - if (position < getItemCount()) { - recordToPulseHighlight = getRecordForPositionOrThrow(position); - notifyItemChanged(position); - } - } - - public void onSearchQueryUpdated(@Nullable String query) { - this.searchQuery = query; - notifyDataSetChanged(); - } - - private boolean hasAudio(MessageRecord messageRecord) { - return messageRecord.isMms() && ((MmsMessageRecord)messageRecord).getSlideDeck().getAudioSlide() != null; - } - - private boolean hasDocument(MessageRecord messageRecord) { - return messageRecord.isMms() && ((MmsMessageRecord)messageRecord).getSlideDeck().getDocumentSlide() != null; - } - - private boolean hasThumbnail(MessageRecord messageRecord) { - return messageRecord.isMms() && ((MmsMessageRecord)messageRecord).getSlideDeck().getThumbnailSlide() != null; - } - - @Override - public long getHeaderId(int position) { - if (!isActiveCursor()) return -1; - if (isHeaderPosition(position)) return -1; - if (isFooterPosition(position)) return -1; - if (position >= getItemCount()) return -1; - if (position < 0) return -1; - - MessageRecord record = getRecordForPositionOrThrow(position); - - calendar.setTime(new Date(record.getDateSent())); - return Util.hashCode(calendar.get(Calendar.YEAR), calendar.get(Calendar.DAY_OF_YEAR)); - } - - public long getReceivedTimestamp(int position) { - if (!isActiveCursor()) return 0; - if (isHeaderPosition(position)) return 0; - if (isFooterPosition(position)) return 0; - if (position >= getItemCount()) return 0; - if (position < 0) return 0; - - MessageRecord messageRecord = getRecordForPositionOrThrow(position); - - if (messageRecord.isOutgoing()) return 0; - else return messageRecord.getDateReceived(); - } - - @Override - public HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent, int position) { - return new HeaderViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.conversation_item_header, parent, false)); - } - - public HeaderViewHolder onCreateLastSeenViewHolder(ViewGroup parent) { - return new HeaderViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.conversation_item_last_seen, parent, false)); - } - - @Override - public void onBindHeaderViewHolder(HeaderViewHolder viewHolder, int position) { - MessageRecord messageRecord = getRecordForPositionOrThrow(position); - viewHolder.setText(DateUtils.getRelativeDate(getContext(), locale, messageRecord.getDateReceived())); - } - - public void onBindLastSeenViewHolder(HeaderViewHolder viewHolder, int position) { - viewHolder.setText(getContext().getResources().getQuantityString(R.plurals.ConversationAdapter_n_unread_messages, (position + 1), (position + 1))); - } - - static class LastSeenHeader extends StickyHeaderDecoration { - - private final ConversationAdapter adapter; - private final long lastSeenTimestamp; - - LastSeenHeader(ConversationAdapter adapter, long lastSeenTimestamp) { - super(adapter, false, false); - this.adapter = adapter; - this.lastSeenTimestamp = lastSeenTimestamp; - } - - @Override - protected boolean hasHeader(RecyclerView parent, StickyHeaderAdapter stickyAdapter, int position) { - if (!adapter.isActiveCursor()) { - return false; - } - - if (lastSeenTimestamp <= 0) { - return false; - } - - long currentRecordTimestamp = adapter.getReceivedTimestamp(position); - long previousRecordTimestamp = adapter.getReceivedTimestamp(position + 1); - - return currentRecordTimestamp > lastSeenTimestamp && previousRecordTimestamp < lastSeenTimestamp; - } - - @Override - protected int getHeaderTop(RecyclerView parent, View child, View header, int adapterPos, int layoutPos) { - return parent.getLayoutManager().getDecoratedTop(child); - } - - @Override - protected HeaderViewHolder getHeader(RecyclerView parent, StickyHeaderAdapter stickyAdapter, int position) { - HeaderViewHolder viewHolder = adapter.onCreateLastSeenViewHolder(parent); - adapter.onBindLastSeenViewHolder(viewHolder, position); - - int widthSpec = View.MeasureSpec.makeMeasureSpec(parent.getWidth(), View.MeasureSpec.EXACTLY); - int heightSpec = View.MeasureSpec.makeMeasureSpec(parent.getHeight(), View.MeasureSpec.UNSPECIFIED); - - int childWidth = ViewGroup.getChildMeasureSpec(widthSpec, parent.getPaddingLeft() + parent.getPaddingRight(), viewHolder.itemView.getLayoutParams().width); - int childHeight = ViewGroup.getChildMeasureSpec(heightSpec, parent.getPaddingTop() + parent.getPaddingBottom(), viewHolder.itemView.getLayoutParams().height); - - viewHolder.itemView.measure(childWidth, childHeight); - viewHolder.itemView.layout(0, 0, viewHolder.itemView.getMeasuredWidth(), viewHolder.itemView.getMeasuredHeight()); - - return viewHolder; - } - } - } - diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationData.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationData.java index 1fa4c31ed1..b598e84759 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationData.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationData.java @@ -1,82 +1,49 @@ package org.thoughtcrime.securesms.conversation; -import android.database.Cursor; - -import androidx.annotation.NonNull; - -public final class ConversationData { - private final Cursor cursor; - private final int offset; - private final int limit; +/** + * Represents metadata about a conversation. + */ +final class ConversationData { private final long lastSeen; - private final int previousOffset; - private final boolean firstLoad; private final boolean hasSent; private final boolean isMessageRequestAccepted; private final boolean hasPreMessageRequestMessages; + private final int jumpToPosition; - public ConversationData(Cursor cursor, - int offset, - int limit, - long lastSeen, - int previousOffset, - boolean firstLoad, - boolean hasSent, - boolean isMessageRequestAccepted, - boolean hasPreMessageRequestMessages) + ConversationData(long lastSeen, + boolean hasSent, + boolean isMessageRequestAccepted, + boolean hasPreMessageRequestMessages, + int jumpToPosition) { - this.cursor = cursor; - this.offset = offset; - this.limit = limit; this.lastSeen = lastSeen; - this.previousOffset = previousOffset; - this.firstLoad = firstLoad; this.hasSent = hasSent; this.isMessageRequestAccepted = isMessageRequestAccepted; this.hasPreMessageRequestMessages = hasPreMessageRequestMessages; + this.jumpToPosition = jumpToPosition; } - public @NonNull Cursor getCursor() { - return cursor; - } - - public boolean hasLimit() { - return limit > 0; - } - - public int getLimit() { - return limit; - } - - public boolean hasOffset() { - return offset > 0; - } - - public int getOffset() { - return offset; - } - - public int getPreviousOffset() { - return previousOffset; - } - - public long getLastSeen() { + long getLastSeen() { return lastSeen; } - public boolean isFirstLoad() { - return firstLoad; - } - - public boolean hasSent() { + boolean hasSent() { return hasSent; } - public boolean isMessageRequestAccepted() { + boolean isMessageRequestAccepted() { return isMessageRequestAccepted; } - public boolean hasPreMessageRequestMessages() { + boolean hasPreMessageRequestMessages() { return hasPreMessageRequestMessages; } + + boolean shouldJumpToMessage() { + return jumpToPosition >= 0; + } + + int getJumpToPosition() { + return jumpToPosition; + } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java new file mode 100644 index 0000000000..f1be41453f --- /dev/null +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java @@ -0,0 +1,95 @@ +package org.thoughtcrime.securesms.conversation; + +import android.content.Context; +import android.database.ContentObserver; + +import androidx.annotation.NonNull; +import androidx.paging.DataSource; +import androidx.paging.PositionalDataSource; + +import org.thoughtcrime.securesms.database.DatabaseContentProviders; +import org.thoughtcrime.securesms.database.DatabaseFactory; +import org.thoughtcrime.securesms.database.MmsSmsDatabase; +import org.thoughtcrime.securesms.database.model.MessageRecord; +import org.thoughtcrime.securesms.logging.Log; + +import java.util.ArrayList; +import java.util.List; + +/** + * Core data source for loading an individual conversation. + */ +class ConversationDataSource extends PositionalDataSource { + + private static final String TAG = Log.tag(ConversationDataSource.class); + + private final Context context; + private final long threadId; + + private ConversationDataSource(@NonNull Context context, long threadId) { + this.context = context; + this.threadId = threadId; + + ContentObserver contentObserver = new ContentObserver(null) { + @Override + public void onChange(boolean selfChange) { + invalidate(); + context.getContentResolver().unregisterContentObserver(this); + } + }; + + context.getContentResolver().registerContentObserver(DatabaseContentProviders.Conversation.getUriForThread(threadId), true, contentObserver); + } + + @Override + public void loadInitial(@NonNull LoadInitialParams params, @NonNull LoadInitialCallback callback) { + long start = System.currentTimeMillis(); + + MmsSmsDatabase db = DatabaseFactory.getMmsSmsDatabase(context); + List records = new ArrayList<>(params.requestedLoadSize); + + try (MmsSmsDatabase.Reader reader = db.readerFor(db.getConversation(threadId, params.requestedStartPosition, params.requestedLoadSize))) { + MessageRecord record; + while ((record = reader.getNext()) != null && !isInvalid()) { + records.add(record); + } + } + + callback.onResult(records, params.requestedStartPosition, db.getConversationCount(threadId)); + Log.d(TAG, "[Initial Load] " + (System.currentTimeMillis() - start) + " ms" + (isInvalid() ? " -- invalidated" : "")); + } + + @Override + public void loadRange(@NonNull LoadRangeParams params, @NonNull LoadRangeCallback callback) { + long start = System.currentTimeMillis(); + + MmsSmsDatabase db = DatabaseFactory.getMmsSmsDatabase(context); + List records = new ArrayList<>(params.loadSize); + + try (MmsSmsDatabase.Reader reader = db.readerFor(db.getConversation(threadId, params.startPosition, params.loadSize))) { + MessageRecord record; + while ((record = reader.getNext()) != null && !isInvalid()) { + records.add(record); + } + } + + callback.onResult(records); + Log.d(TAG, "[Update] " + (System.currentTimeMillis() - start) + " ms" + (isInvalid() ? " -- invalidated" : "")); + } + + static class Factory extends DataSource.Factory { + + private final Context context; + private final long threadId; + + Factory(Context context, long threadId) { + this.context = context; + this.threadId = threadId; + } + + @Override + public @NonNull DataSource create() { + return new ConversationDataSource(context, threadId); + } + } +} diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index 4260907b6e..6b814a38c9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -21,7 +21,6 @@ import android.app.Activity; 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; @@ -51,10 +50,7 @@ import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityOptionsCompat; import androidx.core.text.HtmlCompat; import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProviders; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.OnScrollListener; @@ -76,7 +72,7 @@ import org.thoughtcrime.securesms.components.recyclerview.SmoothScrollingLinearL import org.thoughtcrime.securesms.contactshare.Contact; import org.thoughtcrime.securesms.contactshare.ContactUtil; import org.thoughtcrime.securesms.contactshare.SharedContactDetailsActivity; -import org.thoughtcrime.securesms.conversation.ConversationAdapter.HeaderViewHolder; +import org.thoughtcrime.securesms.conversation.ConversationAdapter.StickyHeaderViewHolder; import org.thoughtcrime.securesms.conversation.ConversationAdapter.ItemClickListener; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase; @@ -136,10 +132,8 @@ import java.util.Set; @SuppressLint("StaticFieldLeak") public class ConversationFragment extends Fragment { - private static final String TAG = ConversationFragment.class.getSimpleName(); - private static final String KEY_LIMIT = "limit"; + private static final String TAG = ConversationFragment.class.getSimpleName(); - private static final int PARTIAL_CONVERSATION_LIMIT = 500; private static final int SCROLL_ANIMATION_THRESHOLD = 50; private static final int CODE_ADD_EDIT_CONTACT = 77; @@ -209,7 +203,12 @@ public class ConversationFragment extends Fragment { setupListLayoutListeners(); this.conversationViewModel = ViewModelProviders.of(requireActivity(), new ConversationViewModel.Factory()).get(ConversationViewModel.class); - conversationViewModel.getConversation().observe(this, this::presentConversation); + conversationViewModel.getMessages().observe(this, list -> { + if (getListAdapter() != null) { + getListAdapter().submitList(list); + } + }); + conversationViewModel.getConversationMetadata().observe(this, this::presentConversationMetadata); return view; } @@ -290,14 +289,6 @@ public class ConversationFragment extends Fragment { initializeResources(); messageRequestViewModel.setConversationInfo(recipient.getId(), threadId); initializeListAdapter(); - - if (threadId == -1) { - conversationViewModel.refreshConversation(); - } - } - - public void reloadList() { - conversationViewModel.refreshConversation(); } public void moveToLastSeen() { @@ -402,14 +393,12 @@ public class ConversationFragment extends Fragment { long lastSeen = this.getActivity().getIntent().getLongExtra(ConversationActivity.LAST_SEEN_EXTRA, -1); int startingPosition = this.getActivity().getIntent().getIntExtra(ConversationActivity.STARTING_POSITION_EXTRA, -1); - int limit = getArguments() != null ? getArguments().getInt(KEY_LIMIT, PARTIAL_CONVERSATION_LIMIT) : PARTIAL_CONVERSATION_LIMIT; this.recipient = Recipient.live(getActivity().getIntent().getParcelableExtra(ConversationActivity.RECIPIENT_EXTRA)); this.threadId = this.getActivity().getIntent().getLongExtra(ConversationActivity.THREAD_ID_EXTRA, -1); this.unknownSenderView = new UnknownSenderView(getActivity(), recipient.get(), threadId); - - conversationViewModel.onConversationDataAvailable(recipient.get(), threadId, lastSeen, startingPosition, limit); + conversationViewModel.onConversationDataAvailable(threadId, lastSeen, startingPosition); OnScrollListener scrollListener = new ConversationScrollListener(getActivity()); list.addOnScrollListener(scrollListener); @@ -422,7 +411,7 @@ public class ConversationFragment extends Fragment { private void initializeListAdapter() { if (this.recipient != null && this.threadId != -1) { Log.d(TAG, "Initializing adapter for " + recipient.getId()); - ConversationAdapter adapter = new ConversationAdapter(requireContext(), GlideApp.with(this), locale, selectionClickListener, null, this.recipient.get()); + ConversationAdapter adapter = new ConversationAdapter(GlideApp.with(this), locale, selectionClickListener, this.recipient.get()); list.setAdapter(adapter); list.addItemDecoration(new StickyHeaderDecoration(adapter, false, false)); @@ -436,7 +425,6 @@ public class ConversationFragment extends Fragment { private void initializeLoadMoreView(ViewSwitcher loadMoreView) { loadMoreView.setOnClickListener(v -> { - conversationViewModel.onLoadMoreClicked(); loadMoreView.showNext(); loadMoreView.setOnClickListener(null); }); @@ -569,7 +557,7 @@ public class ConversationFragment extends Fragment { list.removeItemDecoration(lastSeenDecoration); } - lastSeenDecoration = new ConversationAdapter.LastSeenHeader(getListAdapter(), lastSeen); + lastSeenDecoration = new LastSeenHeader(getListAdapter(), lastSeen); list.addItemDecoration(lastSeenDecoration); } @@ -839,6 +827,7 @@ public class ConversationFragment extends Fragment { clearHeaderIfNotTyping(getListAdapter()); setLastSeen(0); getListAdapter().addFastRecord(messageRecord); + list.post(() -> list.scrollToPosition(0)); } return messageRecord.getId(); @@ -851,6 +840,7 @@ public class ConversationFragment extends Fragment { clearHeaderIfNotTyping(getListAdapter()); setLastSeen(0); getListAdapter().addFastRecord(messageRecord); + list.post(() -> list.scrollToPosition(0)); } return messageRecord.getId(); @@ -862,18 +852,13 @@ public class ConversationFragment extends Fragment { } } - private void presentConversation(@NonNull ConversationData conversation) { - Cursor cursor = conversation.getCursor(); - int count = cursor.getCount(); - + private void presentConversationMetadata(@NonNull ConversationData conversation) { ConversationAdapter adapter = getListAdapter(); if (adapter == null) { return; } - if (cursor.getCount() >= PARTIAL_CONVERSATION_LIMIT && conversation.hasLimit()) { - adapter.setFooterView(topLoadMoreView); - } else if (FeatureFlags.messageRequests()) { + if (FeatureFlags.messageRequests()) { adapter.setFooterView(conversationBanner); } else { adapter.setFooterView(null); @@ -893,40 +878,26 @@ public class ConversationFragment extends Fragment { } } - if (conversation.hasOffset()) { - adapter.setHeaderView(bottomLoadMoreView); - } - - adapter.changeCursor(cursor); listener.onCursorChanged(); - int lastSeenPosition = adapter.findLastSeenPosition(conversationViewModel.getLastSeen()); + list.post(() -> { - if (isTypingIndicatorShowing()) { - lastSeenPosition = Math.max(lastSeenPosition - 1, 0); - } + int lastSeenPosition = adapter.findLastSeenPosition(conversationViewModel.getLastSeen()); - if (conversation.isFirstLoad()) { - if (conversationViewModel.getStartingPosition() >= 0) { - scrollToStartingPosition(conversationViewModel.getStartingPosition()); + if (isTypingIndicatorShowing()) { + lastSeenPosition = Math.max(lastSeenPosition - 1, 0); + } + + if (conversation.shouldJumpToMessage()) { + scrollToStartingPosition(conversation.getJumpToPosition()); } else if (conversation.isMessageRequestAccepted()) { scrollToLastSeenPosition(lastSeenPosition); - } else if (FeatureFlags.messageRequests()) { - list.post(() -> getListLayoutManager().scrollToPosition(adapter.getItemCount() - 1)); } - } else if (conversation.getPreviousOffset() > 0) { - int scrollPosition = conversation.getPreviousOffset() + getListLayoutManager().findFirstVisibleItemPosition(); - scrollPosition = Math.min(scrollPosition, count - 1); - View firstView = list.getLayoutManager().getChildAt(scrollPosition); - int pixelOffset = (firstView == null) ? 0 : (firstView.getBottom() - list.getPaddingBottom()); - - getListLayoutManager().scrollToPositionWithOffset(scrollPosition, pixelOffset); - } - - if (lastSeenPosition <= 0) { - setLastSeen(0); - } + if (lastSeenPosition <= 0) { + setLastSeen(0); + } + }); } private void scrollToStartingPosition(final int startingPosition) { @@ -973,23 +944,14 @@ public class ConversationFragment extends Fragment { } private void moveToMessagePosition(int position, @Nullable Runnable onMessageNotFound) { - int activeOffset = conversationViewModel.getActiveOffset(); - - Log.d(TAG, "Moving to message position: " + position + " activeOffset: " + activeOffset + " cursorCount: " + getListAdapter().getCursorCount()); - - if (position >= activeOffset && position >= 0 && position < getListAdapter().getCursorCount()) { - int offset = activeOffset > 0 ? activeOffset - 1 : 0; - list.scrollToPosition(position - offset); - getListAdapter().pulseHighlightItem(position - offset); - } else if (position < 0) { + if (position >= 0) { + list.scrollToPosition(position); + getListAdapter().pulseHighlightItem(position); + } else { Log.w(TAG, "Tried to navigate to message, but it wasn't found."); if (onMessageNotFound != null) { onMessageNotFound.run(); } - } else { - Log.i(TAG, "Message was outside of the loaded range. Need to restart the loader."); - - conversationViewModel.onMoveJumpToMessageOutOfRange(position); } } @@ -1083,7 +1045,7 @@ public class ConversationFragment extends Fragment { return getListLayoutManager().findLastVisibleItemPosition(); } - private void bindScrollHeader(HeaderViewHolder headerViewHolder, int positionId) { + private void bindScrollHeader(StickyHeaderViewHolder headerViewHolder, int positionId) { if (((ConversationAdapter)list.getAdapter()).getHeaderId(positionId) != -1) { ((ConversationAdapter) list.getAdapter()).onBindHeaderViewHolder(headerViewHolder, positionId); } @@ -1400,7 +1362,7 @@ public class ConversationFragment extends Fragment { } } - private static class ConversationDateHeader extends HeaderViewHolder { + private static class ConversationDateHeader extends StickyHeaderViewHolder { private final Animation animateIn; private final Animation animateOut; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java index c2f1734408..a0475af943 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java @@ -1,9 +1,10 @@ package org.thoughtcrime.securesms.conversation; import android.content.Context; -import android.database.Cursor; import androidx.annotation.NonNull; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; @@ -13,28 +14,27 @@ import org.whispersystems.libsignal.util.Pair; import java.util.concurrent.Executor; -public class ConversationRepository { +class ConversationRepository { private final Context context; private final Executor executor; - public ConversationRepository() { + ConversationRepository() { this.context = ApplicationDependencies.getApplication(); this.executor = SignalExecutors.BOUNDED; } - public void getConversationData(long threadId, - int offset, - int limit, - long lastSeen, - int previousOffset, - boolean firstLoad, - @NonNull Callback callback) - { - executor.execute(() -> callback.onComplete(getConversationDataInternal(threadId, offset, limit, lastSeen, previousOffset, firstLoad))); + LiveData getConversationData(long threadId, long lastSeen, int jumpToPosition) { + MutableLiveData liveData = new MutableLiveData<>(); + + executor.execute(() -> { + liveData.postValue(getConversationDataInternal(threadId, lastSeen, jumpToPosition)); + }); + + return liveData; } - private @NonNull ConversationData getConversationDataInternal(long threadId, int offset, int limit, long lastSeen, int previousOffset, boolean firstLoad) { + private @NonNull ConversationData getConversationDataInternal(long threadId, long lastSeen, int jumpToPosition) { Pair lastSeenAndHasSent = DatabaseFactory.getThreadDatabase(context).getLastSeenAndHasSent(threadId); boolean hasSent = lastSeenAndHasSent.second(); @@ -45,13 +45,7 @@ public class ConversationRepository { boolean isMessageRequestAccepted = RecipientUtil.isMessageRequestAccepted(context, threadId); boolean hasPreMessageRequestMessages = RecipientUtil.isPreMessageRequestThread(context, threadId); - Cursor cursor = DatabaseFactory.getMmsSmsDatabase(context).getConversation(threadId, offset, limit); - return new ConversationData(cursor, offset, limit, lastSeen, previousOffset, firstLoad, hasSent, isMessageRequestAccepted, hasPreMessageRequestMessages); - } - - - interface Callback { - void onComplete(@NonNull E result); + return new ConversationData(lastSeen, hasSent, isMessageRequestAccepted, hasPreMessageRequestMessages, jumpToPosition); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java index 18aadb1b0d..adec08da63 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java @@ -1,26 +1,23 @@ package org.thoughtcrime.securesms.conversation; import android.app.Application; -import android.content.Context; -import android.database.ContentObservable; -import android.database.ContentObserver; -import android.database.Cursor; -import android.os.Handler; import androidx.annotation.NonNull; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.Transformations; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; +import androidx.paging.DataSource; +import androidx.paging.LivePagedListBuilder; +import androidx.paging.PagedList; -import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; -import org.thoughtcrime.securesms.database.DatabaseContentProviders; +import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mediasend.Media; import org.thoughtcrime.securesms.mediasend.MediaRepository; -import org.thoughtcrime.securesms.pin.PinState; -import org.thoughtcrime.securesms.recipients.Recipient; +import org.thoughtcrime.securesms.util.concurrent.SignalExecutors; import java.util.List; @@ -28,91 +25,52 @@ class ConversationViewModel extends ViewModel { private static final String TAG = Log.tag(ConversationViewModel.class); - private static final int NO_LIMIT = 0; + private final Application context; + private final MediaRepository mediaRepository; + private final ConversationRepository conversationRepository; + private final MutableLiveData> recentMedia; + private final MutableLiveData threadId; + private final LiveData> messages; + private final LiveData conversationMetadata; - private final Application context; - private final MediaRepository mediaRepository; - private final ConversationRepository conversationRepository; - private final MutableLiveData> recentMedia; - private final MutableLiveData conversation; - private final ContentObserver contentObserver; - - private Recipient recipient; - private long threadId; - private boolean firstLoad; - private int requestedLimit; - private long lastSeen; - private int startingPosition; - private int previousOffset; - private boolean contentObserverRegistered; + private int jumpToPosition; + private long lastSeen; private ConversationViewModel() { this.context = ApplicationDependencies.getApplication(); this.mediaRepository = new MediaRepository(); this.conversationRepository = new ConversationRepository(); this.recentMedia = new MutableLiveData<>(); - this.conversation = new MutableLiveData<>(); - this.contentObserver = new ContentObserver(new Handler()) { - @Override - public void onChange(boolean selfChange) { - ConversationData data = conversation.getValue(); - if (data != null) { - conversationRepository.getConversationData(threadId, data.getOffset(), data.getLimit(), data.getLastSeen(), data.getPreviousOffset(), data.isFirstLoad(), conversation::postValue); - } else { - Log.w(TAG, "Got a content change, but have no previous data?"); - } - } - }; + this.threadId = new MutableLiveData<>(); + + messages = Transformations.switchMap(threadId, thread -> { + DataSource.Factory factory = new ConversationDataSource.Factory(context, thread); + PagedList.Config config = new PagedList.Config.Builder() + .setPageSize(25) + .setInitialLoadSizeHint(25) + .build(); + + return new LivePagedListBuilder<>(factory, config).setFetchExecutor(SignalExecutors.BOUNDED) + .setInitialLoadKey(Math.max(jumpToPosition, 0)) + .build(); + }); + + conversationMetadata = Transformations.switchMap(threadId, thread -> { + LiveData data = conversationRepository.getConversationData(thread, lastSeen, jumpToPosition); + jumpToPosition = -1; + return data; + }); } void onAttachmentKeyboardOpen() { mediaRepository.getMediaInBucket(context, Media.ALL_MEDIA_BUCKET_ID, recentMedia::postValue); } - void onConversationDataAvailable(Recipient recipient, long threadId, long lastSeen, int startingPosition, int limit) { - this.recipient = recipient; - this.threadId = threadId; - this.lastSeen = lastSeen; - this.startingPosition = startingPosition; - this.requestedLimit = limit; - this.firstLoad = true; + void onConversationDataAvailable(long threadId, long lastSeen, int startingPosition) { + this.lastSeen = lastSeen; + this.jumpToPosition = startingPosition; - if (!contentObserverRegistered) { - context.getContentResolver().registerContentObserver(DatabaseContentProviders.Conversation.getUriForThread(threadId), true, contentObserver); - contentObserverRegistered = true; - } - - refreshConversation(); - } - - void refreshConversation() { - int limit = requestedLimit; - int offset = 0; - - if (requestedLimit != NO_LIMIT && startingPosition >= requestedLimit) { - offset = Math.max(startingPosition - (requestedLimit / 2) + 1, 0); - startingPosition -= offset - 1; - } - - conversationRepository.getConversationData(threadId, offset, limit, lastSeen, previousOffset, firstLoad, conversation::postValue); - - if (firstLoad) { - firstLoad = false; - } - - previousOffset = offset; - } - - void onLoadMoreClicked() { - requestedLimit = 0; - refreshConversation(); - } - - void onMoveJumpToMessageOutOfRange(int startingPosition) { - this.firstLoad = true; - this.startingPosition = startingPosition; - - refreshConversation(); + this.threadId.setValue(threadId); } void onLastSeenChanged(long lastSeen) { @@ -123,29 +81,18 @@ class ConversationViewModel extends ViewModel { return recentMedia; } - @NonNull LiveData getConversation() { - return conversation; + @NonNull LiveData getConversationMetadata() { + return conversationMetadata; + } + + @NonNull LiveData> getMessages() { + return messages; } long getLastSeen() { return lastSeen; } - int getStartingPosition() { - return startingPosition; - } - - int getActiveOffset() { - ConversationData data = conversation.getValue(); - return data != null ? data.getOffset() : 0; - } - - @Override - protected void onCleared() { - context.getContentResolver().unregisterContentObserver(contentObserver); - contentObserverRegistered = false; - } - static class Factory extends ViewModelProvider.NewInstanceFactory { @Override public @NonNull T create(@NonNull Class modelClass) { @@ -153,4 +100,6 @@ class ConversationViewModel extends ViewModel { return modelClass.cast(new ConversationViewModel()); } } + + } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/LastSeenHeader.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/LastSeenHeader.java new file mode 100644 index 0000000000..07ea5fa169 --- /dev/null +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/LastSeenHeader.java @@ -0,0 +1,58 @@ +package org.thoughtcrime.securesms.conversation; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import org.thoughtcrime.securesms.R; +import org.thoughtcrime.securesms.conversation.ConversationAdapter.StickyHeaderViewHolder; +import org.thoughtcrime.securesms.util.StickyHeaderDecoration; + +class LastSeenHeader extends StickyHeaderDecoration { + + private final ConversationAdapter adapter; + private final long lastSeenTimestamp; + + LastSeenHeader(ConversationAdapter adapter, long lastSeenTimestamp) { + super(adapter, false, false); + this.adapter = adapter; + this.lastSeenTimestamp = lastSeenTimestamp; + } + + @Override + protected boolean hasHeader(RecyclerView parent, StickyHeaderAdapter stickyAdapter, int position) { + if (lastSeenTimestamp <= 0) { + return false; + } + + long currentRecordTimestamp = adapter.getReceivedTimestamp(position); + long previousRecordTimestamp = adapter.getReceivedTimestamp(position + 1); + + return currentRecordTimestamp > lastSeenTimestamp && previousRecordTimestamp < lastSeenTimestamp; + } + + @Override + protected int getHeaderTop(RecyclerView parent, View child, View header, int adapterPos, int layoutPos) { + return parent.getLayoutManager().getDecoratedTop(child); + } + + @Override + protected @NonNull RecyclerView.ViewHolder getHeader(RecyclerView parent, StickyHeaderAdapter stickyAdapter, int position) { + StickyHeaderViewHolder viewHolder = new StickyHeaderViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.conversation_item_last_seen, parent, false)); + adapter.onBindLastSeenViewHolder(viewHolder, position); + + int widthSpec = View.MeasureSpec.makeMeasureSpec(parent.getWidth(), View.MeasureSpec.EXACTLY); + int heightSpec = View.MeasureSpec.makeMeasureSpec(parent.getHeight(), View.MeasureSpec.UNSPECIFIED); + + int childWidth = ViewGroup.getChildMeasureSpec(widthSpec, parent.getPaddingLeft() + parent.getPaddingRight(), viewHolder.itemView.getLayoutParams().width); + int childHeight = ViewGroup.getChildMeasureSpec(heightSpec, parent.getPaddingTop() + parent.getPaddingBottom(), viewHolder.itemView.getLayoutParams().height); + + viewHolder.itemView.measure(childWidth, childHeight); + viewHolder.itemView.layout(0, 0, viewHolder.itemView.getMeasuredWidth(), viewHolder.itemView.getMeasuredHeight()); + + return viewHolder; + } +} diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java deleted file mode 100644 index 4dfe6a20b5..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.thoughtcrime.securesms.database; - - -import android.content.Context; -import android.database.Cursor; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - -public abstract class FastCursorRecyclerViewAdapter - extends CursorRecyclerViewAdapter -{ - private static final String TAG = FastCursorRecyclerViewAdapter.class.getSimpleName(); - - private final LinkedList fastRecords = new LinkedList<>(); - private final List releasedRecordIds = new LinkedList<>(); - - protected FastCursorRecyclerViewAdapter(Context context, Cursor cursor) { - super(context, cursor); - } - - public void addFastRecord(@NonNull T record) { - fastRecords.addFirst(record); - notifyDataSetChanged(); - } - - public void releaseFastRecord(long id) { - synchronized (releasedRecordIds) { - releasedRecordIds.add(id); - } - } - - protected void cleanFastRecords() { - synchronized (releasedRecordIds) { - Iterator releaseIdIterator = releasedRecordIds.iterator(); - - while (releaseIdIterator.hasNext()) { - long releasedId = releaseIdIterator.next(); - Iterator fastRecordIterator = fastRecords.iterator(); - - while (fastRecordIterator.hasNext()) { - if (isRecordForId(fastRecordIterator.next(), releasedId)) { - fastRecordIterator.remove(); - releaseIdIterator.remove(); - break; - } - } - } - } - } - - protected abstract T getRecordFromCursor(@NonNull Cursor cursor); - protected abstract void onBindItemViewHolder(VH viewHolder, @NonNull T record); - protected abstract long getItemId(@NonNull T record); - protected abstract int getItemViewType(@NonNull T record); - protected abstract boolean isRecordForId(@NonNull T record, long id); - - @Override - public int getItemViewType(@NonNull Cursor cursor) { - T record = getRecordFromCursor(cursor); - return getItemViewType(record); - } - - @Override - public void onBindItemViewHolder(VH viewHolder, @NonNull Cursor cursor) { - T record = getRecordFromCursor(cursor); - onBindItemViewHolder(viewHolder, record); - } - - @Override - public void onBindFastAccessItemViewHolder(VH viewHolder, int position) { - int calculatedPosition = getCalculatedPosition(position); - onBindItemViewHolder(viewHolder, fastRecords.get(calculatedPosition)); - } - - @Override - protected int getFastAccessSize() { - return fastRecords.size(); - } - - protected T getRecordForPositionOrThrow(int position) { - if (isFastAccessPosition(position)) { - return fastRecords.get(getCalculatedPosition(position)); - } else { - Cursor cursor = getCursorAtPositionOrThrow(position); - return getRecordFromCursor(cursor); - } - } - - protected int getFastAccessItemViewType(int position) { - return getItemViewType(fastRecords.get(getCalculatedPosition(position))); - } - - protected boolean isFastAccessPosition(int position) { - position = getCalculatedPosition(position); - return position >= 0 && position < fastRecords.size(); - } - - protected long getFastAccessItemId(int position) { - return getItemId(fastRecords.get(getCalculatedPosition(position))); - } - - private int getCalculatedPosition(int position) { - return hasHeaderView() ? position - 1 : position; - } - -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java index 8e16aadbe3..f86e3d1745 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java @@ -33,6 +33,7 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.whispersystems.libsignal.util.Pair; +import java.io.Closeable; import java.util.HashSet; import java.util.Set; @@ -536,7 +537,7 @@ public class MmsSmsDatabase extends Database { return new Reader(cursor); } - public class Reader { + public class Reader implements Closeable { private final Cursor cursor; private SmsDatabase.Reader smsReader; @@ -577,6 +578,7 @@ public class MmsSmsDatabase extends Database { else throw new AssertionError("Bad type: " + type); } + @Override public void close() { cursor.close(); } diff --git a/app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationAdapterTest.java b/app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationAdapterTest.java deleted file mode 100644 index 898ae811c6..0000000000 --- a/app/src/test/java/org/thoughtcrime/securesms/conversation/ConversationAdapterTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.thoughtcrime.securesms.conversation; - -import android.database.Cursor; - -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.thoughtcrime.securesms.BaseUnitTest; -import org.thoughtcrime.securesms.conversation.ConversationAdapter; - -import static org.junit.Assert.*; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.powermock.api.mockito.PowerMockito.mock; -import static org.powermock.api.mockito.PowerMockito.when; - -public class ConversationAdapterTest extends BaseUnitTest { - private Cursor cursor = mock(Cursor.class); - private ConversationAdapter adapter; - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - adapter = new ConversationAdapter(context, cursor); - when(cursor.getColumnIndexOrThrow(anyString())).thenReturn(0); - } - - @Test - @Ignore("TODO: Fix test") - public void testGetItemIdEquals() throws Exception { - when(cursor.getString(anyInt())).thenReturn(null).thenReturn("SMS::1::1"); - long firstId = adapter.getItemId(cursor); - when(cursor.getString(anyInt())).thenReturn(null).thenReturn("MMS::1::1"); - long secondId = adapter.getItemId(cursor); - assertNotEquals(firstId, secondId); - when(cursor.getString(anyInt())).thenReturn(null).thenReturn("MMS::2::1"); - long thirdId = adapter.getItemId(cursor); - assertNotEquals(secondId, thirdId); - } -} \ No newline at end of file diff --git a/app/witness-verifications.gradle b/app/witness-verifications.gradle index 53f6fd3a07..60a67600d6 100644 --- a/app/witness-verifications.gradle +++ b/app/witness-verifications.gradle @@ -153,6 +153,12 @@ dependencyVerification { ['androidx.navigation:navigation-ui:2.1.0', '1ec0558d692982c5bcfcca6de5b5972723e6b4a9870aa7fc1eddf5e869f116ed'], + ['androidx.paging:paging-common:2.1.2', + '891dd24bad908d5d866d7d3545114ab2d26994847cd0200ac68477287c0710b5'], + + ['androidx.paging:paging-runtime:2.1.2', + '4e81d8ab584a184e2781c6f0d50b6f00acd11741f759270e7c976ef3307d78a7'], + ['androidx.preference:preference:1.0.0', 'ea9fde25606eb456210ffe9f7e51048abd776b55a34c0cc6608282b5699122d1'],