diff options
author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2022-05-29 20:42:25 +0300 |
---|---|---|
committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2022-05-29 20:42:25 +0300 |
commit | 4f67d291160da77d809bb1a1319ef87777783ffe (patch) | |
tree | f48d2d23a4aa477260d71611aaba2d1e339d8ed7 | |
parent | 859672914cd7ad4f12c1e1fcfa28c03fb9490950 (diff) |
More strings to export
-rw-r--r-- | app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java | 12 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java b/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java index 1d0e2fa..2c0061c 100644 --- a/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java +++ b/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java @@ -61,11 +61,11 @@ public class UsbSerialTelnetService extends Service { { if (mStarted) { // Already started - new Handler(Looper.getMainLooper()).post(() -> Toast.makeText(UsbSerialTelnetService.this.getApplicationContext(), "Already started", Toast.LENGTH_LONG).show()); + new Handler(Looper.getMainLooper()).post(() -> Toast.makeText(UsbSerialTelnetService.this.getApplicationContext(), getString(R.string.already_started), Toast.LENGTH_LONG).show()); return START_STICKY; } - String message = getString(R.string.app_name) + " started"; + String message = getString(R.string.app_name) + " " + getString(R.string.started); boolean success = false; try { @@ -73,7 +73,7 @@ public class UsbSerialTelnetService extends Service { UsbManager manager = (UsbManager) getSystemService(Context.USB_SERVICE); List<UsbSerialDriver> availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager); if (availableDrivers.isEmpty()) { - message = "Error: USB serial device not found"; + message = getString(R.string.device_not_found); } else { // Open a connection to the first available driver. UsbSerialDriver driver = availableDrivers.get(0); @@ -102,7 +102,7 @@ public class UsbSerialTelnetService extends Service { } } catch (Exception ex) { - message = "Error: " + ex.getMessage(); + message = getString(R.string.error) + " " + ex.getMessage(); ex.printStackTrace(); } @@ -137,7 +137,6 @@ public class UsbSerialTelnetService extends Service { if (success) { if (message != null) Log.i(TAG, message); - Log.d(TAG, String.format("Local IP Address: %s", getIPAddress())); mStarted = true; } else { if (message != null) @@ -186,7 +185,8 @@ public class UsbSerialTelnetService extends Service { mUsbSerialThread = null; } if (mStarted) - new Handler(Looper.getMainLooper()).post(() -> Toast.makeText(UsbSerialTelnetService.this.getApplicationContext(), getString(R.string.app_name) + " stopped", Toast.LENGTH_SHORT).show()); + new Handler(Looper.getMainLooper()).post(() -> Toast.makeText(UsbSerialTelnetService.this.getApplicationContext(), + getString(R.string.app_name) + " " + getString(R.string.stopped), Toast.LENGTH_SHORT).show()); Log.i(TAG, "Service stopped"); mStarted = false; mBinder.stopped(); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index acf622f..d01b4c4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,6 +9,11 @@ <string name="data_bits">Data bits</string> <string name="stop_bits">Stop bits</string> <string name="parity">Parity</string> + <string name="started">started</string> + <string name="device_not_found">Error: USB serial device not found</string> + <string name="error">Error:</string> + <string name="stopped">stopped</string> + <string name="already_started">Already started</string> <string-array name="data_bits"> <item>5</item> <item>6</item> |