Skip to content

Commit

Permalink
Implement "Save password" setting
Browse files Browse the repository at this point in the history
  • Loading branch information
iamgio committed May 31, 2019
1 parent de95f65 commit b11c1bd
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 7 deletions.
4 changes: 4 additions & 0 deletions src/assets/configuration/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ _win.max=false
4.Minecraft.6.Obfuscated_text_speed_(ms)%style=TEXTFIELD [^0-9]
5.SFTP.1.Servers=
5.SFTP.1.Servers%style=TEXTAREA
5.SFTP.2.Save_password=true
5.SFTP.2.Save_password%style=CHECKBOX
6.FTP.1.Servers=
6.FTP.1.Servers%style=TEXTAREA
6.FTP.2.Save_password=true
6.FTP.2.Save_password%style=CHECKBOX
7.Backups.1.Save_backups=true
7.Backups.1.Save_backups%style=CHECKBOX
5 changes: 4 additions & 1 deletion src/assets/lang/lang_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ settings.backups.save_backups.text=Speicherst du Dateisicherungen in chorus/back
settings.ftp=FTP
settings.ftp.servers=Servers
settings.ftp.servers.text=Fügst du Server über Host | Benutzername (Standardport)\nor Host | Benutzername | Port ein. Ein Server pro Zeile.
settings.ftp.save_password=Passwort speichern
settings.ftp.save_password.text=Passwort speichern, um sich in derselben Sitzung schneller anzumelden
settings.minecraft=Minecraft
settings.minecraft.color_prefix=Farbpräfix
settings.minecraft.color_prefix.text=Präfix, mit dem Farben erstellt werden können. Normalerweise '&' oder '§'.
Expand All @@ -171,6 +173,8 @@ settings.minecraft.server_version.text=Version von Minecraft Server.
settings.sftp=SFTP
settings.sftp.servers=Servers
settings.sftp.servers.text=Fügst du Server mithilfe von IP | Benutzername (Standardport)\n oder IP | Benutzername | Port ein. Ein Server pro Zeile.\nVerwendst du IP | Benutzername | Port | Pfad, wenn du SSH-Schlüssel verwendst.
settings.sftp.save_password=Passwort speichern
settings.sftp.save_password.text=Passwort speichern, um sich in derselben Sitzung schneller anzumelden
settings.title=Einstellungen
settings.yaml=YAML
settings.yaml.autocompletion=Autovervollständigung
Expand All @@ -191,7 +195,6 @@ show.enchantment_information=Verzauberungsinformation
show.entity_information=Entitätsinformationen
show.item_information=Gegenstand Information
show.ticks_calculation=Ticks Berechnung
make_string=Die Linie umgeben
testfile.error_plural=Fehler
testfile.error_singular=Fehler
testfile.loading=Ergebnisse werden geladen...
Expand Down
4 changes: 4 additions & 0 deletions src/assets/lang/lang_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ settings.backups.save_backups.text=Save file backups in chorus/backups/{config f
settings.ftp=FTP
settings.ftp.servers=Servers
settings.ftp.servers.text=Insert servers using Host|Username (default port)\nor Host|Username|Port. One server per line.
settings.ftp.save_password=Save password
settings.ftp.save_password.text=Save password for faster login during the same session.
settings.minecraft=Minecraft
settings.minecraft.color_prefix=Color prefix
settings.minecraft.color_prefix.text=Prefix that allows colors creation. Usually '&' or '§'.
Expand All @@ -171,6 +173,8 @@ settings.minecraft.server_version.text=Version of Minecraft server.
settings.sftp=SFTP
settings.sftp.servers=Servers
settings.sftp.servers.text=Insert servers using IP|Username (default port)\n or IP|Username|Port. One server per line.\nUse IP|Username|Port|Path if you're using SSH keys.
settings.sftp.save_password=Save password
settings.sftp.save_password.text=Save password for faster login during the same session.
settings.title=Settings
settings.yaml=YAML
settings.yaml.autocompletion=Autocompletion
Expand Down
4 changes: 4 additions & 0 deletions src/assets/lang/lang_it.properties
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ settings.backups.save_backups.text=Salva i backup dei file in chorus/backups/{ca
settings.ftp=FTP
settings.ftp.servers=Servers
settings.ftp.servers.text=Inserisci i server usando Host|Utente (porta default)\no Host|Utente|Porta. Un server per linea.
settings.ftp.save_password=Salva password
settings.ftp.save_password.text=Salva le password per login più rapidi durante la stessa sessione.
settings.minecraft=Minecraft
settings.minecraft.color_prefix=Prefisso colore
settings.minecraft.color_prefix.text=Prefisso che permette la creazione di colori. Solitamente '&' o '§'.
Expand All @@ -171,6 +173,8 @@ settings.minecraft.server_version.text=Versione del server Minecraft.
settings.sftp=SFTP
settings.sftp.servers=Servers
settings.sftp.servers.text=Inserisci i server usando IP|Utente (porta default)\no IP|Utente|Porta. Un server per linea.\nUtilizza IP|Utente|Porta|Percorso se si stanno utilizzando le key SSH.
settings.sftp.save_password=Salva password
settings.sftp.save_password.text=Salva le password per login più rapidi durante la stessa sessione.
settings.title=Impostazioni
settings.yaml=YAML
settings.yaml.autocompletion=Autocompletamento
Expand Down
2 changes: 1 addition & 1 deletion src/org/chorusmc/chorus/connection/FTPRemoteConnection.kt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ class FTPRemoteConnection(override val ip: String, override val username: String
}

companion object : Password {
override var psw: String = ""
override var psw = CharArray(0)
}
}
2 changes: 1 addition & 1 deletion src/org/chorusmc/chorus/connection/Password.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ package org.chorusmc.chorus.connection
*/
interface Password {

val psw: String
val psw: CharArray
}
2 changes: 1 addition & 1 deletion src/org/chorusmc/chorus/connection/SFTPRemoteConnection.kt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ class SFTPRemoteConnection(override val ip: String, override val username: Strin
.map {RemoteFile(it.filename, it.attrs.isDir)}

companion object : Password {
override var psw = ""
override var psw = CharArray(0)
}
}
3 changes: 2 additions & 1 deletion src/org/chorusmc/chorus/menubar/file/OpenFromFTP.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import org.chorusmc.chorus.connection.FTPRemoteConnection
import org.chorusmc.chorus.editor.EditorTab
import org.chorusmc.chorus.file.FTPFile
import org.chorusmc.chorus.menubar.MenuBarAction
import org.chorusmc.chorus.util.config
import org.chorusmc.chorus.util.translate
import org.chorusmc.chorus.views.remoteconnection.ftp.FTPView

Expand Down Expand Up @@ -49,7 +50,7 @@ class OpenFromFTP : MenuBarAction {
button.text = translate("remote.connect")
}}, Duration.seconds(1.5))
}
FTPRemoteConnection.psw = password
if(config.getBoolean("6.FTP.2.Save_password")) FTPRemoteConnection.psw = password.toCharArray()
}
view.onSelect = Runnable {
EditorTab(FTPFile(connection!!, view.selectedPath)).add()
Expand Down
3 changes: 2 additions & 1 deletion src/org/chorusmc/chorus/menubar/file/OpenFromSFTP.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import org.chorusmc.chorus.connection.SFTPRemoteConnection
import org.chorusmc.chorus.editor.EditorTab
import org.chorusmc.chorus.file.SFTPFile
import org.chorusmc.chorus.menubar.MenuBarAction
import org.chorusmc.chorus.util.config
import org.chorusmc.chorus.util.translate
import org.chorusmc.chorus.views.remoteconnection.sftp.SFTPView

Expand Down Expand Up @@ -48,7 +49,7 @@ class OpenFromSFTP : MenuBarAction {
button.text = translate("remote.connect")
}}, Duration.seconds(1.5))
}
SFTPRemoteConnection.psw = password
if(config.getBoolean("5.SFTP.2.Save_password")) SFTPRemoteConnection.psw = password.toCharArray()
}
view.onSelect = Runnable {
EditorTab(SFTPFile(connection!!, view.selectedPath)).add()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ open class RemoteConnectionView(private val name: String, defaultPort: Int, sett
ip.styleClass += "ip-box"
username.promptText = translate("remote.username")
username.styleClass += "username-field"
password.text = psw.psw
password.text = String(psw.psw)
password.promptText = translate("remote.password")
password.styleClass += "password-field"
port.promptText = translate("remote.port")
Expand Down

0 comments on commit b11c1bd

Please sign in to comment.