TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 17:48:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take typing indicator into account when moving to quoted message.

Browse Source 
Fixes #8858

And fixes same bug in search.
This commit is contained in:
Alan Evans 2019-06-14 15:33:26 -04:00 committed by Greyson Parrelli
parent 0484047b4e
commit 6fceb25121
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@ -306,19 +306,19 @@ public class ConversationFragment extends Fragment
} }
if (recipients.size() > 0) { if (recipients.size() > 0) {
if (adapter.getHeaderView() == null && isAtBottom()) { if (!isTypingIndicatorShowing() && isAtBottom()) {
list.setVerticalScrollBarEnabled(false); list.setVerticalScrollBarEnabled(false);
list.post(() -> getListLayoutManager().smoothScrollToPosition(requireContext(), 0, 250)); list.post(() -> getListLayoutManager().smoothScrollToPosition(requireContext(), 0, 250));
list.postDelayed(() -> list.setVerticalScrollBarEnabled(true), 300); list.postDelayed(() -> list.setVerticalScrollBarEnabled(true), 300);
adapter.setHeaderView(typingView); adapter.setHeaderView(typingView);
adapter.notifyItemInserted(0); adapter.notifyItemInserted(0);
} else { } else {
if (adapter.getHeaderView() == null) { if (isTypingIndicatorShowing()) {
adapter.setHeaderView(typingView);
adapter.notifyItemInserted(0);
} else {
adapter.setHeaderView(typingView); adapter.setHeaderView(typingView);
adapter.notifyItemChanged(0); adapter.notifyItemChanged(0);
} else {
adapter.setHeaderView(typingView);
adapter.notifyItemInserted(0);
} }
} }
} else { } else {
@ -677,7 +677,7 @@ public class ConversationFragment extends Fragment
int lastSeenPosition = adapter.findLastSeenPosition(lastSeen); int lastSeenPosition = adapter.findLastSeenPosition(lastSeen);
if (adapter.getHeaderView() == typingView) { if (isTypingIndicatorShowing()) {
lastSeenPosition = Math.max(lastSeenPosition - 1, 0); lastSeenPosition = Math.max(lastSeenPosition - 1, 0);
} }
@ -765,7 +765,7 @@ public class ConversationFragment extends Fragment
int firstVisiblePosition = getListLayoutManager().findFirstVisibleItemPosition(); int firstVisiblePosition = getListLayoutManager().findFirstVisibleItemPosition();
if (getListAdapter().getHeaderView() == typingView) { if (isTypingIndicatorShowing()) {
RecyclerView.ViewHolder item1 = list.findViewHolderForAdapterPosition(1); RecyclerView.ViewHolder item1 = list.findViewHolderForAdapterPosition(1);
return firstVisiblePosition <= 1 && item1 != null && item1.itemView.getBottom() <= list.getHeight(); return firstVisiblePosition <= 1 && item1 != null && item1.itemView.getBottom() <= list.getHeight();
} }
@ -773,6 +773,10 @@ public class ConversationFragment extends Fragment
return firstVisiblePosition == 0 && list.getChildAt(0).getBottom() <= list.getHeight(); return firstVisiblePosition == 0 && list.getChildAt(0).getBottom() <= list.getHeight();
} }
private boolean isTypingIndicatorShowing() {
return getListAdapter().getHeaderView() == typingView;
}
public void onSearchQueryUpdated(@Nullable String query) { public void onSearchQueryUpdated(@Nullable String query) {
if (getListAdapter() != null) { if (getListAdapter() != null) {
getListAdapter().onSearchQueryUpdated(query); getListAdapter().onSearchQueryUpdated(query);
@ -783,7 +787,7 @@ public class ConversationFragment extends Fragment
SimpleTask.run(getLifecycle(), () -> { SimpleTask.run(getLifecycle(), () -> {
return DatabaseFactory.getMmsSmsDatabase(getContext()) return DatabaseFactory.getMmsSmsDatabase(getContext())
.getMessagePositionInConversation(threadId, timestamp, author); .getMessagePositionInConversation(threadId, timestamp, author);
}, p -> moveToMessagePosition(p, onMessageNotFound)); }, p -> moveToMessagePosition(p + (isTypingIndicatorShowing() ? 1 : 0), onMessageNotFound));
} }
private void moveToMessagePosition(int position, @Nullable Runnable onMessageNotFound) { private void moveToMessagePosition(int position, @Nullable Runnable onMessageNotFound) {
@ -928,7 +932,7 @@ public class ConversationFragment extends Fragment
.getQuotedMessagePosition(threadId, .getQuotedMessagePosition(threadId,
messageRecord.getQuote().getId(), messageRecord.getQuote().getId(),
messageRecord.getQuote().getAuthor()); messageRecord.getQuote().getAuthor());
}, p -> moveToMessagePosition(p, () -> { }, p -> moveToMessagePosition(p + (isTypingIndicatorShowing() ? 1 : 0), () -> {
Toast.makeText(getContext(), R.string.ConversationFragment_quoted_message_no_longer_available, Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), R.string.ConversationFragment_quoted_message_no_longer_available, Toast.LENGTH_SHORT).show();
})); }));
} }