Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2025-02-26 05:25:40 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

renamed lookupDatabaseUserPermission to askedForLookupDatabasePermission

Browse Source
This commit is contained in:
Jan-Peter Klein 2023-08-07 15:08:25 +02:00
parent f91a854b3e
commit 27f3d85ae2
No known key found for this signature in database
GPG Key ID: 90EDA3A7C822FD0E
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/cryptomator/ui/error/ErrorController.java
View File

@ -71,7 +71,7 @@ public class ErrorController implements FxController {
private final ObjectProperty<ErrorDiscussion> matchingErrorDiscussion = new SimpleObjectProperty<>();
private final BooleanExpression errorSolutionFound = matchingErrorDiscussion.isNotNull();
private final BooleanProperty isLoadingHttpResponse = new SimpleBooleanProperty();
private final BooleanProperty lookupDatabaseUserPermission = new SimpleBooleanProperty();
private final BooleanProperty askedForLookupDatabasePermission = new SimpleBooleanProperty();
@Inject
ErrorController(Application application, @Named("stackTrace") String stackTrace, ErrorCode errorCode, @Nullable Scene previousScene, Stage window, Environment environment, ExecutorService executorService) {
@ -136,13 +136,13 @@ public class ErrorController implements FxController {
@FXML
public void dismiss() {
lookupDatabaseUserPermission.set(true);
askedForLookupDatabasePermission.set(true);
}
@FXML
public void lookUpSolution() {
isLoadingHttpResponse.set(true);
lookupDatabaseUserPermission.set(true);
askedForLookupDatabasePermission.set(true);
HttpClient httpClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_1_1).build();
HttpRequest httpRequest = HttpRequest.newBuilder()//
.uri(URI.create(ERROR_CODES_URL))//
@ -305,12 +305,12 @@ public class ErrorController implements FxController {
return isLoadingHttpResponse.get();
}
public BooleanProperty lookupDatabaseUserPermissionProperty() {
return lookupDatabaseUserPermission;
public BooleanProperty askedForLookupDatabasePermissionProperty() {
return askedForLookupDatabasePermission;
}
public boolean isLookupDatabaseUserPermission() {
return lookupDatabaseUserPermission.get();
public boolean getAskedForLookupDatabasePermission() {
return askedForLookupDatabasePermission.get();
}
}

4
src/main/resources/fxml/error.fxml
View File

@ -34,7 +34,7 @@
</StackPane>
<VBox spacing="6" HBox.hgrow="ALWAYS">
<FormattedLabel styleClass="label-extra-large" format="%error.message" arg1="${controller.errorCode}"/>
<VBox visible="${!controller.lookupDatabaseUserPermission}" managed="${!controller.lookupDatabaseUserPermission}">
<VBox visible="${!controller.askedForLookupDatabasePermission}" managed="${!controller.askedForLookupDatabasePermission}">
<Label text="%error.lookupPermissionMessage" wrapText="true"/>
<Region VBox.vgrow="ALWAYS" minHeight="18"/>
<ButtonBar buttonMinWidth="120" buttonOrder="+NY">
@ -44,7 +44,7 @@
</buttons>
</ButtonBar>
</VBox>
<VBox visible="${controller.lookupDatabaseUserPermission}" managed="${controller.lookupDatabaseUserPermission}">
<VBox visible="${controller.askedForLookupDatabasePermission}" managed="${controller.askedForLookupDatabasePermission}">
<FontAwesome5Spinner glyphSize="24" visible="${controller.isLoadingHttpResponse}" managed="${controller.isLoadingHttpResponse}"/>
<VBox visible="${!controller.isLoadingHttpResponse}" managed="${!controller.isLoadingHttpResponse}">
<Label text="%error.existingSolutionDescription" wrapText="true" visible="${controller.errorSolutionFound}" managed="${controller.errorSolutionFound}"/>