yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves #430 Trim any leading and trailing whitespace in address, port or token

Browse Source
This commit is contained in:
estevez-dev 2019-09-05 00:51:29 +03:00
parent c114bcfb35
commit 243fcd7c49
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pages/settings.page.dart
View File

@ -74,6 +74,7 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
} }
_saveSettings() async { _saveSettings() async {
_newHassioDomain = _newHassioDomain.trim();
if (_newHassioDomain.indexOf("http") == 0 && _newHassioDomain.indexOf("//") > 0) { if (_newHassioDomain.indexOf("http") == 0 && _newHassioDomain.indexOf("//") > 0) {
_newHassioDomain = _newHassioDomain.split("//")[1]; _newHassioDomain = _newHassioDomain.split("//")[1];
} }
@ -81,6 +82,7 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
SharedPreferences prefs = await SharedPreferences.getInstance(); SharedPreferences prefs = await SharedPreferences.getInstance();
final storage = new FlutterSecureStorage(); final storage = new FlutterSecureStorage();
if (_newLongLivedToken.isNotEmpty) { if (_newLongLivedToken.isNotEmpty) {
_newLongLivedToken = _newLongLivedToken.trim();
prefs.setBool("oauth-used", false); prefs.setBool("oauth-used", false);
await storage.write(key: "hacl_llt", value: _newLongLivedToken); await storage.write(key: "hacl_llt", value: _newLongLivedToken);
} else if (!useOAuth) { } else if (!useOAuth) {
@ -89,6 +91,8 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
prefs.setString("hassio-domain", _newHassioDomain); prefs.setString("hassio-domain", _newHassioDomain);
if (_newHassioPort == null || _newHassioPort.isEmpty) { if (_newHassioPort == null || _newHassioPort.isEmpty) {
_newHassioPort = _newSocketProtocol == "wss" ? "443" : "80"; _newHassioPort = _newSocketProtocol == "wss" ? "443" : "80";
} else {
_newHassioPort = _newHassioPort.trim();
} }
prefs.setString("hassio-port", _newHassioPort); prefs.setString("hassio-port", _newHassioPort);
prefs.setString("hassio-protocol", _newSocketProtocol); prefs.setString("hassio-protocol", _newSocketProtocol);