Support multiple open items

.github/workflows/run-tests.yml

@@ -11,16 +11,16 @@ on:
 jobs:
   tests:
     name: Run Xcode Tests
-    runs-on: macos-15
+    runs-on: macos-26
     strategy:
       matrix:
-        xcode: ["16.3"]
-        ios_version: ["18.4"]
-        device_name: ["iPhone 16"]
+        xcode: ["26.2"]
+        ios_version: ["26.2"]
+        device_name: ["iPhone 17"]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 
@@ -41,7 +41,7 @@ jobs:
           xcode-version: ${{ matrix.xcode }}
 
       - name: Clean & Build & Test
-        uses: sersoft-gmbh/xcodebuild-action@v3.1
+        uses: sersoft-gmbh/xcodebuild-action@v4.0
         with:
           project: Zotero.xcodeproj
           scheme: Zotero

.tx/config

@@ -0,0 +1,31 @@
+[main]
+host = https://app.transifex.com
+lang_map = af_ZA: af, am_ET: am, bg_BG: bg, bn_BD: bn, ca: ca, cs_CZ: cs, da_DK: da, el_GR: el, en_GB: en-GB, es_AR: es-AR, es_ES: es, et_EE: et, eu_ES: eu, fi_FI: fi, fr_FR: fr, gl_ES: gl, he_IL: he, hr_HR: hr, hu_HU: hu, id_ID: id, is_IS: is, it_IT: it, ja_JP: ja, kn_IN: kn, ko_KR: ko, lt_LT: lt, mn_MN: mn, nb_NO: nb-NO, nl_NL: nl, nn_NO: nn-NO, pl_PL: pl, pt_BR: pt-BR, pt_PT: pt-PT, ro_RO: ro, ru_RU: ru, sk_SK: sk, sl_SI: sl, sr_RS: sr, sv_SE: sv, th_TH: th, tr_TR: tr, uk_UA: uk, vi_VN: vi, yue_CN: yue-Hans, zh_CN: zh-Hans, zh_TW: zh-Hant
+
+[o:zotero:p:zotero-mobile:r:infopliststrings]
+file_filter            = Zotero/Assets/<lang>.lproj/InfoPList.strings
+source_file            = Zotero/Assets/en.lproj/InfoPList.strings
+type                   = STRINGS_UTF8
+minimum_perc           = 0
+resource_name          = InfoPlist.strings
+replace_edited_strings = false
+keep_translations      = false
+
+[o:zotero:p:zotero-mobile:r:localizablestrings]
+file_filter            = ./Zotero/Assets/<lang>.lproj/Localizable.strings
+source_file            = ./Zotero/Assets/en.lproj/Localizable.strings
+type                   = STRINGS_UTF8
+minimum_perc           = 0
+resource_name          = Localizable.strings
+replace_edited_strings = false
+keep_translations      = false
+
+[o:zotero:p:zotero-mobile:r:localizablestringsdict]
+file_filter            = ./Zotero/Assets/<lang>.lproj/Localizable.stringsdict
+source_file            = ./Zotero/Assets/en.lproj/Localizable.stringsdict
+type                   = STRINGSDICT
+minimum_perc           = 0
+resource_name          = Localizable.stringsdict
+replace_edited_strings = false
+keep_translations      = false
+

FeatureGates.xcconfig

@@ -1 +1 @@
-SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) FEATURE_GATE_HTML_EPUB_READER FEATURE_GATE_PDF_WORKER
+SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) FEATURE_GATE_HTML_EPUB_READER FEATURE_GATE_PDF_WORKER FEATURE_GATE_MULTIPLE_OPEN_ITEMS

ZShare/Assets/translation/http.js

@@ -41,6 +41,13 @@ Zotero.HTTP = new function() {
 		this.message = `HTTP request has timed out after ${ms}ms`;
 	};
 	this.TimeoutError.prototype = Object.create(Error.prototype);
+    this.VALID_DOM_PARSER_CONTENT_TYPES = new Set([
+        "text/html",
+        "text/xml",
+        "application/xml",
+        "application/xhtml+xml",
+        "image/svg+xml"
+    ]);
 
 	/**
 	 * Get a promise for a HTTP request
@@ -104,10 +111,7 @@ Zotero.HTTP = new function() {
         case "document":
             let parser = new DOMParser();
             var contentType = headers["content-type"];
-            if (contentType != 'application/xml' && contentType != 'text/xml') {
-                contentType = 'text/html';
-            }
-            let doc = parser.parseFromString(responseText, contentType);
+            let doc = parser.parseFromString(responseText, this.determineDOMParserContentType(contentType));
             response = doc;
             break;
 
@@ -305,4 +309,20 @@ Zotero.HTTP = new function() {
 		};
 		return deferred.promise;
 	};
+
+    /**
+     * @param contentType {String}
+     * @returns {DOMParserSupportedType}
+     */
+    this.determineDOMParserContentType = function(contentType) {
+        if (!contentType) {
+            return "text/html";
+        } else if (Zotero.HTTP.VALID_DOM_PARSER_CONTENT_TYPES.has(contentType)) {
+            return contentType;
+        } else if (contentType.includes('xml')) {
+            return "text/xml";
+        } else {
+            return "text/html";
+        }
+    }
 }

