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

Preference: rename ambiguous method names

Browse Source
This commit is contained in:
zt515 2017-12-06 23:53:08 +08:00
parent 7bb71a5aba
commit 787cd79768
6 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/io/neoterm/component/profile/Profile.kt
View File

@ -1,7 +0,0 @@
package io.neoterm.component.profile
/**
* @author kiva
*/
abstract class Profile {
}

5
app/src/main/java/io/neoterm/component/profile/ProfileComponent.kt
View File

@ -1,12 +1,13 @@
package io.neoterm.component.profile package io.neoterm.component.profile
import io.neoterm.frontend.component.NeoComponent import io.neoterm.frontend.component.NeoComponent
import io.neoterm.frontend.session.shell.ShellProfile
/** /**
* @author kiva * @author kiva
*/ */
class ProfileComponent : NeoComponent { class ProfileComponent : NeoComponent {
private val profileList = mutableListOf<Profile>() private val profileList = mutableListOf<ShellProfile>()
override fun onServiceInit() { override fun onServiceInit() {
} }
@ -16,4 +17,6 @@ class ProfileComponent : NeoComponent {
override fun onServiceObtained() { override fun onServiceObtained() {
} }
} }

14
app/src/main/java/io/neoterm/frontend/preference/NeoPreference.kt
View File

@ -125,7 +125,7 @@ object NeoPreference {
return null return null
} }
fun setLoginShell(loginProgramName: String?): Boolean { fun setLoginShellName(loginProgramName: String?): Boolean {
if (loginProgramName == null) { if (loginProgramName == null) {
return false return false
} }
@ -137,14 +137,18 @@ object NeoPreference {
return true return true
} }
fun getLoginShell(): String { fun getLoginShellName(): String {
val loginProgramName = loadString(R.string.key_general_shell, DefaultPreference.loginShell) return loadString(R.string.key_general_shell, DefaultPreference.loginShell)
}
fun getLoginShellPath(): String {
val loginProgramName = getLoginShellName()
// Some programs like ssh needs it // Some programs like ssh needs it
val shell = File(NeoTermPath.NEOTERM_SHELL_PATH) val shell = File(NeoTermPath.NEOTERM_SHELL_PATH)
val loginProgramPath = findLoginProgram(loginProgramName) ?: { val loginProgramPath = findLoginProgram(loginProgramName) ?: {
setLoginShell("sh") setLoginShellName(DefaultPreference.loginShell)
"${NeoTermPath.USR_PATH}/bin/sh" "${NeoTermPath.USR_PATH}/bin/${DefaultPreference.loginShell}"
}() }()
if (!shell.exists()) { if (!shell.exists()) {

3
app/src/main/java/io/neoterm/frontend/session/shell/ShellProfile.kt
View File

@ -4,6 +4,7 @@ import io.neoterm.component.color.ColorSchemeComponent
import io.neoterm.component.font.FontComponent import io.neoterm.component.font.FontComponent
import io.neoterm.frontend.component.ComponentManager import io.neoterm.frontend.component.ComponentManager
import io.neoterm.frontend.preference.DefaultPreference import io.neoterm.frontend.preference.DefaultPreference
import io.neoterm.frontend.preference.NeoPreference
/** /**
* @author kiva * @author kiva
@ -27,5 +28,7 @@ class ShellProfile {
profileFont = fontComp.getCurrentFontName() profileFont = fontComp.getCurrentFontName()
profileColorScheme = colorComp.getCurrentColorSchemeName() profileColorScheme = colorComp.getCurrentColorSchemeName()
loginShell = NeoPreference.getLoginShellPath()
} }
} }

2
app/src/main/java/io/neoterm/frontend/session/shell/ShellTermSession.kt
View File

@ -154,7 +154,7 @@ open class ShellTermSession private constructor(shellPath: String, cwd: String,
if (systemShell) if (systemShell)
"/system/bin/sh" "/system/bin/sh"
else else
NeoPreference.getLoginShell() NeoPreference.getLoginShellPath()
val args = this.args ?: mutableListOf(shell) val args = this.args ?: mutableListOf(shell)
val env = transformEnvironment(this.env) ?: buildEnvironment(cwd, systemShell) val env = transformEnvironment(this.env) ?: buildEnvironment(cwd, systemShell)

3
app/src/main/java/io/neoterm/ui/settings/GeneralSettingsActivity.kt
View File

@ -4,7 +4,6 @@ import android.app.AlertDialog
import android.os.Bundle import android.os.Bundle
import android.view.MenuItem import android.view.MenuItem
import io.neoterm.R import io.neoterm.R
import io.neoterm.frontend.logging.NLog
import io.neoterm.frontend.preference.DefaultPreference import io.neoterm.frontend.preference.DefaultPreference
import io.neoterm.frontend.preference.NeoPreference import io.neoterm.frontend.preference.NeoPreference
import io.neoterm.utils.PackageUtils import io.neoterm.utils.PackageUtils
@ -34,7 +33,7 @@ class GeneralSettingsActivity : BasePreferenceActivity() {
} }
private fun postChangeShell(shellName: String) { private fun postChangeShell(shellName: String) {
NeoPreference.setLoginShell(shellName) NeoPreference.setLoginShellName(shellName)
} }
private fun requestInstallShell(shellName: String, currentShell: String) { private fun requestInstallShell(shellName: String, currentShell: String) {