From 2001602fad7b897f38625445f84e1a0435389f54 Mon Sep 17 00:00:00 2001
From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Sun, 20 Sep 2009 22:00:37 +0000
Subject: [PATCH] OI Safe: overhauled how listadapter is updated in
 CategoryList and PassList.  fillData now checks to for existing thread.
 Swiped build.xml from DroidSpray and updated accordingly.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@2306 72b678ce-9140-0410-bee8-679b907dd61a
---
 build.xml                                   | 634 +++++++++++---------
 res/values/strings.xml                      |   1 +
 src/org/openintents/safe/AskPassword.java   |   2 +-
 src/org/openintents/safe/CategoryList.java  |  14 +-
 src/org/openintents/safe/FrontDoor.java     |   2 +-
 src/org/openintents/safe/IntentHandler.java |   2 +-
 src/org/openintents/safe/PassList.java      |  36 +-
 src/org/openintents/safe/PassView.java      |   2 +-
 src/org/openintents/safe/Search.java        |  23 +-
 9 files changed, 413 insertions(+), 303 deletions(-)

diff --git a/build.xml b/build.xml
index 0b5b41e..103b63a 100644
--- a/build.xml
+++ b/build.xml
@@ -5,87 +5,118 @@
 	developers must have there own copy with the following entries
 proguard.jar=d:\\extern\\proguard4.2\\proguard4.2\\lib\\proguard.jar
 storepass=*password of keystore*
--->
+-->	 
 	<property file="build-private.properties" />
 
 	<!-- Read properties from OpenIntents property file -->
 	<property file="build.properties" />
 	<!-- <property file="${build.properties.dir}/build.properties" /> -->
+	
+<!-- 1.5 Changes START -->
+    <!-- Custom Android task to deal with the project target, and import the proper rules.
+         This requires ant 1.6.0 or above. -->
+    <path id="android.antlibs">
+        <pathelement path="${sdk-location}/tools/lib/anttasks.jar" />
+        <pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
+        <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
+        <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
+        <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
+    </path>
+
+<!-- 1.5 Changes END -->
 
 	<!-- Read manifest properties , e.g. manifest(android:versionName) or manifest.package -->
 	<xmlproperty file="AndroidManifest.xml" />
 
 	<!-- Path to Android SDK and tools -->
-	<property name="sdk-folder" value="${android.sdk}" />
-	<property name="android-tools" value="${sdk-folder}/tools" />
+	<property name="sdk-folder" value="${android.sdk}/platforms/${platform}" />
+	<property name="platform-tools" value="${sdk-folder}/tools" />
+	<property name="android-tools" value="${android.sdk}/tools" />
 	<echo>Using Android SDK directory ${sdk-folder}</echo>
-
+	
 	<!-- Application Package Name -->
 	<property name="application-package" value="${manifest(package)}" />
 	<property name="version" value="${manifest(android:versionName)}" />
 
-	<!-- The intermediates directory -->
-	<!-- Eclipse uses "bin" for its own output, so we do the same. -->
-	<property name="outdir" value="bin" />
-
+    <!-- The intermediates directory -->
+    <!-- Eclipse uses "bin" for its own output, so we do the same. -->
+    <property name="outdir" value="bin" />
+	
 	<!-- OpenIntents library file -->
 	<property name="openintents-lib-jar" value="lib/openintents-lib.jar" />
 
-	<!-- No user servicable parts below. -->
+    <!-- No user servicable parts below. -->
 
-	<property name="android-framework" value="${android-tools}/lib/framework.aidl" />
+	<property name="android-framework" value="${sdk-location}/platforms/${platform}/framework.aidl" />
 
 	<!-- Input directories -->
-	<property name="resource-dir" value="res" />
-	<property name="asset-dir" value="assets" />
-	<property name="srcdir" value="src" />
-	<condition property="srcdir-ospath" value="${basedir}\${srcdir}" else="${basedir}/${srcdir}">
-		<os family="windows" />
+    <property name="resource-dir" value="res" />
+    <property name="asset-dir" value="assets" />
+    <property name="srcdir" value="src" />
+	<condition property="srcdir-ospath"
+	        value="${basedir}\${srcdir}"
+	        else="${basedir}/${srcdir}" >
+	    <os family="windows"/>
 	</condition>
 
 	<property name="external-libs" value="lib" />
-	<condition property="external-libs-ospath" value="${basedir}\${external-libs}" else="${basedir}/${external-libs}">
-		<os family="windows" />
-	</condition>
-
-	<!-- Output directories -->
-	<property name="outdir-classes" value="${outdir}/classes" />
-	<condition property="outdir-classes-ospath" value="${basedir}\${outdir-classes}" else="${basedir}/${outdir-classes}">
-		<os family="windows" />
+	<condition property="external-libs-ospath"
+	        value="${basedir}\${external-libs}"
+	        else="${basedir}/${external-libs}" >
+	    <os family="windows"/>
+	</condition>
+	<property name="googlemaps" value="${sdk-location}/add-ons/google_apis-3/libs" />
+	
+    <!-- Output directories -->
+    <property name="outdir-classes" value="${outdir}/classes" />
+	<condition property="outdir-classes-ospath"
+	        value="${basedir}\${outdir-classes}"
+	        else="${basedir}/${outdir-classes}" >
+	    <os family="windows"/>
 	</condition>
-
+		
 	<property name="docdir" value="doc" />
 	<property name="releasedir" value="release" />
