marinofaggiana hace 5 años
padre
commit
820781eb4e
Se han modificado 3 ficheros con 8 adiciones y 5 borrados
  1. 3 0
      iOSClient/CCGlobal.h
  2. 4 4
      iOSClient/Main/CCMain.m
  3. 1 1
      iOSClient/Main/NCMainCommon.swift

+ 3 - 0
iOSClient/CCGlobal.h

@@ -293,6 +293,9 @@
 #define k_layout_view_trash                             @"LayoutTrash"
 #define k_layout_view_offline                           @"LayoutOffline"
 
+// Rich Workspace
+#define k_fileNameRichWorkspace                         @"Readme.md"
+
 // Nextcloud unsupported
 #define k_nextcloud_unsupported                         13
 

+ 4 - 4
iOSClient/Main/CCMain.m

@@ -1956,7 +1956,7 @@
 
 - (void)viewRichWorkspaceTapAction:(UITapGestureRecognizer *)tapGesture
 {
-    tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@ AND fileNameView LIKE[c] %@", appDelegate.activeAccount, self.serverUrl, @"readme.md"]];
+    tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@ AND fileNameView LIKE[c] %@", appDelegate.activeAccount, self.serverUrl, k_fileNameRichWorkspace.lowercaseString]];
     if (metadata) {
         [self shouldPerformSegue:metadata selector:selectorViewerRichWorkspace];
     }
@@ -1964,7 +1964,7 @@
 
 - (void)createRichWorkspace
 {
-    tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@ AND fileNameView LIKE[c] %@", appDelegate.activeAccount, self.serverUrl, @"readme.md"]];
+    tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@ AND fileNameView LIKE[c] %@", appDelegate.activeAccount, self.serverUrl, k_fileNameRichWorkspace.lowercaseString]];
     if (metadata && [[NCUtility sharedInstance] isDirectEditing:metadata]) {
         if (appDelegate.reachability.isReachable) {
             [self shouldPerformSegue:metadata selector:@""];
@@ -1972,10 +1972,10 @@
             [[NCContentPresenter shared] messageNotification:@"_info_" description:@"_go_online_" delay:k_dismissAfterSecond type:messageTypeInfo errorCode:0];
         }
     } else if (metadata == nil) {
-        NSString *fileNamePath = [CCUtility returnFileNamePathFromFileName:@"Readme.md" serverUrl:self.serverUrl activeUrl:appDelegate.activeUrl];
+        NSString *fileNamePath = [CCUtility returnFileNamePathFromFileName:k_fileNameRichWorkspace serverUrl:self.serverUrl activeUrl:appDelegate.activeUrl];
         [[NCCommunication sharedInstance] NCTextCreateFileWithUrlString:appDelegate.activeUrl fileNamePath:fileNamePath editor:@"text" templateId:@"" account:appDelegate.activeAccount completionHandler:^(NSString *account, NSString *url, NSInteger errorCode, NSString *errorMessage) {
             if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
-                tableMetadata *metadata = [CCUtility createMetadataWithAccount:appDelegate.activeAccount date:[NSDate date] directory:false ocId:[CCUtility createRandomString:12] serverUrl:self.serverUrl fileName:@"Readme.md" etag:@"" size:0 status:k_metadataStatusNormal url:url contentType:@"text/markdown"];
+                tableMetadata *metadata = [CCUtility createMetadataWithAccount:appDelegate.activeAccount date:[NSDate date] directory:false ocId:[CCUtility createRandomString:12] serverUrl:self.serverUrl fileName:k_fileNameRichWorkspace etag:@"" size:0 status:k_metadataStatusNormal url:url contentType:@"text/markdown"];
                 [self shouldPerformSegue:metadata selector:@""];
             } else if (errorCode != 0) {
                 [NCContentPresenter.shared  messageNotification:@"_error_" description:errorMessage delay:k_dismissAfterSecond type:messageTypeError errorCode:errorCode];

+ 1 - 1
iOSClient/Main/NCMainCommon.swift

@@ -1002,7 +1002,7 @@ class NCMainCommon: NSObject, PhotoEditorDelegate, NCAudioRecorderViewController
                         }
                         
                         // Rich Workspace
-                        if metadata.fileNameView.lowercased() == "readme.md" {
+                        if metadata.fileNameView.lowercased() == k_fileNameRichWorkspace.lowercased() {
                             self.appDelegate.activeMain.readFileReloadFolder()
                         }