Marino Faggiana 6 years ago
parent
commit
df6570702b

+ 3 - 1
iOSClient/Library/OCCommunicationLib/OCCommunication.m

@@ -2713,13 +2713,15 @@
     }];
 }
 
-#pragma mark - Clear Cache
+#pragma mark - Manage Mobile Editor OCS API
 
 - (void)createLinkRichdocuments:(NSString *)serverPath fileID:(NSString *)fileID onCommunication:(OCCommunication *)sharedOCComunication successRequest:(void(^)(NSHTTPURLResponse *response, NSString *redirectedServer))successRequest  failureRequest:(void(^)(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer)) failureRequest {
     
     serverPath = [serverPath stringByAppendingString:k_url_create_link_mobile_editor];
     serverPath = [NSString stringWithFormat:@"%@/%@", serverPath, fileID];
     serverPath = [serverPath stringByAppendingString:@"?format=json"];
+    //serverPath = [NSString stringWithFormat:@"%@?fileid=%@", serverPath, fileID];
+    //serverPath = [serverPath stringByAppendingString:@"&format=json"];
     
     OCWebDAVClient *request = [[OCWebDAVClient alloc] init];
     request = [self getRequestWithCredentials:request];

+ 8 - 0
iOSClient/Main/CCDetail.m

@@ -216,6 +216,14 @@
             for (NSString *richdocumentMimetype in richdocumentsMimetypes) {
                 if ([richdocumentMimetype containsString:mimeType]) {
                     NSLog(@"Collabora");
+                    
+                    OCnetworking *ocNetworking = [[OCnetworking alloc] initWithDelegate:nil metadataNet:nil withUser:appDelegate.activeUser withUserID:appDelegate.activeUserID withPassword:appDelegate.activePassword withUrl:appDelegate.activeUrl];
+                    
+                    [ocNetworking createLinkRichdocumentsWithFileID:self.metadataDetail.fileID success:^(NSString *link) {
+                        
+                    } failure:^(NSString *message, NSInteger errorCode) {
+                        
+                    }];
                 }
             }
         }

+ 1 - 1
iOSClient/Networking/OCNetworking.h

@@ -73,7 +73,7 @@
 
 - (void)unsubscribingPushNotificationServer:(NSString *)url deviceIdentifier:(NSString *)deviceIdentifier deviceIdentifierSignature:(NSString *)deviceIdentifierSignature publicKey:(NSString *)publicKey success:(void (^)(void))success failure:(void (^)(NSString *message, NSInteger errorCode))failure;
 
-- (void)createLinkRichdocuments:(NSString *)url fileID:(NSString *)fileID success:(void(^)(NSString *link))success failure:(void (^)(NSString *message, NSInteger errorCode))failure;
+- (void)createLinkRichdocumentsWithFileID:(NSString *)fileID success:(void(^)(NSString *link))success failure:(void (^)(NSString *message, NSInteger errorCode))failure;
 
 @end
 

+ 2 - 2
iOSClient/Networking/OCNetworking.m

@@ -2195,14 +2195,14 @@
 #pragma mark =====  Manage Mobile Editor OCS API =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)createLinkRichdocuments:(NSString *)url fileID:(NSString *)fileID success:(void(^)(NSString *link))success failure:(void (^)(NSString *message, NSInteger errorCode))failure
+- (void)createLinkRichdocumentsWithFileID:(NSString *)fileID success:(void(^)(NSString *link))success failure:(void (^)(NSString *message, NSInteger errorCode))failure
 {
     OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
     
     [communication setCredentialsWithUser:_activeUser andUserID:_activeUserID andPassword:_activePassword];
     [communication setUserAgent:[CCUtility getUserAgent]];
     
-    [communication createLinkRichdocuments:url fileID:fileID onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
+    [communication createLinkRichdocuments:[_activeUrl stringByAppendingString:@"/"] fileID:fileID onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
         
         success(@"");