lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix http warning not being hidden if https used

Browse Source
This commit is contained in:
huanghongxun
2018-02-18 18:29:22 +08:00
parent 9ae952bb78
commit 2310f6e1c0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
View File

@@ -18,6 +18,7 @@ import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.ui.animation.ContainerAnimations; import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
import org.jackhuang.hmcl.ui.animation.TransitionHandler; import org.jackhuang.hmcl.ui.animation.TransitionHandler;
import org.jackhuang.hmcl.ui.wizard.DecoratorPage; import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
import org.jackhuang.hmcl.util.NetworkUtils;
import java.util.Collection; import java.util.Collection;
import java.util.Objects; import java.util.Objects;
@@ -31,6 +32,7 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
@FXML private Label lblServerIp; @FXML private Label lblServerIp;
@FXML private Label lblServerName; @FXML private Label lblServerName;
@FXML private Label lblCreationWarning; @FXML private Label lblCreationWarning;
@FXML private Label lblServerWarning;
@FXML private VBox listPane; @FXML private VBox listPane;
@FXML private JFXTextField txtServerIp; @FXML private JFXTextField txtServerIp;
@FXML private JFXDialogLayout addServerPane; @FXML private JFXDialogLayout addServerPane;
@@ -100,10 +102,11 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
@FXML @FXML
private void onAddNext() { private void onAddNext() {
String serverIp = txtServerIp.getText();
progressBar.setVisible(true); progressBar.setVisible(true);
addServerPane.setDisable(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) -> { .finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
progressBar.setVisible(false); progressBar.setVisible(false);
addServerPane.setDisable(false); addServerPane.setDisable(false);
@@ -112,6 +115,8 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
lblServerName.setText(variables.get("serverName")); lblServerName.setText(variables.get("serverName"));
lblServerIp.setText(txtServerIp.getText()); lblServerIp.setText(txtServerIp.getText());
lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverIp).getProtocol()));
transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer()); transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
} else } else
lblCreationWarning.setText(variables.<Exception>get("lastException").getLocalizedMessage()); lblCreationWarning.setText(variables.<Exception>get("lastException").getLocalizedMessage());

4
HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml
View File

@@ -45,7 +45,7 @@
</body> </body>
<actions> <actions>
<Label fx:id="lblCreationWarning" /> <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" /> <JFXButton fx:id="btnAddNext" onMouseClicked="#onAddNext" text="%wizard.next" styleClass="dialog-accept" />
</actions> </actions>
</JFXDialogLayout> </JFXDialogLayout>
@@ -66,7 +66,7 @@
<Label fx:id="lblServerIp" GridPane.columnIndex="1" GridPane.rowIndex="0" /> <Label fx:id="lblServerIp" GridPane.columnIndex="1" GridPane.rowIndex="0" />
<Label fx:id="lblServerName" GridPane.columnIndex="1" GridPane.rowIndex="1" /> <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> </GridPane>
</body> </body>
<actions> <actions>