import java.util.ArrayList;
import java.util.List;
+import javax.net.ssl.SSLException;
+
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.utils.Image;
import be.nikiroo.utils.Progress;
-import be.nikiroo.utils.StringUtils;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.serial.server.ConnectActionClientObject;
new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- try {
- Object rep = sendCmd(this, new Object[] { "PING" });
+ Object rep = send(new Object[] { "PING" });
- if ("PONG".equals(rep)) {
- result[0] = Status.READY;
- } else {
- result[0] = Status.UNAUTORIZED;
- }
- } catch (IllegalArgumentException e) {
+ if ("PONG".equals(rep)) {
+ result[0] = Status.READY;
+ } else {
result[0] = Status.UNAUTORIZED;
}
}
@Override
protected void onError(Exception e) {
- result[0] = Status.UNAVAILABLE;
+ if (e instanceof SSLException) {
+ result[0] = Status.UNAUTORIZED;
+ } else {
+ result[0] = Status.UNAVAILABLE;
+ }
}
}.connect();
} catch (UnknownHostException e) {
new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- Object rep = sendCmd(this,
- new Object[] { "GET_COVER", luid });
+ Object rep = send(new Object[] { "GET_COVER", luid });
result[0] = (Image) rep;
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (Exception e) {
new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- Object rep = sendCmd(this, new Object[] {
- "GET_CUSTOM_COVER", type, source });
+ Object rep = send(new Object[] { "GET_CUSTOM_COVER", type,
+ source });
result[0] = (Image) rep;
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (Exception e) {
pg = new Progress();
}
- Object rep = sendCmd(this,
- new Object[] { "GET_STORY", luid });
+ Object rep = send(new Object[] { "GET_STORY", luid });
MetaData meta = null;
if (rep instanceof MetaData) {
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (Exception e) {
pg.setMinMax(0, (int) story.getMeta().getWords());
}
- sendCmd(this, new Object[] { "SAVE_STORY", luid });
+ send(new Object[] { "SAVE_STORY", luid });
List<Object> list = RemoteLibraryServer.breakStory(story);
for (Object obj : list) {
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- sendCmd(this, new Object[] { "DELETE_STORY", luid });
+ send(new Object[] { "DELETE_STORY", luid });
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
}
new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- sendCmd(this,
- new Object[] { "SET_COVER", type, value, luid });
+ send(new Object[] { "SET_COVER", type, value, luid });
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (IOException e) {
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
- Object rep = sendCmd(this,
- new Object[] { "IMPORT", url.toString() });
+ Object rep = send(new Object[] { "IMPORT", url.toString() });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (IOException e) {
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
- Object rep = sendCmd(this, new Object[] { "CHANGE_STA",
- luid, newSource, newTitle, newAuthor });
+ Object rep = send(new Object[] { "CHANGE_STA", luid,
+ newSource, newTitle, newAuthor });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {
break;
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (IOException e) {
new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- sendCmd(this, new Object[] { "EXIT" });
+ send(new Object[] { "EXIT" });
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (IOException e) {
pg = new Progress();
}
- Object rep = sendCmd(this, new Object[] { "GET_METADATA",
- luid });
+ Object rep = send(new Object[] { "GET_METADATA", luid });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (Exception e) {
return metas;
}
-
- // IllegalArgumentException if key is bad
- private Object sendCmd(ConnectActionClientObject action, Object[] params)
- throws IOException, NoSuchFieldException, NoSuchMethodException,
- ClassNotFoundException {
- Object rep = action.send(params);
-
- String hash = hashKey(key, "" + rep);
- return action.send(hash);
- }
-
- /**
- * Return a hash that corresponds to the given key and the given random
- * value.
- *
- * @param key
- * the key (the secret)
- *
- * @param random
- * the random value
- *
- * @return a hash that was computed using both
- */
- static String hashKey(String key, String random) {
- return StringUtils.getMd5Hash(key + " <==> " + random);
- }
}