Skip to content

Commit c06e97a

Browse files
committed
new version 0.0.11:
* self signed SSL certificate (issue #1): rename "Ignore" to "Trust" * add FAQ entry
1 parent a793f7a commit c06e97a

8 files changed

Lines changed: 24 additions & 24 deletions

File tree

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818

1919
# FAQ
2020

21-
**Is there any documentation available**
21+
* **Is there any documentation available**
22+
* Not yet
2223

23-
Not yet
24+
* **What does "Sync" means**
25+
* Right, it means "upload". This application will only upload new local images to your remote gallery
2426

25-
26-
**What does "Sync" means**
27-
28-
Right, it means "upload". This application will only upload new local images to your remote gallery
27+
* **Is there any link to [Piwigo Import Tree](http://piwigo.org/doc/doku.php?id=user_documentation:tools:piwigo_import_tree) ?**
28+
* Yes. As of 0.0.x, we try to offer the same level of functionality. Right now, we use the same cache mechanism (upload each local file once based on it's filename)
2929

3030
# Troubleshooting
3131

remotesync-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<parent>
144144
<groupId>piwigo</groupId>
145145
<artifactId>remotesync</artifactId>
146-
<version>0.0.10</version>
146+
<version>0.0.11</version>
147147
<relativePath>../remotesync</relativePath>
148148
</parent>
149149
</project>

remotesync-api/src/main/java/org/piwigo/remotesync/api/IClientConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public interface IClientConfiguration {
2222
public String getProxyUsername();
2323
public String getProxyPassword();
2424

25-
public boolean getIgnoreSelfSignedSSLCertificate();
25+
public boolean getTrustSelfSignedSSLCertificate();
2626

2727
public int getChunkSize();
2828
}

remotesync-api/src/main/java/org/piwigo/remotesync/api/client/WSClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ protected CloseableHttpClient getHttpClient() throws Exception {
180180
requestConfig = RequestConfig.custom().setProxy(proxy).build();
181181
}
182182

183-
if (clientConfiguration.getIgnoreSelfSignedSSLCertificate()) {
183+
if (clientConfiguration.getTrustSelfSignedSSLCertificate()) {
184184
SSLContextBuilder sslContextBuilder = new SSLContextBuilder();
185185
sslContextBuilder.loadTrustMaterial(null, new TrustSelfSignedStrategy());
186186
httpClientBuilder.setSSLSocketFactory(new SSLConnectionSocketFactory(sslContextBuilder.build()));

remotesync-api/src/main/java/org/piwigo/remotesync/api/conf/SyncConfiguration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ public class SyncConfiguration implements ISyncConfiguration {
7171
protected String proxyPassword;
7272

7373
@Element(required = false)
74-
@Option(name = "-isssc", usage = "ignore self signed ssl certificates")
75-
protected String ignoreSelfSignedSSLCertificates = Boolean.FALSE.toString();
74+
@Option(name = "-tsssc", usage = "trust self signed ssl certificates")
75+
protected String trustSelfSignedSSLCertificates = Boolean.FALSE.toString();
7676

7777
@Element(required = false)
7878
@Option(name = "-cs", usage = "chunk size (in Kbytes)")
@@ -177,16 +177,16 @@ public void setProxyPassword(String proxyPassword) {
177177
this.proxyPassword = proxyPassword;
178178
}
179179

180-
public boolean getIgnoreSelfSignedSSLCertificate() {
180+
public boolean getTrustSelfSignedSSLCertificate() {
181181
try {
182-
return Boolean.parseBoolean(ignoreSelfSignedSSLCertificates);
182+
return Boolean.parseBoolean(trustSelfSignedSSLCertificates);
183183
} catch (Exception e) {
184184
return false;
185185
}
186186
}
187187

188-
public void setIgnoreSelfSignedSSLCertificate(String string) {
189-
this.ignoreSelfSignedSSLCertificates = string;
188+
public void setTrustSelfSignedSSLCertificate(String string) {
189+
this.trustSelfSignedSSLCertificates = string;
190190
}
191191

192192
public int getChunkSize() {

remotesync-ui/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>piwigo</groupId>
1919
<artifactId>remotesync-api</artifactId>
20-
<version>0.0.10</version>
20+
<version>0.0.11</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>org.apache.pivot</groupId>
@@ -73,7 +73,7 @@
7373
<parent>
7474
<groupId>piwigo</groupId>
7575
<artifactId>remotesync</artifactId>
76-
<version>0.0.10</version>
76+
<version>0.0.11</version>
7777
<relativePath>../remotesync</relativePath>
7878
</parent>
7979
</project>

remotesync-ui/src/main/java/org/piwigo/remotesync/ui/swing/OptionsUI.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class OptionsUI extends JFrame {
3636
private JTextField proxyLogintextField;
3737
private JTextField proxyPasswordtextField;
3838
private JCheckBox chckbxUseProxy;
39-
private JCheckBox chckbxISSSC;
39+
private JCheckBox chckbxTSSSC;
4040

4141
public static void run(final SyncConfiguration syncConfiguration) {
4242
EventQueue.invokeLater(new Runnable() {
@@ -111,9 +111,9 @@ public void stateChanged(ChangeEvent e) {
111111
contentPane.add(proxyPasswordtextField);
112112
proxyPasswordtextField.setColumns(10);
113113

114-
chckbxISSSC = new JCheckBox("Ignore self signed SSL certificates");
115-
chckbxISSSC.setBounds(8, 170, 300, 23);
116-
contentPane.add(chckbxISSSC);
114+
chckbxTSSSC = new JCheckBox("Trust self signed SSL certificates");
115+
chckbxTSSSC.setBounds(8, 170, 300, 23);
116+
contentPane.add(chckbxTSSSC);
117117

118118
addWindowListener(new WindowAdapter() {
119119
@Override
@@ -124,7 +124,7 @@ public void windowClosing(WindowEvent e) {
124124
syncConfiguration.setProxyPort(proxyPorttextField.getText());
125125
syncConfiguration.setProxyUsername(proxyLogintextField.getText());
126126
syncConfiguration.setProxyPassword(proxyPasswordtextField.getText());
127-
syncConfiguration.setIgnoreSelfSignedSSLCertificate(Boolean.toString(chckbxISSSC.isSelected()));
127+
syncConfiguration.setTrustSelfSignedSSLCertificate(Boolean.toString(chckbxTSSSC.isSelected()));
128128
}
129129

130130
@Override
@@ -135,7 +135,7 @@ public void windowOpened(WindowEvent e) {
135135
proxyPorttextField.setText(syncConfiguration.getProxyPort() + "");
136136
proxyLogintextField.setText(syncConfiguration.getProxyUsername());
137137
proxyPasswordtextField.setText(syncConfiguration.getProxyPassword());
138-
chckbxISSSC.setSelected(syncConfiguration.getIgnoreSelfSignedSSLCertificate());
138+
chckbxTSSSC.setSelected(syncConfiguration.getTrustSelfSignedSSLCertificate());
139139
}
140140

141141
});

remotesync/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<groupId>piwigo</groupId>
1515
<artifactId>remotesync</artifactId>
1616
<name>Piwigo Remote Sync</name>
17-
<version>0.0.10</version>
17+
<version>0.0.11</version>
1818
<packaging>pom</packaging>
1919
<properties>
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

0 commit comments

Comments
 (0)