commit

src/main/java/com/example/afrishop_v3/controllers/Controller.java

@@ -8,10 +8,7 @@ import com.google.firebase.FirebaseOptions;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthException;
 import com.google.firebase.auth.FirebaseToken;
-import com.google.firebase.messaging.FirebaseMessaging;
-import com.google.firebase.messaging.FirebaseMessagingException;
-import com.google.firebase.messaging.Message;
-import com.google.firebase.messaging.Notification;
+import com.google.firebase.messaging.*;
 import org.json.JSONObject;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.HttpEntity;
@@ -58,27 +55,27 @@ class Controller {
     }
 
 
-        protected boolean validateFirebaseToken (String token){
+    protected boolean validateFirebaseToken(String token) {
 
-            FirebaseApp firebaseApp = getApp();
+        FirebaseApp firebaseApp = getApp();
 
-            if( firebaseApp == null ) return false;
+        if (firebaseApp == null) return false;
 
-            FirebaseAuth instance = FirebaseAuth.getInstance(firebaseApp);
-            System.out.println(firebaseApp.getName());
-            System.out.println(token);
-            try {
-                FirebaseToken firebaseToken = instance.verifyIdToken(token);
-                // verify token successfully
-                return firebaseToken != null;
-            } catch (FirebaseAuthException e) {
-                // verify token error
-                System.out.println("verify token error");
-
-                System.out.println(e.getMessage());
-            }
+        FirebaseAuth instance = FirebaseAuth.getInstance(firebaseApp);
+        System.out.println(firebaseApp.getName());
+        System.out.println(token);
+        try {
+            FirebaseToken firebaseToken = instance.verifyIdToken(token);
+            // verify token successfully
+            return firebaseToken != null;
+        } catch (FirebaseAuthException e) {
+            // verify token error
+            System.out.println("verify token error");
 
-            return false;
+            System.out.println(e.getMessage());
+        }
+
+        return false;
 
     }
 
@@ -107,19 +104,16 @@ class Controller {
 
         FirebaseApp firebaseApp = getApp();
 
-        if( firebaseApp == null ) return false;
+        if (firebaseApp == null) return false;
 
         FirebaseMessaging messaging = FirebaseMessaging.getInstance(firebaseApp);
 
 
-
-
-
-
         Message message = Message.builder()
                 .putData("click_action", "FLUTTER_NOTIFICATION_CLICK")
                 .putData("id", String.valueOf(id++))
                 .putData("status", "done")
+                .setAndroidConfig(AndroidConfig.builder().setNotification(AndroidNotification.builder().setSound("default").setBody(_message).setTitle(title).build()).build())
                 .setNotification(Notification.builder().setBody(_message).setTitle(title).build())
                 .setToken(token)
                 .build();

src/main/java/com/example/afrishop_v3/models/Post.java

@@ -40,7 +40,7 @@ public class Post extends Model {
     @Transient
     public boolean liked = false;
 
-    @Transient
+    @Transient @JsonIgnore
     public boolean retrieveAll = false;