push

Libraries external/OCCommunicationLib/OCCommunicationLib/OCWebDavClient/OCWebDAVClient.m

@@ -743,25 +743,19 @@ NSString const *OCWebDAVModificationDateKey	= @"modificationdate";
     
     _requestMethod = @"POST";
     
-    /*
-     
-     pushTokenHash = [pushTokenHash stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding];
-     NSString *pushTokenHashParam = [NSString stringWithFormat:@"?pushTokenHash=%@",pushTokenHash];
-     
-     devicePublicKey = [devicePublicKey stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding];
-     NSString *devicePublicKeyParam = [NSString stringWithFormat:@"&devicePublicKey=%@",devicePublicKey];
-
-    */
-    
-    NSString *pushTokenHashParam = [NSString stringWithFormat:@"?pushTokenHash=%@",pushTokenHash];    
-    NSString *devicePublicKeyParam = [NSString stringWithFormat:@"&devicePublicKey=%@",devicePublicKey];
+    NSString *pushTokenHashParam = [NSString stringWithFormat:@"?pushTokenHash=%@",pushTokenHash];
+    NSString *devicePublicKeyParam = [NSString stringWithFormat:@"devicePublicKey=%@",devicePublicKey];
     
     serverPath = [serverPath stringByAppendingString:pushTokenHashParam];
-    serverPath = [serverPath stringByAppendingString:devicePublicKeyParam];
+    //serverPath = [serverPath stringByAppendingString:devicePublicKeyParam];
 
     NSMutableURLRequest *request = [self sharedRequestWithMethod:_requestMethod path:serverPath parameters:nil];
     [request setValue:[NSString stringWithFormat:@"token %@", authorizationToken] forHTTPHeaderField:@"Authorization"];
     
+    NSData *requestBodyData = [devicePublicKeyParam dataUsingEncoding:NSUTF8StringEncoding];
+    
+    request.HTTPBody = requestBodyData;
+    
     OCHTTPRequestOperation *operation = [self mr_operationWithRequest:request onCommunication:sharedOCCommunication success:success failure:failure];
     [self setRedirectionBlockOnDatataskWithOCCommunication:sharedOCCommunication andSessionManager:sharedOCCommunication.networkSessionManager];
     [operation resume];

iOSClient/AppDelegate.m

@@ -434,6 +434,7 @@
     
     NSString *path = [[[NSBundle mainBundle] URLForResource:k_nextcloudDevicePushPublicKeyDev withExtension:@"pem"] absoluteString];
     NSData *devicePublicKeyData = [NSData dataWithContentsOfURL:[NSURL URLWithString:path]];
+    
     NSString *devicePublicKey = [[NSString alloc] initWithData:devicePublicKeyData encoding:NSUTF8StringEncoding];
     
     NSLog(@"DEVICE TOKEN = %@", pushTokenString);