From b2ecf59eec38ea99863ac5a4e836f8893ad7f00e Mon Sep 17 00:00:00 2001
From: "Daniel.Albert@gi-de.com"
 <Daniel.Albert@gi-de.com@cfea21b8-c4cb-11de-81ce-f10158adbdd1>
Date: Tue, 6 Nov 2012 14:52:03 +0000
Subject: [PATCH] Updated ApduTester source code to match
 PerformanceTester-1_3_0

---
 samples/ApduTester/ApduTester/.classpath      |   5 +-
 .../ApduTester/ApduTester/AndroidManifest.xml |  21 +-
 ...{default.properties => project.properties} |  10 +-
 .../ApduTester/res/drawable-hdpi/icon.png     | Bin 4147 -> 0 bytes
 .../ApduTester/res/drawable-ldpi/icon.png     | Bin 1723 -> 0 bytes
 .../ApduTester/res/drawable-mdpi/icon.png     | Bin 2574 -> 0 bytes
 .../ApduTester/res/drawable/icon.png          | Bin 0 -> 5331 bytes
 .../ApduTester/res/layout/about.xml           |  90 +++++
 .../ApduTester/ApduTester/res/layout/main.xml |  50 ++-
 .../ApduTester/res/values/strings.xml         |   8 +-
 .../ApduTester/res/xml/settings.xml           |  31 ++
 .../android/apdutester/DataContainer.java     | 136 +++++++
 .../android/apdutester/MemoryInfo.java        |  31 ++
 .../android/apdutester/SystemDataWatcher.java | 176 ++++++++++
 .../android/apdutester/TestCase.java          |  48 +++
 .../android/apdutester/TestCases/Case1.java   |  39 +++
 .../android/apdutester/TestCases/Case2.java   |  43 +++
 .../android/apdutester/TestCases/Case3.java   |  47 +++
 .../android/apdutester/TestCases/Case4.java   |  52 +++
 .../android/apdutester/TestPerformer.java     | 331 ++++++++++++++++++
 .../apdutester/TestResultListener.java        |  35 ++
 .../android/apdutester/Util.java              | 141 +++++++-
 .../android/apdutester/gui/AboutActivity.java | 121 +++++++
 .../android/apdutester/gui/MainActivity.java  | 320 +++++++++++++++++
 .../apdutester/gui/SettingsActivity.java      | 127 +++++++
 25 files changed, 1822 insertions(+), 40 deletions(-)
 rename samples/ApduTester/ApduTester/{default.properties => project.properties} (74%)
 mode change 100644 => 100755
 delete mode 100644 samples/ApduTester/ApduTester/res/drawable-hdpi/icon.png
 delete mode 100644 samples/ApduTester/ApduTester/res/drawable-ldpi/icon.png
 delete mode 100644 samples/ApduTester/ApduTester/res/drawable-mdpi/icon.png
 create mode 100644 samples/ApduTester/ApduTester/res/drawable/icon.png
 create mode 100644 samples/ApduTester/ApduTester/res/layout/about.xml
 create mode 100644 samples/ApduTester/ApduTester/res/xml/settings.xml
 create mode 100644 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/DataContainer.java
 create mode 100755 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/MemoryInfo.java
 create mode 100755 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/SystemDataWatcher.java
 create mode 100755 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCase.java
 create mode 100755 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case1.java
 create mode 100755 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case2.java
 create mode 100755 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case3.java
 create mode 100755 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case4.java
 create mode 100755 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestPerformer.java
 create mode 100755 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestResultListener.java
 create mode 100644 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/gui/AboutActivity.java
 create mode 100755 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/gui/MainActivity.java
 create mode 100644 samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/gui/SettingsActivity.java

diff --git a/samples/ApduTester/ApduTester/.classpath b/samples/ApduTester/ApduTester/.classpath
index 609aa00..d3bb07b 100644
--- a/samples/ApduTester/ApduTester/.classpath
+++ b/samples/ApduTester/ApduTester/.classpath
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<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="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/samples/ApduTester/ApduTester/AndroidManifest.xml b/samples/ApduTester/ApduTester/AndroidManifest.xml
index 1f1cbc8..fa390cd 100644
--- a/samples/ApduTester/ApduTester/AndroidManifest.xml
+++ b/samples/ApduTester/ApduTester/AndroidManifest.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.gieseckedevrient.android.apdutester"
-      android:versionCode="1"
-      android:versionName="0.1">
-    <application android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:name=".MainActivity"
-                  android:label="@string/app_name">
+      package="com.gieseckedevrient.android.apdutester" android:versionName="1.3.1" android:versionCode="3">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false" android:description="@string/about_text">
+        <uses-library android:name="org.simalliance.openmobileapi" android:required="true"/>
+        <activity android:name="com.gieseckedevrient.android.apdutester.gui.MainActivity" android:configChanges="orientation|keyboardHidden" android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-    </application>
+		<activity android:name="com.gieseckedevrient.android.apdutester.gui.AboutActivity" android:theme="@android:style/Theme.Dialog"/>
+        <activity android:name="com.gieseckedevrient.android.apdutester.gui.SettingsActivity" />
+        </application>
     <uses-sdk android:minSdkVersion="4" />
-	<uses-permission android:name="org.simalliance.openmobileapi.SMARTCARD"/>
-</manifest> 
+        <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+		<uses-permission android:name="org.simalliance.openmobileapi.SMARTCARD">
+	</uses-permission>
+</manifest>
\ No newline at end of file
diff --git a/samples/ApduTester/ApduTester/default.properties b/samples/ApduTester/ApduTester/project.properties
old mode 100644
new mode 100755
similarity index 74%
rename from samples/ApduTester/ApduTester/default.properties
rename to samples/ApduTester/ApduTester/project.properties
index bf1d39e..16d4d76
--- a/samples/ApduTester/ApduTester/default.properties
+++ b/samples/ApduTester/ApduTester/project.properties
@@ -1,13 +1,13 @@
 # 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 use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
-# Project target.
-target=android-7
 # Indicates whether an apk should be generated for each density.
 split.density=false
+# Project target.
+target=Giesecke & Devrient GmbH:Open Mobile API:15
diff --git a/samples/ApduTester/ApduTester/res/drawable-hdpi/icon.png b/samples/ApduTester/ApduTester/res/drawable-hdpi/icon.png
deleted file mode 100644
index 8074c4c571b8cd19e27f4ee5545df367420686d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4147
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

