Fix fragment transaction after onStop

nkming2 · Sep 12, 2016 · 19ebf95 · 19ebf95
1 parent 0ae2fab
commit 19ebf95
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/src/main/kotlin/com/nkming/powermenu/MainActivity.kt b/src/main/kotlin/com/nkming/powermenu/MainActivity.kt
@@ -45,6 +45,7 @@ class MainActivity : AppCompatActivity()
 		{
 			PersistentService.hideView(this)
 		}
+		_isStop = false
 	}
 
 	override fun onStop()
@@ -59,6 +60,7 @@ class MainActivity : AppCompatActivity()
 			PersistentViewHelper.startIfNecessary(this)
 			SystemOverrideService.startIfNecessary(this)
 		}
+		_isStop = true
 	}
 
 	override fun onUserLeaveHint()
@@ -90,14 +92,22 @@ class MainActivity : AppCompatActivity()
 		}
 		else
 		{
-			// Disable the standard activity launch animation
-			overridePendingTransition(0, 0)
-			setContentView(R.layout.activity_main)
-			if (savedInstanceState == null)
+			if (_isStop)
 			{
-				supportFragmentManager.beginTransaction()
-						.add(R.id.container, MainFragment())
-						.commit()
+				// User has closed/hid the app
+				super.finish()
+			}
+			else
+			{
+				// Disable the standard activity launch animation
+				overridePendingTransition(0, 0)
+				setContentView(R.layout.activity_main)
+				if (savedInstanceState == null)
+				{
+					supportFragmentManager.beginTransaction()
+							.add(R.id.container, MainFragment())
+							.commit()
+				}
 			}
 		}
 	}
@@ -113,4 +123,5 @@ class MainActivity : AppCompatActivity()
 	}
 
 	private var _isAnimateClose = true
+	private var _isStop = false
 }