Skip to content

Commit

Permalink
Merge pull request #1113 from TortugaPower/develop
Browse files Browse the repository at this point in the history 
Release v5.2.5
  • Loading branch information
@GianniCarlo
GianniCarlo authored Mar 4, 2024
2 parents a2c4134 + 1814e0a commit bcd2275
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 22 deletions.
36 changes: 18 additions & 18 deletions BookPlayer.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3967,7 +3967,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerIntents";
Expand Down Expand Up @@ -4001,7 +4001,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerIntents";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -4033,7 +4033,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerIntents";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -4069,7 +4069,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).watchkitapp";
Expand Down Expand Up @@ -4110,7 +4110,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).watchkitapp";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -4148,7 +4148,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).watchkitapp";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -4317,7 +4317,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerWidgetUI";
Expand Down Expand Up @@ -4355,7 +4355,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerWidgetUI";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -4391,7 +4391,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerWidgetUI";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -4544,7 +4544,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER)";
PRODUCT_NAME = BookPlayer;
PROVISIONING_PROFILE_SPECIFIER = "$(BP_PROVISIONING_MAIN)";
Expand Down Expand Up @@ -4582,7 +4582,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER)";
PRODUCT_NAME = BookPlayer;
PROVISIONING_PROFILE_SPECIFIER = "$(BP_PROVISIONING_MAIN)";
Expand Down Expand Up @@ -4804,7 +4804,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).watchkitapp.widgets";
Expand Down Expand Up @@ -4842,7 +4842,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).watchkitapp.widgets";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -4878,7 +4878,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).watchkitapp.widgets";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -4917,7 +4917,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerShareExtension";
Expand Down Expand Up @@ -4957,7 +4957,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerShareExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -4995,7 +4995,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER).BookPlayerShareExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -5087,7 +5087,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.2.4;
MARKETING_VERSION = 5.2.5;
PRODUCT_BUNDLE_IDENTIFIER = "$(BP_BUNDLE_IDENTIFIER)";
PRODUCT_NAME = BookPlayer;
PROVISIONING_PROFILE_SPECIFIER = "$(BP_PROVISIONING_MAIN)";
Expand Down
12 changes: 9 additions & 3 deletions BookPlayer/Player/PlayerManager.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,10 @@ extension PlayerManager {
}

func play() {
play(autoPlayed: false)
}

func play(autoPlayed: Bool) {
playTask?.cancel()
playTask = Task { @MainActor in
/// Ignore play commands if there's no item loaded,
Expand Down Expand Up @@ -739,7 +743,9 @@ extension PlayerManager {

handleSmartRewind(currentItem)

handleAutoTimer()
if !autoPlayed {
handleAutoTimer()
}

fadeTimer?.invalidate()
shakeMotionService.stopMotionUpdates()
Expand Down Expand Up @@ -815,7 +821,7 @@ extension PlayerManager {
self.observeStatus = false

if self.playbackQueued == true {
self.play()
self.play(autoPlayed: true)
}
// Clean up flag
self.playbackQueued = nil
Expand Down Expand Up @@ -1119,7 +1125,7 @@ extension PlayerManager {
}
let options = AVAudioSession.InterruptionOptions(rawValue: optionsValue)
if options.contains(.shouldResume) {
play()
play(autoPlayed: true)
}
@unknown default:
break
Expand Down
11 changes: 10 additions & 1 deletion Shared/Realm/Migrations/MigrationStoredSyncTasks.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ class MigrationStoredSyncTasks: MigrationHandler {
let taskId = UUID().uuidString
taskParams["id"] = taskId

if taskParams["lastPlayDateTimestamp"] is String {
taskParams["lastPlayDateTimestamp"] = 0
}

let task = migrateTask(
taskParams,
id: taskId,
Expand Down Expand Up @@ -77,11 +81,16 @@ class MigrationStoredSyncTasks: MigrationHandler {

for taskData in storedTasks {
autoreleasepool {
if let taskParams = try? JSONSerialization.jsonObject(with: taskData) as? [String: Any],
if var taskParams = try? JSONSerialization.jsonObject(with: taskData) as? [String: Any],
let taskId = taskParams["id"] as? String,
let relativePath = taskParams["relativePath"] as? String,
let jobTypeRaw = taskParams["jobType"] as? String,
let jobType = SyncJobType(rawValue: jobTypeRaw) {

if taskParams["lastPlayDateTimestamp"] is String {
taskParams["lastPlayDateTimestamp"] = 0
}

let task = migrateTask(
taskParams,
id: taskId,
Expand Down

0 comments on commit bcd2275

Please sign in to comment.