ZShare/Info.plist

@@ -54,7 +54,7 @@
 	</dict>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Access to microphone</string>
-	<key>UIDesignRequiresCompatibility</key>
-	<true/>
+    <key>UIDesignRequiresCompatibility</key>
+    <true/>
 </dict>
 </plist>

ZShare/View Controllers/ShareViewController.swift

@@ -373,7 +373,7 @@ final class ShareViewController: UIViewController {
     private func updateNavigationItems(for state: ExtensionViewModel.State.AttachmentState, isSubmitting: Bool) {
         if let error = state.error {
             switch error {
-            case .quotaLimit, .webDavFailure, .apiFailure, .forbidden:
+            case .quotaLimit, .webDavFailure, .webDavUnauthorized, .webDavForbidden, .apiFailure, .forbidden:
                 self.navigationItem.leftBarButtonItem = nil
                 self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(ShareViewController.cancel))
                 return
@@ -475,6 +475,12 @@ final class ShareViewController: UIViewController {
         case .webDavNotVerified:
             return L10n.Errors.Shareext.webdavNotVerified
 
+        case .webDavUnauthorized:
+            return L10n.Errors.Settings.Webdav.unauthorized
+
+        case .webDavForbidden:
+            return L10n.Errors.Settings.Webdav.forbidden
+
         case .cantLoadSchema:
             return L10n.Errors.Shareext.cantLoadSchema
 
@@ -503,6 +509,7 @@ final class ShareViewController: UIViewController {
 
             case .noSuccessfulTranslators:
                 return nil
+
             case .cantFindFile, .webExtractionMissingJs: // should never happen
                 return L10n.Errors.Shareext.missingBaseFiles
 

ZShare/ViewModels/ExtensionViewModel.swift

@@ -79,6 +79,8 @@ final class ExtensionViewModel {
                 case quotaLimit(LibraryIdentifier)
                 case forbidden(LibraryIdentifier)
                 case webDavNotVerified
+                case webDavUnauthorized
+                case webDavForbidden
                 case webDavFailure
                 case md5Missing
                 case mtimeMissing
@@ -106,6 +108,8 @@ final class ExtensionViewModel {
                          .webViewError,
                          .quotaLimit,
                          .webDavNotVerified,
+                         .webDavUnauthorized,
+                         .webDavForbidden,
                          .webDavFailure:
                         return false
                     }
@@ -164,6 +168,7 @@ final class ExtensionViewModel {
                     default:
                         return true
                     }
+
                 default: return false
                 }
             }
@@ -427,6 +432,7 @@ final class ExtensionViewModel {
         case .itemWithAttachment(_, _, let file), .file(let file, _):
             // Remove temporary local file if it exists
             try? self.fileStorage.remove(file)
+
         case .item: break
         }
     }
@@ -1023,6 +1029,7 @@ final class ExtensionViewModel {
                            switch self.state.attachmentState {
                            case .downloading:
                                self.state.attachmentState = .downloading(progress.fractionCompleted)
+
                            default: break
                            }
                        })
@@ -1257,6 +1264,24 @@ final class ExtensionViewModel {
         if let error = error as? State.AttachmentState.Error {
             return error
         }
+        if let error = error as? WebDavError.Verification {
+            DDLogError("ExtensionViewModel: webdav verification failed - \(error)")
+            return .webDavNotVerified
+        }
+        if let error = error as? WebDavError.Upload {
+            DDLogError("ExtensionViewModel: webdav upload failed - \(error)")
+            switch error {
+            case .cantCreatePropData:
+                return .webDavFailure
+
+            case .apiError(let alamoError, _):
+                return webDavError(from: alamoError)
+            }
+        }
+        if let error = error as? WebDavError.Download {
+            DDLogError("ExtensionViewModel: webdav download failed - \(error)")
+            return .webDavFailure
+        }
         if let error = error as? Parsing.Error {
             DDLogError("ExtensionViewModel: could not parse item - \(error)")
             return .parseError(error)
@@ -1296,6 +1321,32 @@ final class ExtensionViewModel {
         }
         return .unknown
 
+        func webDavError(from error: AFError) -> State.AttachmentState.Error {
+            switch error {
+            case .responseValidationFailed(let reason):
+                switch reason {
+                case .unacceptableStatusCode(let code):
+                    switch code {
+                    case 401:
+                        return .webDavUnauthorized
+
+                    case 403:
+                        return .webDavForbidden
+
+                    default:
+                        break
+                    }
+
+                default:
+                    break
+                }
+
+            default:
+                break
+            }
+            return .webDavFailure
+        }
+
         func alamoErrorRequiresAbort(_ error: AFError, url: URL?, libraryId: LibraryIdentifier?) -> State.AttachmentState.Error {
             let defaultError: State.AttachmentState.Error = (url?.absoluteString ?? ApiConstants.baseUrlString).contains(ApiConstants.baseUrlString) ? .apiFailure : .webDavFailure
             switch error {