Merge pull request #499 from nextcloud/backport/496/stable17

[stable17] Fix cutting of multibyte characters
nextcloud · Dec 4, 2019 · 7b909fd · 7b909fd
2 parents f46f766 + 550d325
commit 7b909fd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/Push.php b/lib/Push.php
@@ -264,9 +264,10 @@ protected function encryptAndSign(Key $userKey, array $device, int $id, INotific
 
 		// Max length of encryption is 255, so we need to shorten the subject to be shorter
 		$subject = $notification->getParsedSubject();
-		$dataLength = 245 - strlen(json_encode($data));
+		// Half the length for multibyte characters like Russian, Chinese, Japanese, Emojis, …
+		$dataLength = floor((245 - strlen(json_encode($data))) / 2) - 1;
 		if (strlen($subject) > $dataLength) {
-			$data['subject'] = substr($subject, 0, $dataLength) . '…';
+			$data['subject'] = mb_substr($subject, 0, $dataLength) . '…';
 		} else {
 			$data['subject'] = $subject;
 		}