1. PR suggestions update

2. Enhance robustness of stringEscapedForJavasacript method.
3. sDoc file share bug fix

Author: henry9610

Pod/Classes/ExtentedString.m

@@ -7,6 +7,7 @@
 //
 
 #import "ExtentedString.h"
+#import "Debug.h"
 
 @implementation NSString (ExtentedString)
 
@@ -75,10 +76,20 @@ - (BOOL)isValidFileName
 
 - (NSString *)stringEscapedForJavasacript
 {
-    // valid JSON object need to be an array or dictionary
-    NSArray* arrayForEncoding = @[self];
-    NSString* jsonString = [[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:arrayForEncoding options:0 error:nil] encoding:NSUTF8StringEncoding];
+    NSError *error = nil;
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:@[self] options:0 error:&error];
+    if (error || !jsonData) {
+        Debug(@"Error serializing string for javascript escaping: %@", error);
+        return @"";
+    }
+    
+    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    if (!jsonString || jsonString.length < 4) {
+        return jsonString;
+    }
+    
     NSString* escapedString = [jsonString substringWithRange:NSMakeRange(2, jsonString.length - 4)];
+    
     return escapedString;
 }
 

Pod/Classes/SeafCacheManager.m

@@ -136,9 +136,6 @@ - (NSString *)getCachePathForFile:(SeafFile *)file {
 // Check if there is a local cache
 - (BOOL)fileHasCache:(SeafFile *)file
 {
-    if ([file isSdocFile]) {
-        return YES;
-    }
     // 1) If the local mpath exists and the file exists
     if (file.mpath && [[NSFileManager defaultManager] fileExistsAtPath:file.mpath]) {
         return YES;

Pod/Classes/Version.h

@@ -9,6 +9,6 @@
 #ifndef version_h
 #define version_h
 
-#define SEAFILE_VERSION @"3.0.0"
+#define SEAFILE_VERSION @"3.0.1"
 
 #endif /* version_h */

Seafile.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Seafile"
-  s.version          = "3.0.0"
+  s.version          = "3.0.1"
   s.summary          = "iOS client for seafile."
   s.homepage         = "https://github.com/haiwen/seafile-iOS"
   s.license          = 'MIT'

seafile/SeafActivityViewController.m

@@ -23,6 +23,7 @@
 #import "SeafDateFormatter.h"
 #import "ExtentedString.h"
 #import "Debug.h"
+#import "SeafLoadingView.h"
 
 typedef void (^ModificationHandler)(NSString *repoId, NSString *path);
 
@@ -32,7 +33,7 @@ @interface SeafActivityViewController ()<UITableViewDelegate,UITableViewDataSour
 @property int eventsOffset;
 
 @property (weak, nonatomic) IBOutlet UITableView *tableView;
-@property (strong, nonatomic) UIActivityIndicatorView *loadingView;
+@property (strong, nonatomic) SeafLoadingView *loadingView;
 
 @property NSMutableDictionary *eventDetails;
 @property UIImage *defaultAccountImage;
@@ -60,12 +61,8 @@ - (void)viewDidLoad
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
 
-    // Initialize loading indicator
-    self.loadingView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleLarge];
-    self.loadingView.color = [UIColor darkTextColor];
-    self.loadingView.hidesWhenStopped = YES;
-    [self.view addSubview:self.loadingView];
-    self.loadingView.center = self.view.center;
+    // Initialize loading view
+    self.loadingView = [SeafLoadingView loadingViewWithParentView:self.view];
 
     if (@available(iOS 15.0, *)) {
         UINavigationBarAppearance *barAppearance = [UINavigationBarAppearance new];
@@ -160,12 +157,11 @@ - (void)reloadData
 }
 
 - (void)showLoadingView {
-    self.loadingView.center = self.view.center;
-    [self.loadingView startAnimating];
+    [self.loadingView showInView:self.view];
 }
 
 - (void)dismissLoadingView {
-    [self.loadingView stopAnimating];
+    [self.loadingView dismiss];
 }
 
 - (void)moreEvents:(int)offset
@@ -182,9 +178,11 @@ - (void)moreEvents:(int)offset
 
     // Standard request for older API versions
     NSString *url = [NSString stringWithFormat:API_URL"/events/?start=%d", offset];
+    @weakify(self);
     [_connection sendRequest:url success:^(NSURLRequest *request, NSHTTPURLResponse *response, id JSON) {
         // Process data in background thread
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            @strongify(self);
             Debug("Succeeded to get events start=%d", offset);
             NSArray *arr = [JSON objectForKey:@"events"];
             NSMutableArray *marray = [NSMutableArray new];
@@ -198,6 +196,7 @@ - (void)moreEvents:(int)offset
 
             // Update UI in main thread
             dispatch_async(dispatch_get_main_queue(), ^{
+                @strongify(self);
                 self->_events = marray;
                 self->_eventsMore = hasMore;
                 self->_eventsOffset = newOffset;
@@ -208,6 +207,7 @@ - (void)moreEvents:(int)offset
         });
     } failure:^(NSURLRequest *request, NSHTTPURLResponse *response, id JSON, NSError *error) {
         dispatch_async(dispatch_get_main_queue(), ^{
+            @strongify(self);
             [self endRefreshing];
             [self.tableView.infiniteScrollingView stopAnimating];
             [self dismissLoadingView];
@@ -679,7 +679,7 @@ - (NSDictionary *)opsMap {
 
 - (void)viewDidLayoutSubviews {
     [super viewDidLayoutSubviews];
-    self.loadingView.center = self.view.center;
+    [self.loadingView updatePosition];
 }
 
 @end

seafile/SeafFileViewController.h

@@ -11,6 +11,7 @@
 typedef void(^DownloadCompleteBlock)(NSArray *array, NSString *errorStr);
 
 @class SeafDetailViewController;
+@class SeafLoadingView;
 
 #import <CoreData/CoreData.h>
 
@@ -29,6 +30,8 @@ typedef void(^DownloadCompleteBlock)(NSArray *array, NSString *errorStr);
 
 @property (strong, nonatomic) NSMutableDictionary *expandedSections; // To track expanded/collapsed sections
 
+@property (strong, nonatomic) SeafLoadingView *loadingView;
+
 - (void)refreshView;
 - (void)uploadFile:(SeafUploadFile *)file;
 - (void)deleteFile:(SeafFile *)file;

seafile/SeafFileViewController.m

@@ -44,6 +44,7 @@
 #import "SeafNavLeftItem.h"
 #import "SeafHeaderView.h"
 #import "SeafEditNavRightItem.h"
+#import "SeafLoadingView.h"
 
 #define kCustomTabToolWithTopPadding 15
 #define kCustomTabToolButtonHeight 40
@@ -75,7 +76,6 @@ - (UITableViewCell *)getSeafDirCell:(SeafDir *)sdir forTableView:(UITableView *)
 - (UITableViewCell *)getSeafRepoCell:(SeafRepo *)srepo forTableView:(UITableView *)tableView andIndexPath:(NSIndexPath *)indexPath;
 
 @property (strong) id curEntry; // Currently selected directory entry.
-@property (strong, nonatomic) IBOutlet UIActivityIndicatorView *loadingView;
 
 @property (strong) UIBarButtonItem *selectAllItem;// Button to select all items in the directory.
 @property (strong) UIBarButtonItem *selectNoneItem;
@@ -136,6 +136,9 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
+    // Initialize loading view
+    self.loadingView = [SeafLoadingView loadingViewWithParentView:self.view];
+    
     [self.tableView registerNib:[UINib nibWithNibName:@"SeafCell" bundle:nil]
          forCellReuseIdentifier:@"SeafCell"];
     [self.tableView registerNib:[UINib nibWithNibName:@"SeafDirCell" bundle:nil]
@@ -337,10 +340,7 @@ - (void)editSheet:(id)sender {
 
 - (void)viewWillLayoutSubviews {
     [super viewWillLayoutSubviews];
-    if (self.loadingView.isAnimating) {
-        CGRect viewBounds = self.view.bounds;
-        self.loadingView.center = CGPointMake(CGRectGetMidX(viewBounds), CGRectGetMidY(viewBounds));
-    }
+    [self.loadingView updatePosition];
 }
 
 
@@ -784,19 +784,19 @@ - (void)refreshView
 
 - (void)showLoadingView
 {
-    if (!self.loadingView) {
-        self.loadingView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
-        self.loadingView.color = [UIColor darkTextColor];
-        self.loadingView.hidesWhenStopped = YES;
-        [self.view addSubview:self.loadingView];
-    }
-    self.loadingView.center = self.view.center;
-    [self.loadingView startAnimating];
+    // Get the key window for proper centering in the entire screen
+    UIWindow *keyWindow = [[UIApplication sharedApplication] keyWindow];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        // Only show loading view if still in loading state
+        if (self.state == STATE_LOADING) {
+            [self.loadingView showInView:keyWindow];
+        }
+    });
 }
 
 - (void)dismissLoadingView
 {
-    [self.loadingView stopAnimating];
+    [self.loadingView dismiss];
 }
 
 - (void)loadDataFromServerAndRefresh {
@@ -988,7 +988,6 @@ - (void)editDone:(id)sender
 
     // Restore original title
     self.customTitleLabel.text = self.directory.name;
-    _selectedindex = nil;
 
     UIBarButtonItem *customBarButton = [[UIBarButtonItem alloc] initWithCustomView:[SeafNavLeftItem navLeftItemWithDirectory:self.directory target:self action:@selector(backButtonTapped)]];
     self.navigationItem.leftBarButtonItem = customBarButton;
@@ -1059,7 +1058,6 @@ - (void)noneSelected:(BOOL)none
 {
     if (none) {
         // Get done button container view
-        _selectedindex = nil;
         UIView *containerView = (UIView *)self.doneItem.customView;
         UILabel *countLabel = [containerView.subviews.lastObject isKindOfClass:[UILabel class]] ?
                              (UILabel *)containerView.subviews.lastObject : nil;
@@ -2926,7 +2924,7 @@ - (void)handleLongPress:(UILongPressGestureRecognizer *)gestureRecognizer {
                 if (![entry isKindOfClass:[SeafUploadFile class]]) {
                     // Select the cell that was long pressed
                     [self.tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone];
-                    
+                    _selectedindex = indexPath;
                     // Update selection status
                     [self noneSelected:NO];
                     [self updateToolButtonsState];

seafile/SeafLoadingView.h

@@ -0,0 +1,21 @@
+//
+//  SeafLoadingView.h
+//  seafilePro
+//
+//  Created by henry on 2025/3/31.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SeafLoadingView : UIView
+
++ (instancetype)loadingViewWithParentView:(UIView *)parentView;
+- (void)showInView:(UIView *)view;
+- (void)dismiss;
+- (void)updatePosition;
+
+@end
+
+NS_ASSUME_NONNULL_END 

seafile/SeafLoadingView.m

@@ -0,0 +1,60 @@
+//
+//  SeafLoadingView.m
+//  seafilePro
+//
+//  Created by Seafile Ltd.
+//  Copyright (c) 2024 Seafile Ltd. All rights reserved.
+//
+
+#import "SeafLoadingView.h"
+
+@interface SeafLoadingView()
+
+@property (strong, nonatomic) UIActivityIndicatorView *activityIndicator;
+
+@end
+
+@implementation SeafLoadingView
+
++ (instancetype)loadingViewWithParentView:(UIView *)parentView {
+    SeafLoadingView *loadingView = [[SeafLoadingView alloc] initWithFrame:CGRectMake(0, 0, parentView.bounds.size.width, parentView.bounds.size.height)];
+    [loadingView setupActivityIndicator];
+    return loadingView;
+}
+
+- (void)setupActivityIndicator {
+    self.activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleLarge];
+    self.activityIndicator.color = [UIColor darkTextColor];
+    self.activityIndicator.hidesWhenStopped = YES;
+    [self addSubview:self.activityIndicator];
+    
+    // Center the activity indicator in the loading view
+    self.activityIndicator.translatesAutoresizingMaskIntoConstraints = NO;
+    [NSLayoutConstraint activateConstraints:@[
+        [self.activityIndicator.centerXAnchor constraintEqualToAnchor:self.centerXAnchor],
+        [self.activityIndicator.centerYAnchor constraintEqualToAnchor:self.centerYAnchor]
+    ]];
+}
+
+- (void)showInView:(UIView *)view {
+    self.frame = view.bounds;
+    self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    [view addSubview:self];
+    [self.activityIndicator startAnimating];
+    
+    // Ensure we're above all other views
+    [view bringSubviewToFront:self];
+}
+
+- (void)dismiss {
+    [self.activityIndicator stopAnimating];
+    [self removeFromSuperview];
+}
+
+- (void)updatePosition {
+    if (self.superview) {
+        self.frame = self.superview.bounds;
+    }
+}
+
+@end