From fe33de2a594e0de2eaf90160e275776decde61de Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Thu, 15 May 2014 12:10:40 +0200
Subject: [PATCH] Preparing 2.1.4 release.

---
 core/AndroidManifest.xml                  |  4 ++--
 core/res/values/changelog.xml             | 13 +++++++++++++
 full/AndroidManifest.xml                  |  4 ++--
 lib/src/org/transdroid/daemon/Daemon.java |  6 +++++-
 lite/AndroidManifest.xml                  |  4 ++--
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/core/AndroidManifest.xml b/core/AndroidManifest.xml
index 80f1f5a8..da080d1c 100644
--- a/core/AndroidManifest.xml
+++ b/core/AndroidManifest.xml
@@ -17,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.transdroid.core"
-	android:versionCode="212"
-	android:versionName="2.1.3" >
+	android:versionCode="213"
+	android:versionName="2.1.4" >
 
 	<uses-sdk
 		android:minSdkVersion="7"
diff --git a/core/res/values/changelog.xml b/core/res/values/changelog.xml
index ea548002..6cb6f613 100644
--- a/core/res/values/changelog.xml
+++ b/core/res/values/changelog.xml
@@ -17,6 +17,19 @@
 -->
 <resources>
 <string name="system_changelog">
+Transdroid 2.1.4\n
+- Show separate seeders and leechers counts\n
+- qBittorrent 2.1.8+ fixes\n
+- Xirvik shared seedbox support\n
+- Remember the last-used filter (label or status type) between sessions\n
+- Fixes label support and other small issues\n
+\n
+Transdroid 2.1.3\n
+- Support for new Torrent Search\'s private sites\n
+- Added optional auto refresh\n
+- Allow larger .torrent file uploads with rTorrent\n
+- Fix setting download location with Transmission\n
+\n
 Transdroid 2.1.2\n
 - Fixed labeling from details screen\n
 - Fixed qBittorrent support\n
diff --git a/full/AndroidManifest.xml b/full/AndroidManifest.xml
index 6c12674c..2337b8a0 100644
--- a/full/AndroidManifest.xml
+++ b/full/AndroidManifest.xml
@@ -18,8 +18,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	package="org.transdroid.full"
-	android:versionCode="212"
-	android:versionName="2.1.3" >
+	android:versionCode="213"
+	android:versionName="2.1.4" >
 
 	<uses-sdk
 		android:minSdkVersion="7"
diff --git a/lib/src/org/transdroid/daemon/Daemon.java b/lib/src/org/transdroid/daemon/Daemon.java
index 3c1572f7..e6369b76 100644
--- a/lib/src/org/transdroid/daemon/Daemon.java
+++ b/lib/src/org/transdroid/daemon/Daemon.java
@@ -241,7 +241,11 @@ public static int getDefaultPortNumber(Daemon type, boolean ssl) {
         case Deluge:
         	return 8112;
         case Synology:
-            return 5000;
+        	if (ssl) {
+        		return 5001;
+        	} else {
+        		return 5000;
+        	}
         case Transmission:
         	return 9091;
         case Bitflu:
diff --git a/lite/AndroidManifest.xml b/lite/AndroidManifest.xml
index bbe74338..a6c3b44b 100644
--- a/lite/AndroidManifest.xml
+++ b/lite/AndroidManifest.xml
@@ -18,8 +18,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	package="org.transdroid.lite"
-	android:versionCode="212"
-	android:versionName="2.1.3" >
+	android:versionCode="213"
+	android:versionName="2.1.4" >
 
 	<uses-sdk
 		android:minSdkVersion="7"