-
-	<!-- Create R.java in the source directory -->
-	<property name="outdir-r" value="src" />
-
-	<!-- Intermediate files -->
-	<property name="dex-file" value="classes.dex" />
-	<property name="intermediate-dex" value="${outdir}/${dex-file}" />
-	<condition property="intermediate-dex-ospath" value="${basedir}\${intermediate-dex}" else="${basedir}/${intermediate-dex}">
-		<os family="windows" />
-	</condition>
-
-	<!-- The final package file to generate -->
-	<property name="resources-package" value="${outdir}/${ant.project.name}.ap_" />
-	<condition property="resources-package-ospath" value="${basedir}\${resources-package}" else="${basedir}/${resources-package}">
-		<os family="windows" />
-	</condition>
-
-	<property name="out-debug-package" value="${outdir}/${ant.project.name}.apk" />
-	<condition property="out-debug-package-ospath" value="${basedir}\${out-debug-package}" else="${basedir}/${out-debug-package}">
-		<os family="windows" />
-	</condition>
-
-	<property name="out-unsigned-package" value="${outdir}/${ant.project.name}-unsigned.apk" />
-	<condition property="out-unsigned-package-ospath" value="${basedir}\${out-unsigned-package}" else="${basedir}/${out-unsigned-package}">
-		<os family="windows" />
-	</condition>
-
+    
+    <!-- Create R.java in the source directory -->
+    <property name="outdir-r" value="gen" />
+
+    <!-- Intermediate files -->
+    <property name="dex-file" value="classes.dex" />
+    <property name="intermediate-dex" value="${outdir}/${dex-file}" />
+    <condition property="intermediate-dex-ospath"
+            value="${basedir}\${intermediate-dex}"
+            else="${basedir}/${intermediate-dex}" >
+        <os family="windows"/>
+    </condition>
+
+    <!-- The final package file to generate -->
+    <property name="resources-package" value="${outdir}/${ant.project.name}.ap_" />
+    <condition property="resources-package-ospath"
+            value="${basedir}\${resources-package}"
+            else="${basedir}/${resources-package}" >
+        <os family="windows"/>
+    </condition>
+
+    <property name="out-debug-package" value="${outdir}/${ant.project.name}.apk" />
+    <condition property="out-debug-package-ospath"
+            value="${basedir}\${out-debug-package}"
+            else="${basedir}/${out-debug-package}" >
+        <os family="windows"/>
+    </condition>
+
+    <property name="out-unsigned-package" value="${outdir}/${ant.project.name}-unsigned.apk" />
+    <condition property="out-unsigned-package-ospath"
+            value="${basedir}\${out-unsigned-package}"
+            else="${basedir}/${out-unsigned-package}" >
+        <os family="windows"/>
+    </condition>
+	
 	<property name="out-signed-package" value="${outdir}/${ant.project.name}-${version}.apk" />
-	<condition property="out-signed-package-ospath" value="${basedir}\${out-signed-package}" else="${basedir}/${out-signed-package}">
-		<os family="windows" />
+	<condition property="out-signed-package-ospath"
+	            value="${basedir}\${out-signed-package}"
+	            else="${basedir}/${out-signed-package}" >
+	        <os family="windows"/>
 	</condition>
 
 	<property name="out-release-source" value="${releasedir}/${ant.project.name}-source-${version}" />
@@ -94,248 +125,282 @@ storepass=*password of keystore*
 	            else="${basedir}/${out-release-source}" >
 	        <os family="windows"/>
 	</condition>
-
-	<!-- Tools -->
-	<condition property="aapt" value="${android-tools}/aapt.exe" else="${android-tools}/aapt">
-		<os family="windows" />
-	</condition>
-	<condition property="aidl" value="${android-tools}/aidl.exe" else="${android-tools}/aidl">
-		<os family="windows" />
-	</condition>
-	<condition property="adb" value="${android-tools}/adb.exe" else="${android-tools}/adb">
-		<os family="windows" />
-	</condition>
-	<condition property="dx" value="${android-tools}/dx.bat" else="${android-tools}/dx">
-		<os family="windows" />
-	</condition>
-	<condition property="apk-builder" value="${android-tools}/apkbuilder.bat" else="${android-tools}/apkbuilder">
-		<os family="windows" />
+	
+    <!-- Tools -->
+    <condition property="aapt" value="${platform-tools}/aapt.exe" else="${platform-tools}/aapt" >
+        <os family="windows"/>
+    </condition>
+    <condition property="aidl" value="${platform-tools}/aidl.exe" else="${platform-tools}/aidl" >
+        <os family="windows"/>
+    </condition>
+    <condition property="adb" value="${android-tools}/adb.exe" else="${android-tools}/adb" >
+        <os family="windows"/>
+    </condition>
+    <condition property="dx" value="${platform-tools}/dx.bat" else="${platform-tools}/dx" >
+        <os family="windows"/>
+    </condition>
+    <condition property="apk-builder" value="${android-tools}/apkbuilder.bat" else="${android-tools}/apkbuilder" >
+        <os family="windows"/>
+    </condition>
+	
+	<condition property="apk-builder" value="${android-tools}/apkbuilder.bat" else="${android-tools}/apkbuilder" >
+	       <os family="windows"/>
 	</condition>
 
-	<condition property="apk-builder" value="${android-tools}/apkbuilder.bat" else="${android-tools}/apkbuilder">
-		<os family="windows" />
-	</condition>
 
