Merge branch 'master' into ios-downloads

ios/App/Shared/models/DeviceSettings.swift

@@ -10,6 +10,7 @@ import RealmSwift
 
 class DeviceSettings: Object {
     @Persisted var disableAutoRewind: Bool
+    @Persisted var enableAltView: Bool
     @Persisted var jumpBackwardsTime: Int
     @Persisted var jumpForwardTime: Int
 }
@@ -17,6 +18,7 @@ class DeviceSettings: Object {
 func getDefaultDeviceSettings() -> DeviceSettings {
     let settings = DeviceSettings()
     settings.disableAutoRewind = false
+    settings.enableAltView = false
     settings.jumpForwardTime = 10
     settings.jumpBackwardsTime = 10
     return settings
@@ -26,6 +28,7 @@ func deviceSettingsToJSON(settings: DeviceSettings) -> Dictionary<String, Any> {
     return Database.realmQueue.sync {
         return [
             "disableAutoRewind": settings.disableAutoRewind,
+            "enableAltView": settings.enableAltView,
             "jumpBackwardsTime": settings.jumpBackwardsTime,
             "jumpForwardTime": settings.jumpForwardTime
         ]

ios/App/Shared/player/PlayerHandler.swift

@@ -11,6 +11,7 @@ class PlayerHandler {
     private static var player: AudioPlayer?
     private static var session: PlaybackSession?
     private static var timer: Timer?
+    private static var lastSyncTime:Double = 0.0
     
     private static var _remainingSleepTime: Int? = nil
     public static var remainingSleepTime: Int? {
@@ -128,7 +129,7 @@ class PlayerHandler {
             listeningTimePassedSinceLastSync += 1
         }
         
-        if listeningTimePassedSinceLastSync > 3 {
+        if listeningTimePassedSinceLastSync >= 5 {
             syncProgress()
         }
         
@@ -149,6 +150,15 @@ class PlayerHandler {
             return
         }
         
+        // Prevent multiple sync requests
+        let timeSinceLastSync = Date().timeIntervalSince1970 - lastSyncTime
+        if (lastSyncTime > 0 && timeSinceLastSync < 1) {
+            NSLog("syncProgress last sync time was < 1 second so not syncing")
+            return
+        }
+        
+        lastSyncTime = Date().timeIntervalSince1970 // seconds
+        
         let report = PlaybackReport(currentTime: playerCurrentTime, duration: player.getDuration(), timeListened: listeningTimePassedSinceLastSync)
         
         session!.currentTime = playerCurrentTime