Merge pull request #47 from plankes-projects/master

plankes-projects · web-flow · commit fc6f0bd0a225 · 2020-08-31T00:18:30.000+02:00
null pointer
diff --git a/clients/vue/src/untils/NotificationUtils.ts b/clients/vue/src/untils/NotificationUtils.ts
@@ -39,7 +39,6 @@ export class NotificationUtils {
   }
 
   private static async sendTokenToServer(token: string) {
-    console.log("send to server: " + token);
     const api = new UserApi({
       basePath: config.basePath,
       apiKey: StateUtils.getApiKey(),
diff --git a/server/app/src/main/java/com/epicnerf/hibernate/dao/NotificationDao.java b/server/app/src/main/java/com/epicnerf/hibernate/dao/NotificationDao.java
@@ -72,9 +72,8 @@ private void addUserMapping(String deviceIdentifier, User user) {
 
         device.setUser(user);
 
-        //this shall be called before the save, such we only send notification to current devices
-        notificationManager.onNewDeviceLink(user, device);
         deviceRepository.save(device);
+        notificationManager.onNewDeviceLink(user, device);
     }
 
     public void insertForAllUsersOfGroup(@NonNull String title, @NonNull String body, @NonNull GroupObject group) {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ export class NotificationUtils {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`private static async sendTokenToServer(token: string) {`
`42`		`- console.log("send to server: " + token);`
`43`	`42`	`const api = new UserApi({`
`44`	`43`	`basePath: config.basePath,`
`45`	`44`	`apiKey: StateUtils.getApiKey(),`
Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,8 @@ private void addUserMapping(String deviceIdentifier, User user) {`
`72`	`72`
`73`	`73`	`device.setUser(user);`
`74`	`74`
`75`		`- //this shall be called before the save, such we only send notification to current devices`
`76`		`- notificationManager.onNewDeviceLink(user, device);`
`77`	`75`	`deviceRepository.save(device);`
	`76`	`+ notificationManager.onNewDeviceLink(user, device);`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`public void insertForAllUsersOfGroup(@NonNull String title, @NonNull String body, @NonNull GroupObject group) {`