Browse Source

[e2ee] Filename in the header shows hidden file name instead of the real filename #464

Marino Faggiana 7 years ago
parent
commit
76e655476d
3 changed files with 6 additions and 5 deletions
  1. 4 2
      iOSClient/Main/CCDetail.m
  2. 1 1
      iOSClient/Main/CCMain.m
  3. 1 2
      iOSClient/Text/NCText.swift

+ 4 - 2
iOSClient/Main/CCDetail.m

@@ -319,8 +319,10 @@
         [headRequest setHTTPMethod:@"HEAD"];
         
         NSURLSessionDataTask *task = [session dataTaskWithRequest:headRequest completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
-            NSString *encodingName = [[NCUchardet sharedNUCharDet] encodingStringDetectWithData:data];
-            [self.webView loadData:[NSData dataWithContentsOfURL: url] MIMEType:response.MIMEType characterEncodingName:encodingName baseURL:url];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                NSString *encodingName = [[NCUchardet sharedNUCharDet] encodingStringDetectWithData:data];
+                [self.webView loadData:[NSData dataWithContentsOfURL: url] MIMEType:response.MIMEType characterEncodingName:encodingName baseURL:url];
+            });
         }];
         
         [task resume];

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -5282,7 +5282,7 @@
     _detailViewController.dataSourceImagesVideos = allRecordsDataSourceImagesVideos;
     _detailViewController.dateFilterQuery = nil;
     
-    [_detailViewController setTitle:metadata.fileName];
+    [_detailViewController setTitle:metadata.fileNameView];
 }
 
 // can i go to next viewcontroller

+ 1 - 2
iOSClient/Text/NCText.swift

@@ -72,8 +72,7 @@ class NCText: UIViewController, UITextViewDelegate {
                 loadText = try? String(contentsOfFile: path, encoding: encoding)
                 textView.text = loadText
                 nextButton.title = NSLocalizedString("_save_", comment: "")
-                self.navigationController?.navigationBar.topItem?.title = NSLocalizedString(metadata.fileName, comment: "")
-            
+                self.navigationController?.navigationBar.topItem?.title = NSLocalizedString(metadata.fileNameView, comment: "")
             }
                 
         } else {