-	<condition property="android-jar" value="${sdk-folder}\android.jar" else="${sdk-folder}/android.jar">
-		<os family="windows" />
+	<condition property="android-jar" 
+		value="${sdk-folder}\android.jar" 
+		else="${sdk-folder}/android.jar" >
+		<os family="windows"/>
 	</condition>
 
-	<!-- Rules -->
-
-	<!-- Create the output directories if they don't exist yet. -->
-	<target name="dirs">
-		<mkdir dir="${outdir}" />
-		<delete dir="${outdir-classes}" />
-		<mkdir dir="${outdir-classes}" />
-	</target>
+    <!-- Rules -->
+    <!-- Custom tasks -->
+<!-- 1.5 Changes START -->
+<!--    <taskdef name="setup"
+        classname="com.android.ant.SetupTask"
+        classpathref="android.antlibs"/>
+	<setup import="false" />
+-->
+    <taskdef name="aaptexec"
+        classname="com.android.ant.AaptExecLoopTask"
+        classpathref="android.antlibs"/>
+
+    <taskdef name="apkbuilder"
+        classname="com.android.ant.ApkBuilderTask"
+        classpathref="android.antlibs"/>
+		
+<!-- 1.5 Changes END -->
+
+
+		<!-- Create the output directories if they don't exist yet. -->
+    <target name="dirs">
+        <mkdir dir="${outdir}" />
+    	<delete dir="${outdir-classes}"/>
+        <mkdir dir="${outdir-classes}" />
+    </target>
 
 	<target name="clear_layout">
 		<echo>purging .bak files </echo>
 		<delete>
-			<fileset dir="." includes="**/*.bak" />
+			<fileset dir="." includes="**/*.bak"/>
 		</delete>
 	</target>
+	
+    <!-- Generate the R.java file for this project's resources. -->
+    <target name="resource-src" depends="dirs">
+        <echo>Generating R.java / Manifest.java from the resources...</echo>
+        <exec executable="${aapt}" failonerror="true">
+            <arg value="package" />
+            <arg value="-m" />
+            <arg value="-J" />
+            <arg value="${outdir-r}" />
+            <arg value="-M" />
+            <arg value="AndroidManifest.xml" />
+            <arg value="-S" />
+            <arg value="${resource-dir}" />
+            <arg value="-I" />
+            <arg value="${android-jar}" />
+        </exec>
+    </target>
 
-	<!-- Generate the R.java file for this project's resources. -->
-	<target name="resource-src" depends="dirs">
-		<echo>Generating R.java / Manifest.java from the resources...</echo>
-		<exec executable="${aapt}" failonerror="true">
-			<arg value="package" />
-			<arg value="-m" />
-			<arg value="-J" />
-			<arg value="${outdir-r}" />
-			<arg value="-M" />
-			<arg value="AndroidManifest.xml" />
-			<arg value="-S" />
-			<arg value="${resource-dir}" />
-			<arg value="-I" />
-			<arg value="${android-jar}" />
-		</exec>
-	</target>
-
-	<!-- Generate java classes from .aidl files. -->
-	<target name="aidl" depends="dirs">
-		<echo>Compiling aidl files into Java classes...</echo>
-		<apply executable="${aidl}" failonerror="true">
-			<arg value="-p${android-framework}" />
-			<arg value="-I${srcdir}" />
-			<fileset dir="${srcdir}">
-				<include name="**/*.aidl" />
-			</fileset>
-		</apply>
-	</target>
-
-	<!-- Compile this project's .java files into .class files. -->
-	<target name="compile" depends="dirs, resource-src, aidl">
-		<javac encoding="ascii" target="1.5" debug="true" extdirs="" srcdir="." destdir="${outdir-classes}" bootclasspath="${android-jar}">
-        	<exclude name="gen/**" /> <!-- SDK 1.5: backward compatibility with SDK 1.1 -->
-			<classpath>
-				<fileset dir="${external-libs}" includes="*.jar" />
-			</classpath>
-		</javac>
-	</target>
+    <!-- Generate java classes from .aidl files. -->
+    <target name="aidl" depends="dirs">
+        <echo>Compiling aidl files into Java classes...</echo>
+        <apply executable="${aidl}" failonerror="true">
+            <arg value="-p${android-framework}" />
+           <arg value="-I${srcdir}" />
+            <arg value="-o${outdir-r}" />
+            <fileset dir="${srcdir}">
+                <include name="**/*.aidl"/>
+            </fileset>
+        </apply>
+    </target>
 
+    <!-- Compile this project's .java files into .class files. -->
+    <target name="compile" depends="dirs,clear_layout, resource-src, aidl">
+		<echo>using sdk --|${android-jar}|--</echo>
+		
+        <javac encoding="ascii" target="1.5" debug="true" extdirs=""
+                
+                destdir="${outdir-classes}"
+                bootclasspath="${android-jar}">
+        	<src path="."/>
+        	<src path="./gen"/>
+            <classpath>
+                <fileset dir="${external-libs}" includes="*.jar"/>
+               <fileset dir="${googlemaps}" includes="*.jar"/>
+            </classpath>
+         </javac>
+    </target>
+	
 
