From a60c7cb797a561a5771cfdab9953a69a9abacf55 Mon Sep 17 00:00:00 2001 From: anonymouzz Date: Mon, 7 Aug 2017 10:42:15 +0700 Subject: [PATCH] minor changes (not found message now builts from template), refs #9991 --- android/app/src/main/java/com/dinect/net/ApiClient.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/android/app/src/main/java/com/dinect/net/ApiClient.java b/android/app/src/main/java/com/dinect/net/ApiClient.java index 2dfcd46..f9b680f 100644 --- a/android/app/src/main/java/com/dinect/net/ApiClient.java +++ b/android/app/src/main/java/com/dinect/net/ApiClient.java @@ -41,6 +41,8 @@ public final class ApiClient { private static final int TIMEOUT_CONNECTION = 3; private static final int TIMEOUT_READ = 3; private static final int TIMEOUT_WRITE = 3; + private static final String IDENTIFIER_NOT_FOUND = "Идентификатор {card} не найден."; + public final String endpoint; public final String appToken; @@ -89,16 +91,17 @@ public final class ApiClient { try { final Response response = http.newCall(request).execute(); final String body = response.body().string(); + final String NOT_FOUND_MESSAGE = IDENTIFIER_NOT_FOUND.replace("{card}", card); switch (response.code()) { case 200: final JSONArray users = new JSONArray(body); if (users.length() > 0) { return new Pair<>(card, users.get(0).toString()); } else { - return new Pair<>(null, "Пользователь с таким id не найден"); + return new Pair<>(null, NOT_FOUND_MESSAGE); } case 204: - return new Pair<>(null, "Пользователь с таким id не найден"); + return new Pair<>(null, NOT_FOUND_MESSAGE); default: return new Pair<>(null, "Что-то пошло не так"); }