Rename Android Service to use AndroidService suffix to limit confusion with our Matrix SDK Services

vector/src/fdroid/AndroidManifest.xml

@@ -43,7 +43,7 @@
         </receiver>
 
         <service
-            android:name=".fdroid.service.GuardService"
+            android:name=".fdroid.service.GuardAndroidService"
             android:exported="false"
             tools:ignore="Instantiatable" />
 

vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt

@@ -33,7 +33,7 @@ class FDroidGuardServiceStarter @Inject constructor(
         if (preferences.isBackgroundSyncEnabled()) {
             try {
                 Timber.i("## Sync: starting GuardService")
-                val intent = Intent(appContext, GuardService::class.java)
+                val intent = Intent(appContext, GuardAndroidService::class.java)
                 ContextCompat.startForegroundService(appContext, intent)
             } catch (ex: Throwable) {
                 Timber.e("## Sync: ERROR starting GuardService")
@@ -42,7 +42,7 @@ class FDroidGuardServiceStarter @Inject constructor(
     }
 
     override fun stop() {
-        val intent = Intent(appContext, GuardService::class.java)
+        val intent = Intent(appContext, GuardAndroidService::class.java)
         appContext.stopService(intent)
     }
 }

vector/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt

@@ -18,7 +18,7 @@ package im.vector.app.fdroid.service
 import android.content.Intent
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.services.VectorService
+import im.vector.app.core.services.VectorAndroidService
 import im.vector.app.features.notifications.NotificationUtils
 import javax.inject.Inject
 
@@ -29,7 +29,7 @@ import javax.inject.Inject
  * when the app is not in the foreground.
  */
 @AndroidEntryPoint
-class GuardService : VectorService() {
+class GuardAndroidService : VectorAndroidService() {
 
     @Inject lateinit var notificationUtils: NotificationUtils
 

vector/src/main/AndroidManifest.xml

@@ -351,7 +351,7 @@
         <!-- Services -->
 
         <service
-            android:name=".core.services.CallService"
+            android:name=".core.services.CallAndroidService"
             android:exported="false">
             <!-- in order to get headset button events -->
             <intent-filter>
@@ -366,7 +366,7 @@
             tools:ignore="Instantiatable" />
 
         <service
-            android:name=".features.call.telecom.VectorConnectionService"
+            android:name=".features.call.telecom.VectorConnectionAndroidService"
             android:exported="false"
             android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE">
             <intent-filter>
@@ -375,12 +375,12 @@
         </service>
 
         <service
-            android:name=".features.location.LocationSharingService"
+            android:name=".features.location.LocationSharingAndroidService"
             android:exported="false"
             android:foregroundServiceType="location" />
 
         <service
-            android:name=".features.call.webrtc.ScreenCaptureService"
+            android:name=".features.call.webrtc.ScreenCaptureAndroidService"
             android:exported="false"
             android:foregroundServiceType="mediaProjection"
             tools:targetApi="Q" />

vector/src/main/java/im/vector/app/core/services/CallAndroidService.kt

@@ -51,7 +51,7 @@ private val loggerTag = LoggerTag("CallService", LoggerTag.VOIP)
  * Foreground service to manage calls.
  */
 @AndroidEntryPoint
-class CallService : VectorService() {
+class CallAndroidService : VectorAndroidService() {
 
     private val connections = mutableMapOf<String, CallConnection>()
     private val knownCalls = mutableMapOf<String, CallInformation>()
@@ -98,7 +98,7 @@ class CallService : VectorService() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         Timber.tag(loggerTag.value).v("onStartCommand $intent")
         if (mediaSession == null) {
-            mediaSession = MediaSessionCompat(applicationContext, CallService::class.java.name).apply {
+            mediaSession = MediaSessionCompat(applicationContext, CallAndroidService::class.java.name).apply {
                 setCallback(mediaSessionButtonCallback)
             }
         }
@@ -326,7 +326,7 @@ class CallService : VectorService() {
                 callId: String,
                 isInBackground: Boolean
         ) {
-            val intent = Intent(context, CallService::class.java)
+            val intent = Intent(context, CallAndroidService::class.java)
                     .apply {
                         action = ACTION_INCOMING_RINGING_CALL
                         putExtra(EXTRA_CALL_ID, callId)
@@ -339,7 +339,7 @@ class CallService : VectorService() {
                 context: Context,
                 callId: String
         ) {
-            val intent = Intent(context, CallService::class.java)
+            val intent = Intent(context, CallAndroidService::class.java)
                     .apply {
                         action = ACTION_OUTGOING_RINGING_CALL
                         putExtra(EXTRA_CALL_ID, callId)
@@ -351,7 +351,7 @@ class CallService : VectorService() {
                 context: Context,
                 callId: String
         ) {
-            val intent = Intent(context, CallService::class.java)
+            val intent = Intent(context, CallAndroidService::class.java)
                     .apply {
                         action = ACTION_ONGOING_CALL
                         putExtra(EXTRA_CALL_ID, callId)
@@ -365,7 +365,7 @@ class CallService : VectorService() {
                 endCallReason: EndCallReason,
                 rejected: Boolean
         ) {
-            val intent = Intent(context, CallService::class.java)
+            val intent = Intent(context, CallAndroidService::class.java)
                     .apply {
                         action = ACTION_CALL_TERMINATED
                         putExtra(EXTRA_CALL_ID, callId)
@@ -377,8 +377,8 @@ class CallService : VectorService() {
     }
 
     inner class CallServiceBinder : Binder() {
-        fun getCallService(): CallService {
+        fun getCallService(): CallAndroidService {
-            return this@CallService
+            return this@CallAndroidService
         }
     }
 }

vector/src/main/java/im/vector/app/core/services/VectorAndroidService.kt

@@ -22,9 +22,9 @@ import android.os.IBinder
 import timber.log.Timber
 
 /**
- * Parent class for all services.
+ * Parent class for all Android Services.
  */
-abstract class VectorService : Service() {
+abstract class VectorAndroidService : Service() {
 
     /**
      * Tells if the service self destroyed.

vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt

@@ -59,7 +59,7 @@ import im.vector.app.features.call.dialpad.CallDialPadBottomSheet
 import im.vector.app.features.call.dialpad.DialPadFragment
 import im.vector.app.features.call.transfer.CallTransferActivity
 import im.vector.app.features.call.utils.EglUtils
-import im.vector.app.features.call.webrtc.ScreenCaptureService
+import im.vector.app.features.call.webrtc.ScreenCaptureAndroidService
 import im.vector.app.features.call.webrtc.ScreenCaptureServiceConnection
 import im.vector.app.features.call.webrtc.WebRtcCall
 import im.vector.app.features.call.webrtc.WebRtcCallManager
@@ -663,7 +663,7 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
     private fun startScreenSharingService(activityResult: ActivityResult) {
         ContextCompat.startForegroundService(
                 this,
-                Intent(this, ScreenCaptureService::class.java)
+                Intent(this, ScreenCaptureAndroidService::class.java)
         )
         bindToScreenCaptureService(activityResult)
     }

vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionAndroidService.kt

@@ -29,7 +29,7 @@ import android.telecom.PhoneAccountHandle
 import android.telecom.StatusHints
 import android.telecom.TelecomManager
 import androidx.annotation.RequiresApi
-import im.vector.app.core.services.CallService
+import im.vector.app.core.services.CallAndroidService
 
 /**
  * No active calls in other apps
@@ -47,7 +47,7 @@ import im.vector.app.core.services.CallService
  *            the parameter followed by a call to the destroy() method if the user rejects the incoming call.
  *</pre>
  */
-@RequiresApi(Build.VERSION_CODES.M) class VectorConnectionService : ConnectionService() {
+@RequiresApi(Build.VERSION_CODES.M) class VectorConnectionAndroidService : ConnectionService() {
 
     /**
      * The telecom subsystem calls this method in response to your app calling placeCall(Uri, Bundle) to create a new outgoing call.
@@ -69,14 +69,14 @@ import im.vector.app.core.services.CallService
         connection.setCallerDisplayName("Element Caller", TelecomManager.PRESENTATION_ALLOWED)
         connection.statusHints = StatusHints("Testing Hint...", null, null)
 
-        bindService(Intent(applicationContext, CallService::class.java), CallServiceConnection(connection), 0)
+        bindService(Intent(applicationContext, CallAndroidService::class.java), CallServiceConnection(connection), 0)
         connection.setInitializing()
         return connection
     }
 
     inner class CallServiceConnection(private val callConnection: CallConnection) : ServiceConnection {
         override fun onServiceConnected(name: ComponentName?, binder: IBinder?) {
-            val callSrvBinder = binder as CallService.CallServiceBinder
+            val callSrvBinder = binder as CallAndroidService.CallServiceBinder
             callSrvBinder.getCallService().addConnection(callConnection)
             unbindService(this)
         }

vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureAndroidService.kt

@@ -20,13 +20,13 @@ import android.content.Intent
 import android.os.Binder
 import android.os.IBinder
 import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.core.services.VectorService
+import im.vector.app.core.services.VectorAndroidService
 import im.vector.app.core.time.Clock
 import im.vector.app.features.notifications.NotificationUtils
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class ScreenCaptureService : VectorService() {
+class ScreenCaptureAndroidService : VectorAndroidService() {
 
     @Inject lateinit var notificationUtils: NotificationUtils
     @Inject lateinit var clock: Clock
@@ -53,6 +53,6 @@ class ScreenCaptureService : VectorService() {
     }
 
     inner class LocalBinder : Binder() {
-        fun getService(): ScreenCaptureService = this@ScreenCaptureService
+        fun getService(): ScreenCaptureAndroidService = this@ScreenCaptureAndroidService
     }
 }

vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureServiceConnection.kt

@@ -32,7 +32,7 @@ class ScreenCaptureServiceConnection @Inject constructor(
     }
 
     private var isBound = false
-    private var screenCaptureService: ScreenCaptureService? = null
+    private var screenCaptureAndroidService: ScreenCaptureAndroidService? = null
     private var callback: Callback? = null
 
     fun bind(callback: Callback) {
@@ -41,25 +41,25 @@ class ScreenCaptureServiceConnection @Inject constructor(
         if (isBound) {
             callback.onServiceConnected()
         } else {
-            Intent(context, ScreenCaptureService::class.java).also { intent ->
+            Intent(context, ScreenCaptureAndroidService::class.java).also { intent ->
                 context.bindService(intent, this, 0)
             }
         }
     }
 
     fun stopScreenCapturing() {
-        screenCaptureService?.stopService()
+        screenCaptureAndroidService?.stopService()
     }
 
     override fun onServiceConnected(className: ComponentName, binder: IBinder) {
-        screenCaptureService = (binder as ScreenCaptureService.LocalBinder).getService()
+        screenCaptureAndroidService = (binder as ScreenCaptureAndroidService.LocalBinder).getService()
         isBound = true
         callback?.onServiceConnected()
     }
 
     override fun onServiceDisconnected(className: ComponentName) {
         isBound = false
-        screenCaptureService = null
+        screenCaptureAndroidService = null
         callback = null
     }
 }

vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt

@@ -19,7 +19,7 @@ package im.vector.app.features.call.webrtc
 import android.content.Context
 import android.hardware.camera2.CameraManager
 import androidx.core.content.getSystemService
-import im.vector.app.core.services.CallService
+import im.vector.app.core.services.CallAndroidService
 import im.vector.app.core.utils.PublishDataSource
 import im.vector.app.core.utils.TextUtils.formatDuration
 import im.vector.app.features.call.CameraEventsHandlerAdapter
@@ -477,7 +477,7 @@ class WebRtcCall(
         val turnServerResponse = getTurnServer()
         // Update service state
         withContext(Dispatchers.Main) {
-            CallService.onPendingCall(
+            CallAndroidService.onPendingCall(
                     context = context,
                     callId = mxCall.callId
             )

vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt

@@ -22,7 +22,7 @@ import androidx.lifecycle.LifecycleOwner
 import im.vector.app.ActiveSessionDataSource
 import im.vector.app.BuildConfig
 import im.vector.app.core.pushers.UnifiedPushHelper
-import im.vector.app.core.services.CallService
+import im.vector.app.core.services.CallAndroidService
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.plan.CallEnded
 import im.vector.app.features.analytics.plan.CallStarted
@@ -254,7 +254,7 @@ class WebRtcCallManager @Inject constructor(
             Timber.tag(loggerTag.value).v("On call ended for unknown call $callId")
         }
         webRtcCall.trackCallEnded()
-        CallService.onCallTerminated(context, callId, endCallReason, rejected)
+        CallAndroidService.onCallTerminated(context, callId, endCallReason, rejected)
         callsByRoomId[webRtcCall.signalingRoomId]?.remove(webRtcCall)
         callsByRoomId[webRtcCall.nativeRoomId]?.remove(webRtcCall)
         transferees.remove(callId)
@@ -305,7 +305,7 @@ class WebRtcCallManager @Inject constructor(
         if (transferee != null) {
             transferees[webRtcCall.callId] = transferee
         }
-        CallService.onOutgoingCallRinging(
+        CallAndroidService.onOutgoingCallRinging(
                 context = context.applicationContext,
                 callId = mxCall.callId
         )
@@ -370,7 +370,7 @@ class WebRtcCallManager @Inject constructor(
             offerSdp = callInviteContent.offer
         }
         // Start background service with notification
-        CallService.onIncomingCallRinging(
+        CallAndroidService.onIncomingCallRinging(
                 context = context,
                 callId = mxCall.callId,
                 isInBackground = isInBackground
@@ -395,7 +395,7 @@ class WebRtcCallManager @Inject constructor(
                 }
         val mxCall = call.mxCall
         // Update service state
-        CallService.onPendingCall(
+        CallAndroidService.onPendingCall(
                 context = context,
                 callId = mxCall.callId
         )

vector/src/main/java/im/vector/app/features/location/LocationSharingAndroidService.kt

@@ -23,7 +23,7 @@ import android.os.Parcelable
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.services.VectorService
+import im.vector.app.core.services.VectorAndroidService
 import im.vector.app.features.location.live.GetLiveLocationShareSummaryUseCase
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.session.coroutineScope
@@ -42,7 +42,7 @@ import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class LocationSharingService : VectorService(), LocationTracker.Callback {
+class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Callback {
 
     @Parcelize
     data class RoomArgs(
@@ -80,7 +80,7 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
 
         launchWithActiveSession { session ->
             val job = locationTracker.locations
-                    .onEach(this@LocationSharingService::onLocationUpdate)
+                    .onEach(this@LocationSharingAndroidService::onLocationUpdate)
                     .launchIn(session.coroutineScope)
             jobs.add(job)
         }
@@ -225,7 +225,7 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
     }
 
     inner class LocalBinder : Binder() {
-        fun getService(): LocationSharingService = this@LocationSharingService
+        fun getService(): LocationSharingAndroidService = this@LocationSharingAndroidService
     }
 
     interface Callback {

vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt

@@ -179,10 +179,10 @@ class LocationSharingFragment @Inject constructor(
     }
 
     private fun handleStartLiveLocationService(event: LocationSharingViewEvents.StartLiveLocationService) {
-        val args = LocationSharingService.RoomArgs(event.sessionId, event.roomId, event.durationMillis)
+        val args = LocationSharingAndroidService.RoomArgs(event.sessionId, event.roomId, event.durationMillis)
 
-        Intent(requireContext(), LocationSharingService::class.java)
+        Intent(requireContext(), LocationSharingAndroidService::class.java)
-                .putExtra(LocationSharingService.EXTRA_ROOM_ARGS, args)
+                .putExtra(LocationSharingAndroidService.EXTRA_ROOM_ARGS, args)
                 .also {
                     ContextCompat.startForegroundService(requireContext(), it)
                 }

vector/src/main/java/im/vector/app/features/location/LocationSharingServiceConnection.kt

@@ -27,7 +27,8 @@ import javax.inject.Singleton
 @Singleton
 class LocationSharingServiceConnection @Inject constructor(
         private val context: Context
-) : ServiceConnection, LocationSharingService.Callback {
+) : ServiceConnection,
+        LocationSharingAndroidService.Callback {
 
     interface Callback {
         fun onLocationServiceRunning()
@@ -37,7 +38,7 @@ class LocationSharingServiceConnection @Inject constructor(
 
     private val callbacks = mutableSetOf<Callback>()
     private var isBound = false
-    private var locationSharingService: LocationSharingService? = null
+    private var locationSharingAndroidService: LocationSharingAndroidService? = null
 
     fun bind(callback: Callback) {
         addCallback(callback)
@@ -45,7 +46,7 @@ class LocationSharingServiceConnection @Inject constructor(
         if (isBound) {
             callback.onLocationServiceRunning()
         } else {
-            Intent(context, LocationSharingService::class.java).also { intent ->
+            Intent(context, LocationSharingAndroidService::class.java).also { intent ->
                 context.bindService(intent, this, 0)
             }
         }
@@ -56,7 +57,7 @@ class LocationSharingServiceConnection @Inject constructor(
     }
 
     override fun onServiceConnected(className: ComponentName, binder: IBinder) {
-        locationSharingService = (binder as LocationSharingService.LocalBinder).getService().also {
+        locationSharingAndroidService = (binder as LocationSharingAndroidService.LocalBinder).getService().also {
             it.callback = this
         }
         isBound = true
@@ -65,8 +66,8 @@ class LocationSharingServiceConnection @Inject constructor(
 
     override fun onServiceDisconnected(className: ComponentName) {
         isBound = false
-        locationSharingService?.callback = null
+        locationSharingAndroidService?.callback = null
-        locationSharingService = null
+        locationSharingAndroidService = null
         onCallbackActionNoArg(Callback::onLocationServiceStopped)
     }
 

vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt

@@ -50,7 +50,7 @@ import im.vector.app.R
 import im.vector.app.core.extensions.createIgnoredUri
 import im.vector.app.core.platform.PendingIntentCompat
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.services.CallService
+import im.vector.app.core.services.CallAndroidService
 import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.startNotificationChannelSettingsIntent
 import im.vector.app.features.call.VectorCallActivity
@@ -512,7 +512,7 @@ class NotificationUtils @Inject constructor(
     /**
      * Build notification for the CallService, when a call is missed.
      */
-    fun buildCallMissedNotification(callInformation: CallService.CallInformation): Notification {
+    fun buildCallMissedNotification(callInformation: CallAndroidService.CallInformation): Notification {
         val builder = NotificationCompat.Builder(context, SILENT_NOTIFICATION_CHANNEL_ID)
                 .setContentTitle(callInformation.opponentMatrixItem?.getBestName() ?: callInformation.opponentUserId)
                 .apply {