diff --git a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/MainActivity.java b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/MainActivity.java index d88f470..17de26a 100644 --- a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/MainActivity.java +++ b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/MainActivity.java @@ -175,4 +175,4 @@ public class MainActivity extends AppCompatActivity { dialog.dismiss(); super.onPause(); } -} +} \ No newline at end of file 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 f7e7c94..0cf7cfd 100644 --- a/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java +++ b/ACardEmulator/app/src/main/java/com/vsmartcard/acardemulator/SettingsActivity.java @@ -201,7 +201,30 @@ public class SettingsActivity extends AppCompatPreferenceActivity { } }); - bindPreferenceSummaryToValue(findPreference("nfc")); + Preference internal_nfc = findPreference("internal_nfc"); + internal_nfc.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + public boolean onPreferenceClick(Preference preference) { + if (android.os.Build.VERSION.SDK_INT >= 16) { + startActivity(new Intent(android.provider.Settings.ACTION_NFC_SETTINGS)); + } else { + startActivity(new Intent(android.provider.Settings.ACTION_WIRELESS_SETTINGS)); + } + return true; + } + }); + + Preference gear_nfc = findPreference("gear_nfc"); + gear_nfc.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + public boolean onPreferenceClick(Preference preference) { + String gearPackage = "com.samsung.android.gearoplugin"; + try { + startActivity(new Intent(android.content.Intent.ACTION_VIEW, Uri.parse("market://details?id="+gearPackage))); + } catch (android.content.ActivityNotFoundException e) { + startActivity(new Intent(android.content.Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id="+gearPackage))); + } + return true; + } + }); } @Override diff --git a/ACardEmulator/app/src/main/res/values/strings.xml b/ACardEmulator/app/src/main/res/values/strings.xml index 6d3d63a..6eea7fc 100644 --- a/ACardEmulator/app/src/main/res/values/strings.xml +++ b/ACardEmulator/app/src/main/res/values/strings.xml @@ -45,13 +45,6 @@ Builtin Java Card Simulator Remote Virtual Smart Card - - @string/nfc - @string/gear - - Builtin NFC - Samsung Accessory - If you choose the virtual smart card (VICC) as emulator, you need to start the it on your computer with the `--reversed` flag and configure the connection parameters here accordingly. VICC Port VICC Hostname diff --git a/ACardEmulator/app/src/main/res/xml/settings.xml b/ACardEmulator/app/src/main/res/xml/settings.xml index 17148a2..2b33d30 100644 --- a/ACardEmulator/app/src/main/res/xml/settings.xml +++ b/ACardEmulator/app/src/main/res/xml/settings.xml @@ -81,11 +81,23 @@ - + > + + + + + + + + \ No newline at end of file