add initial LocationMessage support

CHANGELOG.md

@@ -2,10 +2,15 @@
 
 See README.md for info about version numbering. Follows https://keepachangelog.com/en/1.0.0/
 
+## 2.2.3 - 2018-08-15
+### Added
+- unofficial support for LocationMessage: reverse engineered from the message format. Not documented by Threema
+
 ## 2.2.2 - 2018-08-15
 ### Changed
 - Split calculateMac out of connection class to remove duplication
 - phpstan fixes
+- namespace fixes on sodium functions
 
 ## 2.2.1 - 2018-08-15
 ### Changed

src/Threema/MsgApi/Encryptor/AbstractEncryptor.php

@@ -18,6 +18,7 @@
 use Threema\MsgApi\Message\DeliveryReceipt;
 use Threema\MsgApi\Message\FileMessage;
 use Threema\MsgApi\Message\ImageMessage;
+use Threema\MsgApi\Message\LocationMessage;
 use Threema\MsgApi\Message\TextMessage;
 use Threema\MsgApi\Response\UploadFileResponse;
 
@@ -172,7 +173,7 @@ final public function decryptMessage($box, $recipientPrivateKey, $senderPublicKe
  case TextMessage::TYPE_CODE:
  /* Text message */
  if ($realDataLength < 2) {
- throw new BadMessageException();
+ throw new BadMessageException('text message is too short');
  }
  return new TextMessage(substr($data, 1));
 
@@ -202,7 +203,7 @@ final public function decryptMessage($box, $recipientPrivateKey, $senderPublicKe
  /* Image Message */
  $values = json_decode(substr($data, 1), true);
  if (empty($values)) {
- throw new BadMessageException();
+ throw new BadMessageException('json badly formatted');
  }
 
  return new FileMessage(
@@ -212,6 +213,14 @@ final public function decryptMessage($box, $recipientPrivateKey, $senderPublicKe
  $values['m'],
  $values['n'],
  $values['s']);
+
+ case LocationMessage::TYPE_CODE:
+ $points = explode(',',$this->bin2hex($data));
+ if (count($points) !== 3) {
+ throw new BadMessageException('invalid latitude and longitude');
+ }
+ return new LocationMessage($points[0], $points[1]);
+
  default:
  throw new UnsupportedMessageTypeException();
  }

src/Threema/MsgApi/Message/LocationMessage.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * @author Threema GmbH
+ * @copyright Copyright (c) 2015-2016 Threema GmbH
+ */
+
+declare(strict_types=1);
+
+namespace Threema\MsgApi\Message;
+
+class LocationMessage extends AbstractMessage
+{
+ const TYPE_CODE = 0x16;
+
+ /** @var string */
+ private $latitude;
+
+ /** @var string */
+ private $longitute;
+
+ public function __construct(string $latitude, string $longitute)
+ {
+ $this->latitude = $latitude;
+ $this->longitute = $longitute;
+ }
+
+ /**
+ * @return string
+ */
+ public function __toString()
+ {
+ return 'Location: ' . $this->latitude . ',' . $this->longitute;
+ }
+
+ /**
+ * Get the message type code of this message.
+ *
+ * @return int message type code
+ */
+ public function getTypeCode(): int
+ {
+ return self::TYPE_CODE;
+ }
+}