Skip to content

Commit 837ee65

Browse files
author
ylexus
committed
#28 attempting to make it run on Windows 7 32 bit: correct README and logging
1 parent 8cfd3f3 commit 837ee65

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ For enthusiasts, to build or run from sources:
66
1. Follow [these steps](https://github.com/ylexus/jiotty-photos-uploader/wiki#using-your-own-google-api-client-secret) to generate your own Google API client
77
secret file.
88
2. Install JDK
9-
1. for a desktop, use any JDK version 16 or higher.
9+
1. for a desktop other than Windows 7 32 bit, use any JDK version 16 or higher.
1010
2. for a Raspberry Pi, use Liberica OpenJDK (because it contains RPi-compatible javafx). Go to https://bell-sw.com/pages/downloads/, select version 16 or
1111
higher, 32-bit, Linux, package: Full JDK, and install via `.deb`.
12+
3. for Windows 7 32-bit, use Liberica OpenJDK (because it contains compatible javafx). Go to https://bell-sw.com/pages/downloads/, select version 16 or
13+
higher, 32-bit, Windows, package: Full JDK, download and install.
1214
3. Clone this repository.
1315
4. `cd jiotty-photos-uploader`
1416

app/src/main/java/net/yudichev/googlephotosupload/ui/LoginDialogSimpleController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public final class LoginDialogSimpleController implements LoginDialogController
2020

2121
@Override
2222
public void load(String url) {
23-
logger.info("JavaFX webkit library missing - using system browser to open login URL");
2423
javafxApplicationResourcesProvider.get().hostServices().showDocument(url);
2524
}
2625
}

app/src/main/java/net/yudichev/googlephotosupload/ui/UiAuthorizationBrowser.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import net.yudichev.jiotty.common.app.ApplicationLifecycleControl;
55
import net.yudichev.jiotty.common.inject.BaseLifecycleComponent;
66
import net.yudichev.jiotty.connector.google.common.AuthorizationBrowser;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
79

810
import javax.inject.Inject;
911
import javax.inject.Provider;
@@ -14,6 +16,7 @@
1416
import static javafx.stage.Modality.APPLICATION_MODAL;
1517

1618
final class UiAuthorizationBrowser extends BaseLifecycleComponent implements AuthorizationBrowser {
19+
private static final Logger logger = LoggerFactory.getLogger(UiAuthorizationBrowser.class);
1720
static {
1821
System.setProperty("sun.net.http.allowRestrictedHeaders", "true");
1922
}
@@ -41,12 +44,14 @@ public void browse(String url) {
4144
if (dialog == null) {
4245
if (windows732Bit()) {
4346
// known issue on Windows 7 32 bit - jfxwebkit is not properly working with Google Login dialog (javascript issues)
47+
logger.info("Known issues with jfxwebkit on Windows 7 32 bit - using system browser to open login URL");
4448
dialog = createSimpleLoginDialog();
4549
} else {
4650
try {
4751
dialog = createFullLoginDialog();
4852
} catch (UnsatisfiedLinkError e) {
4953
if (e.getMessage() != null && e.getMessage().contains("jfxwebkit")) {
54+
logger.info("JavaFX webkit library missing - using system browser to open login URL");
5055
dialog = createSimpleLoginDialog();
5156
} else {
5257
throw e;

0 commit comments

Comments
 (0)