π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Drive Android foreground heartbeat from app lifecycle callbacks
laurenspriem99d6b69629b6
diff --git a/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/EnteApplication.kt b/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/EnteApplication.ktindex 0008da861d..d74d1af180 100644--- a/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/EnteApplication.kt+++ b/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/EnteApplication.kt@@ -17,6 +17,7 @@ class EnteApplication : Application() {override fun onCreate() {super.onCreate()WorkmanagerDebug.setCurrent(InternalUserWorkmanagerDebugHandler())+ ForegroundHeartbeat.install(this)}companion object {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 19269ece62..3dd764633f 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@@ -1,36 +1,13 @@package io.ente.photos+import android.app.Activity+import android.app.Applicationimport android.content.Contextimport android.os.Bundleimport android.os.Handlerimport android.os.Looper-import io.flutter.embedding.android.FlutterFragmentActivity-abstract class ForegroundHeartbeatActivity : FlutterFragmentActivity() {- private val foregroundHeartbeat = ForegroundHeartbeat(this)-- override fun onCreate(savedInstanceState: Bundle?) {- foregroundHeartbeat.start()- super.onCreate(savedInstanceState)- }-- override fun onStart() {- super.onStart()- foregroundHeartbeat.start()- }-- override fun onStop() {- foregroundHeartbeat.stop()- super.onStop()- }-- override fun onDestroy() {- foregroundHeartbeat.stop()- super.onDestroy()- }-}--private class ForegroundHeartbeat(private val context: Context) {+class ForegroundHeartbeat(private val context: Context) {private val handler = Handler(Looper.getMainLooper())private val preferences by lazy {context.getSharedPreferences(@@ -87,9 +64,59 @@ private class ForegroundHeartbeat(private val context: Context) {private fun currentTimeInMicroseconds() = System.currentTimeMillis() * 1000L- private companion object {- const val DART_FOREGROUND_HEARTBEAT_KEY = "flutter.fg_task_hb_time"- const val NATIVE_FOREGROUND_HEARTBEAT_KEY = "flutter.native_fg_task_hb_time"- const val HEARTBEAT_INTERVAL_MS = 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 = 1000L++ fun install(application: Application) {+ val heartbeat = ForegroundHeartbeat(application)+ application.registerActivityLifecycleCallbacks(+ object : Application.ActivityLifecycleCallbacks {+ private var startedActivities = 0++ override fun onActivityPreCreated(+ activity: Activity,+ savedInstanceState: Bundle?+ ) {+ heartbeat.start()+ }++ override fun onActivityCreated(+ activity: Activity,+ savedInstanceState: Bundle?+ ) {+ heartbeat.start()+ }++ override fun onActivityStarted(activity: Activity) {+ startedActivities+++ heartbeat.start()+ }++ override fun onActivityResumed(activity: Activity) {}++ override fun onActivityPaused(activity: Activity) {}++ override fun onActivityStopped(activity: Activity) {+ startedActivities--+ if (startedActivities == 0) {+ heartbeat.stop()+ }+ }++ override fun onActivitySaveInstanceState(+ activity: Activity,+ outState: Bundle+ ) {}++ override fun onActivityDestroyed(activity: Activity) {+ if (startedActivities == 0) {+ heartbeat.stop()+ }+ }+ }+ )+ }}}diff --git a/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/MainActivity.kt b/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/MainActivity.ktindex 0c80134840..7422f67826 100644--- a/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/MainActivity.kt+++ b/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/MainActivity.kt@@ -1,8 +1,9 @@package io.ente.photosimport android.content.Intent+import io.flutter.embedding.android.FlutterFragmentActivity-class MainActivity : ForegroundHeartbeatActivity() {+class MainActivity : FlutterFragmentActivity() {override fun onNewIntent(intent: Intent) {setIntent(intent)super.onNewIntent(intent)diff --git a/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/MediaPickerActivity.kt b/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/MediaPickerActivity.ktindex e7da2ea490..6f549c179b 100644--- a/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/MediaPickerActivity.kt+++ b/mobile/apps/photos/android/app/src/main/kotlin/io/ente/photos/MediaPickerActivity.kt@@ -2,8 +2,9 @@ package io.ente.photosimport android.content.Intentimport android.os.Bundle+import io.flutter.embedding.android.FlutterFragmentActivity-class MediaPickerActivity : ForegroundHeartbeatActivity() {+class MediaPickerActivity : FlutterFragmentActivity() {override fun onCreate(savedInstanceState: Bundle?) {normalizePickerIntent(intent)super.onCreate(savedInstanceState)