From c46b5c2021112cf4ade34206e219c42e964041c8 Mon Sep 17 00:00:00 2001
From: Frank Morgner <frankmorgner@gmail.com>
Date: Sat, 25 Apr 2020 02:19:29 +0200
Subject: [PATCH] fixed obsolete reference to Hello world applet

fixes https://github.com/frankmorgner/vsmartcard/issues/163
regression from 1caff4f4971ad6a05acdcff4be4a0becbac139c9
---
 ACardEmulator/README.md                                        | 1 -
 ACardEmulator/app/src/main/external/jcardsim                   | 2 +-
 .../java/com/vsmartcard/acardemulator/SettingsActivity.java    | 1 -
 .../vsmartcard/acardemulator/emulators/EmulatorSingleton.java  | 3 +--
 .../com/vsmartcard/acardemulator/emulators/JCEmulator.java     | 3 +--
 ACardEmulator/doc/README.txt                                   | 1 -
 6 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ACardEmulator/README.md b/ACardEmulator/README.md
index 79be80a8..ff5476e3 100644
--- a/ACardEmulator/README.md
+++ b/ACardEmulator/README.md
@@ -9,7 +9,6 @@ APDUs are then returned to the smart card reader.
 With the built-in Java Card runtime of [jCardSim](http://www.jcardsim.org/) the
 app includes the following Applets:
 
-- [Hello World Applet](https://github.com/licel/jcardsim/blob/master/src/main/java/com/licel/jcardsim/samples/HelloWorldApplet.java) (application identifier ``F000000001``)
 - [OpenPGP Applet](https://developers.yubico.com/ykneo-openpgp/) (application identifier ``D2760001240102000000000000010000``)
 - [OATH Applet](https://developers.yubico.com/ykneo-oath/) (application identifier ``A000000527210101``)
 - [ISO Applet](http://www.pwendland.net/IsoApplet/) (application identifier ``F276A288BCFBA69D34F31001``)
diff --git a/ACardEmulator/app/src/main/external/jcardsim b/ACardEmulator/app/src/main/external/jcardsim
index 48c258ea..73cc1871 160000
--- a/ACardEmulator/app/src/main/external/jcardsim
+++ b/ACardEmulator/app/src/main/external/jcardsim
@@ -1 +1 @@
-Subproject commit 48c258ea35001b5edc3af62fb69653e2ae4763b8
+Subproject commit 73cc18710c79365fae8e12652ff174226a9dac1e
diff --git a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java
index 1d1fc043..1035af7a 100644
--- a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java
+++ b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java
@@ -184,7 +184,6 @@ public void onCreate(Bundle savedInstanceState) {
             // guidelines.
             bindPreferenceSummaryToValue(findPreference("emulator"));
 
-            bindPreferenceSummaryToValue(findPreference("activate_helloworld"));
             bindPreferenceSummaryToValue(findPreference("activate_pivapplet"));
             bindPreferenceSummaryToValue(findPreference("activate_openpgp"));
             bindPreferenceSummaryToValue(findPreference("activate_oath"));
diff --git a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/emulators/EmulatorSingleton.java b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/emulators/EmulatorSingleton.java
index 9383e553..ea418c88 100644
--- a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/emulators/EmulatorSingleton.java
+++ b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/emulators/EmulatorSingleton.java
@@ -81,7 +81,6 @@ public static void createEmulator(Context context) {
                         Integer.parseInt(SP.getString("port", Integer.toString(VICCEmulator.DEFAULT_PORT))));
             } else {
                 emulator = new JCEmulator(context,
-                        SP.getBoolean("activate_helloworld", false),
                         SP.getBoolean("activate_openpgp", false),
                         SP.getBoolean("activate_oath", false),
                         SP.getBoolean("activate_isoapplet", false),
@@ -132,4 +131,4 @@ public static String[] getRegisteredAids(Context context) {
     public static void deactivate() {
         emulator.deactivate();
     }
-}
\ No newline at end of file
+}
diff --git a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/emulators/JCEmulator.java b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/emulators/JCEmulator.java
index 8f6dddcf..a4250e64 100644
--- a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/emulators/JCEmulator.java
+++ b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/emulators/JCEmulator.java
@@ -23,7 +23,6 @@ public class JCEmulator implements Emulator {
 
     public JCEmulator(
             Context context,
-            boolean activate_helloworld,
             boolean activate_openpgp,
             boolean activate_oath,
             boolean activate_isoapplet,
@@ -122,4 +121,4 @@ public byte[] process(byte[] commandAPDU) {
     public void deactivate() {
         simulator.reset();
     }
-}
\ No newline at end of file
+}
diff --git a/ACardEmulator/doc/README.txt b/ACardEmulator/doc/README.txt
index 3d65d53a..66edc24d 100644
--- a/ACardEmulator/doc/README.txt
+++ b/ACardEmulator/doc/README.txt
@@ -26,7 +26,6 @@ device instead of the phone.
 With the built-in Java Card runtime of jCardSim_ the app includes the following
 Applets:
 
-- `Hello World Applet`_ (application identifier ``F000000001``)
 - `OpenPGP Applet`_ (application identifier ``D2760001240102000000000000010000``)
 - `OATH Applet`_ (application identifier ``A000000527210101``)
 - `ISO Applet`_ (application identifier ``F276A288BCFBA69D34F31001``)