Merge pull request #1620 from NYPL-Simplified/release/simplye/3.9.3

Merge SE 3.9.3 Release to Master

Author: Ernest Fan

Axis-iOS

@@ -27,9 +27,13 @@ class OPDS2SamlIDP: NSObject, Codable {
   func isSignedIn() -> Bool
 }
 
+@objc protocol NYPLReaderServerPermissions {
+  var syncPermissionGranted:Bool {get}
+}
+
 // MARK: AccountDetails
 // Extra data that gets loaded from an OPDS2AuthenticationDocument,
-@objcMembers final class AccountDetails: NSObject {
+@objcMembers final class AccountDetails: NSObject, NYPLReaderServerPermissions {
   enum AuthType: String, Codable {
     /// This is used with barcode/username credentials on SimplyE. It was also
     /// used for FirstBook authentication on Open eBooks versions before 2.4.0.

NYPLAEToolkit

@@ -348,3 +348,9 @@ let currentAccountIdentifierKey  = "NYPLCurrentAccountIdentifier"
     }
   }
 }
+
+extension AccountsManager: NYPLReaderServerPermissions {
+  var syncPermissionGranted: Bool {
+    return currentAccount?.details?.syncPermissionGranted ?? false
+  }
+}

NYPLAudiobookToolkit

@@ -41,7 +41,7 @@ private enum StorageKey: String {
   static func sharedAccount(libraryUUID: String?) -> NYPLUserAccount
 }
 
-@objc protocol NYPLOAuthTokenProvider {
+@objc protocol NYPLOAuthTokenSource {
   var authToken: String? { get }
   func setAuthToken(_ token: String)
   func hasOAuthClientCredentials() -> Bool
@@ -58,7 +58,7 @@ private enum StorageKey: String {
 /// by storing credentials on the keychain using storage keys that contain the
 /// the library UUID appended after the actual key name.
 /// - seealso: StorageKey.keyForLibrary(uuid:)
-@objcMembers class NYPLUserAccount : NSObject, NYPLUserAccountProvider, NYPLOAuthTokenProvider {
+@objcMembers class NYPLUserAccount : NSObject, NYPLUserAccountProvider, NYPLOAuthTokenSource {
   static private let shared = NYPLUserAccount()
 
   private let accountInfoLock = NSRecursiveLock()

Simplified.xcodeproj/project.pbxproj

@@ -0,0 +1,17 @@
+//
+//  NYPLRootTabBarController+Common.swift
+//  Simplified
+//
+//  Created by Ettore Pasquini on 11/9/22.
+//  Copyright © 2022 NYPL. All rights reserved.
+//
+
+import Foundation
+
+extension NYPLRootTabBarController {
+  @objc func makeR2Owner() -> NYPLR2Owner {
+    self.annotationsSynchronizer = NYPLAnnotations()
+    return NYPLR2Owner(bookRegistry: NYPLBookRegistry.shared(),
+                       annotationsSynchronizer: annotationsSynchronizer)
+  }
+}

Simplified/Accounts/Library/Account.swift

@@ -1,4 +1,5 @@
 @class NYPLR2Owner;
+@class NYPLAnnotations;
 @class NYPLCatalogNavigationController;
 
 @interface NYPLRootTabBarController : UITabBarController
@@ -11,6 +12,7 @@
 + (instancetype)sharedController;
 
 @property (readonly) NYPLR2Owner *r2Owner;
+@property NYPLAnnotations *annotationsSynchronizer;
 @property(nonatomic, readonly) NYPLCatalogNavigationController *catalogNavigationController;
 
 /// This method will present a view controller from the receiver, or from the

Simplified/Accounts/Library/AccountsManager.swift

@@ -59,8 +59,7 @@ - (instancetype)init
                                            selector:@selector(setTabViewControllers)
                                                name:NSNotification.NYPLCurrentAccountDidChange
                                              object:nil];
-
-  self.r2Owner = [[NYPLR2Owner alloc] init];
+  self.r2Owner = [self makeR2Owner];
   return self;
 }