diff --git a/android/app/build.gradle b/android/app/build.gradle index 9495c29..05a5194 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -4,12 +4,12 @@ plugins { android { namespace 'com.sdk.socket' - compileSdk 35 + compileSdk = 36 defaultConfig { applicationId "com.sdk.socket" - minSdk 24 - targetSdk 35 + minSdk = 24 + targetSdk = 36 versionCode 1 versionName "1.0" diff --git a/android/app/src/main/java/com/sdk/socket/MainActivity.java b/android/app/src/main/java/com/sdk/socket/MainActivity.java index 2da1e57..3a9d11e 100644 --- a/android/app/src/main/java/com/sdk/socket/MainActivity.java +++ b/android/app/src/main/java/com/sdk/socket/MainActivity.java @@ -30,26 +30,23 @@ protected void onCreate(Bundle savedInstanceState) { // Example of a call to a native method Button reqBtn = binding.request; - reqBtn.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // Code to execute when the button is clicked - String ipAddress = binding.ipaddress.getText().toString(); - if (!Utils.isValidIPAddressDomain(ipAddress)) { - Toast.makeText(getApplicationContext(), "Invalid IP address, domain", - Toast.LENGTH_SHORT).show(); - return; - } - String portNumber = binding.portNumber.getText().toString(); - if (!Utils.isValidPort(portNumber)) { - Toast.makeText(getApplicationContext(), "Invalid port number", - Toast.LENGTH_SHORT).show(); - return; - } - String reqMessage = binding.requestMessage.getText().toString(); - EditText result = binding.result; - result.setText(SendRequest(ipAddress, Integer.parseInt(portNumber), reqMessage)); + reqBtn.setOnClickListener(v -> { + // Code to execute when the button is clicked + String ipAddress = binding.ipaddress.getText().toString(); + if (!Utils.isValidIPAddressDomain(ipAddress)) { + Toast.makeText(getApplicationContext(), "Invalid IP address, domain", + Toast.LENGTH_SHORT).show(); + return; } + String portNumber = binding.portNumber.getText().toString(); + if (!Utils.isValidPort(portNumber)) { + Toast.makeText(getApplicationContext(), "Invalid port number", + Toast.LENGTH_SHORT).show(); + return; + } + String reqMessage = binding.requestMessage.getText().toString(); + EditText result = binding.result; + result.setText(SendRequest(ipAddress, Integer.parseInt(portNumber), reqMessage)); }); } diff --git a/android/app/src/main/java/com/sdk/socket/Utils.java b/android/app/src/main/java/com/sdk/socket/Utils.java index e755bf6..d2532c6 100644 --- a/android/app/src/main/java/com/sdk/socket/Utils.java +++ b/android/app/src/main/java/com/sdk/socket/Utils.java @@ -5,12 +5,12 @@ public static boolean isValidIPAddressDomain(String input) { String ipPattern = "^((25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)\\.){3}" + "(25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)" + - "(\\:[0-9]{1,5})?$"; + "(:[0-9]{1,5})?$"; String domainPattern = "^(?!-)[A-Za-z0-9-]{1,63}(?