From 3a6f20d12e6987a9683ecfb189a2a5b9da481739 Mon Sep 17 00:00:00 2001
From: Domagalski <adadom@st.amu.edu.pl>
Date: Thu, 3 Jan 2019 21:30:43 +0100
Subject: [PATCH] strings fixes and toast removed

---
 .../java/com/uam/wmi/findmytutor/activity/BlackList.java   | 5 +++--
 .../java/com/uam/wmi/findmytutor/activity/MapActivity.java | 1 -
 .../java/com/uam/wmi/findmytutor/activity/WhiteList.java   | 7 +++----
 app/src/main/res/values-pl/strings.xml                     | 1 +
 app/src/main/res/values/strings.xml                        | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java
index a381e41..89b5004 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java
@@ -168,8 +168,6 @@ public class BlackList extends AppCompatActivity {
                                 @Override
                                 public void onSuccess(User user) {
                                     blacklistedUsers.add(user);
-                                    Snackbar.make(getWindow().getDecorView().getRootView(), "user fetch OK! success", Snackbar.LENGTH_LONG)
-                                            .setAction("Action", null).show();
                                     toggleEmptyNotes();
                                     if (blacklistedUsers.size() == blacklistedUsersIDs.size()) {
                                         mAdapter.notifyDataSetChanged();
@@ -244,6 +242,9 @@ public class BlackList extends AppCompatActivity {
         if (e instanceof HttpException) {
             ResponseBody responseBody = ((HttpException) e).response().errorBody();
             message = RestApiHelper.getErrorMessage(responseBody);
+            if (((HttpException) e).response().code() == 404) {
+                message = getString(R.string.no_such_a_user);
+            }
         } else {
             message = "Network Error !";
         }
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
index 6124dd0..b1e9a32 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
@@ -199,7 +199,6 @@ public class MapActivity extends BaseActivity
     private void createMarkerModalView(User user) {
         String cordStatus = coordsMap.get(user.getId()).getLabel();
         String sharingLevel = coordsMap.get(user.getId()).getDisplayMode();
-        user.statu
 
         LayoutInflater layoutInflaterAndroid = LayoutInflater.from(getApplicationContext());
         @SuppressLint("InflateParams") View view = layoutInflaterAndroid.inflate(R.layout.marker_modal, null);
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java
index 04a698e..8ad8ea8 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java
@@ -155,8 +155,6 @@ public class WhiteList extends AppCompatActivity {
                                 @Override
                                 public void onSuccess(User user) {
                                     whitelistedUsers.add(user);
-                                    Snackbar.make(getWindow().getDecorView().getRootView(), "user fetch OK! success", Snackbar.LENGTH_LONG)
-                                            .setAction("Action", null).show();
                                     toggleEmptyNotes();
                                     if (whitelistedUsers.size() == whitelistedUsersIDs.size()) {
                                         mAdapter.notifyDataSetChanged();
@@ -231,11 +229,12 @@ public class WhiteList extends AppCompatActivity {
         if (e instanceof HttpException) {
             ResponseBody responseBody = ((HttpException) e).response().errorBody();
             message = RestApiHelper.getErrorMessage(responseBody);
+            if (((HttpException) e).response().code() == 404) {
+                message = getString(R.string.no_such_a_user);
+            }
         } else {
             message = "Network Error !";
         }
-        Toast.makeText(getApplicationContext(), e.toString(), Toast.LENGTH_SHORT).show();
-
 
         Snackbar.make(getWindow().getDecorView().getRootView(), message, Snackbar.LENGTH_LONG)
                 .setAction("Action", null).show();
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 65df81d..c79d468 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -260,6 +260,7 @@
     <string name="activity_title_whitelist">Biała lista</string>
     <string name="title_activity_white_list">Biała lista</string>
     <string name="white_list_title">Dodaj użytkownika do białej listy</string>
+    <string name="no_such_a_user">Nie ma takiego użytkownika</string>
 
 </resources>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 69d392b..f47f95f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -427,5 +427,6 @@
     <string name="no_online_users">Currently, there are no\nonline users.</string>
     <string name="no_offline_users">Currently, there are no\noffline users.</string>
     <string name="only_online_users">Only online users</string>
+    <string name="no_such_a_user">No such a user</string>
 
 </resources>