فهرست منبع

remove old code

marinofaggiana 5 سال پیش
والد
کامیت
10f7698585
2فایلهای تغییر یافته به همراه18 افزوده شده و 23 حذف شده
  1. 1 6
      iOSClient/AppDelegate.m
  2. 17 17
      iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

+ 1 - 6
iOSClient/AppDelegate.m

@@ -1513,14 +1513,9 @@ PKPushRegistry *pushRegistry;
 }
 
 #pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Open CCUploadFromOtherUpp  =====
+#pragma mark ===== OpenURL  =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url
-{
-    return YES;
-}
-
 // Method called from iOS system to send a file from other app.
 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options
 {

+ 17 - 17
iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -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