Skip to content

fix: App crashes on first time sign in #2055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 3, 2019
Merged

fix: App crashes on first time sign in #2055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b83e8c7
fix: App crashes on first time sign in (#2054)
liveHarshit Jul 3, 2019
7119723
Merge branch 'development' into development-1
ShridharGoel Jul 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,11 @@ class LoginFragment : Fragment() {
SPEAKERS_CALL_FRAGMENT -> R.id.speakersCallFragment
else -> R.id.eventsFragment
}
findNavController(rootView).popBackStack(destinationId, false)
if (destinationId == R.id.eventsFragment) {
findNavController(rootView).navigate(LoginFragmentDirections.actionLoginToEventsPop())
} else {
findNavController(rootView).popBackStack(destinationId, false)
}
rootView.snackbar(R.string.welcome_back)
}
}
6 changes: 5 additions & 1 deletion app/src/main/java/org/fossasia/openevent/general/auth/SignUpFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,11 @@ class SignUpFragment : Fragment() {
SPEAKERS_CALL_FRAGMENT -> R.id.speakersCallFragment
else -> R.id.eventsFragment
}
findNavController(rootView).popBackStack(destinationId, false)
if (destinationId == R.id.eventsFragment) {
findNavController(rootView).navigate(SignUpFragmentDirections.actionSignUpToEventsPop())
} else {
findNavController(rootView).popBackStack(destinationId, false)
}
rootView.snackbar(R.string.logged_in_automatically)
}

Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/navigation/navigation_graph.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,11 @@
app:destination="@id/authFragment"
app:popUpTo="@id/authFragment"
app:popUpToInclusive="true"/>
<action
android:id="@+id/action_login_to_events_pop"
app:destination="@id/eventsFragment"
app:popUpTo="@id/eventsFragment"
app:popUpToInclusive="true"/>
<argument
android:name="email"
app:argType="string"
Expand All @@ -776,6 +781,11 @@
app:destination="@id/authFragment"
app:popUpTo="@id/authFragment"
app:popUpToInclusive="true"/>
<action
android:id="@+id/action_sign_up_to_events_pop"
app:destination="@id/eventsFragment"
app:popUpTo="@id/eventsFragment"
app:popUpToInclusive="true"/>
<argument
android:name="email"
app:argType="string"
Expand Down