Merged default branch with Synology support into newui.

README

@@ -20,21 +20,45 @@ along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
 ---
 
 Some code/libraries are used in the project:
-  Base16Encoder (Apache OpenJPA)
-    Marc Prud'hommeaux (Apache License, Version 2.0)
-  MultipartEntity (AOSP)
-    Apache Software Foundation (Apache License, Version 2.0)
+  ActionBarSherlock
+    Jake Wharton
+    Apache License, Version 2.0
+    http://actionbarsherlock.com/
+  AndroidAnnotations
+    Pierre-Yves Ricau (eBusinessInformations) et al.
+    Apache License, Version 2.0
+    http://androidannotations.org/
+  Crouton
+    Code: Benjamin Weiss (Neofonie Mobile Gmbh) et al.
+    Idea: Cyril Mottier
+    Apache License, Version 2.0
+    https://github.com/keyboardsurfer/Crouton
+  Base16Encoder
+    Marc Prud'hommeaux
+    Apache OpenJPA
+    http://openjpa.apache.org/
+  MultipartEntity
+    Apache Software Foundation
+    Apache License, Version 2.0
     http://source.android.com/
   RssParser (learning-android)
-    Tane Piper (Public Domain)
+    Tane Piper
+    Public Domain
     http://github.com/digitalspaghetti/learning-android
   Base64
-    Robert Harder (Public Domain)
+    Robert Harder
+    Public Domain
     http://iharder.net/base64
   android-xmlrpc
-    pskink et al. (Apache License, Version 2.0)
+    pskink et al.
+    Apache License, Version 2.0
     http://code.google.com/p/android-xmlrpc/
   android-ColorPickerPreference
-    Daniel Nilsson and Sergey Margaritov (Apache License, Version 2.0)
+    Daniel Nilsson and Sergey Margaritov
+    Apache License, Version 2.0
     https://github.com/attenzione/android-ColorPickerPreference
+  CheckableRelativeLayout
+    Cédric Caron (MarvinLabs)
+    Public Domain
+    http://www.marvinlabs.com/2010/10/custom-listview-ability-check-items/
 

android/.classpath

@@ -5,5 +5,6 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Transdroid Torrent Connect"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

android/src/org/transdroid/gui/TorrentsFragment.java

@@ -1749,7 +1749,7 @@ public class TorrentsFragment extends SherlockFragment implements IDaemonCallbac
 				
 				// Sort the new list of torrents
 				allTorrents = ((RetrieveTaskSuccessResult) result).getTorrents();
-				Collections.sort(allTorrents, new TorrentsComparator(daemon, sortSetting, sortReversed));
+				Collections.sort(allTorrents, new TorrentsComparator(daemon.getType(), sortSetting, sortReversed));
 
 				// Sort the new list of labels
 				allLabels = ((RetrieveTaskSuccessResult) result).getLabels();
@@ -1936,7 +1936,7 @@ public class TorrentsFragment extends SherlockFragment implements IDaemonCallbac
 		if (!(getTorrentListAdapter() == null || getTorrentListAdapter().getCount() == 0)) {
 			
 			// Sort the shown list of torrents using the new sortBy criteria
-			Collections.sort(allTorrents, new TorrentsComparator(daemon, sortSetting, sortReversed));
+			Collections.sort(allTorrents, new TorrentsComparator(daemon.getType(), sortSetting, sortReversed));
 			updateTorrentsView(true);
 			
 		}

core/.classpath

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="src" path=".apt_generated">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Transdroid Torrent Connect"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

core/.factorypath

@@ -0,0 +1,3 @@
+<factorypath>
+    <factorypathentry kind="WKSPJAR" id="/Transdroid Core/compile-libs/androidannotations-3.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>

core/.project

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Transdroid Core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

core/.settings/org.eclipse.jdt.apt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.genSrcDir=.apt_generated
+org.eclipse.jdt.apt.reconcileEnabled=true

core/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.processAnnotations=enabled

core/AndroidManifest.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="org.transdroid.core"
+	android:versionCode="1"
+	android:versionName="2.0-alpha1" >
+
+	<uses-sdk
+		android:minSdkVersion="7"
+		android:targetSdkVersion="17" />
+
+</manifest>

core/proguard-project.txt

@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

core/project.properties

@@ -0,0 +1,18 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-17
+android.library.reference.1=../external/JakeWharton-ActionBarSherlock/library
+android.library.reference.2=../external/ColorPickerPreference
+android.library=true
+android.library.reference.3=../external/Crouton/library