|
@@ -25,7 +25,7 @@
|
|
|
#import "AppDelegate.h"
|
|
|
#import "NCBridgeSwift.h"
|
|
|
|
|
|
-@interface CCUploadFromOtherUpp()
|
|
|
+@interface CCUploadFromOtherUpp() <NCSelectDelegate>
|
|
|
{
|
|
|
AppDelegate *appDelegate;
|
|
|
|
|
@@ -139,31 +139,31 @@
|
|
|
#pragma mark == IBAction ==
|
|
|
#pragma --------------------------------------------------------------------------------------------
|
|
|
|
|
|
-- (void)moveServerUrlTo:(NSString *)serverUrlTo title:(NSString *)title type:(NSString *)type
|
|
|
+- (void)dismissSelectWithServerUrl:(NSString *)serverUrl metadata:(tableMetadata *)metadata type:(NSString *)type
|
|
|
{
|
|
|
- if (serverUrlTo) {
|
|
|
- serverUrlLocal = serverUrlTo;
|
|
|
- if (title) destinationTitle = title;
|
|
|
- else destinationTitle = NSLocalizedString(@"_home_", nil);
|
|
|
+ if (serverUrl) {
|
|
|
+ serverUrlLocal = serverUrl;
|
|
|
+ destinationTitle = metadata.fileNameView;
|
|
|
+ //destinationTitle = NSLocalizedString(@"_home_", nil);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- (void)changeFolder
|
|
|
{
|
|
|
- UINavigationController *navigationController = [[UIStoryboard storyboardWithName:@"CCMove" bundle:nil] instantiateViewControllerWithIdentifier:@"CCMove"];
|
|
|
+ UINavigationController *navigationController = [[UIStoryboard storyboardWithName:@"NCSelect" bundle:nil] instantiateInitialViewController];
|
|
|
+ NCSelect *viewController = (NCSelect *)navigationController.topViewController;
|
|
|
|
|
|
- /*
|
|
|
- CCMove *viewController = (CCMove *)navigationController.topViewController;
|
|
|
viewController.delegate = self;
|
|
|
- viewController.move.title = NSLocalizedString(@"_select_", nil);
|
|
|
- viewController.tintColor = NCBrandColor.sharedInstance.brandText;
|
|
|
- viewController.barTintColor = NCBrandColor.sharedInstance.brand;
|
|
|
- viewController.tintColorTitle = NCBrandColor.sharedInstance.brandText;
|
|
|
- // E2EE
|
|
|
- viewController.includeDirectoryE2EEncryption = NO;
|
|
|
-
|
|
|
+ viewController.hideButtonCreateFolder = false;
|
|
|
+ viewController.selectFile = false;
|
|
|
+ viewController.includeDirectoryE2EEncryption = false;
|
|
|
+ viewController.includeImages = false;
|
|
|
+ viewController.type = @"";
|
|
|
+ viewController.titleButtonDone = NSLocalizedString(@"_select_", nil);
|
|
|
+ viewController.layoutViewSelect = k_layout_view_move;
|
|
|
+
|
|
|
+ [navigationController setModalPresentationStyle:UIModalPresentationFullScreen];
|
|
|
[self presentViewController:navigationController animated:YES completion:nil];
|
|
|
- */
|
|
|
}
|
|
|
|
|
|
-(void)upload
|