-	<target name="optimize" depends="compile">
-		<!-- unless="debug" -->
-		<jar basedir="${outdir-classes}" destfile="temp.jar" />
-		<java jar="${proguard.jar}" fork="true" failonerror="true">
-			<!-- <jvmarg value="-Dmaximum.inlined.code.length=32"/> -->
-			<arg value="-injars temp.jar" />
-			<arg value="-outjars optimized.jar" />
-			<arg value="-libraryjars '${android-jar}'" />
-			<!-- <arg value="-dontpreverify"/> -->
-			<!-- <arg value="-dontobfuscate"/> -->
-			<arg value="-printmapping obfuscated.txt" />
-			<arg value="-printusage obfuscated_deadcode.txt" />
-			<arg value="-dontusemixedcaseclassnames" />
-			<arg value="-dontoptimize" />
-			<arg value="-dontshrink" />
-			<arg value="-keep public class org.openintents.news.channels.SearchSuggestionProvider" />
-			<arg value="-keep public class org.openintents.news.NewsProvider" />
-			<arg value="-keep public class org.openintents.news.reader.Newsreader" />
-			<arg value="-keep public class org.openintents.news.reader.EulaActivity" />
-			<arg value="-keep public class org.openintents.news.help.PreselectedChannelsActivity" />
-			<arg value="-keep public class org.openintents.news.channels.ChannelSettings" />
-			<arg value="-keep public class org.openintents.news.services.NewsServiceSettings" />
-			<arg value="-keep public class org.openintents.news.messages.AFeedMessages" />
-			<arg value="-keep public class org.openintents.news.channels.ChannelSettings" />
-			<arg value="-keep public class org.openintents.news.channels.ActionSpinner" />
-			<arg value="-keep public class org.openintents.news.categories.AddCategoryActivity" />
-			<arg value="-keep public class org.openintents.news.categories.CategoriesListActivity" />
-			<arg value="-keep public class org.openintents.news.channels.ChannelListView" />
-			<arg value="-keep public class org.openintents.news.About" />
-			<arg value="-keep public class org.openintents.lib.ConfirmDialogPreference" />
-			<arg value="-keep public class org.openintents.news.services.AutostartService" />
-			<arg value="-keep public class org.openintents.news.services.RoamingWatcher" />
-			<arg value="-keep public class org.openintents.news.services.NewsreaderService" />
-
-			<!-- <arg value="-optimizationpasses 7"/> -->
-			<!-- <arg value="-overloadaggressively"/> -->
-			<arg value="-verbose" />
-		</java>
-		<delete file="temp.jar" />
-		<delete dir="${outdir-classes}" />
-		<mkdir dir="${outdir-classes}" />
-		<unzip src="optimized.jar" dest="${outdir-classes}" />
-		<!-- <delete file="optimized.jar"/> -->
-	</target>
 
+	  <target name="optimize" depends="compile"> <!-- unless="debug" -->
+	  	<mkdir dir="tmp" />
+	  	<jar basedir="${outdir-classes}" destfile="tmp/temp.jar"/>
+	    <java jar="${proguard.jar}" fork="true" failonerror="true">
+	     <!-- <jvmarg value="-Dmaximum.inlined.code.length=32"/> -->
+	     <arg value="-injars tmp/temp.jar"/>
+	     <arg value="-outjars tmp/optimized.jar"/>
+	     <arg value="-libraryjars '${android-jar}'"/>
+	     <!-- <arg value="-dontpreverify"/> -->
+	     <!-- <arg value="-dontobfuscate"/> -->
+	     <arg value="-printmapping tmp/obfuscated.txt"/>
+	     <arg value="-printusage tmp/obfuscated_deadcode.txt"/>
+	     <arg value="-dontusemixedcaseclassnames"/>
+	     <arg value="-dontoptimize"/>
+	     <arg value="-dontshrink"/>
+	     <arg value="-keep public class org.openintents.flashlight.ColorPickerActivity"/>
+	     <arg value="-keep public class org.openintents.flashlight.Flashlight"/>
+	     <arg value="-keep public class android.content.BroadcastReceiver"/>
+	     <arg value="-keep public class org.openintents.widget.ColorCircle"/>
+	     <arg value="-keep public class org.openintents.widget.ColorSlider"/>
+		 <arg value="-keep public class org.openintents.distribution.EulaActivity"/>
+		 <arg value="-keep public class org.openintents.distribution.AboutActivity"/>
+	    	 <!-- <arg value="-keep public class org.openintents.splashplay.widget.LazyLinearLayout {
+	    	 	public LazyLinearLayout(android.content.Context,android.util.AttributeSet);
+	    		 public LazyLinearLayout(android.content.Context);
+	    		 }" /> -->
+	    	 	
+	     <!-- <arg value="-optimizationpasses 7"/> -->
+	     <!-- <arg value="-overloadaggressively"/> -->
+	     <arg value="-verbose"/>
+	   </java>
+	   <delete file="tmp/temp.jar"/>
+	   <delete dir="${outdir-classes}"/>
+	   <mkdir dir="${outdir-classes}"/>
+	   <unzip src="tmp/optimized.jar" dest="${outdir-classes}"/>
+	   <delete file="tmp/optimized.jar"/>
+	  </target>
+
+
+    <!-- Convert this project's .class files into .dex files. currently no optimization add >>,optimize<< to depends attr -->
+    <target name="dex" depends="compile">
+        <echo>Converting compiled files and external libraries into ${outdir}/${dex-file}...</echo>
+        <apply executable="${dx}" failonerror="true" parallel="true">
+            <arg value="--dex" />
+            <arg value="--output=${intermediate-dex-ospath}" />
+            <arg path="${outdir-classes-ospath}" />
+            <fileset dir="${external-libs}" includes="*.jar"/>
+        </apply>
+    </target>
 
