From 367bc7518ed9e37e52b17747289e7cd1049ed740 Mon Sep 17 00:00:00 2001
From: "marcin.jedynski" <marjed12@st.amu.edu.pl>
Date: Thu, 6 Dec 2018 22:31:02 +0100
Subject: [PATCH] fixed toast on send feedback, minor model adjustment of
 feedback

---
 .../com/uam/wmi/findmytutor/service/FeedbackService.java   | 2 +-
 .../java/com/uam/wmi/findmytutor/utils/FeedbackUtils.java  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/uam/wmi/findmytutor/service/FeedbackService.java b/app/src/main/java/com/uam/wmi/findmytutor/service/FeedbackService.java
index 6461a19..c5b318b 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/service/FeedbackService.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/service/FeedbackService.java
@@ -10,7 +10,7 @@ import retrofit2.http.POST;
 
 public interface FeedbackService {
     @POST("api/Feedback")
-    Observable<Void> postFeedback(@Body Feedback feedback);
+    Observable<Response<Void>> postFeedback(@Body Feedback feedback);
 
     @GET("api/Feedback")
     Observable<Void> getFeedback();
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/FeedbackUtils.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/FeedbackUtils.java
index 17021d3..26f2031 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/FeedbackUtils.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/FeedbackUtils.java
@@ -82,10 +82,9 @@ public class FeedbackUtils {
         try {
             appVersion = activityContext.getPackageManager().getPackageInfo(activityContext.getPackageName(), 0).versionName;
             if( !mode ){
-                body = PrefUtils.getUserFirstName(activityContext) + " " +  PrefUtils.getUserLastName(activityContext) + "\n" + body;
                 userFeedback = new Feedback(mode,
                         header,
-                        PrefUtils.getUserId(activityContext),
+                        PrefUtils.getUserFirstName(activityContext) + " " +  PrefUtils.getUserLastName(activityContext) + " | " + PrefUtils.getUserId(activityContext),
                         "Android "+ Build.VERSION.RELEASE,
                         appVersion,
                         Build.MODEL,
@@ -113,8 +112,10 @@ public class FeedbackUtils {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(this::handleResponse, this::handleError));
     }
-    private void handleResponse( Void resp) {
+    private void handleResponse( Response<Void> resp) {
         Toast.makeText(activityContext, activityContext.getString(R.string.modal_feedback_thankyou), Toast.LENGTH_SHORT).show();
+        Log.d("FEEDBACK toast","gdzie jest mój tost");
+
     }
 
     private void handleError(Throwable error) {