diff --git a/Android/app/build.gradle b/Android/app/build.gradle index c14552b..01b09bd 100644 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.cns.encom" minSdkVersion 21 targetSdkVersion 30 - versionCode 7 - versionName "2.1.1" + versionCode 8 + versionName "2.1.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/Android/app/src/main/java/com/cns/encom/MainActivity.java b/Android/app/src/main/java/com/cns/encom/MainActivity.java index bbf9a3b..de03a20 100644 --- a/Android/app/src/main/java/com/cns/encom/MainActivity.java +++ b/Android/app/src/main/java/com/cns/encom/MainActivity.java @@ -110,7 +110,7 @@ protected void onCreate(Bundle savedInstanceState) { } - public void clear_oncliek(View view){ + public void clear_onclick(View view){ Toast.makeText(view.getContext(), "Console cleared", Toast.LENGTH_SHORT).show(); TextView logsWindows = findViewById(R.id.textView); logsWindows.setText(""); @@ -232,8 +232,9 @@ public void connect_onclick(View view){ } public void disconnect_onclick(View view) { + TextView logsWindows = findViewById(R.id.textView); - if(connectionUp) { + try{ if (mConnThread != null) { try { mConnThread.join(); @@ -241,14 +242,17 @@ public void disconnect_onclick(View view) { mConnThread.interrupt(); } } - TextView logsWindows = findViewById(R.id.textView); logsWindows.append("You have disconnected\n"); TextView indicator_host = findViewById(R.id.Indicator_hostip); indicator_host.setText("Host: 0.0.0.0"); mConnThread = null; switchCam = false; connectionUp = false; + } catch(Exception err){ + Log.d("Disconnect", "disconnect_onclick: "+err.getMessage()); + logsWindows.append(err.getMessage()+"\n"); } + } public class connectionThread extends Thread{ diff --git a/Android/app/src/main/res/layout/activity_main.xml b/Android/app/src/main/res/layout/activity_main.xml index 57053f9..73d4f03 100644 --- a/Android/app/src/main/res/layout/activity_main.xml +++ b/Android/app/src/main/res/layout/activity_main.xml @@ -87,7 +87,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:layout_marginBottom="12dp" - android:onClick="clear_oncliek" + android:onClick="clear_onclick" android:text="@string/button4" app:layout_constraintBottom_toTopOf="@+id/ip_form" app:layout_constraintEnd_toEndOf="parent" diff --git a/README.md b/README.md index 83c9419..7b4590f 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Software compatibility: ![](https://img.shields.io/badge/-OK-black?style=flat&logo=Firefox&logoColor=ff6611) ![](https://img.shields.io/badge/-OK-black?style=flat&logo=Google%20Chrome&logoColor=4285F4) ![](https://img.shields.io/badge/-OK-black?style=flat&logo=microsoft%20edge&logoColor=0078D7) -![](https://img.shields.io/badge/-OK-black?style=flat&logo=zoom&logoColor=blue) +![](https://img.shields.io/badge/Zoom-OK-black?style=flat&labelColor=black) ![](https://img.shields.io/badge/-OK-black?style=flat&logo=discord&logoColor=7289d9) ![](https://img.shields.io/badge/-INCOMPATIBLE-black?style=flat&logo=skype&logoColor=00aff0) ![](https://img.shields.io/badge/-INCOMPATIBLE-black?style=flat&logo=Telegram)