Merge branch 'newui', which is Transdroid 2 and includes the new core (UI project), full and lite versions of the app.

README

@@ -20,21 +20,49 @@ 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
+  BetterPickers
+    Derek Brameyer
+    Apache License, Version 2.0
+    https://github.com/derekbrameyer/android-betterpickers
+  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,6 +5,6 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Transdroid Torrent Connect"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

android/src/com/xirvik/transdroid/preferences/PreferencesXirvikServer.java

@@ -230,7 +230,7 @@ public class PreferencesXirvikServer extends PreferenceActivity {
 						String url = "https://" + serverValue + ":443/browsers_addons/transdroid_autoconf.txt";
 						HttpResponse request = httpclient.execute(new HttpGet(url));
 						InputStream stream = request.getEntity().getContent();
-						String folderVal = HttpHelper.ConvertStreamToString(stream).trim();
+						String folderVal = HttpHelper.convertStreamToString(stream).trim();
 						if (folderVal.startsWith("<?xml")) {
 							folderVal = null;
 						}

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);
 			
 		}

android/src/org/transdroid/preferences/ImportExport.java

@@ -33,7 +33,7 @@ public class ImportExport {
 		Editor editor = prefs.edit();
 
 		// Read the settings file
-		String raw = HttpHelper.ConvertStreamToString(new FileInputStream(settingsFile));
+		String raw = HttpHelper.convertStreamToString(new FileInputStream(settingsFile));
 		JSONObject json = new JSONObject(raw);
 		
 		if (json.has("servers")) {

android/src/org/transdroid/search/barcode/GoogleWebSearchBarcodeResolver.java

@@ -53,7 +53,7 @@ public abstract class GoogleWebSearchBarcodeResolver  extends AsyncTask<String,
 			HttpGet httpget = new HttpGet(callUrl);
 			HttpResponse response = httpclient.execute(httpget);
 	        InputStream instream = response.getEntity().getContent();
-	        String result = HttpHelper.ConvertStreamToString(instream);
+	        String result = HttpHelper.convertStreamToString(instream);
 			JSONArray results = new JSONObject(result).getJSONObject("responseData").getJSONArray("results");
 			
 			// We will combine and filter multiple results, if there are any

android/src/org/transdroid/service/UpdateService.java

@@ -134,7 +134,7 @@ public class UpdateService extends IntentService {
 		// Retrieve what is the latest released app version
 		HttpResponse request = httpclient.execute(new HttpGet(url));
 		InputStream stream = request.getEntity().getContent();
-		String appVersion[] = HttpHelper.ConvertStreamToString(stream).split("\\|");
+		String appVersion[] = HttpHelper.convertStreamToString(stream).split("\\|");
 		stream.close();
 		return appVersion;
 

core/.classpath

@@ -0,0 +1,14 @@
+<?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 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="3"
+	android:versionName="2.0-alpha3" >
+
+	<uses-sdk
+		android:minSdkVersion="7"
+		android:targetSdkVersion="18" />
+
+</manifest>

core/build.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="TransdroidCore" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

core/custom_rules.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="custom_rules">
+
+    <!-- Enable AndroidAnnotations, see https://github.com/excilys/androidannotations/wiki/Building-Project-Ant -->
+    <property name="generated.dir" value=".apt_generated" />
+    <property name="generated.absolute.dir" location="${generated.dir}" />
+    <property name="java.compilerargs" value="-s &apos;${generated.absolute.dir}&apos;" />
+    
+    <target name="-pre-compile">
+      <mkdir dir="${generated.absolute.dir}" />
+    </target>
+    
+    <!-- copied (and modified) from $ANDROID_SDK_ROOT$/tools/ant/build.xml -->
+    <target name="-compile" depends="-build-setup, -pre-build, -code-gen, -pre-compile">
+        <do-only-if-manifest-hasCode elseText="hasCode = false. Skipping...">
+            <!-- merge the project's own classpath and the tested project's classpath -->
+            <path id="project.javac.classpath">
+                <fileset dir="compile-libs" includes="*.jar"/>
+                <path refid="project.all.jars.path" />
+                <path refid="tested.project.classpath" />
+            </path>
+            <javac encoding="${java.encoding}"
+                    source="${java.source}" target="${java.target}"
+                    debug="true" extdirs="" includeantruntime="false"
+                    destdir="${out.classes.absolute.dir}"
+                    bootclasspathref="project.target.class.path"
+                    verbose="${verbose}"
+                    classpathref="project.javac.classpath"
+                    fork="${need.javac.fork}">
+                <src path="${source.absolute.dir}" />
+                <src path="${gen.absolute.dir}" />
+                <compilerarg line="${java.compilerargs}" />
+            </javac>
+
+            <!-- if the project is instrumented, intrument the classes -->
+            <if condition="${build.is.instrumented}">
+                <then>
+                    <echo level="info">Instrumenting classes from ${out.absolute.dir}/classes...</echo>
+
+                    <!-- build the filter to remove R, Manifest, BuildConfig -->
+                    <getemmafilter
+                            appPackage="${project.app.package}"
+                            libraryPackagesRefId="project.library.packages"
+                            filterOut="emma.default.filter"/>
+
+                    <!-- define where the .em file is going. This may have been
+                         setup already if this is a library -->
+                    <property name="emma.coverage.absolute.file" location="${out.absolute.dir}/coverage.em" />
+
+                    <!-- It only instruments class files, not any external libs -->
+                    <emma enabled="true">
+                        <instr verbosity="${verbosity}"
+                               mode="overwrite"
+                               instrpath="${out.absolute.dir}/classes"
+                               outdir="${out.absolute.dir}/classes"
+                               metadatafile="${emma.coverage.absolute.file}">
+                            <filter excludes="${emma.default.filter}" />
+                            <filter value="${emma.filter}" />
+                        </instr>
+                    </emma>
+                </then>
+            </if>
+
+            <!-- if the project is a library then we generate a jar file -->
+            <if condition="${project.is.library}">
+                <then>
+                    <echo level="info">Creating library output jar file...</echo>
+                    <property name="out.library.jar.file" location="${out.absolute.dir}/classes.jar" />
+                    <if>
+                        <condition>
+                            <length string="${android.package.excludes}" trim="true" when="greater" length="0" />
+                        </condition>
+                        <then>
+                            <echo level="info">Custom jar packaging exclusion: ${android.package.excludes}</echo>
+                        </then>
+                    </if>
+
+                    <propertybyreplace name="project.app.package.path" input="${project.app.package}" replace="." with="/" />
+
+                    <jar destfile="${out.library.jar.file}">
+                        <fileset dir="${out.classes.absolute.dir}"
+                                includes="**/*.class"
+                                excludes="${project.app.package.path}/R.class ${project.app.package.path}/R$*.class ${project.app.package.path}/Manifest.class ${project.app.package.path}/Manifest$*.class ${project.app.package.path}/BuildConfig.class"/>
+                        <fileset dir="${source.absolute.dir}" excludes="**/*.java ${android.package.excludes}" />
+                    </jar>
+                </then>
+            </if>
+
+        </do-only-if-manifest-hasCode>
+    </target>
+    
+</project>

core/local.properties

@@ -0,0 +1,10 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=/home/eric/Dev/android-sdk

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-18
+android.library.reference.1=../external/JakeWharton-ActionBarSherlock/library
+android.library.reference.2=../external/ColorPickerPreference
+android.library=true
+android.library.reference.3=../external/Crouton/library