Update jlibtorrent to beta7 and update gradle

se-bastiaan · Oct 22, 2016 · f19e299 · f19e299
1 parent 17c410f
commit f19e299
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/library/build.gradle b/library/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 

diff --git a/library/src/main/java/com/github/se_bastiaan/torrentstream/Torrent.java b/library/src/main/java/com/github/se_bastiaan/torrentstream/Torrent.java
@@ -76,11 +76,13 @@ public Torrent(TorrentHandle torrentHandle, TorrentListener listener, Long prepa
 
         this.prepareSize = prepareSize;
 
-        if (selectedFileIndex == -1)
+        if (selectedFileIndex == -1) {
             setLargestFile();
+        }
 
-        if (this.listener != null)
+        if (this.listener != null) {
             this.listener.onStreamPrepared(this);
+        }
     }
 
     /**

diff --git a/library/src/main/java/com/github/se_bastiaan/torrentstream/TorrentStream.java b/library/src/main/java/com/github/se_bastiaan/torrentstream/TorrentStream.java
@@ -22,6 +22,7 @@
 
 import com.frostwire.jlibtorrent.Priority;
 import com.frostwire.jlibtorrent.SessionManager;
+import com.frostwire.jlibtorrent.SessionParams;
 import com.frostwire.jlibtorrent.SettingsPack;
 import com.frostwire.jlibtorrent.TorrentHandle;
 import com.frostwire.jlibtorrent.TorrentInfo;
@@ -45,6 +46,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.CountDownLatch;
 
 public final class TorrentStream {
@@ -414,7 +416,7 @@ public void setOptions(TorrentOptions options) {
             .activeDhtLimit(torrentOptions.maxDht);
 
         if (torrentOptions.listeningPort != -1) {
-            String ifStr = String.format("%s:%d", "0.0.0.0", torrentOptions.listeningPort);
+            String ifStr = String.format(Locale.ENGLISH, "%s:%d", "0.0.0.0", torrentOptions.listeningPort);
             settingsPack.setString(settings_pack.string_types.listen_interfaces.swigValue(), ifStr);
         }
 
@@ -433,7 +435,8 @@ public void setOptions(TorrentOptions options) {
         }
 
         if (!torrentSession.isRunning()) {
-            torrentSession.start(settingsPack);
+            SessionParams sessionParams = new SessionParams(settingsPack);
+            torrentSession.start(sessionParams);
         } else {
             torrentSession.applySettings(settingsPack);
         }