Browse Source

Prevent crash when connecting to an Rtorrent client with a space in host name or SCGI mount folder. Fixes #296.

pull/311/head
Eric Kok 9 years ago
parent
commit
429d045274
  1. 9
      app/src/main/java/org/transdroid/daemon/Rtorrent/RtorrentAdapter.java

9
app/src/main/java/org/transdroid/daemon/Rtorrent/RtorrentAdapter.java

@ -17,6 +17,8 @@
*/ */
package org.transdroid.daemon.Rtorrent; package org.transdroid.daemon.Rtorrent;
import android.text.TextUtils;
import org.transdroid.core.gui.log.Log; import org.transdroid.core.gui.log.Log;
import org.transdroid.daemon.Daemon; import org.transdroid.daemon.Daemon;
import org.transdroid.daemon.DaemonException; import org.transdroid.daemon.DaemonException;
@ -367,9 +369,10 @@ public class RtorrentAdapter implements IDaemonAdapter {
* @return The URL of the RPC API * @return The URL of the RPC API
*/ */
private String buildWebUIUrl() { private String buildWebUIUrl() {
return (settings.getSsl() ? "https://" : "http://") + settings.getAddress() + ":" + settings.getPort() + String address = settings.getAddress() == null ? "" : settings.getAddress().trim();
(settings.getFolder() == null || settings.getFolder().equals("") ? DEFAULT_RPC_URL : String folder = settings.getFolder() == null ? "" : settings.getFolder().trim();
settings.getFolder()); return (settings.getSsl() ? "https://" : "http://") + address + ":" + settings.getPort() +
(TextUtils.isEmpty(folder) ? DEFAULT_RPC_URL : folder);
} }
private List<Torrent> onTorrentsRetrieved(Object response) throws DaemonException { private List<Torrent> onTorrentsRetrieved(Object response) throws DaemonException {

Loading…
Cancel
Save