Change input setup flow. Fixes austinhuang0131/barinsta#1529

This commit is contained in:
Ammar Githam 2021-07-06 06:50:18 +09:00
parent 49780a61b0
commit 82d7555eee
1 changed files with 4 additions and 5 deletions

View File

@ -586,7 +586,6 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
if (getArguments() == null) return; if (getArguments() == null) return;
actionBar = fragmentActivity.getSupportActionBar(); actionBar = fragmentActivity.getSupportActionBar();
setupList(); setupList();
root.post(this::setupInput);
} }
private void setupList() { private void setupList() {
@ -642,10 +641,11 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
inputModeLiveData.observe(getViewLifecycleOwner(), inputMode -> { inputModeLiveData.observe(getViewLifecycleOwner(), inputMode -> {
final Boolean isPending = viewModel.isPending().getValue(); final Boolean isPending = viewModel.isPending().getValue();
if (isPending != null && isPending || inputMode == null) return; if (isPending != null && isPending || inputMode == null) return;
if (inputMode != 1) { setupInput(inputMode);
if (inputMode == 0) {
setupTouchHelper(); setupTouchHelper();
return;
} }
if (inputMode == 0) return;
if (inputMode == 1) { if (inputMode == 1) {
hideInput(); hideInput();
} }
@ -1052,8 +1052,7 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
}); });
} }
private void setupInput() { private void setupInput(@Nullable final Integer inputMode) {
final Integer inputMode = viewModel.getInputMode().getValue();
if (inputMode != null && inputMode == 1) return; if (inputMode != null && inputMode == 1) return;
final Context context = getContext(); final Context context = getContext();
if (context == null) return; if (context == null) return;