kopia lustrzana https://github.com/ryukoposting/Signal-Android
Fix crash when recreating conversation react with any emoji fragment.
rodzic
b7afe4411e
commit
aeb568bcf4
|
@ -41,9 +41,9 @@ import org.thoughtcrime.securesms.keyboard.emoji.EmojiKeyboardPageCategoryMappin
|
||||||
import org.thoughtcrime.securesms.keyboard.emoji.KeyboardPageSearchView;
|
import org.thoughtcrime.securesms.keyboard.emoji.KeyboardPageSearchView;
|
||||||
import org.thoughtcrime.securesms.reactions.edit.EditReactionsActivity;
|
import org.thoughtcrime.securesms.reactions.edit.EditReactionsActivity;
|
||||||
import org.thoughtcrime.securesms.util.LifecycleDisposable;
|
import org.thoughtcrime.securesms.util.LifecycleDisposable;
|
||||||
import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
|
|
||||||
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||||
import org.thoughtcrime.securesms.util.ViewUtil;
|
import org.thoughtcrime.securesms.util.ViewUtil;
|
||||||
|
import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
|
@ -196,16 +196,9 @@ public final class ReactWithAnyEmojiBottomSheetDialogFragment extends BottomShee
|
||||||
emojiPageView.addOnScrollListener(categoryUpdateOnScroll);
|
emojiPageView.addOnScrollListener(categoryUpdateOnScroll);
|
||||||
|
|
||||||
search = view.findViewById(R.id.react_with_any_emoji_search);
|
search = view.findViewById(R.id.react_with_any_emoji_search);
|
||||||
search.setCallbacks(new SearchCallbacks());
|
|
||||||
|
|
||||||
initializeViewModel();
|
initializeViewModel();
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
|
|
||||||
super.onActivityCreated(savedInstanceState);
|
|
||||||
|
|
||||||
if (savedInstanceState == null) {
|
|
||||||
EmojiKeyboardPageCategoriesAdapter categoriesAdapter = new EmojiKeyboardPageCategoriesAdapter(key -> {
|
EmojiKeyboardPageCategoriesAdapter categoriesAdapter = new EmojiKeyboardPageCategoriesAdapter(key -> {
|
||||||
scrollTo(key);
|
scrollTo(key);
|
||||||
viewModel.selectPage(key);
|
viewModel.selectPage(key);
|
||||||
|
@ -239,7 +232,8 @@ public final class ReactWithAnyEmojiBottomSheetDialogFragment extends BottomShee
|
||||||
categoriesRecycler.smoothScrollToPosition(index);
|
categoriesRecycler.smoothScrollToPosition(index);
|
||||||
}
|
}
|
||||||
})));
|
})));
|
||||||
}
|
|
||||||
|
search.setCallbacks(new SearchCallbacks());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void scrollTo(@NonNull String key) {
|
private void scrollTo(@NonNull String key) {
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/tab_bar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="bottom"
|
android:layout_gravity="bottom"
|
||||||
|
|
Ładowanie…
Reference in New Issue