π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Always write native heartbeat off the main thread
laurenspriembe81feb2ee49
diff --git a/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/ForegroundHeartbeat.kt b/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/ForegroundHeartbeat.ktindex 3dd764633f..b48aef6398 100644--- a/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/ForegroundHeartbeat.kt+++ b/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/ForegroundHeartbeat.kt@@ -5,67 +5,59 @@ import android.app.Applicationimport android.content.Contextimport android.os.Bundleimport android.os.Handler-import android.os.Looper+import android.os.HandlerThreadclass ForegroundHeartbeat(private val context: Context) {- private val handler = Handler(Looper.getMainLooper())+ private val handler by lazy {+ val thread = HandlerThread("ForegroundHeartbeat")+ thread.start()+ Handler(thread.looper)+ }private val preferences by lazy {context.getSharedPreferences(EnteApplication.FLUTTER_SHARED_PREFERENCES,Context.MODE_PRIVATE)}- private var nativeHeartbeatStartedAt = 0Lprivate var isRunning = false- private var dartHasTakenOver = falseprivate val heartbeat =object : Runnable {override fun run() {if (!isRunning) {return}- if (hasDartHeartbeatTakenOver()) {- isRunning = false- dartHasTakenOver = true- return- }writeNativeHeartbeat()handler.postDelayed(this, HEARTBEAT_INTERVAL_MS)}}fun start() {- if (isRunning || dartHasTakenOver) {- return+ handler.post {+ if (isRunning) {+ return@post+ }+ isRunning = true+ heartbeat.run()}- isRunning = true- nativeHeartbeatStartedAt = currentTimeInMicroseconds()- writeNativeHeartbeat(nativeHeartbeatStartedAt)- handler.postDelayed(heartbeat, HEARTBEAT_INTERVAL_MS)}fun stop() {- isRunning = false- dartHasTakenOver = false- handler.removeCallbacks(heartbeat)- }-- private fun hasDartHeartbeatTakenOver(): Boolean {- val dartHeartbeat =- preferences.getLong(DART_FOREGROUND_HEARTBEAT_KEY, 0L)- return dartHeartbeat >= nativeHeartbeatStartedAt+ handler.post {+ isRunning = false+ handler.removeCallbacks(heartbeat)+ }}- private fun writeNativeHeartbeat(heartbeat: Long = currentTimeInMicroseconds()) {+ private fun writeNativeHeartbeat() {preferences.edit()- .putLong(NATIVE_FOREGROUND_HEARTBEAT_KEY, heartbeat)+ .putLong(+ NATIVE_FOREGROUND_HEARTBEAT_KEY,+ System.currentTimeMillis() * 1000L+ ).apply()}- private fun currentTimeInMicroseconds() = System.currentTimeMillis() * 1000L-companion object {- private const val DART_FOREGROUND_HEARTBEAT_KEY = "flutter.fg_task_hb_time"private const val NATIVE_FOREGROUND_HEARTBEAT_KEY = "flutter.native_fg_task_hb_time"private const val HEARTBEAT_INTERVAL_MS = 1000Ldiff --git a/mobile/apps/photos/ios/Runner/ForegroundHeartbeat.swift b/mobile/apps/photos/ios/Runner/ForegroundHeartbeat.swiftindex e4a1501fd0..e17b42ae30 100644--- a/mobile/apps/photos/ios/Runner/ForegroundHeartbeat.swift+++ b/mobile/apps/photos/ios/Runner/ForegroundHeartbeat.swift@@ -2,59 +2,45 @@ import Foundationfinal class ForegroundHeartbeat {private let defaults = UserDefaults.standard- private var timer: Timer?- private var nativeHeartbeatStartedAt: Int64 = 0- private var dartHasTakenOver = false+ private let queue = DispatchQueue(+ label: "io.ente.frame.foreground-heartbeat",+ qos: .utility+ )+ private var timer: DispatchSourceTimer?func start() {- guard timer == nil, !dartHasTakenOver else {- return+ queue.async {+ if self.timer != nil {+ return+ }+ let timer = DispatchSource.makeTimerSource(queue: self.queue)+ timer.schedule(+ deadline: .now(),+ repeating: self.heartbeatInterval,+ leeway: .milliseconds(100)+ )+ timer.setEventHandler { [weak self] in+ self?.writeNativeHeartbeat()+ }+ timer.resume()+ self.timer = timer}-- nativeHeartbeatStartedAt = currentTimeInMicroseconds()- writeNativeHeartbeat(nativeHeartbeatStartedAt)-- let timer = Timer(timeInterval: heartbeatInterval, repeats: true) { [weak self] _ in- self?.heartbeatTimerFired()- }- self.timer = timer- RunLoop.main.add(timer, forMode: .common)}func stop() {- stopTimer()- dartHasTakenOver = false- }-- private func heartbeatTimerFired() {- if hasDartHeartbeatTakenOver() {- stopTimer()- dartHasTakenOver = true- return+ queue.async {+ self.timer?.cancel()+ self.timer = nil}- writeNativeHeartbeat(currentTimeInMicroseconds())- }-- private func stopTimer() {- timer?.invalidate()- timer = nil- }-- private func hasDartHeartbeatTakenOver() -> Bool {- let dartHeartbeat =- (defaults.object(forKey: dartForegroundHeartbeatKey) as? NSNumber)?.int64Value ?? 0- return dartHeartbeat >= nativeHeartbeatStartedAt- }-- private func writeNativeHeartbeat(_ heartbeat: Int64) {- defaults.set(heartbeat, forKey: nativeForegroundHeartbeatKey)}- private func currentTimeInMicroseconds() -> Int64 {- Int64(Date().timeIntervalSince1970 * 1_000_000)+ private func writeNativeHeartbeat() {+ defaults.set(+ Int64(Date().timeIntervalSince1970 * 1_000_000),+ forKey: nativeForegroundHeartbeatKey+ )}- private let dartForegroundHeartbeatKey = "flutter.fg_task_hb_time"private let nativeForegroundHeartbeatKey = "flutter.native_fg_task_hb_time"- private let heartbeatInterval: TimeInterval = 1+ private let heartbeatInterval: DispatchTimeInterval = .seconds(1)}