empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix navigation crashes in registration and manage profile.

Browse source
This commit is contained in:
Cody Henthorne 2021-09-29 13:03:35 -04:00 • committed by Greyson Parrelli
parent 8d53c2392a
commit 641db1cbe2
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/profiles/manage/ManageProfileActivity.java
View file

@ -6,6 +6,7 @@ import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.navigation.NavController;
import androidx.navigation.NavDirections;
import androidx.navigation.NavGraph;
import androidx.navigation.Navigation;
@ -51,18 +52,22 @@ public class ManageProfileActivity extends PassphraseRequiredActivity implements
if (bundle == null) {
Bundle extras = getIntent().getExtras();
NavGraph graph = Navigation.findNavController(this, R.id.nav_host_fragment).getGraph();
Navigation.findNavController(this, R.id.nav_host_fragment).setGraph(graph, extras != null ? extras : new Bundle());
//noinspection ConstantConditions
NavController navController = ((NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment)).getNavController();
NavGraph graph = navController.getGraph();
navController.setGraph(graph, extras != null ? extras : new Bundle());
if (extras != null && extras.getBoolean(START_AT_USERNAME, false)) {
NavDirections action = ManageProfileFragmentDirections.actionManageUsername();
Navigation.findNavController(this, R.id.nav_host_fragment).navigate(action);
navController.navigate(action);
}
if (extras != null && extras.getBoolean(START_AT_AVATAR, false)) {
NavDirections action = ManageProfileFragmentDirections.actionManageProfileFragmentToAvatarPicker(null, null);
Navigation.findNavController(this, R.id.nav_host_fragment).navigate(action);
navController.navigate(action);
}
}
}

2
app/src/main/res/layout/activity_registration_navigation.xml
View file

@ -6,7 +6,7 @@
android:layout_height="match_parent"
tools:context=".registration.RegistrationNavigationActivity">
<fragment
<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"

2
app/src/main/res/layout/manage_profile_activity.xml
View file

@ -6,7 +6,7 @@
android:layout_height="match_parent"
tools:context=".profiles.edit.EditProfileActivity">
<fragment
<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"