remove constructor argument for TorServiceConnection from BaseService.startService

Author: 05nelsonm

topl-service/src/main/java/io/matthewnelson/topl_service/TorServiceController.kt

@@ -339,11 +339,7 @@ class TorServiceController private constructor(): ServiceConsts() {
          * */
         @Throws(RuntimeException::class)
         fun startTor() =
-            BaseService.startService(
-                BaseService.getAppContext(),
-                TorService::class.java,
-                TorServiceConnection.torServiceConnection
-            )
+            BaseService.startService(BaseService.getAppContext(), TorService::class.java)
 
         /**
          * Stops [TorService].

topl-service/src/main/java/io/matthewnelson/topl_service/lifecycle/BackgroundManager.kt

@@ -262,7 +262,6 @@ class BackgroundManager internal constructor(
             BaseService.startService(
                 BaseService.getAppContext(),
                 serviceClass,
-                TorServiceConnection.torServiceConnection,
                 includeIntentActionStart = false,
                 bindServiceFlag = bindServiceFlag
             )

topl-service/src/main/java/io/matthewnelson/topl_service/service/BaseService.kt

@@ -173,23 +173,25 @@ internal abstract class BaseService: Service() {
          *
          * @param [context]
          * @param [serviceClass] The Service's class wanting to be started
-         * @param [serviceConn] The [TorServiceConnection] to bind to
          * @param [includeIntentActionStart] Boolean for including [ServiceActionName.START] as
          *   the Intent's Action.
          * @param [bindServiceFlag] The flag to use when binding to [TorService]
          * */
         fun startService(
             context: Context,
             serviceClass: Class<*>,
-            serviceConn: TorServiceConnection,
             includeIntentActionStart: Boolean = true,
             bindServiceFlag: Int = Context.BIND_AUTO_CREATE
         ) {
             val intent = Intent(context.applicationContext, serviceClass)
             if (includeIntentActionStart)
                 intent.action = ServiceActionName.START
             context.applicationContext.startService(intent)
-            context.applicationContext.bindService(intent, serviceConn, bindServiceFlag)
+            context.applicationContext.bindService(
+                intent,
+                TorServiceConnection.torServiceConnection,
+                bindServiceFlag
+            )
         }
 
         /**
@@ -201,9 +203,9 @@ internal abstract class BaseService: Service() {
          * @throws [IllegalArgumentException] If no binding exists for the provided [serviceConn]
          * */
         @Throws(IllegalArgumentException::class)
-        fun unbindService(context: Context, serviceConn: TorServiceConnection) {
-            serviceConn.clearServiceBinderReference()
-            context.applicationContext.unbindService(serviceConn)
+        fun unbindService(context: Context) {
+            TorServiceConnection.torServiceConnection.clearServiceBinderReference()
+            context.applicationContext.unbindService(TorServiceConnection.torServiceConnection)
         }
     }
 

topl-service/src/main/java/io/matthewnelson/topl_service/service/TorService.kt

@@ -105,7 +105,7 @@ internal class TorService: BaseService() {
 
     override fun unbindTorService() {
         try {
-            unbindService(context, TorServiceConnection.torServiceConnection)
+            unbindService(context)
             broadcastLogger.debug("Has been unbound")
         } catch (e: IllegalArgumentException) {}
     }