diff --git a/app/src/main/java/pl/lebihan/authnkey/MainActivity.kt b/app/src/main/java/pl/lebihan/authnkey/MainActivity.kt index 1c4e456..3cc0ca0 100644 --- a/app/src/main/java/pl/lebihan/authnkey/MainActivity.kt +++ b/app/src/main/java/pl/lebihan/authnkey/MainActivity.kt @@ -287,11 +287,11 @@ class MainActivity : AppCompatActivity() { if (action != null) { action() } else { - statusText.text = getString(R.string.nfc_connected) + statusText.text = getString(R.string.security_key_detected) resultText.text = "" } } else { - statusText.text = getString(R.string.nfc_connected) + statusText.text = getString(R.string.security_key_detected) } } catch (e: Exception) { @@ -411,7 +411,7 @@ class MainActivity : AppCompatActivity() { credentialManagement = null updateConnectionStatus() - statusText.text = getString(R.string.usb_connected) + statusText.text = getString(R.string.security_key_detected) } catch (e: Exception) { statusText.text = getString(R.string.usb_error, e.toUserMessage(this@MainActivity)) @@ -425,7 +425,11 @@ class MainActivity : AppCompatActivity() { val connected = transport?.isConnected == true connectionType.text = if (connected) { - getString(R.string.connected_via, transport?.transportType?.name ?: "") + when (transport?.transportType) { + TransportType.NFC -> getString(R.string.using_nfc) + TransportType.USB -> getString(R.string.using_usb) + else -> "" + } } else { getString(R.string.not_connected) } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 853db94..181a194 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -41,6 +41,7 @@ android:id="@+id/statusText" android:layout_width="match_parent" android:layout_height="wrap_content" + android:minLines="2" android:text="@string/waiting_for_key" android:textSize="16sp" android:gravity="center" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 46f4d22..86ff9a3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -86,8 +86,7 @@ USB permission denied - Security key connected via NFC! - Security key connected via USB! + Security key detected NFC Error: %1$s USB Error: %1$s No Devices Found @@ -95,7 +94,8 @@ OK Select Security Key Connecting to USB device… - Connected via %1$s + Using NFC + Using USB Not connected Hold your security key against the back of your phone, or plug it in via USB Connection lost