Browse Source

Allow empty web interface password for Deluge connections. See Google Code issue 495.

pull/13/merge
Eric Kok 11 years ago
parent
commit
aa7dad0993
  1. BIN
      core/libs/transdroid-connect.jar
  2. 1
      lib/src/org/transdroid/daemon/DLinkRouterBT/DLinkRouterBTAdapter.java
  3. 4
      lib/src/org/transdroid/daemon/Deluge/DelugeAdapter.java
  4. 1
      lib/src/org/transdroid/daemon/Ktorrent/KtorrentAdapter.java
  5. 1
      lib/src/org/xmlrpc/android/XMLRPCClient.java

BIN
core/libs/transdroid-connect.jar

Binary file not shown.

1
lib/src/org/transdroid/daemon/DLinkRouterBT/DLinkRouterBTAdapter.java

@ -20,7 +20,6 @@ package org.transdroid.daemon.DLinkRouterBT;
import java.io.File; import java.io.File;
import java.net.URI; import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;

4
lib/src/org/transdroid/daemon/Deluge/DelugeAdapter.java

@ -447,8 +447,8 @@ public class DelugeAdapter implements IDaemonAdapter {
// Build login object // Build login object
String extraPass = settings.getExtraPassword(); String extraPass = settings.getExtraPassword();
if (extraPass == null || extraPass == "") { if (extraPass == null) {
extraPass = settings.getPassword(); extraPass = "";
} }
JSONObject loginRequest = new JSONObject(); JSONObject loginRequest = new JSONObject();
loginRequest.put(RPC_METHOD, RPC_METHOD_LOGIN); loginRequest.put(RPC_METHOD, RPC_METHOD_LOGIN);

1
lib/src/org/transdroid/daemon/Ktorrent/KtorrentAdapter.java

@ -175,6 +175,7 @@ public class KtorrentAdapter implements IDaemonAdapter {
act = "file_stop=" + task.getTargetTorrent().getUniqueID() + "-"; act = "file_stop=" + task.getTargetTorrent().getUniqueID() + "-";
break; break;
case Low: case Low:
case Normal:
act = "file_lp=" + task.getTargetTorrent().getUniqueID() + "-"; act = "file_lp=" + task.getTargetTorrent().getUniqueID() + "-";
break; break;
case High: case High:

1
lib/src/org/xmlrpc/android/XMLRPCClient.java

@ -15,7 +15,6 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.params.HttpParams; import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams; import org.apache.http.params.HttpProtocolParams;
import org.transdroid.daemon.DaemonException; import org.transdroid.daemon.DaemonException;
import org.transdroid.daemon.DaemonMethod;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserFactory; import org.xmlpull.v1.XmlPullParserFactory;
import org.xmlpull.v1.XmlSerializer; import org.xmlpull.v1.XmlSerializer;

Loading…
Cancel
Save