diff --git a/app/build.gradle b/app/build.gradle
index 6e05b57..7dd0557 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "ru.wtw.moreliatalkclient"
minSdkVersion 14
targetSdkVersion 30
- versionCode 9
- versionName "0.1.3.6"
+ versionCode 10
+ versionName "0.1.3.7"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/java/ru/wtw/moreliatalkclient/Network.java b/app/src/main/java/ru/wtw/moreliatalkclient/Network.java
index 1111946..bc15ac8 100644
--- a/app/src/main/java/ru/wtw/moreliatalkclient/Network.java
+++ b/app/src/main/java/ru/wtw/moreliatalkclient/Network.java
@@ -133,12 +133,12 @@ public void onOpen(ServerHandshake handshakedata) {
@Override
public void onMessage(String message) {
+ if (showJSON) {
+ outChat("", "Received: " + message, "");
+ }
String cleanmessage = message.replaceAll("\\\\n", "").replaceAll("\\\\", "");
cleanmessage = cleanmessage.startsWith("\"") ? cleanmessage.substring(1) : cleanmessage;
cleanmessage = cleanmessage.endsWith("\"") ? cleanmessage.substring(0, cleanmessage.length() - 1) : cleanmessage;
- if (showJSON) {
- outChat("", "Received: " + cleanmessage, "");
- }
Protocol protocol = new Gson().fromJson(cleanmessage, Protocol.class);
String reply = "";
if (protocol.getType().equals("register_user")) {
@@ -150,6 +150,13 @@ public void onMessage(String message) {
if (protocol.getErrors().getCode() == 409)
reply = activity.getResources().getString(R.string.auth_status_exist);
}
+ if (protocol.getType().equals("auth")) {
+ if (protocol.getErrors().getCode() == 200) {
+ uuid = protocol.getData().getUser()[0].getUuid();
+ auth_id = protocol.getData().getUser()[0].getAuth_id();
+ reply = activity.getResources().getString(R.string.auth_status_ok);
+ }
+ }
if (!showJSON) {
outChat("", reply, "");
}
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 75d48b1..ff5b7b0 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -51,5 +51,6 @@
Безопасная прокрутка
Прокручивать только из нижней позиции
Прокручивать всегда
+ Auth success
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b3d72f3..e3648f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -62,4 +62,5 @@
Themes of messages ballons
+ Auth success
\ No newline at end of file