fix(android): permissions & retrieve token

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Jan 17, 2019 · a483869 · a483869
1 parent 10cf29b
commit a483869
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/...act-native/android/app/src/main/java/chat/berty/core/notification/NotificationNative.java b/...act-native/android/app/src/main/java/chat/berty/core/notification/NotificationNative.java
@@ -24,6 +24,7 @@
 
 import chat.berty.core.Level;
 import chat.berty.core.Logger;
+import chat.berty.main.BuildConfig;
 import chat.berty.main.R;
 import core.Core;
 import core.MobileNotification;
@@ -44,31 +45,34 @@ public void display(String title, String body, String icon, String sound, String
     }
 
     public void refreshToken() throws Exception {
-        FirebaseInstanceId.getInstance().deleteInstanceId();
-        FirebaseInstanceId.getInstance().getInstanceId();
+            FirebaseInstanceId.getInstance().deleteToken(BuildConfig.APPLICATION_ID, "GCM");
+            FirebaseInstanceId.getInstance().deleteInstanceId();
+            FirebaseInstanceId.getInstance().getInstanceId();
+            FirebaseInstanceId.getInstance().getToken(BuildConfig.APPLICATION_ID, "GCM");
     }
 
     public void askPermissions() {
         ReactApplicationContext context = NotificationModule.getInstance().getReactApplicationContext();
 
         if (ContextCompat.checkSelfPermission(context.getCurrentActivity(), Manifest.permission.ACCESS_NOTIFICATION_POLICY) == PackageManager.PERMISSION_GRANTED) {
-            this.logger.format(Level.DEBUG, "GRANTED", "GRANTED");
             return;
         }
-        this.logger.format(Level.DEBUG, "NOT_GRANTED", "NOT_GRANTED");
         ActivityCompat.requestPermissions(
                 context.getCurrentActivity(),
                 new String[]{Manifest.permission.ACCESS_NOTIFICATION_POLICY},
                 PERMISSION_CODE);
     }
 
     public void register() throws Exception {
-        this.logger.format(Level.DEBUG, "REGISTER", "REGISTER");
         this.askPermissions();
-        FirebaseInstanceId.getInstance().getInstanceId();
+        // TODO: do not refresh token every time in prod just uncomment this following lines and remove refreshToken when all good
+        // FirebaseInstanceId.getInstance().getInstanceId();
+        // FirebaseInstanceId.getInstance().getToken(BuildConfig.APPLICATION_ID, "GCM");
+        this.refreshToken();
     }
 
     public void unregister() throws Exception {
+        FirebaseInstanceId.getInstance().deleteToken(BuildConfig.APPLICATION_ID, "GCM");
         FirebaseInstanceId.getInstance().deleteInstanceId();
         gomobile.receiveFCMToken(null);
     }

diff --git a/client/react-native/gomobile/core/notification.go b/client/react-native/gomobile/core/notification.go
@@ -1,7 +1,6 @@
 package core
 
 import (
-	"encoding/hex"
 	"fmt"
 	"sync"
 
@@ -62,7 +61,7 @@ func (n *MobileNotification) ReceiveFCMToken(token []byte) {
 func (n *MobileNotification) ReceiveToken(token *notification.Token) {
 	logger().Debug("receive token",
 		zap.String("type", token.Type.String()),
-		zap.String("token", hex.EncodeToString(token.Value)),
+		zap.String("hash", token.Hash()),
 	)
 	n.tokenSubscribersMutex.Lock()
 	for i := range n.subscribers {

diff --git a/core/node/notification.go b/core/node/notification.go
@@ -34,7 +34,8 @@ func (n *Node) UseNotificationDriver() {
 				)
 			case token := <-tokenChan:
 				logger().Debug("node receive notification token",
-					zap.String("token", fmt.Sprintf("%+v", token.String())),
+					zap.String("type", token.Type.String()),
+					zap.String("hash", token.Hash()),
 				)
 			case <-n.shutdown:
 				logger().Debug("node notification driver shutdown")

diff --git a/core/pkg/notification/notification.go b/core/pkg/notification/notification.go
@@ -4,7 +4,6 @@ package notification
 
 import (
 	"encoding/hex"
-	"fmt"
 	"path"
 	"runtime"
 	"sync"
@@ -30,8 +29,15 @@ type Token struct {
 	Type  p2p.DevicePushType
 }
 
-func (t *Token) String() string {
-	return fmt.Sprintf("hash: %+v, type: %+v", hex.EncodeToString(t.Value), t.Type)
+func (t *Token) Hash() string {
+	switch t.Type {
+	default:
+		return ""
+	case p2p.DevicePushType_FCM:
+		return string(t.Value)
+	case p2p.DevicePushType_APNS:
+		return hex.EncodeToString(t.Value)
+	}
 }
 
 type Payload struct {