nextcloud
/
ios
зеркало из https://github.com/nextcloud/ios.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fix

This commit is contained in:
Marino Faggiana 2017-10-29 13:17:39 +01:00
Родитель 89651e084a
Коммит fe386ed71f
4 изменённых файлов: 15 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
iOSClient/Networking/NCNetworkingSync.h
Просмотреть файл

@ -13,9 +13,9 @@
+ (NCNetworkingSync *)sharedManager;
- (NSString *)lockEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url fileID:(NSString *)fileID token:(NSString *)token;
- (NSError *)unlockEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url fileID:(NSString *)fileID token:(NSString *)token;
- (NSString *)lockEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password serverUrl:(NSString *)serverUrl fileID:(NSString *)fileID token:(NSString *)token;
- (NSError *)unlockEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password serverUrl:(NSString *)serverUrl fileID:(NSString *)fileID token:(NSString *)token;
- (NSError *)markEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url fileID:(NSString *)fileID;
- (NSError *)deletemarkEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url fileID:(NSString *)fileID;
- (NSError *)markEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password serverUrl:(NSString *)serverUrl fileID:(NSString *)fileID;
- (NSError *)deletemarkEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password serverUrl:(NSString *)serverUrl fileID:(NSString *)fileID;
@end

16
iOSClient/Networking/NCNetworkingSync.m
Просмотреть файл

@ -23,7 +23,7 @@
}
}
- (NSString *)lockEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url fileID:(NSString *)fileID token:(NSString *)token
- (NSString *)lockEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password serverUrl:(NSString *)serverUrl fileID:(NSString *)fileID token:(NSString *)token
{
OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
__block NSString *returnToken = nil;
@ -33,7 +33,7 @@
[communication setCredentialsWithUser:user andUserID:userID andPassword:password];
[communication setUserAgent:[CCUtility getUserAgent]];
[communication lockEndToEndFolderEncrypted:[url stringByAppendingString:@"/"] fileID:fileID token:token onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *token, NSString *redirectedServer) {
[communication lockEndToEndFolderEncrypted:[serverUrl stringByAppendingString:@"/"] fileID:fileID token:token onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *token, NSString *redirectedServer) {
returnToken = token;
dispatch_semaphore_signal(semaphore);
@ -49,7 +49,7 @@
return returnToken;
}
- (NSError *)unlockEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url fileID:(NSString *)fileID token:(NSString *)token
- (NSError *)unlockEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password serverUrl:(NSString *)serverUrl fileID:(NSString *)fileID token:(NSString *)token
{
OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
__block NSError *returnError= nil;
@ -59,7 +59,7 @@
[communication setCredentialsWithUser:user andUserID:userID andPassword:password];
[communication setUserAgent:[CCUtility getUserAgent]];
[communication unlockEndToEndFolderEncrypted:[url stringByAppendingString:@"/"] fileID:fileID onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
[communication unlockEndToEndFolderEncrypted:[serverUrl stringByAppendingString:@"/"] fileID:fileID onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
dispatch_semaphore_signal(semaphore);
@ -75,7 +75,7 @@
return returnError;
}
- (NSError *)markEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url fileID:(NSString *)fileID
- (NSError *)markEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password serverUrl:(NSString *)serverUrl fileID:(NSString *)fileID
{
OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
__block NSError *returnError= nil;
@ -85,7 +85,7 @@
[communication setCredentialsWithUser:user andUserID:userID andPassword:password];
[communication setUserAgent:[CCUtility getUserAgent]];
[communication markEndToEndFolderEncrypted:[url stringByAppendingString:@"/"] fileID:fileID onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
[communication markEndToEndFolderEncrypted:[serverUrl stringByAppendingString:@"/"] fileID:fileID onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
dispatch_semaphore_signal(semaphore);
@ -101,7 +101,7 @@
return returnError;
}
- (NSError *)deletemarkEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url fileID:(NSString *)fileID
- (NSError *)deletemarkEndToEndFolderEncrypted:(NSString *)user userID:(NSString *)userID password:(NSString *)password serverUrl:(NSString *)serverUrl fileID:(NSString *)fileID
{
OCCommunication *communication = [CCNetworking sharedNetworking].sharedOCCommunication;
__block NSError *returnError= nil;
@ -111,7 +111,7 @@
[communication setCredentialsWithUser:user andUserID:userID andPassword:password];
[communication setUserAgent:[CCUtility getUserAgent]];
[communication deletemarkEndToEndFolderEncrypted:[url stringByAppendingString:@"/"] fileID:fileID onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
[communication deletemarkEndToEndFolderEncrypted:[serverUrl stringByAppendingString:@"/"] fileID:fileID onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *redirectedServer) {
dispatch_semaphore_signal(semaphore);

1
iOSClient/Nextcloud-Bridging-Header.h
Просмотреть файл

@ -20,3 +20,4 @@
#import "OCSharedDto.h"
#import "OCNotifications.h"
#import "OCNotificationsAction.h"
#import "NCNetworkingSync.h"

26
iOSClient/Security/NCEntoToEndInterface.swift
Просмотреть файл

@ -340,31 +340,9 @@ class NCEntoToEndInterface : NSObject, OCNetworkingDelegate {
// MARK: Mark/Delete Encrypted Folder
// --------------------------------------------------------------------------------------------
func markEnd(toEndFolderEncryptedSuccess metadataNet: CCMetadataNet!) {
print("E2E mark folder success")
}
func markEnd(toEndFolderEncryptedFailure metadataNet: CCMetadataNet!, message: String!, errorCode: Int) {
// Unauthorized
if (errorCode == kOCErrorServerUnauthorized) {
appDelegate.openLoginView(appDelegate.activeMain, loginType: loginModifyPasswordUser)
}
@objc func markEndToEndFolderEncrypted(_ serverUrl: String, fileID: String, token: String) {
if (errorCode != kOCErrorServerUnauthorized) {
appDelegate.messageNotification("_error_", description: message as String!, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
}
}
@objc func markEndToEndFolderEncrypted(_ metadata: tableMetadata) {
let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
metadataNet.action = actionMarkEndToEndFolderEncrypted;
metadataNet.fileID = metadata.fileID;
appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
NCNetworkingSync.sharedManager().lockEnd(toEndFolderEncrypted: appDelegate.activeUser, userID: appDelegate.activeUserID, password: appDelegate.activePassword, serverUrl: serverUrl , fileID: fileID, token: token)
}
func deletemarkEnd(toEndFolderEncryptedSuccess metadataNet: CCMetadataNet!) {