From 0cfda07ab78d915b2745cd463bad5321f619cec3 Mon Sep 17 00:00:00 2001 From: liveHarshit Date: Sun, 14 Oct 2018 22:03:41 +0530 Subject: [PATCH] fix: App stuck when open event from favorites (#631) Fixed #631 --- .../java/org/fossasia/openevent/general/MainActivity.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt b/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt index 05ee29a2d..eef50d967 100644 --- a/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt +++ b/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt @@ -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 @@ -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) { loadFragment(EventsFragment()) navigation.selectedItemId = navigation_events } else {