diff --git a/samples/ApduTester/ApduTester/res/drawable-ldpi/icon.png b/samples/ApduTester/ApduTester/res/drawable-ldpi/icon.png
deleted file mode 100644
index 1095584ec21f71cd0afc9e0993aa2209671b590c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1723
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
Rn%e*X002ovPDHLkV1g`*Fem^3

diff --git a/samples/ApduTester/ApduTester/res/drawable-mdpi/icon.png b/samples/ApduTester/ApduTester/res/drawable-mdpi/icon.png
deleted file mode 100644
index a07c69fa5a0f4da5d5efe96eea12a543154dbab6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2574
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

diff --git a/samples/ApduTester/ApduTester/res/drawable/icon.png b/samples/ApduTester/ApduTester/res/drawable/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..50532bd147d0311f19a0896438222af20078b128
GIT binary patch
literal 5331
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

literal 0
HcmV?d00001

diff --git a/samples/ApduTester/ApduTester/res/layout/about.xml b/samples/ApduTester/ApduTester/res/layout/about.xml
new file mode 100644
index 0000000..2455581
--- /dev/null
+++ b/samples/ApduTester/ApduTester/res/layout/about.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:background="#FFFFFF"
+   	android:layout_width="fill_parent"
+   	android:layout_height="fill_parent"
+   	android:padding="15dip">
+   	<LinearLayout
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent"
+	    android:orientation="horizontal"
+	    android:isScrollContainer="true"
+	    android:scrollbars="vertical">
+	    <LinearLayout
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="fill_parent"
+	    	android:orientation="vertical">
+			<ImageView
+	   			android:src="@drawable/icon"
+	        	android:layout_width="wrap_content"
+	        	android:layout_height="wrap_content"
+	        	android:layout_gravity="top"
+	        	android:layout_marginRight="10dp" />
+	       <LinearLayout
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="fill_parent"
+	    	android:orientation="vertical"/>
+	    </LinearLayout>
+	    <LinearLayout
+	    	android:layout_width="fill_parent"
+	    	android:layout_height="fill_parent"
+	    	android:orientation="vertical">
+	    	<TextView
+	      		android:text="@string/app_name"
+	      		android:textStyle="bold"
+	      		android:textColor="#000000"
+	      		android:layout_width="wrap_content"
+	      		android:layout_height="wrap_content" />
+	      	<TextView
+	      		android:id="@+id/app_version"
+	      		android:textColor="#000000"
+	      		android:textSize="11.5sp"
+	      		android:typeface="monospace"
+				android:layout_width="wrap_content"
+	      		android:layout_height="wrap_content" />
+	   		<TextView
+	      		android:text="@string/about_text"
+	      		android:textColor="#000000"
+	      		android:textSize="12.5sp"
+	      		android:layout_width="wrap_content"
+	      		android:layout_height="wrap_content"
+	      		android:layout_marginTop="8dp" />
+	      	<TextView
+	      		android:text="@string/about_copyright"
+	      		android:textColor="#000000"
+	      		android:textSize="11.0sp"
+	      		android:layout_width="wrap_content"
+	      		android:layout_height="wrap_content"
+	      		android:layout_marginTop="8dp" />
+	      	<TextView
+	      		android:text="@string/about_rights"
+	      		android:textColor="#000000"
+	      		android:textSize="11.0sp"
+	      		android:layout_width="wrap_content"
+	      		android:layout_height="wrap_content" />
+	      	<TextView
+	      		android:text="@string/about_url"
+	      		android:textColor="#000000"
+	      		android:textSize="11.0sp"
+	      		android:layout_width="wrap_content"
+	      		android:layout_height="35sp"
+	      		android:layout_marginTop="8dp"
+	      		android:clickable="true"
+	      		android:autoLink="web"/>
+	      	<TextView
+	      		android:id="@+id/about_info_headline"
+	      		android:textColor="#000000"
+	      		android:textSize="11.0sp"
+	      		android:layout_width="wrap_content"
+	      		android:layout_height="wrap_content"/>
+	      	<TextView
+	      		android:id="@+id/app_info"
+	      		android:textColor="#000000"
+	      		android:textSize="9.5sp"
+	      		android:typeface="monospace"
+				android:layout_width="wrap_content"
+	      		android:layout_height="wrap_content" />
+	    </LinearLayout>
+	</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/samples/ApduTester/ApduTester/res/layout/main.xml b/samples/ApduTester/ApduTester/res/layout/main.xml
index 4361cfe..581fc21 100644
--- a/samples/ApduTester/ApduTester/res/layout/main.xml
+++ b/samples/ApduTester/ApduTester/res/layout/main.xml
@@ -2,6 +2,52 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
+    android:layout_height="fill_parent">
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+        <Spinner
+            android:id="@+id/spinnerDataLen"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <Spinner
+            android:id="@+id/spinnerLoops"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    </LinearLayout>
+    <RelativeLayout
+        android:id="@+id/linearLayout"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+        <Button
+	        android:id="@+id/startButton"
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_weight="1"
+	        android:enabled="false"
+	        android:text="Start test" />
+	    <Button
+	        android:id="@+id/stopButton"
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_weight="1"
+	        android:visibility="invisible" 
+	        android:text="Stop test" />
+    </RelativeLayout>
+	    <ScrollView
+        android:id="@+id/scrollView"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+        <TextView
+            android:id="@+id/textView"
+            android:typeface="monospace"
+            android:textSize="10sp"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent" >
+        </TextView>
+    </ScrollView>
 </LinearLayout>
diff --git a/samples/ApduTester/ApduTester/res/values/strings.xml b/samples/ApduTester/ApduTester/res/values/strings.xml
index de23700..f79ad68 100644
--- a/samples/ApduTester/ApduTester/res/values/strings.xml
+++ b/samples/ApduTester/ApduTester/res/values/strings.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    
-    <string name="app_name">APDU Stress</string>
+    <string name="app_name">ApduTester</string>
+	<string name="subline">Giesecke &amp; Devrient GmbH, 2011</string>
+	<string name="about_text">SmartCard API verification</string>
+	<string name="about_copyright">Copyright © 2011, Giesecke &amp; Devrient</string>
+	<string name="about_rights">All rights reserved.</string>
+	<string name="about_url">http://seek-for-android.googlecode.com</string>
 </resources>
diff --git a/samples/ApduTester/ApduTester/res/xml/settings.xml b/samples/ApduTester/ApduTester/res/xml/settings.xml
new file mode 100644
index 0000000..98b50e8
--- /dev/null
+++ b/samples/ApduTester/ApduTester/res/xml/settings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+	<PreferenceCategory android:title="Logfile directory">
+		<EditTextPreference android:key="logpath"
+			android:dialogTitle="Logfile directory" android:title="/sdcard" android:summary="Empty string will omit saving a logfile"/>
+	</PreferenceCategory>
+
+	<PreferenceCategory	android:title="Communication channel">
+		<ListPreference android:key="communicationChannel" android:dialogTitle="Communication channel" android:title="Basic channel"/>
+	</PreferenceCategory>
+
+	<PreferenceCategory	android:title="Include delays between test cases">
+		<CheckBoxPreference android:key="delays" android:title="Delays"  android:summaryOn="Random delays between test cases" android:summaryOff="No delays between test cases"/>
+	</PreferenceCategory>
+
+	<PreferenceCategory	android:title="Stop test run on error">
+		<CheckBoxPreference android:key="errors" android:title="Error handling"  android:summaryOn="Stop after error occured" android:summaryOff="Don't stop on errors"/>
+	</PreferenceCategory>
+
+	<PreferenceCategory	android:title="Test cases">
+		<CheckBoxPreference android:key="case1"
+			android:title="Case-1" android:summaryOn="Test Case-1 APDU commands" android:summaryOff="Don't test Case-1 APDU commands" />
+		<CheckBoxPreference android:key="case2"
+			android:title="Case-2" android:summaryOn="Test Case-2 APDU commands" android:summaryOff="Don't test Case-2 APDU commands" />
+		<CheckBoxPreference android:key="case3"
+			android:title="Case-3" android:summaryOn="Test Case-3 APDU commands" android:summaryOff="Don't test Case-3 APDU commands" />
+		<CheckBoxPreference android:key="case4"
+			android:title="Case-4" android:summaryOn="Test Case-4 APDU commands" android:summaryOff="Don't test Case-4 APDU commands" />
+	</PreferenceCategory>
+</PreferenceScreen>
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/DataContainer.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/DataContainer.java
new file mode 100644
index 0000000..8e94ce8
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/DataContainer.java
@@ -0,0 +1,136 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester;
+
+import java.io.File;
+
+import android.os.Environment;
+
+public class DataContainer {
+
+	public static final byte[] APPLET_AID = new byte[] { (byte) 0xD2, 0x76, 0x00, 0x01, 0x18, 0x01, 0x01 };
+
+	private static DataContainer instance = null;
+
+	private boolean basicChannel = false;
+	private boolean delays = false;
+	private boolean errors = true;
+	private boolean case1 = true;
+	private boolean case2 = true;
+	private boolean case3 = true;
+	private boolean case4 = true;
+	private int loops = 1;
+	private int dataLength = 250;
+	private String logPath = "/sdcard";
+	
+	
+    private  DataContainer() {
+		logPath = "";
+		try {
+			File path = new File(Environment.getExternalStorageDirectory().toString());
+	    	if (path.isDirectory() && path.canWrite())
+				logPath = path.getAbsolutePath();
+		} catch (Exception e) {	
+		}
+    }
+    
+    public static DataContainer getInstance() {
+    	if (instance == null) {
+    		instance = new DataContainer();
+        }
+        return instance;
+    }
+	
+	public void setBasicChannel(boolean basicChannel) {
+		this.basicChannel = basicChannel;
+	}
+	
+	public boolean getBasicChannel() {
+		return basicChannel;
+	}
+	
+	public void setDelays(boolean delays) {
+		this.delays = delays;
+	}
+	
+	public boolean getDelays() {
+		return delays;
+	}
+	
+	public void setErrors(boolean errors) {
+		this.errors = errors;
+	}
+	
+	public boolean getErrors() {
+		return errors;
+	}
+	
+	public void setCase1(boolean case1) {
+		this.case1 = case1;
+	}
+	
+	public boolean getCase1() {
+		return case1;
+	}
+	
+	public void setCase2(boolean case2) {
+		this.case2 = case2;
+	}
+	
+	public boolean getCase2() {
+		return case2;
+	}
+	
+	public void setCase3(boolean case3) {
+		this.case3 = case3;
+	}
+	
+	public boolean getCase3() {
+		return case3;
+	}
+	
+	public void setCase4(boolean case4) {
+		this.case4 = case4;
+	}
+	
+	public boolean getCase4() {
+		return case4;
+	}
+	
+	public void setLoops(int loops) {
+		this.loops = loops;
+	}
+	
+	public int getLoops() {
+		return loops;
+	}
+	
+	public void setDataLength(int dataLength) {
+		this.dataLength = dataLength;
+	}
+	
+	public int getDataLength() {
+		return dataLength;
+	}
+	
+	public void setLogPath(String logPath) {
+		this.logPath = logPath;
+	}
+	
+	public String getLogPath() {
+		return logPath;
+	}
+}
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/MemoryInfo.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/MemoryInfo.java
new file mode 100755
index 0000000..add149a
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/MemoryInfo.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester;
+
+
+class MemoryInfo {
+	long sizeNative = 0;
+	long sizeDalvik = 0;
+	long sizeTotal = 0;
+
+	long allocatedNative;
+	long allocatedDalvik;
+	long allocatedTotal;
+
+	long freeNative = 0;
+	long freeDalvik = 0;
+	long freeTotal = 0;
+}
\ No newline at end of file
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/SystemDataWatcher.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/SystemDataWatcher.java
new file mode 100755
index 0000000..aa0c4db
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/SystemDataWatcher.java
@@ -0,0 +1,176 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+public class SystemDataWatcher {
+	
+	ArrayList<Integer> batteryLevels = new ArrayList<Integer>();
+
+	ArrayList<Long> freeNativeValues = new ArrayList<Long>();
+	ArrayList<Long> freeDalvikValues = new ArrayList<Long>();
+	ArrayList<Long> freeTotalValues = new ArrayList<Long>();
+
+	ArrayList<Long> allocatedNativeValues = new ArrayList<Long>();
+	ArrayList<Long> allocatedDalvikValues = new ArrayList<Long>();
+	ArrayList<Long> allocatedTotalValues = new ArrayList<Long>();
+
+	ArrayList<Long> sizeNativeValues = new ArrayList<Long>();
+	ArrayList<Long> sizeDalvikValues = new ArrayList<Long>();
+	ArrayList<Long> sizeTotalValues = new ArrayList<Long>();
+
+	ArrayList<Long> cpuUsageValues = new ArrayList<Long>();
+	
+	public void getCpuUsage() {
+		try {
+			String cmd = "top -n 1";
+			Runtime rt = Runtime.getRuntime();
+			Process ps = rt.exec(cmd);
+			ps.waitFor();
+			BufferedReader rd = new BufferedReader(new InputStreamReader(ps.getInputStream()));
+			String line = "";
+			while ((line = rd.readLine()) != null) {
+				line = line.trim();
+				String[] values = Util.removeWithspaces(line.split("[\t ]"));
+				for (String value : values) {
+					if (value.equals("org.simalliance.openmobileapi") || value.equals("org.simalliance.openmobileapi:remote")) {
+						values[1] = values[1].replace("%", "");
+						long cpuUsage = Long.parseLong(values[1]);
+						cpuUsageValues.add(cpuUsage);
+						break;
+					}
+				}
+			}
+			rd.close();
+		} catch (Exception ex) {
+		}
+	}
+	
+	protected void clearMemoryUsageValues() {
+		freeNativeValues.clear();
+		freeDalvikValues.clear();
+		freeTotalValues.clear();
+
+		allocatedNativeValues.clear();
+		allocatedDalvikValues.clear();
+		allocatedTotalValues.clear();
+
+		sizeNativeValues.clear();
+		sizeDalvikValues.clear();
+		sizeTotalValues.clear();
+	}
+
+	protected void clearCpuTimeValues() {
+		cpuUsageValues.clear();
+	}
+
+	void clearData() {
+		clearMemoryUsageValues();
+		clearCpuTimeValues();
+	}
+	
+	MemoryInfo getMemoryAvg() {
+		MemoryInfo mf = new MemoryInfo();
+
+		mf.freeNative = Util.getAvarageValue(freeNativeValues);
+		mf.freeDalvik = Util.getAvarageValue(freeDalvikValues);
+		mf.freeTotal = Util.getAvarageValue(freeTotalValues);
+
+		mf.allocatedNative = Util.getAvarageValue(allocatedNativeValues);
+		mf.allocatedDalvik = Util.getAvarageValue(allocatedDalvikValues);
+		mf.allocatedTotal = Util.getAvarageValue(allocatedTotalValues);
+
+		mf.sizeNative = Util.getAvarageValue(sizeNativeValues);
+		mf.sizeDalvik = Util.getAvarageValue(sizeDalvikValues);
+		mf.sizeTotal = Util.getAvarageValue(sizeTotalValues);
+
+		return mf;
+	}
+	
+	public void messureMemoryUsage(Context context) {
+		try {
+
+			MemoryInfo mf = new MemoryInfo();
+			String cmd = "dumpsys meminfo " + Util.getSmartcardApiPid(context);
+			Runtime rt = Runtime.getRuntime();
+			Process ps = rt.exec(cmd);
+			ps.waitFor();
+			BufferedReader rd = new BufferedReader(new InputStreamReader(ps.getInputStream()));
+			String line = "";
+			while ((line = rd.readLine()) != null) {
+				line = line.trim();
+				if (line.startsWith("size")) {
+					String[] values = Util.removeWithspaces(line.split("[\t ]"));
+					mf.sizeNative = Long.parseLong(values[1]);
+					mf.sizeDalvik = Long.parseLong(values[2]);
+					mf.sizeTotal = Long.parseLong(values[4]);
+					sizeNativeValues.add(mf.sizeNative);
+					sizeDalvikValues.add(mf.sizeDalvik);
+					sizeTotalValues.add(mf.sizeTotal);
+				}
+				if (line.startsWith("allocated")) {
+					String[] values = Util.removeWithspaces(line.split("[\t ]"));
+					mf.allocatedNative = Long.parseLong(values[1]);
+					mf.allocatedDalvik = Long.parseLong(values[2]);
+					mf.allocatedTotal = Long.parseLong(values[4]);
+					allocatedNativeValues.add(mf.allocatedNative);
+					allocatedDalvikValues.add(mf.allocatedDalvik);
+					allocatedTotalValues.add(mf.allocatedTotal);
+				}
+				if (line.startsWith("free")) {
+					String[] values = Util.removeWithspaces(line.split("[\t ]"));
+					mf.freeNative = Long.parseLong(values[1]);
+					mf.freeDalvik = Long.parseLong(values[2]);
+					mf.freeTotal = Long.parseLong(values[4]);
+					freeNativeValues.add(mf.freeNative);
+					freeDalvikValues.add(mf.freeDalvik);
+					freeTotalValues.add(mf.freeTotal);
+				}
+
+			}
+			rd.close();
+
+		} catch (Exception ex) {
+		}
+	}
+	
+	public void activateBatteryLevelMeassurement(Context context) {
+		batteryLevels.clear();
+
+		BroadcastReceiver batteryLevelReceiver = new BroadcastReceiver() {
+			public void onReceive(Context context, Intent intent) {
+				context.unregisterReceiver(this);
+				int rawlevel = intent.getIntExtra("level", -1);
+				int scale = intent.getIntExtra("scale", -1);
+				int level = -1;
+				if (rawlevel >= 0 && scale > 0) {
+					level = (rawlevel * 100) / scale;
+					batteryLevels.add(level);
+				}
+			}
+		};
+		IntentFilter batteryLevelFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+		context.registerReceiver(batteryLevelReceiver, batteryLevelFilter);
+	}
+}
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCase.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCase.java
new file mode 100755
index 0000000..de528eb
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCase.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester;
+
+import java.util.ArrayList;
+
+import org.simalliance.openmobileapi.Channel;
+
+
+public abstract class TestCase {
+	
+	public final String description = "";
+
+	protected boolean error = false;
+
+	protected ArrayList<Long> time = new ArrayList<Long>();
+
+	public abstract boolean run(TestPerformer pt, Channel channel) throws Exception;
+
+	public boolean didErrorOccured() {
+		return error;
+	}
+
+	public void clearError() {
+		error = false;
+	}
+
+	public void errorOccurred() {
+		error = true;
+	}
+
+	public ArrayList<Long> getTime() {
+		return time;
+	}
+}
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case1.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case1.java
new file mode 100755
index 0000000..fad419d
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case1.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester.TestCases;
+
+import java.util.ArrayList;
+
+import org.simalliance.openmobileapi.Channel;
+
+import com.gieseckedevrient.android.apdutester.TestCase;
+import com.gieseckedevrient.android.apdutester.TestPerformer;
+
+public class Case1 extends TestCase {
+	public final String description = "Legacy test case 1";
+
+	@Override
+	public boolean run(TestPerformer pt, Channel channel) throws Exception {
+		ArrayList<Byte> cmdApduA = new ArrayList<Byte>();
+		cmdApduA.add((byte) 0x00); // CLA
+		cmdApduA.add((byte) 0x01); // INS
+		cmdApduA.add((byte) 0x00); // P1
+		cmdApduA.add((byte) 0x00); // P2
+		time.add(pt.send(channel, cmdApduA, 0, this));
+	
+		return error;
+	}
+}
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case2.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case2.java
new file mode 100755
index 0000000..bd200d0
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case2.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester.TestCases;
+
+import java.util.ArrayList;
+
+import org.simalliance.openmobileapi.Channel;
+
+import com.gieseckedevrient.android.apdutester.TestCase;
+import com.gieseckedevrient.android.apdutester.TestPerformer;
+
+public class Case2 extends TestCase {
+	public final String description = "Legacy test case 2";
+
+	@Override
+	public boolean run(TestPerformer pt, Channel cardChannel) throws Exception {
+		ArrayList<Byte> cmdApduA = new ArrayList<Byte>();
+		cmdApduA.add((byte) 0x00); // CLA
+		cmdApduA.add((byte) 0x02); // INS
+		cmdApduA.add((byte) 0x00); // P1
+		cmdApduA.add((byte) 0x00); // P2
+		if (pt.getDataLength() == 256)
+			cmdApduA.add((byte) 0); // LE
+		else
+			cmdApduA.add((byte) pt.getDataLength()); // LE
+		time.add(pt.send(cardChannel, cmdApduA, pt.getDataLength(), this));
+	
+		return error;
+	}
+}
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case3.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case3.java
new file mode 100755
index 0000000..81e5dba
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case3.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester.TestCases;
+
+import java.util.ArrayList;
+
+import org.simalliance.openmobileapi.Channel;
+
+import com.gieseckedevrient.android.apdutester.TestCase;
+import com.gieseckedevrient.android.apdutester.TestPerformer;
+import com.gieseckedevrient.android.apdutester.Util;
+
+public class Case3 extends TestCase {
+	public final String description = "Legacy test case 3";
+
+	@Override
+	public boolean run(TestPerformer pt, Channel cardChannel) 	throws Exception {
+		ArrayList<Byte> cmdApduA = new ArrayList<Byte>();
+		cmdApduA.add((byte) 0x00); // CLA
+		cmdApduA.add((byte) 0x03); // INS
+		cmdApduA.add((byte) 0x00); // P1
+		cmdApduA.add((byte) 0x00); // P2
+		if (pt.getDataLength() == 256) {
+			cmdApduA.add((byte) 255); // LC
+			cmdApduA.addAll(Util.getData(255)); // DATA
+		} else {
+			cmdApduA.add((byte) pt.getDataLength()); // LC
+			cmdApduA.addAll(Util.getData(pt.getDataLength())); // DATA
+		}
+		time.add(pt.send(cardChannel, cmdApduA, 0, this));
+	
+		return error;
+	}
+}
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case4.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case4.java
new file mode 100755
index 0000000..71fd843
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestCases/Case4.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester.TestCases;
+
+import java.util.ArrayList;
+
+import org.simalliance.openmobileapi.Channel;
+
+import com.gieseckedevrient.android.apdutester.TestCase;
+import com.gieseckedevrient.android.apdutester.TestPerformer;
+import com.gieseckedevrient.android.apdutester.Util;
+
+public class Case4 extends TestCase {
+	public final String description = "Legacy test case 3";
+
+	@Override
+	public boolean run(TestPerformer pt, Channel cardChannel) throws Exception {
+		ArrayList<Byte> cmdApduA = new ArrayList<Byte>();
+		cmdApduA.add((byte) 0x00); // CLA
+		if (pt.getDataLength() == 256)
+			cmdApduA.add((byte) 0x05); // INS
+		else
+			cmdApduA.add((byte) 0x04); // INS
+		cmdApduA.add((byte) 0x00); // P1
+		cmdApduA.add((byte) 0x00); // P2
+		if (pt.getDataLength() == 256) {
+			cmdApduA.add((byte) 255); // LC
+			cmdApduA.addAll(Util.getData(255)); // DATA
+			cmdApduA.add((byte) 0); // LE
+		} else {
+			cmdApduA.add((byte) pt.getDataLength()); // LC
+			cmdApduA.addAll(Util.getData(pt.getDataLength())); // DATA
+			cmdApduA.add((byte) pt.getDataLength()); // LE
+		}
+		time.add(pt.send(cardChannel, cmdApduA, pt.getDataLength(), this));
+	
+		return error;
+	}
+}
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestPerformer.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestPerformer.java
new file mode 100755
index 0000000..a50c127
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestPerformer.java
@@ -0,0 +1,331 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Random;
+
+import org.simalliance.openmobileapi.Channel;
+import org.simalliance.openmobileapi.Reader;
+import org.simalliance.openmobileapi.SEService;
+import org.simalliance.openmobileapi.Session;
+
+import android.content.Context;
+
+import com.gieseckedevrient.android.apdutester.TestCases.Case1;
+import com.gieseckedevrient.android.apdutester.TestCases.Case2;
+import com.gieseckedevrient.android.apdutester.TestCases.Case3;
+import com.gieseckedevrient.android.apdutester.TestCases.Case4;
+
+
+public class TestPerformer implements org.simalliance.openmobileapi.SEService.CallBack {
+
+	static public SEService seService;
+	private Reader reader = null;
+	private Context context;
+	private Reader[] readers;
+
+	private SystemDataWatcher sysDataWatcher;
+	private TestResultListener listener;
+	private ArrayList<TestCase> testCases = new ArrayList<TestCase>();
+	private Random randomGenerator = new Random();
+	private boolean isReady = false;
+	public volatile boolean testFinished = false;
+	private DataContainer dataContainer;
+
+
+	public TestPerformer(Context context, TestResultListener listener) {
+		this.context = context;
+		this.listener = listener;
+
+		testCases.add(new Case1());
+		testCases.add(new Case2());
+		testCases.add(new Case3());
+		testCases.add(new Case4());
+
+		dataContainer = DataContainer.getInstance();
+		
+		this.sysDataWatcher = new SystemDataWatcher();
+	}
+
+	public void connectToService() {
+		listener.logText("Connecting to SmartCardService...\n");
+		try {
+			seService = new SEService(context, this);
+		} catch (SecurityException e) {
+			listener.logText("Binding not allowed, permission 'org.simalliance.openmobileapi.SMARTCARD' not sufficient?");
+		} catch (Exception e) {
+			listener.logText(e.toString());
+		}
+	}
+
+	public void serviceConnected(SEService service) {
+		listener.logText("SmartCardService connected\n");
+		try {
+			setReaders(seService.getReaders());
+			if (getReaders().length > 0)
+				setReader(getReaders()[0]);
+		} catch (Exception e) {
+			listener.logText("Exception: " + e.getMessage());
+		}
+
+		isReady = true;
+		listener.uiUpdate();
+	}
+
+	public void onDestroy() {
+		if (seService != null) {
+			listener.logText("Disconnecting from SmartCardService\n");
+			seService.shutdown();
+		}
+	}
+
+	protected void clearErrors() {
+		for (TestCase c : testCases)
+			c.clearError();
+	}
+
+	protected void clearTimeValues() {
+		for (TestCase c : testCases)
+			c.time.clear();
+	}
+
+	public void runApduCaseTest(final Context context) {
+		final boolean activated[] = {dataContainer.getCase1(), dataContainer.getCase2(), dataContainer.getCase3(), dataContainer.getCase4()};
+		
+		testFinished = false;
+		if (activated.length != testCases.size()) {
+			throw new IllegalArgumentException("activated.length != testCases.size");
+		}
+
+		Thread thread1 = new Thread() {
+			public void run() {
+
+				Channel channel = null;
+				try {
+					File file = listener.openNewLogFile();
+
+					TestPerformer.this.sysDataWatcher.activateBatteryLevelMeassurement(context);
+
+					clearData();
+
+					if (getReader().equals("")) {
+						listener.logText("\nReader not available\n");
+						return;
+					}
+
+					if (!getReader().isSecureElementPresent()) {
+						listener.logText("\nCard not available\n");
+						return;
+					}
+
+					Session session = getReader().openSession();
+
+					if (TestPerformer.this.isBasicChannel()) {
+						listener.logText("\nOpen Basic Channel to Applet: " + Util.bytesToString(DataContainer.APPLET_AID) 	+ "\n");
+						channel = session.openBasicChannel(DataContainer.APPLET_AID);
+					} else {
+						listener.logText("\nOpen Logical Channel to Applet: " + Util.bytesToString(DataContainer.APPLET_AID) + "\n");
+						channel = session.openLogicalChannel(DataContainer.APPLET_AID);
+					}
+					
+					byte[] selectResponseData = channel.getSelectResponse();
+					if (selectResponseData != null)
+					    listener.logText("Applet select response: " + Util.bytesToString(selectResponseData) + "\n");
+					
+					if (dataContainer.getDelays())
+						randomGenerator.setSeed(10);
+
+					boolean errorOccured = false;
+					int iLoop = 1;
+					long start = System.currentTimeMillis();
+					do {
+						listener.logText("\n================ Loop: " + iLoop + " ================\n");
+
+						for (int c = 0; c < testCases.size(); c++) {
+							if (activated[c]) {
+								listener.logText("\nTestcase CASE-" + (c + 1) + " APDU\n");
+								errorOccured = testCases.get(c).run(TestPerformer.this, channel);
+								
+								if (errorOccured == true && dataContainer.getErrors() == true)
+									break;
+							}
+						}
+
+						sysDataWatcher.messureMemoryUsage(context);
+						
+						if (errorOccured == true && dataContainer.getErrors() == true)
+							break;
+
+						if (dataContainer.getDelays()) {
+							int waitTime = randomGenerator.nextInt(1000);
+							listener.logText("wait " + waitTime + " ms...\n");
+							Thread.sleep(waitTime);
+						}
+						iLoop++;
+					} while (((getLoops() == 0) ? true : iLoop <= getLoops()) && (testFinished == false));
+					long end = System.currentTimeMillis();
+					long exeTime = (end - start);
+					testFinished = true;
+					
+					int preSpaces = 15;
+					int inSpaces = 10;
+					listener.logText("\n\n\n\n================ Summary ================\n");
+					listener.logText(Util.fill("Reader", preSpaces) + getReader().getName() + "\n");
+					listener.logText(Util.fill("Channel", preSpaces) + (TestPerformer.this.isBasicChannel() ? "Basic Channel" : "Logical Channel") + "\n");
+					listener.logText(Util.fill("Data length", preSpaces) + getDataLength() + "\n");
+					if (errorOccured == true) 
+						listener.logText(Util.fill("Loops", preSpaces) + getLoops() + " - executed loops: " + iLoop + "\n");
+					else
+						listener.logText(Util.fill("Loops", preSpaces) + getLoops() + "\n");							
+					listener.logText(Util.fill("Delays", preSpaces) + (dataContainer.getDelays() ? "enabled" : "disabled") + "\n");
+					listener.logText(Util.fill("Execution time", preSpaces) + String.format("%.2f", (float)exeTime/1000) + "s\n");
+					listener.logText(Util.fill("Response data", preSpaces));
+					if (selectResponseData == null) { 
+					    listener.logText("no response data retrieved\n");
+					} else {
+					    listener.logText(Util.bytesToString(selectResponseData) + "\n");
+					}
+					
+					listener.logText("\nExecution time (average)\n");
+					for (int c = 0; c < testCases.size(); c++) {
+						TestCase testCase = testCases.get(c);
+						if (activated[c])
+							listener.logText(Util.fill("Test Case-" + (c+1), preSpaces) + Util.getAvarageValue(testCase.time) + " ms " + (testCase.didErrorOccured() ? "(errors occured!)" : "") + "\n");
+						else
+							listener.logText(Util.fill("Test Case-" + (c+1), preSpaces) + ": not executed\n");
+					}
+
+					MemoryInfo mf = sysDataWatcher.getMemoryAvg();
+					listener.logText("\nMemory usage (average):\n");
+					listener.logText(Util.fill("", preSpaces) + Util.fill("native", inSpaces) + Util.fill("dalvik", inSpaces) + Util.fill("total", inSpaces) + "\n");
+					listener.logText(Util.fill("Size", preSpaces) + Util.fill(mf.sizeNative, inSpaces) + Util.fill(mf.sizeDalvik, inSpaces) + Util.fill(mf.sizeTotal, inSpaces) + "\n");
+					listener.logText(Util.fill("Allocated", preSpaces) + Util.fill(mf.allocatedNative, inSpaces) + Util.fill(mf.allocatedDalvik, inSpaces) + Util.fill(mf.allocatedTotal, inSpaces) + "\n");
+					listener.logText(Util.fill("Free", preSpaces) + Util.fill(mf.freeNative, inSpaces) + Util.fill(mf.freeDalvik, inSpaces) + Util.fill(mf.freeTotal, inSpaces) + "\n\n");
+
+					long avgCpuTimeAvg = Util.getAvarageValue(sysDataWatcher.cpuUsageValues);
+
+					listener.logText(Util.fill("CPU usage", preSpaces) + avgCpuTimeAvg + " % \n");
+
+					SystemDataWatcher sysDataWatcher = TestPerformer.this.sysDataWatcher;
+					listener.logText(Util.fill("Battery begin", preSpaces) + sysDataWatcher.batteryLevels.get(0) + "% \n");
+					listener.logText(Util.fill("Battery end", preSpaces) + sysDataWatcher.batteryLevels.get(sysDataWatcher.batteryLevels.size() - 1) + "% \n");
+
+					if (file != null)
+						listener.logText(Util.fill("\nLogfile", preSpaces) + file);
+				} catch (Exception e) {
+					listener.logText(e.toString());
+				} finally {
+					try {
+						if (channel != null && !channel.isClosed())
+							channel.close();
+
+						while (!listener.allMessagesHandled())
+							Thread.sleep(1000);
+
+						listener.closeLogFile();
+					} catch (Exception e) {
+						listener.logText(e.toString());
+					}
+					
+					listener.testFinished();
+				}
+			}
+		};
+
+		Thread thread2 = new Thread() {
+			public void run() {
+
+				while (!testFinished) {
+					sysDataWatcher.getCpuUsage();
+					try {
+						Thread.sleep(2000);
+					} catch (InterruptedException e) {
+					}
+				}
+			}
+		};
+
+		thread1.start();
+		thread2.start();
+	}
+
+	public long send(Channel channel, ArrayList<Byte> cmdApduA, int refDataLength, TestCase c) throws Exception {
+		byte[] cmdApdu = Util.getArray(cmdApduA);
+		listener.logText("-> " + Util.bytesToString(cmdApdu) + "\n");
+		long start = System.currentTimeMillis();
+		byte[] rspApdu;
+		try {
+			rspApdu = channel.transmit(cmdApdu);
+		} catch (Exception e) {
+			rspApdu = new byte[0];
+		}
+		long end = System.currentTimeMillis();
+		long exeTime = (end - start);
+		listener.logText("<- " + Util.bytesToString(rspApdu) + "\n");
+		listener.logText("Time: " + exeTime + " ms\n");
+		byte[] refData = Util.getArray(Util.getData(refDataLength));
+		byte[] acData = Util.stripSW1SW2(rspApdu);
+		int sw1sw2 = Util.getSW1SW2(rspApdu);
+		if (sw1sw2 == 0x9000 && Util.isEqual(refData, acData)) {
+			listener.logText("Ok: test succeeded\n");
+		} else {
+			listener.logText("Error: test failed (expected response " + Util.bytesToString(refData) + ")\n");
+			c.errorOccurred();
+		}
+		return exeTime;
+	}
+
+	protected void clearData() {
+		clearErrors();
+		sysDataWatcher.clearData();
+		clearTimeValues();
+	}
+
+	public boolean isReady() {
+		return isReady;
+	}
+
+	public boolean isBasicChannel() {
+		return dataContainer.getBasicChannel();
+	}
+
+	public int getDataLength() {
+		return dataContainer.getDataLength();
+	}
+
+	public int getLoops() {
+		return dataContainer.getLoops();
+	}
+	
+	public Reader[] getReaders() {
+		return readers;
+	}
+
+	public void setReaders(Reader[] readers) {
+		this.readers = readers;
+	}
+
+	public Reader getReader() {
+		return reader;
+	}
+
+	public void setReader(Reader reader) {
+		this.reader = reader;
+	}
+
+}
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestResultListener.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestResultListener.java
new file mode 100755
index 0000000..a8ab2e9
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/TestResultListener.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester;
+
+import java.io.File;
+import java.io.IOException;
+
+
+public interface TestResultListener {
+
+	void logText(String message);
+
+	void uiUpdate();
+
+	File openNewLogFile() throws IOException;
+
+	void closeLogFile() throws IOException;
+
+	boolean allMessagesHandled();
+	
+	void testFinished();
+}
\ No newline at end of file
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/Util.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/Util.java
index bc7bb1c..80bcaae 100644
--- a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/Util.java
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/Util.java
@@ -1,32 +1,135 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gieseckedevrient.android.apdutester;
 
-import java.util.Random;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
-class Util {
-	static final String AB = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	static Random rnd = new Random();
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningAppProcessInfo;
+import android.content.Context;
 
-	static String randomString( int len ) 
-	{
-	  StringBuilder sb = new StringBuilder( len );
-	  for( int i = 0; i < len; i++ )
-		  sb.append( AB.charAt(rnd.nextInt(AB.length())) );
-	  
-	  return sb.toString();
+public class Util {
+
+	static String bytesToString(byte[] bytes) {
+		StringBuffer sb = new StringBuffer();
+		for (byte b : bytes) {
+			sb.append(String.format("%02x ", b & 0xFF));
+		}
+		return sb.toString();
+	}
+
+	static String fill(long value, int length) {
+		return Util.fill(new Long(value).toString(), length);
+	}
+
+	public static String fill(String string, int length) {
+		StringBuffer sb = new StringBuffer();
+		sb.append(string);
+		int effLength = length - string.length();
+		for (int i = 0; i < effLength; i++)
+			sb.append(' ');
+		return sb.toString();
+	}
+
+	static byte[] getArray(ArrayList<Byte> arrayList) {
+		byte[] array = new byte[arrayList.size()];
+		int i = 0;
+		for (Byte value : arrayList) {
+			array[i] = value.byteValue();
+			i++;
+		}
+		return array;
+	}
+
+	static long getAvarageValue(ArrayList<Long> times) {
+		long num = times.size();
+		if (num == 0)
+			return 0;
+		long timeSum = 0;
+		for (long time : times)
+			timeSum += time;
+		long avgTime = timeSum / num;
+		return avgTime;
 	}
-	
-	
-	static boolean isEqual(byte[] cmd, byte[]rsp) {
-		if (rsp.length-2 != cmd.length || rsp[rsp.length-2] != (byte)0x90 || rsp[rsp.length-1] != (byte)0x00) {
+
+	public static ArrayList<Byte> getData(int dataLength) {
+		ArrayList<Byte> data = new ArrayList<Byte>(dataLength);
+		for (int i = 0; i < dataLength; i++)
+			data.add((byte) i);
+		return data;
+	}
+
+	static public int getSmartcardApiPid(Context context) {
+		ActivityManager actvityManager = (ActivityManager) context	.getSystemService(Context.ACTIVITY_SERVICE);
+		List<RunningAppProcessInfo> procInfos = actvityManager.getRunningAppProcesses();
+		for (RunningAppProcessInfo procInfo : procInfos) {
+			if (procInfo.processName.equals("org.simalliance.openmobileapi") || procInfo.processName.equals("org.simalliance.openmobileapi:remote"))
+				return procInfo.pid;
+		}
+		return 0;
+	}
+
+	static int getSW1SW2(byte[] data) {
+		if (data.length >= 2) {
+			int sw1sw2 = ((byte) data[data.length - 2] << 8) & 0xFF00;
+			sw1sw2 |= (byte) data[data.length - 1] & 0x00FF;
+			return sw1sw2;
+		} else
+			return 0;
+	}
+
+	static public String getTimeStamp() {
+		Date dt = new Date();
+		SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd_HHmmss");
+		return df.format(dt);
+	}
+
+	static boolean isEqual(byte[] refData, byte[] acData) {
+		if (refData.length != acData.length) {
 			return false;
 		}
-		
-		for (int t=1; t<cmd.length; t++) {
-			if (cmd[t] != rsp[t]) {
+
+		for (int i = 0; i < refData.length; i++) {
+			if ((byte) refData[i] != (byte) acData[i]) {
 				return false;
 			}
 		}
-		
 		return true;
 	}
+
+	static String[] removeWithspaces(String[] values) {
+		ArrayList<String> list = new ArrayList<String>(values.length);
+		for (int i = 0; i < values.length; i++) {
+			if (!values[i].equals("") && !values[i].equals(" ")
+					&& !values[i].equals("\t"))
+				list.add(values[i]);
+		}
+		return list.toArray(new String[list.size()]);
+	}
+
+	static byte[] stripSW1SW2(byte[] data) {
+		if (data.length > 2) {
+			byte[] strippedData = new byte[data.length - 2];
+			for (int i = 0; i < data.length - 2; i++)
+				strippedData[i] = data[i];
+			return strippedData;
+		} else
+			return new byte[0];
+	}
 }
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/gui/AboutActivity.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/gui/AboutActivity.java
new file mode 100644
index 0000000..2843ba2
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/gui/AboutActivity.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester.gui;
+
+import org.simalliance.openmobileapi.Channel;
+import org.simalliance.openmobileapi.Reader;
+import org.simalliance.openmobileapi.Session;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Window;
+import android.widget.TextView;
+
+import com.gieseckedevrient.android.apdutester.DataContainer;
+import com.gieseckedevrient.android.apdutester.TestPerformer;
+import com.gieseckedevrient.android.apdutester.Util;
+import com.gieseckedevrient.android.apdutester.R;
+
+
+public class AboutActivity extends Activity {
+
+	String appletVersion = "";
+	
+	
+	protected void onCreate(Bundle savedInstanceState) {
+
+		super.onCreate(savedInstanceState);
+
+	    this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+	    
+		setContentView(R.layout.about);
+
+		TextView tv = (TextView) this.findViewById(R.id.app_version);
+
+		try {
+			tv.setText("version " + getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
+		} catch (Exception e) {
+			tv.setText("unknown version");
+		}
+
+		tv = (TextView) this.findViewById(R.id.about_info_headline);
+		if (tv != null)
+			tv.setText(getResources().getString(R.string.app_name) + " test applet");
+
+		// enumerating all secure elements might result in ANR if a specific SE is not responding at all
+		// in case it is not properly integrated in the system (e.g. MSC on Crespo or eSE on G1, ...)
+		// -> put retrieval of applet version is separate thread that will get killed after max. 5 seconds
+		appletVersion = "";
+		Thread thread = new Thread() {
+			public void run() {
+				try {
+					for (Reader reader: TestPerformer.seService.getReaders()) {
+						try {
+							appletVersion += " " + Util.fill(reader.getName().split(":")[0], 5);
+						} catch (Exception e) {
+							appletVersion += reader.getName();
+						}
+						
+						if (reader.isSecureElementPresent()) {
+							Session session;
+							try {
+								session = reader.openSession();
+							} catch (Exception e) {
+						        appletVersion += "no session available\n";
+						        continue;
+							}
+	
+							Channel channel;
+							try {
+								channel = session.openLogicalChannel(DataContainer.APPLET_AID);
+							} catch (Exception e) {
+						        appletVersion += "applet not installed\n";
+						        continue;
+							}
+							
+							try {
+								byte[] rspApdu = channel.transmit(new byte[] { 0x00, 0x76, 0x00, 0x00, 0x02 });
+								if (rspApdu == null || rspApdu.length != 4) {
+							        appletVersion += "applet installed, no version\n";
+								} else {
+									appletVersion += "version " + String.valueOf(rspApdu[0]) + "." + String.valueOf(rspApdu[1]) + "\n";
+								}
+							} catch (Exception e) {
+								appletVersion += "applet installed, no response\n";
+							}
+						} else {
+					        appletVersion += "no Secure Element present\n";		
+						}
+					}
+				} catch (Exception e) {
+				}
+			}
+		};
+		
+		try {
+			thread.start();
+			thread.join(5000);
+		} catch (InterruptedException e) {
+		}
+		
+		if (thread.isAlive())
+			thread.destroy();
+		
+		tv = (TextView) this.findViewById(R.id.app_info);
+		if (tv != null)
+			tv.setText(appletVersion);
+	}
+}
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/gui/MainActivity.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/gui/MainActivity.java
new file mode 100755
index 0000000..1552b3e
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/gui/MainActivity.java
@@ -0,0 +1,320 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester.gui;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.Window;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ScrollView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.gieseckedevrient.android.apdutester.DataContainer;
+import com.gieseckedevrient.android.apdutester.TestPerformer;
+import com.gieseckedevrient.android.apdutester.TestResultListener;
+import com.gieseckedevrient.android.apdutester.Util;
+import com.gieseckedevrient.android.apdutester.R;
+
+
+public class MainActivity extends Activity implements	TestResultListener {
+
+	TestPerformer performer = new TestPerformer(this, this);
+
+	TextView textView = null;
+	ScrollView scrollView = null;
+	Button startButton = null;
+	Button stopButton = null;
+	Spinner spinnerDataLen = null;
+	Spinner spinnerLoops = null;
+	BufferedWriter logOutput;
+	DataContainer dataContainer;
+	
+	final Handler mHandler = new Handler();
+	List<String> message = new ArrayList<String>(0);
+
+	final Runnable mUpdateResults = new Runnable() {
+		public void run() {
+			scrollView.post(new Runnable() {
+				public void run() {
+					scrollView.fullScroll(ScrollView.FOCUS_DOWN);
+				}
+			});
+			
+			String msg = "";
+			synchronized (this) {
+				if (message.isEmpty() == false) {
+					msg = message.remove(0);
+				}
+			}
+			
+			if (msg != null) {
+				Log.v(getResources().getString(R.string.app_name), msg);
+				textView.append(msg);
+				if (logOutput != null) {
+					try {
+						logOutput.append(msg);
+					} catch (IOException e) {
+					}
+				}
+			}
+		}
+	};
+
+	public void logText(String message) {
+		this.message.add(message);
+		mHandler.post(mUpdateResults);
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+		setContentView(R.layout.main);
+
+		dataContainer = DataContainer.getInstance();
+		SharedPreferences settings = getSharedPreferences(getResources().getString(R.string.app_name), 0);
+		dataContainer.setBasicChannel(settings.getBoolean("basicChannel", false));		
+		dataContainer.setCase1(settings.getBoolean("case1", true));		
+		dataContainer.setCase2(settings.getBoolean("case2", true));		
+		dataContainer.setCase3(settings.getBoolean("case3", true));		
+		dataContainer.setCase4(settings.getBoolean("case4", true));		
+		dataContainer.setDelays(settings.getBoolean("delays", false));		
+		dataContainer.setErrors(settings.getBoolean("errors", true));		
+		dataContainer.setDataLength(settings.getInt("dataLength", 250));		
+		dataContainer.setLoops(settings.getInt("loops", 1));		
+		dataContainer.setLogPath(settings.getString("logPath", "/sdcard"));		
+		
+		ArrayList<String> arrayList_spinnerDataLength = new ArrayList<String>();
+		for (int i = 1; i <= 256; i++)
+			arrayList_spinnerDataLength.add("Data len: " + i);
+		final String[] array_spinnerDataLength = arrayList_spinnerDataLength.toArray(new String[arrayList_spinnerDataLength.size()]);
+		ArrayAdapter adapterDataLength = new ArrayAdapter(this, android.R.layout.simple_spinner_item, array_spinnerDataLength);
+		spinnerDataLen = (Spinner) findViewById(R.id.spinnerDataLen);
+		spinnerDataLen.setAdapter(adapterDataLength);
+		spinnerDataLen.setSelection(dataContainer.getDataLength() - 1);
+		spinnerDataLen.setOnItemSelectedListener(new OnItemSelectedListener() {
+			public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
+				String value = array_spinnerDataLength[position];
+				String[] values = value.split("[:]");
+				dataContainer.setDataLength(Integer.parseInt(values[1].trim()));
+			}
+			public void onNothingSelected(AdapterView<?> parentView) {
+			}
+		});
+
+		ArrayList<String> arrayList_spinnerLoops = new ArrayList<String>();
+		int selection = 0;
+		for (int i = 0; i <= 16; i++) {
+			int value = new Double(Math.pow(2, i)).intValue();
+			arrayList_spinnerLoops.add("Loops: " + value);
+			if (value == dataContainer.getLoops())
+				selection = i;
+		}
+		if (dataContainer.getLoops() == 0)
+			selection = 17;
+		arrayList_spinnerLoops.add("Loops: endless");
+		final String[] array_spinnerLoops = arrayList_spinnerLoops.toArray(new String[arrayList_spinnerLoops.size()]);
+		ArrayAdapter adapterLoops = new ArrayAdapter(this, android.R.layout.simple_spinner_item, array_spinnerLoops);
+		spinnerLoops = (Spinner) findViewById(R.id.spinnerLoops);
+		spinnerLoops.setAdapter(adapterLoops);
+		spinnerLoops.setSelection(selection);
+		spinnerLoops.setOnItemSelectedListener(new OnItemSelectedListener() {
+			public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
+				String value = array_spinnerLoops[position];
+				String[] values = value.split("[:]");
+				if (values[1].trim().equalsIgnoreCase("endless") == true)
+					dataContainer.setLoops(0);
+				else
+					dataContainer.setLoops(Integer.parseInt(values[1].trim()));
+			}
+			public void onNothingSelected(AdapterView<?> parentView) {
+			}
+		});
+
+		startButton = (Button) findViewById(R.id.startButton);
+		startButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				textView.setText("");
+				spinnerLoops.setEnabled(false);
+				spinnerDataLen.setEnabled(false);
+				startButton.setVisibility(Button.INVISIBLE);
+				stopButton.setVisibility(Button.VISIBLE);
+				performer.runApduCaseTest(MainActivity.this);
+			}
+		});
+
+		stopButton = (Button) findViewById(R.id.stopButton);
+		stopButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				performer.testFinished = true;
+			}
+		});
+
+		scrollView = (ScrollView) findViewById(R.id.scrollView);
+		textView = (TextView) findViewById(R.id.textView);
+		
+		performer.connectToService();
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+	    if ((keyCode == KeyEvent.KEYCODE_BACK)) {
+	        finish();
+	    }
+	    return super.onKeyDown(keyCode, event);
+	}
+	
+	@Override
+	protected void onDestroy() {
+		performer.onDestroy();
+		
+		SharedPreferences settings = getSharedPreferences(getResources().getString(R.string.app_name), 0);
+		SharedPreferences.Editor editor = settings.edit();
+		editor.putBoolean("basicChannel", dataContainer.getBasicChannel());
+		editor.putBoolean("case1", dataContainer.getCase1());
+		editor.putBoolean("case2", dataContainer.getCase2());
+		editor.putBoolean("case3", dataContainer.getCase3());
+		editor.putBoolean("case4", dataContainer.getCase4());
+		editor.putBoolean("delays", dataContainer.getDelays());
+		editor.putBoolean("errors", dataContainer.getErrors());
+		editor.putInt("dataLength", dataContainer.getDataLength());
+		editor.putInt("loops", dataContainer.getLoops());
+		editor.putString("logPath", dataContainer.getLogPath());
+		editor.commit();
+		
+		super.onDestroy();
+	}
+	
+	public boolean onCreateOptionsMenu(Menu menu) {
+		SubMenu smReaders = menu.addSubMenu(0, 1000, 0, "Readers");
+		try {
+			for (int i = 0; i < performer.getReaders().length; i++)
+				smReaders.add(0, 1000 + i + 1, 0, performer.getReaders()[i].getName());
+		} catch (Exception e) {
+		}
+		menu.addSubMenu(1, 2000, 0, "Settings");		
+		menu.add(0, 3000, 0, "About");
+		menu.add(0, 4000, 0, "Exit");
+		
+		return true;
+	}
+
+	public boolean onOptionsItemSelected(MenuItem item) {
+		int id = item.getItemId();
+		
+		if (id < 2000) {
+			try {
+				if (id != 1000 & (id - 1000 - 1) < performer.getReaders().length)
+					performer.setReader(performer.getReaders()[id - 1000 - 1]);
+			} catch (Exception e) {
+			}
+		} else  if (id == 2000) {
+			Intent intent = new Intent(this, SettingsActivity.class);
+			startActivityForResult(intent, 1337);
+		} else if (id == 3000) {
+			Intent intent = new Intent(this, AboutActivity.class);
+			startActivity(intent);
+		} else if (id == 4000) {
+			finish();
+		}
+		
+		uiUpdate();
+		
+		return true;
+	}
+
+	public void uiUpdate() {
+		if (startButton != null) {
+			try {
+				startButton.setText("Start Test ("	+ performer.getReader().getName() + " - " + (performer.isBasicChannel() ? "Basic Channel)" 	: "Logical Channel)"));
+			} catch (Exception e) {
+				startButton.setText("Start Test");
+			}
+			startButton.setEnabled(performer.isReady());
+		}
+		
+		if (performer.isReady())
+			startButton.setEnabled(true);
+		else
+			startButton.setEnabled(false);
+	}
+
+	public void testFinished() {
+		runOnUiThread(new Runnable() {
+		    public void run() {
+				spinnerLoops.setEnabled(true);
+				spinnerDataLen.setEnabled(true);
+				startButton.setVisibility(Button.VISIBLE);
+				stopButton.setVisibility(Button.INVISIBLE);
+		    }
+		});
+	}
+	
+	@Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+       super.onActivityResult(requestCode, resultCode, data);
+        if(resultCode == 1337)
+        	uiUpdate();
+	}    
+	
+	public File openNewLogFile() throws IOException {
+		File file = null;
+		try {
+			String path = dataContainer.getLogPath();
+			if (path.length() > 0) {
+				file = new File(path, "test_log_" + Util.getTimeStamp() + ".txt");
+				logOutput = new BufferedWriter(new FileWriter(file));
+			}
+		} catch (Exception e) {
+			file = null;
+		}
+		return file;
+	}
+
+	public boolean allMessagesHandled() {
+		return message.isEmpty();
+	}
+
+	public void closeLogFile() throws IOException {
+		if (logOutput != null)
+			logOutput.close();
+	}
+
+}
diff --git a/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/gui/SettingsActivity.java b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/gui/SettingsActivity.java
new file mode 100644
index 0000000..bdef5d9
--- /dev/null
+++ b/samples/ApduTester/ApduTester/src/com/gieseckedevrient/android/apdutester/gui/SettingsActivity.java
@@ -0,0 +1,127 @@
+/**
+ * Copyright 2011 Giesecke & Devrient GmbH.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gieseckedevrient.android.apdutester.gui;
+
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
+
+import com.gieseckedevrient.android.apdutester.DataContainer;
+import com.gieseckedevrient.android.apdutester.R;
+
+
+public class SettingsActivity extends PreferenceActivity implements Preference.OnPreferenceChangeListener {
+
+	private DataContainer dataContainer;
+
+	private EditTextPreference editTestLogFile;
+	private ListPreference listPrefCommunicationChannel;
+	private CheckBoxPreference checkBoxDelays;
+	private CheckBoxPreference checkBoxErrors;
+	private CheckBoxPreference checkBoxCase1;
+	private CheckBoxPreference checkBoxCase2;
+	private CheckBoxPreference checkBoxCase3;
+	private CheckBoxPreference checkBoxCase4;
+	
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setTitle(getResources().getString(R.string.app_name) + " settings");
+
+		addPreferencesFromResource(R.xml.settings);
+		PreferenceScreen prefSet = getPreferenceScreen();
+
+		dataContainer = DataContainer.getInstance();
+		
+		editTestLogFile = (EditTextPreference) prefSet.findPreference("logpath");
+		editTestLogFile.setTitle(dataContainer.getLogPath());
+		editTestLogFile.setOnPreferenceChangeListener(this);
+
+		listPrefCommunicationChannel = (ListPreference) prefSet.findPreference("communicationChannel");
+		listPrefCommunicationChannel.setOnPreferenceChangeListener(this);
+		listPrefCommunicationChannel.setEntries(new CharSequence[] { "Basic channel", "Logical Channel"});
+		listPrefCommunicationChannel.setEntryValues(new CharSequence[] { "basic", "logical"});
+		listPrefCommunicationChannel.setValue((dataContainer.getBasicChannel() == true) ? "basic" : "logical");
+		listPrefCommunicationChannel.setTitle((dataContainer.getBasicChannel() == true) ? "Basic channel" : "Logical channel");
+		
+		checkBoxDelays = (CheckBoxPreference) prefSet.findPreference("delays");
+		checkBoxDelays.setChecked(DataContainer.getInstance().getDelays());
+
+		checkBoxErrors = (CheckBoxPreference) prefSet.findPreference("errors");
+		checkBoxErrors.setChecked(DataContainer.getInstance().getErrors());
+
+		checkBoxCase1 = (CheckBoxPreference) prefSet.findPreference("case1");
+		checkBoxCase1.setChecked(DataContainer.getInstance().getCase1());
+
+		checkBoxCase2 = (CheckBoxPreference) prefSet.findPreference("case2");
+		checkBoxCase2.setChecked(DataContainer.getInstance().getCase2());
+
+		checkBoxCase3 = (CheckBoxPreference) prefSet.findPreference("case3");
+		checkBoxCase3.setChecked(DataContainer.getInstance().getCase3());
+
+		checkBoxCase4 = (CheckBoxPreference) prefSet.findPreference("case4");
+		checkBoxCase4.setChecked(DataContainer.getInstance().getCase4());
+		
+		setResult(1337, null);
+	}
+
+	public boolean onPreferenceChange(Preference pref, Object newValue) {
+		if (pref == editTestLogFile) {
+			dataContainer.setLogPath(newValue.toString());
+			editTestLogFile.setTitle(dataContainer.getLogPath());
+			return true;
+		} else if (pref == listPrefCommunicationChannel) {
+			if (newValue.toString().compareToIgnoreCase("basic") == 0)
+				dataContainer.setBasicChannel(true);
+			else
+				dataContainer.setBasicChannel(false);
+			listPrefCommunicationChannel.setTitle((dataContainer.getBasicChannel() == true) ? "Basic channel" : "Logical channel");
+
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean onPreferenceTreeClick(PreferenceScreen prefScreen, Preference pref) {
+		if (pref == checkBoxDelays) {
+			dataContainer.setDelays(checkBoxDelays.isChecked());
+			return true;
+		} else if (pref == checkBoxErrors) {
+			dataContainer.setErrors(checkBoxErrors.isChecked());
+			return true;
+		} else if (pref == checkBoxCase1) {
+			dataContainer.setCase1(checkBoxCase1.isChecked());
+			return true;
+		} else if (pref == checkBoxCase2) {
+			dataContainer.setCase2(checkBoxCase2.isChecked());
+			return true;
+		} else if (pref == checkBoxCase3) {
+			dataContainer.setCase3(checkBoxCase3.isChecked());
+			return true;
+		} else if (pref == checkBoxCase4) {
+			dataContainer.setCase4(checkBoxCase4.isChecked());
+			return true;
+		}
+		return false;
+	}
+}