From e62f5d9fc4c88458eefd94e4c5a6957f51b749b8 Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Fri, 19 Oct 2012 14:37:13 +0200
Subject: [PATCH] Properly catch old BitComet installed to revert to using HTML
 parsing.

---
 android/AndroidManifest.xml                   |  2 +-
 android/res/values/changelog.xml              |  4 +++-
 .../daemon/BitComet/BitCometAdapter.java      | 21 ++++++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 90578da4..132984af 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -19,7 +19,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.transdroid"
 	android:versionName="1.1.8" 
-	android:versionCode="149"
+	android:versionCode="150"
 	android:installLocation="auto">
 	
 	<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="13" />
diff --git a/android/res/values/changelog.xml b/android/res/values/changelog.xml
index 3542b4a5..a02e8b1e 100644
--- a/android/res/values/changelog.xml
+++ b/android/res/values/changelog.xml
@@ -4,11 +4,13 @@
 Transdroid 1.1.8\n
 - Improved BitComet support, by Sergey\n
 - Fix for non-English KTorrent\n
+- Report Deluge tracker errors\n
+- Sort by date added with uTorrent\n
 \n
 Transdroid 1.1.7\n
 - Transmission and qBittorrent bugfixes\n
 \n
-	Transdroid 1.1.6\n
+Transdroid 1.1.6\n
 - Added BitComet support, by Sergey (SeNS)\n
 - Improved label support, by Alexey Rogovoy\n
 - Added GZipped content support in RSS feeds\n
diff --git a/lib/src/org/transdroid/daemon/BitComet/BitCometAdapter.java b/lib/src/org/transdroid/daemon/BitComet/BitCometAdapter.java
index a4f94b30..732a4e8a 100644
--- a/lib/src/org/transdroid/daemon/BitComet/BitCometAdapter.java
+++ b/lib/src/org/transdroid/daemon/BitComet/BitCometAdapter.java
@@ -101,20 +101,25 @@ public class BitCometAdapter implements IDaemonAdapter {
 				
 				// Request all torrents from server
 				// first, check client for the new AJAX interface (BitComet v.1.34 and up)
-				String result = makeRequest("/panel/task_list_xml");
-				if (result.startsWith("<?xml", 0)) {
-					return new RetrieveTaskSuccessResult((RetrieveTask) task, parseXmlTorrents(result), null);
+				try {
+					String xmlResult = makeRequest("/panel/task_list_xml");
+					if (xmlResult.startsWith("<?xml", 0)) {
+						return new RetrieveTaskSuccessResult((RetrieveTask) task, parseXmlTorrents(xmlResult), null);
+					}
+				} catch (Exception e) {
+					// it's probably an old client, parse HTML instead
+					String htmlResult = makeRequest("/panel/task_list");
+					return new RetrieveTaskSuccessResult((RetrieveTask) task, parseHttpTorrents(htmlResult), null);
 				}
-				// it's old client, parse HTML
-				result = makeRequest("/panel/task_list");
-				return new RetrieveTaskSuccessResult((RetrieveTask) task, parseHttpTorrents(result), null);
 				
 			case GetFileList:
 				
 				// Request files listing for a specific torrent
 				String fhash = ((GetFileListTask)task).getTargetTorrent().getUniqueID();
-				result = makeRequest("/panel/task_detail", new BasicNameValuePair("id", fhash), new BasicNameValuePair("show", "files"));
-				return new GetFileListTaskSuccessResult((GetFileListTask) task, parseHttpTorrentFiles(result, fhash));
+				String fileListResult = makeRequest("/panel/task_detail", new BasicNameValuePair("id", fhash),
+					new BasicNameValuePair("show", "files"));
+				return new GetFileListTaskSuccessResult((GetFileListTask) task, parseHttpTorrentFiles(fileListResult,
+					fhash));
 				
 			case AddByFile: