True RAW json printed

MoreliaTalk · Oct 17, 2020 · 643690f · 643690f
1 parent 5fe6754
commit 643690f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git 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
@@ -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
@@ -51,5 +51,6 @@
     <string name="safe_scrolling">Безопасная прокрутка</string>
     <string name="safe_scroll_on">Прокручивать только из нижней позиции</string>
     <string name="safe_scroll_off">Прокручивать всегда</string>
+    <string name="auth_status_ok">Auth success</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -62,4 +62,5 @@
 
     <!-- Design Preferences -->
     <string name="themes_messages">Themes of messages ballons</string>
+    <string name="auth_status_ok">Auth success</string>
 </resources>