-	<!-- Convert this project's .class files into .dex files. -->
-	<target name="dex" depends="compile">
-		<echo>Converting compiled files and external libraries into ${outdir}/${dex-file}...</echo>
-		<apply executable="${dx}" failonerror="true" parallel="true">
-			<arg value="--dex" />
-			<arg value="--output=${intermediate-dex-ospath}" />
-			<arg path="${outdir-classes-ospath}" />
-			<fileset dir="${external-libs}" includes="*.jar" />
-		</apply>
-	</target>
+    <!-- Convert this project's .class files into .dex files. -->
+    <target name="dex-debug" depends="compile">
+        <echo>Converting compiled files and external libraries into ${outdir}/${dex-file}...</echo>
+        <apply executable="${dx}" failonerror="true" parallel="true">
+            <arg value="--dex" />
+            <arg value="--output=${intermediate-dex-ospath}" />
+            <arg path="${outdir-classes-ospath}" />
+            <fileset dir="${external-libs}" includes="*.jar"/>
+        </apply>
+    </target>
 
-	<!-- Put the project's resources into the output package file. -->
-	<target name="package-res-and-assets">
-		<echo>Packaging resources and assets...</echo>
-		<exec executable="${aapt}" failonerror="true">
-			<arg value="package" />
-			<arg value="-f" />
-			<arg value="-M" />
-			<arg value="AndroidManifest.xml" />
-			<arg value="-S" />
-			<arg value="${resource-dir}" />
-			<arg value="-A" />
-			<arg value="${asset-dir}" />
-			<arg value="-I" />
-			<arg value="${android-jar}" />
-			<arg value="-F" />
-			<arg value="${resources-package}" />
-		</exec>
-	</target>
+    <!-- Put the project's resources into the output package file. -->
+    <target name="package-res-and-assets">
+        <echo>Packaging resources and assets...</echo>
+        <exec executable="${aapt}" failonerror="true">
+            <arg value="package" />
+            <arg value="-f" />
+            <arg value="-M" />
+            <arg value="AndroidManifest.xml" />
+            <arg value="-S" />
+            <arg value="${resource-dir}" />
+            <arg value="-A" />
+            <arg value="${asset-dir}" />
+            <arg value="-I" />
+            <arg value="${android-jar}" />
+            <arg value="-F" />
+            <arg value="${resources-package}" />
+        </exec>
+    </target>
 
-	<!-- Same as package-res-and-assets, but without "-A ${asset-dir}" -->
-	<target name="package-res-no-assets">
-		<echo>Packaging resources...</echo>
-		<exec executable="${aapt}" failonerror="true">
-			<arg value="package" />
-			<arg value="-f" />
-			<arg value="-M" />
-			<arg value="AndroidManifest.xml" />
-			<arg value="-S" />
-			<arg value="${resource-dir}" />
-			<!-- No assets directory -->
-			<arg value="-I" />
-			<arg value="${android-jar}" />
-			<arg value="-F" />
-			<arg value="${resources-package}" />
-		</exec>
-	</target>
+    <!-- Same as package-res-and-assets, but without "-A ${asset-dir}" -->
+    <target name="package-res-no-assets">
+        <echo>Packaging resources...</echo>
+        <exec executable="${aapt}" failonerror="true">
+            <arg value="package" />
+            <arg value="-f" />
+            <arg value="-M" />
+            <arg value="AndroidManifest.xml" />
+            <arg value="-S" />
+            <arg value="${resource-dir}" />
+            <!-- No assets directory -->
+            <arg value="-I" />
+            <arg value="${android-jar}" />
+            <arg value="-F" />
+            <arg value="${resources-package}" />
+        </exec>
+    </target>
 
-	<!-- Invoke the proper target depending on whether or not
+    <!-- Invoke the proper target depending on whether or not
          an assets directory is present. -->
-	<!-- TODO: find a nicer way to include the "-A ${asset-dir}" argument
+    <!-- TODO: find a nicer way to include the "-A ${asset-dir}" argument
          only when the assets dir exists. -->
-	<target name="package-res">
-		<available file="${asset-dir}" type="dir" property="res-target" value="and-assets" />
-		<property name="res-target" value="no-assets" />
-		<antcall target="package-res-${res-target}" />
-	</target>
+    <target name="package-res">
+        <available file="${asset-dir}" type="dir"
+                property="res-target" value="and-assets" />
+        <property name="res-target" value="no-assets" />
+        <antcall target="package-res-${res-target}" />
+    </target>
 
-	<!-- Package the application and sign it with a debug key.
+    <!-- Package the application and sign it with a debug key.
 		 This is the default target when building. It is used for debug. -->
