Selaa lähdekoodia

compatibility xcode 8.3

Marino Faggiana 8 vuotta sitten
vanhempi
commit
4b3d51a6f6

+ 1 - 1
Libraries external/OCCommunicationLib/OCCommunicationLib/OCCommunication.h

@@ -842,7 +842,7 @@ typedef enum {
 
 - (void)subscribingNextcloudServerPush:(NSString *)serverPath pushTokenHash:(NSString *)pushTokenHash devicePublicKey:(NSString *)devicePublicKey proxyServerPath:(NSString *)proxyServerPath onCommunication:(OCCommunication *)sharedOCComunication successRequest:(void (^)(NSHTTPURLResponse *response, NSString *publicKey, NSString *deviceIdentifier, NSString *signature, NSString *redirectedServer))successRequest failureRequest:(void (^)(NSHTTPURLResponse *, NSError *, NSString *))failureRequest;
 
-- (void)subscribingPushProxy:(NSString *)serverPath pushToken:(NSString *)pushToken deviceIdentifier:(NSString *)deviceIdentifier deviceIdentifierSignature:(NSString *)deviceIdentifierSignature userPublicKey:(NSString *)userPublicKey onCommunication:(OCCommunication *)sharedOCComunication successRequest:(void (^)(NSHTTPURLResponse *response, NSString *redirectedServer))successRequest failureRequest:(void (^)(NSHTTPURLResponse *, NSError *, NSString *))failureRequest;
+- (void)subscribingPushProxy:(NSString *)serverPath pushToken:(NSString *)pushToken deviceIdentifier:(NSString *)deviceIdentifier deviceIdentifierSignature:(NSString *)deviceIdentifierSignature userPublicKey:(NSString *)userPublicKey onCommunication:(OCCommunication *)sharedOCComunication successRequest:(void (^)(NSHTTPURLResponse *response, NSString *redirectedServer)) successRequest failureRequest:(void (^)(NSHTTPURLResponse *, NSError *, NSString *))failureRequest;
 
 #pragma mark -  Server Activity
 

+ 4 - 5
Libraries external/OCCommunicationLib/OCCommunicationLib/OCCommunication.m

@@ -1507,16 +1507,15 @@
     OCWebDAVClient *request = [OCWebDAVClient new];
     request = [self getRequestWithCredentials:request];
     
+    __weak OCWebDAVClient *wrequest = request;
+    
     [request setNotificationServer:serverPath type:type onCommunication:sharedOCComunication success:^(NSHTTPURLResponse *response, id responseObject) {
         
-        if (successRequest) {
-            //Return success
-            successRequest(response, request.redirectedServer);
-        }
+        successRequest(response, wrequest.redirectedServer);
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
         
-        failureRequest(response, error, request.redirectedServer);
+        failureRequest(response, error, wrequest.redirectedServer);
     }];
 }
 

+ 1 - 1
Picker/DocumentPickerViewController.swift

@@ -769,7 +769,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
 
         if recordTableMetadata!.directory == 0 {
             
-            if FileManager.default.fileExists(atPath: "\(directoryUser!)/\(self.metadata?.fileID!)") {
+            if FileManager.default.fileExists(atPath: "\(directoryUser!)/\(String(describing: self.metadata?.fileID!))") {
                 
                 downloadFileSuccess(self.metadata?.fileID!, serverUrl: self.serverUrl!, selector: selectorLoadFileView, selectorPost: nil)
                 

+ 1 - 1
Share Ext/CCloadItemData.swift

@@ -85,7 +85,7 @@ class CCloadItemData: NSObject {
                                     
                                     if let url = item as? URL {
                                         
-                                        print("item as url: \(item)")
+                                        print("item as url: \(String(describing: item))")
                                         
                                         let pathExtention = URL(fileURLWithPath: url.lastPathComponent).pathExtension
                                         let fileName = "\(dateFormatter.string(from: Date()))\(conuter).\(pathExtention)"