Fix notification and Order Food

FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Common/Common.java

@@ -8,6 +8,7 @@ import android.graphics.Paint;
 import com.waterbase.foodifyServer.Model.Request;
 import com.waterbase.foodifyServer.Model.User;
 import com.waterbase.foodifyServer.Remote.APIService;
+import com.waterbase.foodifyServer.Remote.FCMRetrofitClient;
 import com.waterbase.foodifyServer.Remote.IGeoCoordinates;
 import com.waterbase.foodifyServer.Remote.RetrofitClient;
 
@@ -24,7 +25,7 @@ public class Common {
     private static final String fcmUrl = "https://fcm.googleapis.com/";
 
     public static APIService getFCMClient(){
-        return RetrofitClient.getClient(fcmUrl).create(APIService.class);
+        return FCMRetrofitClient.getClient(fcmUrl).create(APIService.class);
     }
 
     public static String coverCodeToStatus(String code){

FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Model/Token.java

@@ -9,6 +9,9 @@ public class Token {
         this.isServerToken = isServerToken;
     }
 
+    public Token() {
+    }
+
     public String getToken() {
         return token;
     }

FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Remote/FCMRetrofitClient.java

@@ -0,0 +1,19 @@
+package com.waterbase.foodifyServer.Remote;
+
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+public class FCMRetrofitClient {
+    private static Retrofit retrofit = null;
+
+    public static Retrofit getClient(String baseUrl) {
+        if(retrofit == null) {
+            retrofit = new Retrofit.Builder()
+                    .baseUrl(baseUrl)
+                    .addConverterFactory(GsonConverterFactory.create())
+                    .build();
+        }
+
+        return retrofit;
+    }
+}

FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/ViewHolder/OrderViewHolder.java

@@ -10,8 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.waterbase.foodifyServer.Interface.ItemClickListener;
 import com.waterbase.foodifyServer.R;
 
-public class OrderViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnCreateContextMenuListener,
-View.OnLongClickListener{
+public class OrderViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnCreateContextMenuListener{
 
     public TextView txtOrderId, txtOrderStatus, txtOrderPhone, txtOrderAddress;
 
@@ -27,7 +26,6 @@ View.OnLongClickListener{
 
         itemView.setOnClickListener(this);
         itemView.setOnCreateContextMenuListener(this);
-        itemView.setOnLongClickListener(this);
     }
 
     public void setItemClickListener(ItemClickListener itemClickListener) {
@@ -47,9 +45,4 @@ View.OnLongClickListener{
         contextMenu.add(0,1, getAdapterPosition(), "Xoá");
     }
 
-    @Override
-    public boolean onLongClick(View view) {
-        itemClickListener.onClick(view, getAdapterPosition(), true);
-        return true;
-    }
 }