-	<target name="debug" depends="dex, package-res">
-		<echo>Packaging ${out-debug-package}, and signing it with a debug key...</echo>
-		<exec executable="${apk-builder}" failonerror="true">
-			<arg value="${out-debug-package-ospath}" />
-			<arg value="-z" />
-			<arg value="${resources-package-ospath}" />
-			<arg value="-f" />
-			<arg value="${intermediate-dex-ospath}" />
-			<arg value="-rf" />
-			<arg value="${srcdir-ospath}" />
-			<arg value="-rj" />
-			<arg value="${external-libs-ospath}" />
-		</exec>
-	</target>
+    <target name="debug" depends="dex-debug, package-res">
+        <echo>Packaging ${out-debug-package}, and signing it with a debug key...</echo>
+        <exec executable="${apk-builder}" failonerror="true">
+            <arg value="${out-debug-package-ospath}" />
+            <arg value="-z" />
+            <arg value="${resources-package-ospath}" />
+            <arg value="-f" />
+            <arg value="${intermediate-dex-ospath}" />
+            <arg value="-rf" />
+            <arg value="${srcdir-ospath}" />
+            <arg value="-rj" />
+            <arg value="${external-libs-ospath}" />
+        </exec>
+    </target>
 
-	<!-- Package the application without signing it.
+    <!-- Package the application without signing it.
     	 This allows for the application to be signed later with an official publishing key. -->
-	<target name="release" depends="dex, package-res">
-		<echo>Packaging ${out-unsigned-package} for release...</echo>
-		<exec executable="${apk-builder}" failonerror="true">
-			<arg value="${out-unsigned-package-ospath}" />
-			<arg value="-u" />
-			<arg value="-z" />
-			<arg value="${resources-package-ospath}" />
-			<arg value="-f" />
-			<arg value="${intermediate-dex-ospath}" />
-			<arg value="-rf" />
-			<arg value="${srcdir-ospath}" />
-			<arg value="-rj" />
-			<arg value="${external-libs-ospath}" />
-		</exec>
-		<signjar jar="${out-unsigned-package-ospath}" alias="${cert-alias}" keystore="${keystore}" storepass="${storepass}" signedjar="${out-signed-package-ospath}" />
-	</target>
-
-	<!-- Install the package on the default emulator -->
-	<target name="install" depends="debug">
-		<echo>Installing ${out-debug-package} onto default emulator...</echo>
-		<exec executable="${adb}" failonerror="true">
-			<arg value="install" />
-			<arg value="${out-debug-package}" />
-		</exec>
-	</target>
-
-	<target name="reinstall" depends="debug">
-		<echo>Installing ${out-debug-package} onto default emulator...</echo>
-		<exec executable="${adb}" failonerror="true">
-			<arg value="install" />
-			<arg value="-r" />
-			<arg value="${out-debug-package}" />
-		</exec>
-	</target>
+    <target name="release" depends="dex-debug, package-res">
+        <echo>Packaging ${out-unsigned-package} for release...</echo>
+        <exec executable="${apk-builder}" failonerror="true">
+            <arg value="${out-unsigned-package-ospath}" />
+            <arg value="-u" />
+            <arg value="-z" />
+            <arg value="${resources-package-ospath}" />
+            <arg value="-f" />
+            <arg value="${intermediate-dex-ospath}" />
+            <arg value="-rf" />
+            <arg value="${srcdir-ospath}" />
+            <arg value="-rj" />
+            <arg value="${external-libs-ospath}" />
+        </exec>
+    	<signjar jar="${out-unsigned-package-ospath}" alias="${cert-alias}" keystore="${keystore}" storepass="${storepass}" keypass="${keypass}" signedjar="${out-signed-package-ospath}"/>
+    	
+    </target>
 
+    <!-- Install the package on the default emulator -->
+    <target name="install" depends="debug">
+        <echo>Installing ${out-debug-package} onto default emulator...</echo>
+        <exec executable="${adb}" failonerror="true">
+            <arg value="install" />
+            <arg value="${out-debug-package}" />
+        </exec>
+    </target>
 
-	<!-- Install the package on the default emulator -->
+    <target name="reinstall" depends="debug">
+        <echo>Installing ${out-debug-package} onto default emulator...</echo>
+        <exec executable="${adb}" failonerror="true">
+            <arg value="install" />
+            <arg value="-r" />
+            <arg value="${out-debug-package}" />
+        </exec>
+    </target>
+	
+	<!-- Install the signed package on the default emulator -->
 	<target name="install-signed" depends="release">
 		<echo>Installing ${out-signed-package} onto default emulator...</echo>
 		<exec executable="${adb}" failonerror="true">
@@ -352,26 +417,26 @@ storepass=*password of keystore*
 			<arg value="${out-signed-package}" />
 		</exec>
 	</target>
-			
-	<!-- Uinstall the package from the default emulator -->
-	<target name="uninstall">
-		<echo>Uninstalling ${application-package} from the default emulator...</echo>
-		<exec executable="${adb}" failonerror="true">
-			<arg value="uninstall" />
-			<arg value="${application-package}" />
-		</exec>
-	</target>
-
-
 
+    <!-- Uinstall the package from the default emulator -->
+    <target name="uninstall">
+        <echo>Uninstalling ${application-package} from the default emulator...</echo>
+        <exec executable="${adb}" failonerror="true">
+            <arg value="uninstall" />
+            <arg value="${application-package}" />
+        </exec>
+    </target>
+	
 
 	<!-- ############### JavaDoc ####################### -->
 	<!-- Create JavaDoc -->
 	<target name="javadoc">
 		<delete dir="${docdir}" />
-		<javadoc access="public" author="true" destdir="${docdir}" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" sourcepath="${srcdir}" splitindex="true" use="true" version="true">
-		</javadoc>
-	</target>
+		<javadoc access="public" author="true" destdir="${docdir}" 
+        	nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" 
+        	source="1.6" sourcepath="${srcdir}" splitindex="true" use="true" version="true">
+        </javadoc>
+    </target>
 
 	<!-- ############### Release source ####################### -->
 	<!-- Copy to source release -->
