[NEW] topic in HTTP json payload

[NEW] 9.5.5
owntracks · Jun 14, 2017 · 4aabd6c · 4aabd6c
1 parent d8c9f6c
commit 4aabd6c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/OwnTracks/OwnTracks WatchKit App/Info.plist b/OwnTracks/OwnTracks WatchKit App/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.4</string>
+	<string>9.5.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.4</string>
+	<string>9.5.5</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

diff --git a/OwnTracks/OwnTracks WatchKit Extension/Info.plist b/OwnTracks/OwnTracks WatchKit Extension/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.4</string>
+	<string>9.5.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.4</string>
+	<string>9.5.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

diff --git a/OwnTracks/OwnTracks/Connection.m b/OwnTracks/OwnTracks/Connection.m
@@ -357,7 +357,13 @@ - (UInt16)sendData:(NSData *)data topic:(NSString *)topic qos:(NSInteger)qos ret
                  [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding],
                  (long)qos,
                  retainFlag);
-
+
+    NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
+    if (json && [json isKindOfClass:[NSDictionary class]] && self.url) {
+        NSMutableDictionary *mutableJson = [json mutableCopy];
+        [mutableJson setObject:topic forKey:@"topic"];
+        data = [NSJSONSerialization dataWithJSONObject:mutableJson options:0 error:nil];
+    }
     NSData *outgoingData = (self.key && self.key.length) ? [self encrypt:data] : data;
 
     if (self.url) {

diff --git a/OwnTracks/OwnTracks/OwnTracks-Info.plist b/OwnTracks/OwnTracks/OwnTracks-Info.plist
@@ -92,7 +92,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.4</string>
+	<string>9.5.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -111,7 +111,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.5.4</string>
+	<string>9.5.5</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/OwnTracks/OwnTracks/de.lproj/Launch Screen.strings b/OwnTracks/OwnTracks/de.lproj/Launch Screen.strings
@@ -5,5 +5,5 @@
 /* Class = "UILabel"; text = "OwnTracks"; ObjectID = "kId-c2-rCX"; */
 "kId-c2-rCX.text" = "OwnTracks";
 
-/* Class = "UILabel"; text = "9.5.4"; ObjectID = "wg9-vU-Qvm"; */
-"wg9-vU-Qvm.text" = "9.5.4";
+/* Class = "UILabel"; text = "9.5.5"; ObjectID = "wg9-vU-Qvm"; */
+"wg9-vU-Qvm.text" = "9.5.5";
diff --git a/OwnTracks/OwnTracks/en.lproj/Launch Screen.strings b/OwnTracks/OwnTracks/en.lproj/Launch Screen.strings
@@ -5,5 +5,5 @@
 /* Class = "UILabel"; text = "OwnTracks"; ObjectID = "kId-c2-rCX"; */
 "kId-c2-rCX.text" = "OwnTracks";
 
-/* Class = "UILabel"; text = "9.5.4"; ObjectID = "wg9-vU-Qvm"; */
-"wg9-vU-Qvm.text" = "9.5.4";
+/* Class = "UILabel"; text = "9.5.5"; ObjectID = "wg9-vU-Qvm"; */
+"wg9-vU-Qvm.text" = "9.5.5";
diff --git a/OwnTracks/OwnTracksToday/Info.plist b/OwnTracks/OwnTracksToday/Info.plist
@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.5.4</string>
+	<string>9.5.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.5.4</string>
+	<string>9.5.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>