jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

making the guard service a noop, lifeline scheduling will be brought back if we confirm the service by itself is not enough 

- reuses the sync foreground notification for the guard foreground service
This commit is contained in:
Adam Brown 2021-10-21 19:14:33 +01:00
parent c6b942cd31
commit 71b27bfd5d
9 changed files with 178 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright (c) 2021 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.app.di
import android.content.Context
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import im.vector.app.core.services.GuardServiceStarter
import im.vector.app.fdroid.service.FDroidGuardServiceStarter
import im.vector.app.features.settings.VectorPreferences
@Module
@InstallIn(SingletonComponent::class)
abstract class FlavorModule {
companion object {
@Provides
@JvmStatic
fun provideGuardServiceStarter(preferences: VectorPreferences, appContext: Context): GuardServiceStarter {
return FDroidGuardServiceStarter(preferences, appContext)
}
}
}

15
vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt
View File

@ -31,21 +31,6 @@ object BackgroundSyncStarter {
fun start(context: Context, vectorPreferences: VectorPreferences, activeSessionHolder: ActiveSessionHolder) {
if (vectorPreferences.areNotificationEnabledForDevice()) {
val activeSession = activeSessionHolder.getSafeActiveSession() ?: return
val intent = Intent(context, GuardService::class.java)
if (vectorPreferences.getFdroidSyncBackgroundMode() == BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME) {
intent.putExtra(SyncService.EXTRA_SESSION_ID, activeSession.sessionId)
} else {
intent.putExtra(SyncService.EXTRA_SESSION_ID, "") // this assures the GuardService runs, but will not start VectorSyncService
}
intent.putExtra(SyncService.EXTRA_DELAY_SECONDS, vectorPreferences.backgroundSyncDelay())
try {
Timber.i("## Sync: starting GuardService")
ContextCompat.startForegroundService(context, intent)
} catch (ex: Throwable) {
Timber.e("## Sync: ERROR starting GuardService")
}
when (vectorPreferences.getFdroidSyncBackgroundMode()) {
BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_BATTERY -> {
// we rely on periodic worker

49
vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright (c) 2021 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.app.fdroid.service
import android.content.Context
import android.content.Intent
import androidx.core.content.ContextCompat
import im.vector.app.core.services.GuardServiceStarter
import im.vector.app.features.settings.VectorPreferences
import timber.log.Timber
import javax.inject.Inject
class FDroidGuardServiceStarter @Inject constructor(
private val preferences: VectorPreferences,
private val appContext: Context
) : GuardServiceStarter {
override fun start() {
if (preferences.isBackgroundSyncEnabled()) {
try {
Timber.i("## Sync: starting GuardService")
val intent = Intent(appContext, GuardService::class.java)
ContextCompat.startForegroundService(appContext, intent)
} catch (ex: Throwable) {
Timber.e("## Sync: ERROR starting GuardService")
}
}
}
override fun stop() {
val intent = Intent(appContext, GuardService::class.java)
appContext.stopService(intent)
}
}

138
vector/src/fdroid/java/im/vector/app/fdroid/service/GuardService.kt
View File

@ -18,140 +18,34 @@ package im.vector.app.fdroid.service
import android.app.Service
import android.content.Intent
import android.os.IBinder
import androidx.core.content.getSystemService
import timber.log.Timber
import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.R
import im.vector.app.core.extensions.vectorComponent
import im.vector.app.features.notifications.NotificationUtils
import java.util.Timer
import java.util.TimerTask
import im.vector.app.core.services.VectorSyncService
import androidx.core.content.ContextCompat
import org.matrix.android.sdk.internal.session.sync.job.SyncService
import android.app.AlarmManager
import android.os.Build
import android.app.PendingIntent
import im.vector.app.features.settings.BackgroundSyncMode
import timber.log.Timber
import javax.inject.Inject
/**
* This no-op foreground service acts as a deterrent for the system
* to avoid eagerly killing the app process.
* Keeping the app process alive avoids some OEMs ignoring scheduled WorkManager and AlarmManager tasks
* when the app is not in the foreground.
*/
@AndroidEntryPoint
class GuardService : Service() {
private var timer = Timer()
private var sessionId: String? = null
private var running: Boolean = false
@Inject lateinit var notificationUtils: NotificationUtils
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
Timber.i("## Sync: onStartCommand GuardService running:$running")
if (running) {
if (intent != null) {
val lifeLine = intent.getBooleanExtra(EXTRA_LIFELINE, false)
if (lifeLine) {
// called from lifeLine?
scheduleLifeLine()
return START_STICKY
}
}
}
try {
timer.cancel()
} catch (ex: Exception) {
}
val notificationSubtitleRes = R.string.notification_listening_for_events
val notification = notificationUtils.buildForegroundServiceNotification(notificationSubtitleRes, false)
startForeground(NotificationUtils.NOTIFICATION_ID_FOREGROUND_SERVICE + 1, notification)
try {
val sharedPref = getSharedPreferences(PREF_NAME_SESSION_ID, 0)
var delayInSeconds = BackgroundSyncMode.DEFAULT_SYNC_DELAY_SECONDS
if (intent != null) {
sessionId = intent.getStringExtra(SyncService.EXTRA_SESSION_ID)
delayInSeconds = intent.getIntExtra(SyncService.EXTRA_DELAY_SECONDS, BackgroundSyncMode.DEFAULT_SYNC_DELAY_SECONDS)
val lifeLine = intent.getBooleanExtra(EXTRA_LIFELINE, false)
if (lifeLine) {
Timber.i("## Sync: GuardService restarted by lifeLine")
}
if (sessionId.isNullOrEmpty()) {
Timber.i("## Sync: GuardService getting sessionId from sharedPreferences")
sessionId = sharedPref.getString(PREF_NAME_SESSION_ID, null)
} else {
Timber.i("## Sync: GuardService saving sessionId to sharedPreferences")
val editor = sharedPref.edit()
editor.putString(PREF_NAME_SESSION_ID, sessionId)
editor.apply()
}
} else {
Timber.i("## Sync: GuardService intent is null in GuardService, getting sessionId from sharedPreferences")
sessionId = sharedPref.getString(PREF_NAME_SESSION_ID, null)
}
timer = Timer()
timer.scheduleAtFixedRate(object : TimerTask() {
override fun run() {
if (sessionId.isNullOrEmpty()) {
Timber.i("## Sync: timer still alive GuardService sessionId:nullOrEmpty")
} else {
Timber.i("## Sync: timer still alive GuardService sessionId:$sessionId")
try {
val syncIntent = Intent(applicationContext, VectorSyncService::class.java)
syncIntent.putExtra(SyncService.EXTRA_SESSION_ID, sessionId)
syncIntent.putExtra(SyncService.EXTRA_PERIODIC, true)
ContextCompat.startForegroundService(applicationContext, syncIntent)
} catch (ex: Throwable) {
}
}
}
}, delayInSeconds * 1000L, delayInSeconds * 1000L)
} catch (ex: Exception) {
Timber.e("## Sync: error in GuardService when creating timer")
}
if (!running) {
scheduleLifeLine()
}
running = true
return START_STICKY
}
private lateinit var notificationUtils: NotificationUtils
override fun onBind(intent: Intent?): IBinder? = null
override fun onCreate() {
Timber.i("## Sync: onCreate GuardService")
super.onCreate()
notificationUtils = vectorComponent().notificationUtils()
Timber.i("## Sync: onCreate GuardService")
}
override fun onDestroy() {
Timber.i("## Sync: onDestroy GuardService")
try {
timer.cancel()
} catch (ex: Exception) {
}
super.onDestroy()
}
override fun onBind(intent: Intent?): IBinder? {
return null
}
private fun scheduleLifeLine() {
Timber.d("## Sync: GuardService scheduleLifeLine")
val intent = Intent(applicationContext, GuardService::class.java)
intent.putExtra(EXTRA_LIFELINE, true)
val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
PendingIntent.getForegroundService(this, 0, intent, 0)
} else {
PendingIntent.getService(this, 0, intent, 0)
}
val firstMillis = System.currentTimeMillis() + 60 * 1000L
val alarmMgr = getSystemService<AlarmManager>()!!
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
alarmMgr.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, firstMillis, pendingIntent)
} else {
alarmMgr.set(AlarmManager.RTC_WAKEUP, firstMillis, pendingIntent)
}
}
companion object {
const val PREF_NAME_SESSION_ID = "GuardServiceLastActiveSessionId"
const val EXTRA_LIFELINE = "GuardServiceLifeLine"
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
val notificationSubtitleRes = R.string.notification_listening_for_events
val notification = notificationUtils.buildForegroundServiceNotification(notificationSubtitleRes, false)
startForeground(NotificationUtils.NOTIFICATION_ID_FOREGROUND_SERVICE, notification)
return START_STICKY
}
}

37
vector/src/gplay/java/im/vector/app/di/FlavorModule.kt Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright (c) 2021 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.app.di
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import im.vector.app.core.services.GuardServiceStarter
@InstallIn(SingletonComponent::class)
@Module
abstract class FlavorModule {
companion object {
@Provides
@JvmStatic
fun provideGuardServiceStarter(): GuardServiceStarter {
return object : GuardServiceStarter {}
}
}
}

3
vector/src/main/java/im/vector/app/VectorApplication.kt
View File

@ -44,6 +44,7 @@ import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.extensions.configureAndStart
import im.vector.app.core.extensions.startSyncing
import im.vector.app.core.rx.RxConfig
import im.vector.app.core.services.GuardServiceStarter
import im.vector.app.features.call.webrtc.WebRtcCallManager
import im.vector.app.features.configuration.VectorConfiguration
import im.vector.app.features.disclaimer.doNotShowDisclaimerDialog
@ -99,6 +100,7 @@ class VectorApplication :
@Inject lateinit var callManager: WebRtcCallManager
@Inject lateinit var invitesAcceptor: InvitesAcceptor
@Inject lateinit var vectorFileLogger: VectorFileLogger
@Inject lateinit var guardServiceStarter: GuardServiceStarter
// font thread handler
private var fontThreadHandler: Handler? = null
@ -164,6 +166,7 @@ class VectorApplication :
if (authenticationService.hasAuthenticatedSessions() && !activeSessionHolder.hasActiveSession()) {
val lastAuthenticatedSession = authenticationService.getLastAuthenticatedSession()!!
activeSessionHolder.setActiveSession(lastAuthenticatedSession)
guardServiceStarter.start()
lastAuthenticatedSession.configureAndStart(applicationContext, startSyncing = false)
}

1
vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
View File

@ -29,6 +29,7 @@ import dagger.hilt.components.SingletonComponent
import im.vector.app.core.dispatchers.CoroutineDispatchers
import im.vector.app.core.error.DefaultErrorFormatter
import im.vector.app.core.error.ErrorFormatter
import im.vector.app.di.FlavorModule
import im.vector.app.features.invite.AutoAcceptInvites
import im.vector.app.features.invite.CompileTimeAutoAcceptInvites
import im.vector.app.features.navigation.DefaultNavigator

22
vector/src/main/java/im/vector/app/core/services/GuardServiceStarter.kt Normal file
View File

@ -0,0 +1,22 @@
/*
* Copyright (c) 2021 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.app.core.services
interface GuardServiceStarter {
fun start() {}
fun stop() {}
}

13
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
View File

@ -37,6 +37,7 @@ import im.vector.app.core.preference.VectorPreference
import im.vector.app.core.preference.VectorPreferenceCategory
import im.vector.app.core.preference.VectorSwitchPreference
import im.vector.app.core.pushers.PushersManager
import im.vector.app.core.services.GuardServiceStarter
import im.vector.app.core.utils.isIgnoringBatteryOptimizations
import im.vector.app.core.utils.requestDisablingBatteryOptimization
import im.vector.app.features.notifications.NotificationUtils
@ -61,7 +62,8 @@ import javax.inject.Inject
class VectorSettingsNotificationPreferenceFragment @Inject constructor(
private val pushManager: PushersManager,
private val activeSessionHolder: ActiveSessionHolder,
private val vectorPreferences: VectorPreferences
private val vectorPreferences: VectorPreferences,
private val guardServiceStarter: GuardServiceStarter
) : VectorSettingsBaseFragment(),
BackgroundSyncModeChooserDialog.InteractionListener {
@ -216,14 +218,19 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
it.isVisible = !FcmHelper.isPushSupported()
}
val backgroundSyncEnabled = vectorPreferences.isBackgroundSyncEnabled()
findPreference<VectorEditTextPreference>(VectorPreferences.SETTINGS_SET_SYNC_TIMEOUT_PREFERENCE_KEY)?.let {
it.isEnabled = vectorPreferences.isBackgroundSyncEnabled()
it.isEnabled = backgroundSyncEnabled
it.summary = secondsToText(vectorPreferences.backgroundSyncTimeOut())
}
findPreference<VectorEditTextPreference>(VectorPreferences.SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY)?.let {
it.isEnabled = vectorPreferences.isBackgroundSyncEnabled()
it.isEnabled = backgroundSyncEnabled
it.summary = secondsToText(vectorPreferences.backgroundSyncDelay())
}
when {
backgroundSyncEnabled -> guardServiceStarter.start()
else -> guardServiceStarter.stop()
}
}
/**