Browse Source

Merge pull request #356 from AnnieTheEagle/master

Issue #355 - Fix compatibility with latest Deluge. Also upgrade Gradle.
pull/364/head
Eric Kok 8 years ago committed by GitHub
parent
commit
bc4f442d8b
  1. 3
      app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java
  2. 2
      build.gradle
  3. 4
      gradle/wrapper/gradle-wrapper.properties

3
app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java

@ -71,7 +71,6 @@ import java.io.FileNotFoundException; @@ -71,7 +71,6 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -523,6 +522,7 @@ public class DelugeAdapter implements IDaemonAdapter { @@ -523,6 +522,7 @@ public class DelugeAdapter implements IDaemonAdapter {
// Set POST URL and data
HttpPost httppost = new HttpPost(buildWebUIUrl() + PATH_TO_RPC);
httppost.setHeader("content-type", "application/json");
StringEntity se = new StringEntity(loginRequest.toString());
httppost.setEntity(se);
@ -554,6 +554,7 @@ public class DelugeAdapter implements IDaemonAdapter { @@ -554,6 +554,7 @@ public class DelugeAdapter implements IDaemonAdapter {
// Set POST URL and data
HttpPost httppost = new HttpPost(buildWebUIUrl() + PATH_TO_RPC);
httppost.setHeader("content-type", "application/json");
StringEntity se = new StringEntity(data.toString());
httppost.setEntity(se);

2
build.gradle

@ -3,7 +3,7 @@ buildscript { @@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.0'
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
}
}

4
gradle/wrapper/gradle-wrapper.properties vendored

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
#Wed Jan 20 12:20:00 CET 2016
#Tue Mar 07 21:09:46 GMT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

Loading…
Cancel
Save