Release 1.0.34

.github/workflows/non-drm-build.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: macOS-13
     steps:
       - name: Force Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
       - name: Checkout main repo
         uses: actions/checkout@v3
       - name: Set up repo for nonDRM build

.github/workflows/release-on-merge.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: macOS-13
     steps:
       - name: Force Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
       - name: Checkout main repo and submodules
         uses: actions/checkout@v3
         with:

.github/workflows/release.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: macOS-13
     steps:
       - name: Force Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
       - name: Checkout main repo and submodules
         uses: actions/checkout@v3
         with:

.github/workflows/unit-testing.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: macOS-13
     steps:
       - name: Force Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
       - name: Checkout main repo and submodules
         uses: actions/checkout@v3
         with:

.github/workflows/upload-on-merge.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: macOS-13
     steps:
       - name: Force Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
       - name: Checkout main repo and submodules
         uses: actions/checkout@v3
         with:
@@ -28,7 +28,7 @@ jobs:
     if: github.event.pull_request.merged == true && needs.check-version.outputs.should_upload == '1'
     steps:
       - name: Force Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
       - name: Checkout main repo and submodules
         uses: actions/checkout@v3
         with:

.github/workflows/upload.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: macOS-13
     steps:
       - name: Force Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
       - name: Checkout main repo and submodules
         uses: actions/checkout@v3
         with:
@@ -24,7 +24,7 @@ jobs:
     if: needs.check-version.outputs.should_upload == '1'
     steps:
       - name: Force Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
       - name: Checkout main repo and submodules
         uses: actions/checkout@v3
         with:

Palace.xcodeproj/project.pbxproj

@@ -3628,11 +3628,11 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)",
-				"${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}/GoogleService-Info.plist",
-				"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
 				"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}",
+				"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${PRODUCT_NAME}",
 				"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Info.plist",
+				"$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/GoogleService-Info.plist",
+				"$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
 			);
 			name = Crashlytics;
 			outputFileListPaths = (
@@ -3641,7 +3641,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
-			shellScript = "\"${PROJECT_DIR}/scripts/firebase/run\"\n";
+			shellScript = "\"${BUILD_DIR%/Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\"\n";
 		};
 		73EB0B6E25821DF4006BC997 /* Copy Frameworks (Carthage) */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -4537,7 +4537,7 @@
 					"\"$(SRCROOT)/adobe-rmsdk/xml/uft/public\"",
 				);
 				INFOPLIST_FILE = PalaceTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -4602,7 +4602,7 @@
 					"\"$(SRCROOT)/adobe-rmsdk/xml/uft/public\"",
 				);
 				INFOPLIST_FILE = PalaceTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -4642,7 +4642,7 @@
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 215;
 				DEVELOPMENT_TEAM = 88CBA74T8K;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -4659,12 +4659,12 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = "PalaceConfig/Palace-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.33;
+				MARKETING_VERSION = 1.0.34;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PRODUCT_MODULE_NAME = Palace;
 				PRODUCT_NAME = "Palace-noDRM";
@@ -4699,7 +4699,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
 				CODE_SIGN_ENTITLEMENTS = Palace/SimplyE.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 215;
 				DEVELOPMENT_TEAM = 88CBA74T8K;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -4716,12 +4716,12 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = "PalaceConfig/Palace-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.33;
+				MARKETING_VERSION = 1.0.34;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PRODUCT_MODULE_NAME = Palace;
 				PRODUCT_NAME = "Palace-noDRM";
@@ -4883,7 +4883,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 215;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -4905,12 +4905,12 @@
 					"FEATURE_OVERDRIVE=1",
 				);
 				INFOPLIST_FILE = "PalaceConfig/Palace-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.33;
+				MARKETING_VERSION = 1.0.34;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PROVISIONING_PROFILE_SPECIFIER = "Ad Hoc";
 				RUN_CLANG_STATIC_ANALYZER = YES;
@@ -4943,7 +4943,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
 				CODE_SIGN_ENTITLEMENTS = Palace/SimplyE.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 215;
 				DEVELOPMENT_TEAM = 88CBA74T8K;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -4965,12 +4965,12 @@
 					"FEATURE_OVERDRIVE=1",
 				);
 				INFOPLIST_FILE = "PalaceConfig/Palace-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.33;
+				MARKETING_VERSION = 1.0.34;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PROVISIONING_PROFILE_SPECIFIER = "App Store";
 				RUN_CLANG_STATIC_ANALYZER = YES;

Palace/Accounts/Library/Account.swift

@@ -424,7 +424,10 @@ protocol AccountLogoDelegate: AnyObject {
     homePageUrl = publication.links.first(where: { $0.rel == "alternate" })?.href
 
     super.init()
-    loadLogo(imageURL: publication.thumbnailURL)
+
+    DispatchQueue.main.async {
+      self.loadLogo(imageURL: publication.thumbnailURL)
+    }
   }
 
   /// Load authentication documents from the network or cache.

Palace/AppInfrastructure/TPPAppDelegate.swift

@@ -70,9 +70,7 @@ class TPPAppDelegate: UIResponder, UIApplicationDelegate {
     _ = TPPBookRegistry.shared
 
     // Push Notificatoins
-    // TODO: Enable push notifications once they are fully tested here
-    // Disabling because of PP-473
-//    NotificationService.shared.setupPushNotifications()
+    NotificationService.shared.setupPushNotifications()
   }
 
   // TODO: This method is deprecated, we should migrate to BGAppRefreshTask in the BackgroundTasks framework instead

Palace/MyBooks/MyBooks/MyBooksViewModel.swift

