Skip to content

Fix recents not refreshing on clear-all, and pending keys surviving a clear #2696

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
MiMoHo wants to merge 1 commit into
base: remove_recents
Choose a base branch
from
Open

Fix recents not refreshing on clear-all, and pending keys surviving a clear #2696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/java/helium314/keyboard/keyboard/emoji/DynamicGridKeyboard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@ public void addKeyLast(final Key usedKey) {
public void removeAllKeys() {
synchronized (mLock) {
mGridKeys.clear();
// also drop keys typed while viewing the recents tab that haven't been flushed yet,
// otherwise they get re-added on the next flushPendingRecentKeys() after a clear-all
mPendingKeys.clear();
mCachedGridKeys = null;
}
}
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ private static RecyclerView getRecyclerView(View view) {
return view.findViewById(R.id.emoji_keyboard_list);
}

/** Rebuild the recents page while it is the currently visible page. notifyItemChanged does not
* rebind the current ViewPager2 page, so refresh its inner adapter directly (same as the
* tab-change path in onViewDetachedFromWindow). No-op if recents is not currently bound. */
void refreshVisibleRecents() {
final RecyclerView recyclerView = mViews.get(mEmojiCategory.getRecentTabId());
if (recyclerView != null && recyclerView.getAdapter() != null) {
recyclerView.getAdapter().notifyDataSetChanged();
}
}

private void updateState(@NonNull RecyclerView recyclerView, long categoryId) {
if (categoryId != mEmojiCategory.getCurrentCategory().ordinal()) {
return;
Expand Down Expand Up @@ -333,6 +343,10 @@ public void onRemoveRecentsKey(Key key)
private void clearRecentKeys() {
RecentEmojis.clear();
getRecentsKeyboard().removeAllKeys();
// clearing happens while the recents tab is visible (its icon is long-pressed), where a plain
// notifyItemChanged does not rebind the current page - refresh the visible recents grid directly
if (initialized && mPager.getAdapter() instanceof PagerAdapter adapter)
adapter.refreshVisibleRecents();
}

@Override
Expand Down