fix logs

profiles/profile.go

@@ -256,35 +256,37 @@ func GetProfileAndCredential(UUID string, profileKey []byte) (*Profile, error) {
 		log.Debugln("[textsecure] GetProfileAndCredential", err)
 		return nil, err
 	}
-	log.Debugln("[textsecure] GetProfileAndCredential credential length", len(credential))
 	profile.Credential = credential
 	return profile, err
 
 }
 func decryptProfile(profileKey []byte, profile *Profile) error {
 	log.Println("[textsecure] decryptProfile")
-	name, err := decryptString(profileKey, profile.Name)
-	if err != nil {
-		log.Debugln("[textsecure] decryptProfile name", profile.Name, err)
-		return err
-	}
-	profile.Name = name
-	if profile.About != "" {
-		about, err := decryptString(profileKey, profile.About)
+	if profile.Name != "" {
+		name, err := decryptString(profileKey, profile.Name)
 		if err != nil {
-			log.Debugln("[textsecure] decryptProfile about", err)
+			log.Debugln("[textsecure] decryptProfile name", profile.Name, err)
 			return err
 		}
-		profile.About = about
-	}
-	if profile.AboutEmoji != "" {
+		profile.Name = name
 
-		emoji, err := decryptString(profileKey, profile.AboutEmoji)
-		if err != nil {
-			log.Debugln("[textsecure] decryptProfile aboutEmoji", err)
-			return err
+		if profile.About != "" {
+			about, err := decryptString(profileKey, profile.About)
+			if err != nil {
+				log.Debugln("[textsecure] decryptProfile about", err)
+				return err
+			}
+			profile.About = about
+		}
+		if profile.AboutEmoji != "" {
+
+			emoji, err := decryptString(profileKey, profile.AboutEmoji)
+			if err != nil {
+				log.Debugln("[textsecure] decryptProfile aboutEmoji", err)
+				return err
+			}
+			profile.AboutEmoji = emoji
 		}
-		profile.AboutEmoji = emoji
 	}
 	identityKey, err := base64.StdEncoding.DecodeString(profile.IdentityKey)
 	if err != nil {

textsecure.go

@@ -633,7 +633,7 @@ func handleReceivedMessage(env *signalservice.Envelope) error {
 		}
 
 		p, _ := proto.Marshal(env)
-		log.Debugf("[textsecure] Incoming UnidentifiedSenderMessage %s.\n", env)
+		log.Debugf("[textsecure] Incoming UnidentifiedSenderMessage %s.\n", *env.DestinationUuid)
 		data, err := crayfish.Instance.HandleEnvelope(p)
 		if err != nil {
 			return err

websocket.go

@@ -198,6 +198,7 @@ func StartListening() error {
 				}
 				err = handleReceivedMessage(env)
 				if err != nil {
+					log.Debugf("[textsecure] Failed to handle received message: %+v", env)
 					log.WithFields(log.Fields{
 						"error": err,
 					}).Error("[textsecure] Failed to handle received message")