diff --git a/vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt b/vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt deleted file mode 100644 index 39b5c4a976..0000000000 --- a/vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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) - } - } -} diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt b/vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt deleted file mode 100644 index a9574c3bfe..0000000000 --- a/vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2019 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. - */ - -/** - * Code exclusively used by the FDroid build and not referenced on the main source code - */ -package im.vector.app.fdroid diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt b/vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt deleted file mode 100644 index d421c8bb87..0000000000 --- a/vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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) - } -} diff --git a/vector/src/gplay/java/im/vector/app/di/FlavorModule.kt b/vector/src/gplay/java/im/vector/app/di/FlavorModule.kt deleted file mode 100644 index 61fd476c87..0000000000 --- a/vector/src/gplay/java/im/vector/app/di/FlavorModule.kt +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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 {} - } - } -} diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index 713d656f8d..5f5bd22257 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -382,6 +382,11 @@ + +