Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-27 06:29:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix back navigation issues when creating an initial profile.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-08-23 13:49:21 -04:00
parent b92dd19a4c
commit 6bbd941158
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileActivity.java
View File

@@ -6,7 +6,9 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import androidx.activity.OnBackPressedCallback;
import androidx.annotation.NonNull;
import androidx.navigation.Navigation;
import androidx.navigation.fragment.NavHostFragment;
import org.thoughtcrime.securesms.BaseActivity;
@@ -64,6 +66,14 @@ public class EditProfileActivity extends BaseActivity implements EditProfileFrag
.add(R.id.fragment_container, fragment)
.commit();
}
getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
@Override public void handleOnBackPressed() {
if (!Navigation.findNavController(EditProfileActivity.this, R.id.fragment_container).popBackStack()) {
finish();
}
}
});
}
@Override

3
app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
View File

@@ -53,6 +53,9 @@ import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.NEXT_
import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.NEXT_INTENT;
import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.SHOW_TOOLBAR;
/**
* Used for profile creation during registration.
*/
public class EditProfileFragment extends LoggingFragment {
private static final String TAG = Log.tag(EditProfileFragment.class);