From 2310f6e1c05d9fb6d103ea67796f63477d8c4e56 Mon Sep 17 00:00:00 2001
From: huanghongxun <huanghongxun2008@126.com>
Date: Sun, 18 Feb 2018 18:29:22 +0800
Subject: [PATCH] Fix http warning not being hidden if https used

---
 .../org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java  | 7 ++++++-
 .../resources/assets/fxml/authlib-injector-servers.fxml    | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
index 1f8192370..e24d06237 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
@@ -18,6 +18,7 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionHandler;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
+import org.jackhuang.hmcl.util.NetworkUtils;
 
 import java.util.Collection;
 import java.util.Objects;
@@ -31,6 +32,7 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
     @FXML private Label lblServerIp;
     @FXML private Label lblServerName;
     @FXML private Label lblCreationWarning;
+    @FXML private Label lblServerWarning;
     @FXML private VBox listPane;
     @FXML private JFXTextField txtServerIp;
     @FXML private JFXDialogLayout addServerPane;
@@ -100,10 +102,11 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
 
     @FXML
     private void onAddNext() {
+        String serverIp = txtServerIp.getText();
         progressBar.setVisible(true);
         addServerPane.setDisable(true);
 
-        Task.ofResult("serverName", () -> Objects.requireNonNull(Accounts.getAuthlibInjectorServerName(txtServerIp.getText())))
+        Task.ofResult("serverName", () -> Objects.requireNonNull(Accounts.getAuthlibInjectorServerName(serverIp)))
                 .finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
                     progressBar.setVisible(false);
                     addServerPane.setDisable(false);
@@ -112,6 +115,8 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
                         lblServerName.setText(variables.get("serverName"));
                         lblServerIp.setText(txtServerIp.getText());
 
+                        lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverIp).getProtocol()));
+
                         transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
                     } else
                         lblCreationWarning.setText(variables.<Exception>get("lastException").getLocalizedMessage());
diff --git a/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml b/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml
index 8bd06485b..05ea1066d 100644
--- a/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml
+++ b/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml
@@ -45,7 +45,7 @@
                     </body>
                     <actions>
                         <Label fx:id="lblCreationWarning" />
-                        <JFXButton onMouseClicked="#onAddCancel" text="%button.ok" styleClass="dialog-cancel" />
+                        <JFXButton onMouseClicked="#onAddCancel" text="%button.cancel" styleClass="dialog-cancel" />
                         <JFXButton fx:id="btnAddNext" onMouseClicked="#onAddNext" text="%wizard.next" styleClass="dialog-accept" />
                     </actions>
                 </JFXDialogLayout>
@@ -66,7 +66,7 @@
                             <Label fx:id="lblServerIp" GridPane.columnIndex="1" GridPane.rowIndex="0" />
                             <Label fx:id="lblServerName" GridPane.columnIndex="1" GridPane.rowIndex="1" />
 
-                            <Label text="%account.injector.http" style="-fx-text-fill: red;" GridPane.rowIndex="2" GridPane.columnSpan="2" GridPane.columnIndex="0" />
+                            <Label fx:id="lblServerWarning" text="%account.injector.http" style="-fx-text-fill: red;" GridPane.rowIndex="2" GridPane.columnSpan="2" GridPane.columnIndex="0" />
                         </GridPane>
                     </body>
                     <actions>