You've already forked FIDO2_Bridge
mirror of
https://github.com/token2/FIDO2_Bridge.git
synced 2026-03-13 11:12:26 -07:00
Remove duplicate transport info from connection status
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -86,8 +86,7 @@
|
||||
|
||||
<!-- MainActivity (Debug) -->
|
||||
<string name="usb_permission_denied">USB permission denied</string>
|
||||
<string name="nfc_connected">Security key connected via NFC!</string>
|
||||
<string name="usb_connected">Security key connected via USB!</string>
|
||||
<string name="security_key_detected">Security key detected</string>
|
||||
<string name="nfc_error">NFC Error: %1$s</string>
|
||||
<string name="usb_error">USB Error: %1$s</string>
|
||||
<string name="no_devices_title">No Devices Found</string>
|
||||
@@ -95,7 +94,8 @@
|
||||
<string name="ok">OK</string>
|
||||
<string name="select_security_key">Select Security Key</string>
|
||||
<string name="connecting_usb">Connecting to USB device…</string>
|
||||
<string name="connected_via">Connected via %1$s</string>
|
||||
<string name="using_nfc">Using NFC</string>
|
||||
<string name="using_usb">Using USB</string>
|
||||
<string name="not_connected">Not connected</string>
|
||||
<string name="waiting_for_key">Hold your security key against the back of your phone, or plug it in via USB</string>
|
||||
<string name="connection_lost">Connection lost</string>
|
||||
|
||||
Reference in New Issue
Block a user