π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Polish foreground heartbeat handoff
laurenspriem62f485ec339b
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 371517dada..19269ece62 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@@ -40,6 +40,7 @@ private class ForegroundHeartbeat(private val context: Context) {}private var nativeHeartbeatStartedAt = 0Lprivate var isRunning = false+ private var dartHasTakenOver = falseprivate val heartbeat =object : Runnable {override fun run() {@@ -48,6 +49,7 @@ private class ForegroundHeartbeat(private val context: Context) {}if (hasDartHeartbeatTakenOver()) {isRunning = false+ dartHasTakenOver = truereturn}writeNativeHeartbeat()@@ -56,7 +58,7 @@ private class ForegroundHeartbeat(private val context: Context) {}fun start() {- if (isRunning) {+ if (isRunning || dartHasTakenOver) {return}isRunning = true@@ -67,6 +69,7 @@ private class ForegroundHeartbeat(private val context: Context) {fun stop() {isRunning = false+ dartHasTakenOver = falsehandler.removeCallbacks(heartbeat)}diff --git a/mobile/apps/photos/ios/Runner/ForegroundHeartbeat.swift b/mobile/apps/photos/ios/Runner/ForegroundHeartbeat.swiftindex bdd6051daf..e4a1501fd0 100644--- a/mobile/apps/photos/ios/Runner/ForegroundHeartbeat.swift+++ b/mobile/apps/photos/ios/Runner/ForegroundHeartbeat.swift@@ -4,9 +4,10 @@ final class ForegroundHeartbeat {private let defaults = UserDefaults.standardprivate var timer: Timer?private var nativeHeartbeatStartedAt: Int64 = 0+ private var dartHasTakenOver = falsefunc start() {- guard timer == nil else {+ guard timer == nil, !dartHasTakenOver else {return}@@ -21,18 +22,24 @@ final class ForegroundHeartbeat {}func stop() {- timer?.invalidate()- timer = nil+ stopTimer()+ dartHasTakenOver = false}private func heartbeatTimerFired() {if hasDartHeartbeatTakenOver() {- stop()+ stopTimer()+ dartHasTakenOver = truereturn}writeNativeHeartbeat(currentTimeInMicroseconds())}+ private func stopTimer() {+ timer?.invalidate()+ timer = nil+ }+private func hasDartHeartbeatTakenOver() -> Bool {let dartHeartbeat =(defaults.object(forKey: dartForegroundHeartbeatKey) as? NSNumber)?.int64Value ?? 0diff --git a/mobile/apps/photos/lib/main.dart b/mobile/apps/photos/lib/main.dartindex f350e373b8..0abaf73708 100644--- a/mobile/apps/photos/lib/main.dart+++ b/mobile/apps/photos/lib/main.dart@@ -728,11 +728,16 @@ Future<void> _handleBackgroundPush(Object message) async {}Future<void> _logFGHeartBeatInfo(SharedPreferences prefs) async {- final bool isRunningInFG = await isForegroundEngineActive();+ final bool isDartEngineActive = await isDartForegroundEngineActive();+ final bool isNativeForeground = await isNativeForegroundActive();await prefs.reload();final lastFGTaskHeartBeatTime = prefs.getInt(kLastFGTaskHeartBeatTime) ?? 0;final String lastRun = lastFGTaskHeartBeatTime == 0? 'never': DateTime.fromMicrosecondsSinceEpoch(lastFGTaskHeartBeatTime).toString();- _logger.info('isAlreadyRunningFG: $isRunningInFG, last Beat: $lastRun');+ _logger.info(+ 'isDartForegroundEngineActive: $isDartEngineActive, '+ 'isNativeForegroundActive: $isNativeForeground, '+ 'last Dart beat: $lastRun',+ );}diff --git a/mobile/apps/photos/lib/services/process_activity.dart b/mobile/apps/photos/lib/services/process_activity.dartindex 1fb03a54ec..bdac4775e2 100644--- a/mobile/apps/photos/lib/services/process_activity.dart+++ b/mobile/apps/photos/lib/services/process_activity.dart@@ -9,6 +9,12 @@ const kEngineDeathTimeoutInMicroseconds = 5000000;Future<bool> isForegroundEngineActive() =>_isEngineActive([kLastFGTaskHeartBeatTime, kLastNativeFGTaskHeartBeatTime]);+Future<bool> isDartForegroundEngineActive() =>+ _isEngineActive([kLastFGTaskHeartBeatTime]);++Future<bool> isNativeForegroundActive() =>+ _isEngineActive([kLastNativeFGTaskHeartBeatTime]);+Future<bool> isBackgroundEngineActive() =>_isEngineActive([kLastBGTaskHeartBeatTime]);