Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
35 changes: 16 additions & 19 deletions android/app/src/main/java/com/sdk/socket/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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));
});
}

Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/java/com/sdk/socket/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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}(?<!-)\\." +
"[A-Za-z]{2,6}" +
"(\\:[0-9]{1,5})?$";
"(:[0-9]{1,5})?$";

return input.matches(ipPattern) || input.matches(domainPattern);
}
Expand Down
10 changes: 5 additions & 5 deletions android/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
agp = "8.9.0"
agp = "8.13.2"
junit = "4.13.2"
junitVersion = "1.2.1"
espressoCore = "3.6.1"
appcompat = "1.7.0"
material = "1.12.0"
junitVersion = "1.3.0"
espressoCore = "3.7.0"
appcompat = "1.7.1"
material = "1.13.0"
constraintlayout = "2.2.1"

[libraries]
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jun 11 21:46:26 TRT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists