From 86ebbd0db5c281de4d18980521a3fb3d1251ed47 Mon Sep 17 00:00:00 2001 From: miyon Date: Sat, 11 Nov 2017 11:46:42 +0800 Subject: [PATCH] fix fragment called onstart twice on click back Removed irrelevant changes. --- .../main/scala/com/github/shadowsocks/MainActivity.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mobile/src/main/scala/com/github/shadowsocks/MainActivity.scala b/mobile/src/main/scala/com/github/shadowsocks/MainActivity.scala index 5bef0c68..96c93976 100644 --- a/mobile/src/main/scala/com/github/shadowsocks/MainActivity.scala +++ b/mobile/src/main/scala/com/github/shadowsocks/MainActivity.scala @@ -399,10 +399,8 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe override def onBackPressed(): Unit = if (drawer.isDrawerOpen) drawer.closeDrawer() else { val currentFragment = getFragmentManager.findFragmentById(R.id.fragment_holder).asInstanceOf[ToolbarFragment] if (!currentFragment.onBackPressed()) - if (currentFragment.isInstanceOf[ProfilesFragment]) super.onBackPressed() else { - displayFragment(new ProfilesFragment) - drawer.setSelection(DRAWER_PROFILES) - } + if (currentFragment.isInstanceOf[ProfilesFragment]) super.onBackPressed() + else drawer.setSelection(DRAWER_PROFILES) } override def onStop() {