Skip to content

fix: App stuck when open event from favorites #641

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 3 commits into from
Nov 1, 2018
Merged

fix: App stuck when open event from favorites #641

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cfda07
fix: App stuck when open event from favorites (#631)
liveHarshit Oct 14, 2018
d17a130
Merge branch 'development' into issue631
iamareebjamal Oct 28, 2018
152f6a0
Merge branch 'development' into issue631
nikit19 Nov 1, 2018
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
7 changes: 4 additions & 3 deletions app/src/main/java/org/fossasia/openevent/general/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import android.support.v4.app.Fragment
import android.support.v7.app.AppCompatActivity
import android.view.Menu
import kotlinx.android.synthetic.main.activity_main.*
import org.fossasia.openevent.general.R.id.navigation_events
import org.fossasia.openevent.general.R.id.navigation_search
import org.fossasia.openevent.general.R.id.*
import org.fossasia.openevent.general.attendees.AttendeeFragment
import org.fossasia.openevent.general.auth.LAUNCH_ATTENDEE
import org.fossasia.openevent.general.auth.ProfileFragment
import org.fossasia.openevent.general.event.EventDetailsFragment
import org.fossasia.openevent.general.event.EventsFragment
import org.fossasia.openevent.general.favorite.FavoriteFragment
import org.fossasia.openevent.general.order.LAUNCH_TICKETS
Expand Down Expand Up @@ -127,7 +127,8 @@ class MainActivity : AppCompatActivity() {

override fun onBackPressed() {
val currentFragment = this.supportFragmentManager.findFragmentById(R.id.frameContainer)
if (currentFragment !is EventsFragment) {
val rootFragment = this.supportFragmentManager.findFragmentById(R.id.rootLayout)
if (currentFragment !is EventsFragment && rootFragment !is EventDetailsFragment) {
Copy link
Member

@iamareebjamal iamareebjamal Oct 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also special casing but OK, it was already there

loadFragment(EventsFragment())
navigation.selectedItemId = navigation_events
} else {
Expand Down