Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-23 19:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add onBackPressed callback for ConversationParentFragment.

Browse Source
This commit is contained in:
Alex Hart
2022-01-28 13:24:44 -04:00
committed by Cody Henthorne
parent ccc08e651c
commit 4de8807297
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View File

@@ -66,6 +66,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import androidx.activity.OnBackPressedCallback;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -538,6 +539,13 @@ public class ConversationParentFragment extends Fragment
});
initializeInsightObserver();
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
@@ -1102,13 +1110,12 @@ public class ConversationParentFragment extends Fragment
case R.id.menu_expiring_messages_off:
case R.id.menu_expiring_messages: handleSelectMessageExpiration(); 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;
}
// TODO [alex] LargeScreenSupport -- Add to a back handler
public void onBackPressed() {
Log.d(TAG, "onBackPressed()");
if (reactionDelegate.isShowing()) {
@@ -1116,7 +1123,7 @@ public class ConversationParentFragment extends Fragment
} else if (container.isInputOpen()) {
container.hideCurrentInput(composeText);
} else {
requireActivity().onBackPressed();
requireActivity().finish();
}
}