@@ -395,6 +460,7 @@ storepass=*password of keystore*
     </target>
 	
 	<!-- ############ Convencience target ############## -->
-	<target name="all" depends="debug, javadoc" />
-
+	<target name="all" 
+		depends="debug, javadoc" />
+	
 </project>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9ef6f0c..6b9817f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -211,6 +211,7 @@
 	<string name="search">Search</string>
 	<string name="search_progress">Searching...</string>
 	<string name="search_hint">Type search criteria</string>
+	<string name="search_nothing_found">Nothing found</string>
 	
 	
 	<!-- ***************************
diff --git a/src/org/openintents/safe/AskPassword.java b/src/org/openintents/safe/AskPassword.java
index 4364045..ec8ac77 100644
--- a/src/org/openintents/safe/AskPassword.java
+++ b/src/org/openintents/safe/AskPassword.java
@@ -53,7 +53,7 @@ import android.widget.Toast;
  */
 public class AskPassword extends Activity {
 
-	private boolean debug = true;
+	private boolean debug = false;
 	private static String TAG = "AskPassword";
 	public static String EXTRA_IS_LOCAL = "org.openintents.safe.bundle.EXTRA_IS_REMOTE";
 
diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index ba92df8..bb6ebff 100644
--- a/src/org/openintents/safe/CategoryList.java
+++ b/src/org/openintents/safe/CategoryList.java
@@ -55,6 +55,7 @@ import android.view.View;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
@@ -119,7 +120,7 @@ public class CategoryList extends ListActivity {
 	private static String salt;
     private static String masterKey;			
 
-    private List<CategoryEntry> rows;
+    private List<CategoryEntry> rows=null;
     private Intent restartTimerIntent=null;
     private int lastPosition=0;
     
@@ -231,7 +232,7 @@ public class CategoryList extends ListActivity {
         filter.addAction (CryptoIntents.ACTION_CRYPTO_LOGGED_OUT);
         registerReceiver(mIntentReceiver, filter);
 
-		fillData();
+//		fillData();
 
 		final ListView list = getListView();
 		list.setFocusable(true);
@@ -257,6 +258,14 @@ public class CategoryList extends ListActivity {
         showFirstTimeWarningDialog();
 		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
 		lockOnScreenLock = sp.getBoolean(Preferences.PREFERENCE_LOCK_ON_SCREEN_LOCK, true);
+
+		ListAdapter la=getListAdapter();
+        if (la!=null) {
+        	if (debug) Log.d(TAG,"onResume: count="+la.getCount());
+        } else {
+        	if (debug) Log.d(TAG,"onResume: no list");
+        	fillData();
+        }
     }
 
 	/**
@@ -398,6 +407,7 @@ public class CategoryList extends ListActivity {
 		List<String> categoryNames=Passwords.getCategoryNames();
 		
 		rows=Passwords.getCategoryEntries();
+		if (debug) Log.d(TAG,"fillData: rows="+rows.size());
 		
 		ArrayAdapter<String> entries = 
 		    new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1,
diff --git a/src/org/openintents/safe/FrontDoor.java b/src/org/openintents/safe/FrontDoor.java
index 9be50b8..cf5822a 100644
--- a/src/org/openintents/safe/FrontDoor.java
+++ b/src/org/openintents/safe/FrontDoor.java
@@ -35,7 +35,7 @@ import android.util.Log;
 public class FrontDoor extends Activity {
 
     private static final String TAG = "FrontDoor";
-	private static final boolean debug = true;
+	private static final boolean debug = false;
 
 //	public static final String KEY_AUTOLOCK = "autolock";
 	
diff --git a/src/org/openintents/safe/IntentHandler.java b/src/org/openintents/safe/IntentHandler.java
index a49f1a0..c0f2fe2 100644
--- a/src/org/openintents/safe/IntentHandler.java
+++ b/src/org/openintents/safe/IntentHandler.java
@@ -49,7 +49,7 @@ import android.widget.Toast;
  */
 public class IntentHandler extends Activity {
 
-	private static final boolean debug = true;
+	private static final boolean debug = false;
 	private static String TAG = "IntentHandler";
 	
 	private static final int REQUEST_CODE_ASK_PASSWORD = 1;
diff --git a/src/org/openintents/safe/PassList.java b/src/org/openintents/safe/PassList.java
index 8b513f1..f4b9956 100644
--- a/src/org/openintents/safe/PassList.java
+++ b/src/org/openintents/safe/PassList.java
@@ -45,6 +45,7 @@ import android.view.MenuItem;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
@@ -60,7 +61,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
  */
 public class PassList extends ListActivity {
 
-	private static final boolean debug = true;
+	private static final boolean debug = false;
     private static final String TAG = "PassList";
 
     // Menu Item order
@@ -92,7 +93,7 @@ public class PassList extends ListActivity {
     
 	private Thread fillerThread=null;
 
-    private List<PassEntry> rows;
+    private List<PassEntry> rows=null;
     private int lastPosition=0;
 	List<String> passDescriptions=new ArrayList<String>();
 
@@ -101,11 +102,11 @@ public class PassList extends ListActivity {
 		public void handleMessage(Message msg) {
 			switch (msg.what) {
 				case PassList.MSG_UPDATE_LIST:
-					ArrayAdapter<String> entries = 
-					    new ArrayAdapter<String>(PassList.this, android.R.layout.simple_list_item_1,
-					    		passDescriptions);
-					setListAdapter(entries);
-
+					fillerThread=null;
+			    	ArrayAdapter<String> entries = 
+			    		new ArrayAdapter<String>(PassList.this, android.R.layout.simple_list_item_1,
+			    				passDescriptions);
+			    	setListAdapter(entries);
 					if (debug) Log.d(TAG,"lastPosition="+lastPosition);
 					if (lastPosition>2) {
 						setSelection(lastPosition-1);
@@ -160,7 +161,7 @@ public class PassList extends ListActivity {
 			categoryName;
 		setTitle(title);
 
-		fillData();
+//		fillData();
 
 		final ListView list = getListView();
 		list.setFocusable(true);
@@ -213,6 +214,14 @@ public class PassList extends ListActivity {
 		}
         IntentFilter filter = new IntentFilter(CryptoIntents.ACTION_CRYPTO_LOGGED_OUT);
         registerReceiver(mIntentReceiver, filter);
+
+        ListAdapter la=getListAdapter();
+        if (la!=null) {
+        	if (debug) Log.d(TAG,"onResume: count="+la.getCount());
+        } else {
+        	if (debug) Log.d(TAG,"onResume: no list");
+        	fillData();
+        }
     }
     
     @Override
@@ -266,6 +275,15 @@ public class PassList extends ListActivity {
      * Populates the password ListView
      */
 	private void fillData() {
+		if (fillerThread!=null) {
+			if (fillerThread.isAlive()) {
+				// there's already a thread running
+			} else {
+				showDialog(DECRYPT_PROGRESS_KEY);
+				fillerThread.run();
+			}
+			return;
+		}
 		showDialog(DECRYPT_PROGRESS_KEY);
 
 		fillerThread = new Thread(new Runnable() {
@@ -287,7 +305,7 @@ public class PassList extends ListActivity {
 				mu.what = PassList.MSG_UPDATE_LIST;
 				PassList.this.myViewUpdateHandler.sendMessage(mu); 
 			}
-		});
+		},"PassList fillData");
 		fillerThread.start();
 	}
 
diff --git a/src/org/openintents/safe/PassView.java b/src/org/openintents/safe/PassView.java
index 0c75a0f..51e86c8 100644
--- a/src/org/openintents/safe/PassView.java
+++ b/src/org/openintents/safe/PassView.java
@@ -52,7 +52,7 @@ import android.widget.Toast;
  */
 public class PassView extends Activity implements View.OnClickListener {
 
-	private static boolean debug = true;
+	private static boolean debug = false;
 	private static String TAG = "PassView";
 
 	public static final int EDIT_PASSWORD_INDEX = Menu.FIRST;
diff --git a/src/org/openintents/safe/Search.java b/src/org/openintents/safe/Search.java
index 71a916d..e106675 100644
--- a/src/org/openintents/safe/Search.java
+++ b/src/org/openintents/safe/Search.java
@@ -37,6 +37,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ListView;
+import android.widget.Toast;
 
 public class Search extends ListActivity {
 	
@@ -65,6 +66,10 @@ public class Search extends ListActivity {
     		switch (msg.what) {
     		case MSG_SEARCH_COMPLETE:
     			setListAdapter(entries);
+    			if ((entries!=null) && (entries.isEmpty())) {
+    				Toast.makeText(Search.this, R.string.search_nothing_found,
+   						Toast.LENGTH_LONG).show();
+    			}
     			break;
     		}
     		super.handleMessage(msg);
@@ -177,7 +182,7 @@ public class Search extends ListActivity {
 			ProgressDialog dialog = new ProgressDialog(this);
 			dialog.setMessage(getString(R.string.search_progress));
 			dialog.setIndeterminate(false);
-			dialog.setCancelable(false);
+			dialog.setCancelable(true);
 			return dialog;
 		}
 		}
@@ -190,6 +195,16 @@ public class Search extends ListActivity {
 	 * and permit the updating of the progress dialog.
 	 */
 	private void searchThreadStart(){
+		if (searchThread!=null) {
+			if (searchThread.isAlive()) {
+				// it's already searching
+			} else {
+				// just rerun
+				showDialog(SEARCH_PROGRESS_KEY);
+				searchThread.run();
+			}
+			return;
+		}
 		showDialog(SEARCH_PROGRESS_KEY);
 		searchThread = new Thread(new Runnable() {
 			public void run() {
@@ -203,7 +218,7 @@ public class Search extends ListActivity {
 
 				if (debug) Log.d(TAG,"thread end");
 				}
-			});
+			},"Search");
 		searchThread.start();
 	}
 
@@ -214,7 +229,6 @@ public class Search extends ListActivity {
 			// don't bother searching for nothing
 			return;
 		}
-
 		
 		List<CategoryEntry> categories=Passwords.getCategoryEntries();
 		for (CategoryEntry catRow : categories) {
@@ -260,7 +274,8 @@ public class Search extends ListActivity {
 	}
 	
 	private void updateListFromResults() {
-		if ((results==null) || (results.size()==0)) {
+		if (results==null) {
+//		if ((results==null) || (results.size()==0)) {
 			return;
 		}
 
-- 
2.50.1