expvintl/NeoTerm_System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: cannot back to last session

Browse Source
This commit is contained in:
zt515 2017-10-31 23:46:41 +08:00
parent ebff85ae15
commit 748b702180
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt
View File

@ -348,6 +348,8 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
setSystemShellMode(false)
if (!termService!!.sessions.isEmpty()) {
val lastSession = getStoredCurrentSessionOrLast();
for (session in termService!!.sessions) {
addNewSession(session)
}
@ -357,7 +359,7 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
addNewSession(null,
false, createRevealAnimation())
} else {
switchToSession(getStoredCurrentSessionOrLast());
switchToSession(lastSession);
}
} else {
@ -545,13 +547,7 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
}
private fun toggleSwitcher(showSwitcher: Boolean, easterEgg: Boolean) {
if (tabSwitcher.count > 0) {
// if (showSwitcher) {
// val transparentAnimator = ObjectAnimator.ofFloat(toolbar, View.ALPHA, 1.0f, 0.0f, 1.0f)
// transparentAnimator.interpolator = AccelerateDecelerateInterpolator()
// transparentAnimator.start()
// }
} else if (easterEgg) {
if (tabSwitcher.count == 0 && easterEgg) {
val happyCount = NeoPreference.loadInt(NeoPreference.KEY_HAPPY_EGG, 0) + 1
NeoPreference.store(NeoPreference.KEY_HAPPY_EGG, happyCount)
@ -568,6 +564,7 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
}
return
}
if (showSwitcher) {
tabSwitcher.showSwitcher()
} else {