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

Fix: Some crashes after jumping to SettingsActivity

Browse Source
This commit is contained in:
zt515 2017-06-12 18:10:31 +08:00
parent bcf7e1ef22
commit 9b29779be6
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@ import android.support.v4.view.OnApplyWindowInsetsListener
import android.support.v4.view.ViewCompat
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.Toolbar
import android.util.Log
import android.view.KeyEvent
import android.view.View
import android.widget.ImageButton
@ -60,6 +59,14 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection {
tabSwitcher
.setToolbarNavigationIcon(R.drawable.ic_add_box_white_24dp, createAddSessionListener())
tabSwitcher.inflateToolbarMenu(R.menu.tab_switcher, createToolbarMenuListener())
val serviceIntent = Intent(this, NeoTermService::class.java)
startService(serviceIntent)
bindService(serviceIntent, this, 0)
}
override fun onResume() {
super.onResume()
tabSwitcher.addListener(object : TabSwitcherListener {
private var tabSwitcherButtonInited = false
@ -96,7 +103,6 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection {
}
override fun onTabRemoved(tabSwitcher: TabSwitcher, index: Int, tab: Tab, animation: Animation) {
Log.e("NeoTerm", "onTabRemoved " + tab.toString())
if (tab is TermTab) {
tab.termSession?.finishIfRunning()
removeFinishedSession(tab.termSession)
@ -108,10 +114,6 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection {
override fun onAllTabsRemoved(tabSwitcher: TabSwitcher, tabs: Array<out Tab>, animation: Animation) {
}
})
val serviceIntent = Intent(this, NeoTermService::class.java)
startService(serviceIntent)
bindService(serviceIntent, this, 0)
}
override fun onDestroy() {

6
chrome-tabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcher.java
View File

@ -1416,7 +1416,11 @@ public class TabSwitcher extends FrameLayout implements TabSwitcherLayout, Model
TabSwitcherState savedState = new TabSwitcherState(superState);
savedState.layoutPolicy = layoutPolicy;
savedState.modelState = new Bundle();
Pair<Integer, Float> pair = layout.detachLayout(true);
Pair<Integer, Float> pair = null;
if (getCount() > 0) {
pair = layout.detachLayout(true);
}
if (pair != null) {
savedState.modelState