diff --git a/ios/App/App/plugins/AbsDatabase.m b/ios/App/App/plugins/AbsDatabase.m index 5d45a91c..aa89aecd 100644 --- a/ios/App/App/plugins/AbsDatabase.m +++ b/ios/App/App/plugins/AbsDatabase.m @@ -10,6 +10,8 @@ CAP_PLUGIN(AbsDatabase, "AbsDatabase", CAP_PLUGIN_METHOD(setCurrentServerConnectionConfig, CAPPluginReturnPromise); + CAP_PLUGIN_METHOD(removeServerConnectionConfig, CAPPluginReturnPromise); + CAP_PLUGIN_METHOD(logout, CAPPluginReturnPromise); CAP_PLUGIN_METHOD(getDeviceData, CAPPluginReturnPromise); diff --git a/ios/App/App/plugins/AbsDatabase.swift b/ios/App/App/plugins/AbsDatabase.swift index c6c29c2a..de9c5c89 100644 --- a/ios/App/App/plugins/AbsDatabase.swift +++ b/ios/App/App/plugins/AbsDatabase.swift @@ -51,6 +51,12 @@ public class AbsDatabase: CAPPlugin { Store.serverConfig = config call.resolve(convertServerConnectionConfigToJSON(config: config)) } + @objc func removeServerConnectionConfig(_ call: CAPPluginCall) { + let id = call.getString("serverConnectionConfigId", "") + Database.deleteServerConnectionConfig(id: id) + + call.resolve() + } @objc func logout(_ call: CAPPluginCall) { Store.serverConfig = nil call.resolve() diff --git a/ios/App/Shared/player/AudioPlayer.swift b/ios/App/Shared/player/AudioPlayer.swift index 30363788..baac5e52 100644 --- a/ios/App/Shared/player/AudioPlayer.swift +++ b/ios/App/Shared/player/AudioPlayer.swift @@ -57,7 +57,6 @@ class AudioPlayer: NSObject { playerItem.addObserver(self, forKeyPath: #keyPath(AVPlayerItem.status), options: .new, context: &playerItemContext) self.audioPlayer.replaceCurrentItem(with: playerItem) - seek(playbackSession.currentTime) NSLog("Audioplayer ready") } @@ -259,6 +258,8 @@ class AudioPlayer: NSObject { self.playWhenReady = false self.play() } + + seek(playbackSession.currentTime) } } } else if context == &playerContext { diff --git a/ios/App/Shared/player/PlayerHandler.swift b/ios/App/Shared/player/PlayerHandler.swift index 4a3a9c71..0788597b 100644 --- a/ios/App/Shared/player/PlayerHandler.swift +++ b/ios/App/Shared/player/PlayerHandler.swift @@ -12,7 +12,7 @@ class PlayerHandler { private static var session: PlaybackSession? private static var timer: Timer? - private static var listningTimePassedSinceLastSync = 0.0 + private static var listeningTimePassedSinceLastSync = 0.0 public static func startPlayback(session: PlaybackSession, playWhenReady: Bool) { if player != nil { @@ -26,9 +26,9 @@ class PlayerHandler { player = AudioPlayer(playbackSession: session, playWhenReady: playWhenReady) // DispatchQueue.main.sync { - timer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { _ in - self.tick() - } + timer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { _ in + self.tick() + } // } } public static func stopPlayback() { @@ -101,10 +101,10 @@ class PlayerHandler { private static func tick() { if !paused() { - listningTimePassedSinceLastSync += 1 + listeningTimePassedSinceLastSync += 1 } - if listningTimePassedSinceLastSync > 3 { + if listeningTimePassedSinceLastSync > 3 { syncProgress() } } @@ -113,10 +113,10 @@ class PlayerHandler { return } - let report = PlaybackReport(currentTime: player!.getCurrentTime(), duration: player!.getDuration(), timeListened: listningTimePassedSinceLastSync) + let report = PlaybackReport(currentTime: player!.getCurrentTime(), duration: player!.getDuration(), timeListened: listeningTimePassedSinceLastSync) session!.currentTime = player!.getCurrentTime() - listningTimePassedSinceLastSync = 0 + listeningTimePassedSinceLastSync = 0 // TODO: check if online NSLog("sending playback report") diff --git a/ios/App/Shared/util/Database.swift b/ios/App/Shared/util/Database.swift index 902aeb8e..d9e0b63a 100644 --- a/ios/App/Shared/util/Database.swift +++ b/ios/App/Shared/util/Database.swift @@ -11,9 +11,7 @@ import RealmSwift class Database { // All DB releated actions must be executed on "realm-queue" public static let realmQueue = DispatchQueue(label: "realm-queue") - private static var instance: Realm = { - try! Realm(queue: realmQueue) - }() + private static var instance: Realm = try! Realm(queue: realmQueue) public static func setServerConnectionConfig(config: ServerConnectionConfig) { var refrence: ThreadSafeReference? @@ -57,6 +55,22 @@ class Database { setLastActiveConfigIndex(index: config.index) } } + public static func deleteServerConnectionConfig(id: String) { + realmQueue.sync { + let config = instance.object(ofType: ServerConnectionConfig.self, forPrimaryKey: id) + + do { + try instance.write { + if config != nil { + instance.delete(config!) + } + } + } catch(let exception) { + NSLog("failed to delete server config") + debugPrint(exception) + } + } + } public static func getServerConnectionConfigs() -> [ServerConnectionConfig] { var refrences: [ThreadSafeReference] = []