@@ -110,7 +110,9 @@ class MyBooksViewModel: ObservableObject {
   }
 
   @objc private func stopLoading() {
-    isLoading.toggle()
+    DispatchQueue.main.async {
+      self.isLoading.toggle()
+    }
   }
 
   @objc private func bookRegistryDidChange() {

Palace/Reader2/UI/EpubSearchView/EPUBSearchView.swift

@@ -16,19 +16,12 @@ struct EPUBSearchView: View {
   @State private var searchQuery: String = ""
   @State private var debounceSearch: AnyCancellable?
 
-  var body: some View {
-    VStack {
-      searchBar
-      listView
-    }
-    .onChange(of: searchQuery, perform: search)
-    .padding()
-    .ignoresSafeArea(.keyboard)
-  }
+  @FocusState private var isSearchFieldFocused: Bool
 
   @ViewBuilder private var searchBar: some View {
     HStack {
       TextField("\(Strings.Generic.search)...", text: $searchQuery)
+        .focused($isSearchFieldFocused) // Bind the focus state to the text field
       Button(action: {
         searchQuery = ""
         viewModel.cancelSearch()
@@ -42,6 +35,22 @@ struct EPUBSearchView: View {
     .background(Color(.secondarySystemBackground))
     .cornerRadius(8)
     .padding(.bottom)
+    .onAppear {
+      DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+        // This delay ensures that the view is fully loaded before focusing
+        isSearchFieldFocused = true
+      }
+    }
+  }
+
+  var body: some View {
+    VStack {
+      searchBar
+      listView
+    }
+    .onChange(of: searchQuery, perform: search)
+    .padding()
+    .ignoresSafeArea(.keyboard)
   }
 
   @ViewBuilder private var listView: some View {

Palace/Settings/DeveloperSettings/TPPDeveloperSettingsTableViewController.swift

@@ -15,7 +15,6 @@ import Foundation
   private let betaLibraryCellIdentifier = "betaLibraryCell"
   private let lcpPassphraseCellIdentifier = "lcpPassphraseCell"
   private let clearCacheCellIdentifier = "clearCacheCell"
-  private let enablePushNotificationsCellIdentifier = "enablePushNotificationsCell"
 
   private var pushNotificationsStatus = false
 
@@ -35,15 +34,7 @@ import Foundation
   @objc func enterLCPPassphraseSwitchDidChange(sender: UISwitch) {
     TPPSettings.shared.enterLCPPassphraseManually = sender.isOn
   }
-
-  @objc func enablePushNotificationsDidChange(sender: UISwitch) {
-    if sender.isOn {
-      NotificationService.shared.setupPushNotifications { _ in
-        self.updatePushNotificationStatus()
-      }
-    }
-  }
-
+
   // MARK:- UIViewController
 
   override func loadView() {
@@ -58,33 +49,13 @@ import Foundation
     self.tableView.register(UITableViewCell.self, forCellReuseIdentifier: betaLibraryCellIdentifier)
     self.tableView.register(UITableViewCell.self, forCellReuseIdentifier: lcpPassphraseCellIdentifier)
     self.tableView.register(UITableViewCell.self, forCellReuseIdentifier: clearCacheCellIdentifier)
-    self.tableView.register(UITableViewCell.self, forCellReuseIdentifier: enablePushNotificationsCellIdentifier)
-
-    updatePushNotificationStatus()
-    NotificationCenter.default.addObserver(forName: UIApplication.didBecomeActiveNotification, object: nil, queue: .main) { _ in
-      self.updatePushNotificationStatus()
-    }
-  }
-
-  deinit {
-    NotificationCenter.default.removeObserver(self, name: UIApplication.didBecomeActiveNotification, object: nil)
-  }
-
-  // Gets push notifications authorization status and updates the view
-  private func updatePushNotificationStatus() {
-    NotificationService.shared.getNotificationStatus { areEnabled in
-      DispatchQueue.main.async {
-        self.pushNotificationsStatus = areEnabled
-        self.tableView.reloadData()
-      }
-    }
   }
 
   // MARK:- UITableViewDataSource
 
   func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
     switch Section(rawValue: section)! {
-    case .librarySettings: return 3
+    case .librarySettings: return 2
     default: return 1
     }
   }
@@ -98,8 +69,7 @@ import Foundation
     case .librarySettings:
       switch indexPath.row {
       case 0: return cellForBetaLibraries()
-      case 1: return cellForLCPPassphrase()
-      default: return cellForPushNotifications()
+      default: return cellForLCPPassphrase()
       }
     case .libraryRegistryDebugging: return cellForCustomRegsitry()
     case .dataManagement: return cellForClearCache()
@@ -142,18 +112,6 @@ import Foundation
     return cell
   }
 
-  private func cellForPushNotifications() -> UITableViewCell {
-    let cell = tableView.dequeueReusableCell(withIdentifier: enablePushNotificationsCellIdentifier)!
-    cell.selectionStyle = .none
-    cell.textLabel?.text = "Enable Push Notifications"
-    cell.textLabel?.adjustsFontSizeToFitWidth = true
-    cell.textLabel?.minimumScaleFactor = 0.5
-    let pushNotificationSwitch = createSwitch(isOn: pushNotificationsStatus, action: #selector(enablePushNotificationsDidChange))
-    pushNotificationSwitch.isEnabled = !pushNotificationsStatus
-    cell.accessoryView = pushNotificationSwitch
-    return cell
-  }
-
   private func cellForCustomRegsitry() -> UITableViewCell {
     let cell = TPPRegistryDebuggingCell()
     cell.delegate = self