Add onBackPressed callback for ConversationParentFragment.

fork-5.53.8
Alex Hart 2022-01-28 13:24:44 -04:00 zatwierdzone przez Cody Henthorne
rodzic ccc08e651c
commit 4de8807297
1 zmienionych plików z 10 dodań i 3 usunięć

Wyświetl plik

@ -66,6 +66,7 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.activity.OnBackPressedCallback;
import androidx.annotation.IdRes; import androidx.annotation.IdRes;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -538,6 +539,13 @@ public class ConversationParentFragment extends Fragment
}); });
initializeInsightObserver(); initializeInsightObserver();
initializeActionBar(); initializeActionBar();
requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) {
@Override
public void handleOnBackPressed() {
onBackPressed();
}
});
} }
// TODO [alex] LargeScreenSupport -- This needs to be fed a stream of intents // TODO [alex] LargeScreenSupport -- This needs to be fed a stream of intents
@ -1102,13 +1110,12 @@ public class ConversationParentFragment extends Fragment
case R.id.menu_expiring_messages_off: case R.id.menu_expiring_messages_off:
case R.id.menu_expiring_messages: handleSelectMessageExpiration(); return true; case R.id.menu_expiring_messages: handleSelectMessageExpiration(); return true;
case R.id.menu_create_bubble: handleCreateBubble(); return true; case R.id.menu_create_bubble: handleCreateBubble(); return true;
case android.R.id.home: requireActivity().onBackPressed(); return true; case android.R.id.home: requireActivity().finish(); return true;
} }
return false; return false;
} }
// TODO [alex] LargeScreenSupport -- Add to a back handler
public void onBackPressed() { public void onBackPressed() {
Log.d(TAG, "onBackPressed()"); Log.d(TAG, "onBackPressed()");
if (reactionDelegate.isShowing()) { if (reactionDelegate.isShowing()) {
@ -1116,7 +1123,7 @@ public class ConversationParentFragment extends Fragment
} else if (container.isInputOpen()) { } else if (container.isInputOpen()) {
container.hideCurrentInput(composeText); container.hideCurrentInput(composeText);
} else { } else {
requireActivity().onBackPressed(); requireActivity().finish();
} }
} }