update

cpaas-lite/src/main/java/io/nexilis/service/Api.kt

@@ -7,9 +7,8 @@ import android.os.Build
 import android.util.Log
 import dagger.hilt.android.EntryPointAccessors
 import io.newuniverse.SDK.nuSDKService
-import io.nexilis.service.core.ApiEntry
-import io.nexilis.service.core.DaggerIncomingComponent
 import io.nexilis.service.core.Data
+import io.nexilis.service.core.IncomingInterface
 import io.nexilis.service.core.getSharedPreferences
 import io.nexilis.service.core.optString
 import io.nexilis.service.core.put
@@ -27,19 +26,14 @@ class Api {
 
         internal var condition: Condition? = null
 
+        internal var entryPoint: IncomingInterface? = null
+
         fun connect(account: String, activity: Activity) {
             Log.d(tag, "connect:$account")
-            val sdkCallback = SdkCallback()
-            DaggerIncomingComponent.builder()
-                .context(activity)
-                .appDependencies(
-                    EntryPointAccessors.fromApplication(
-                        activity.applicationContext,
-                        ApiEntry.IncomingInterface::class.java
-                    )
-                )
-                .build()
-                .inject(sdkCallback)
+            entryPoint = EntryPointAccessors.fromApplication(
+                activity.applicationContext,
+                IncomingInterface::class.java
+            )
             Thread {
                 try {
                     activity.startService(Intent(activity, nuSDKService::class.java))
@@ -58,7 +52,7 @@ class Api {
                         account,
                         activity,
                         SdkCallback::class.java,
-                        sdkCallback,
+                        SdkCallback(),
                         "202.158.33.26",
                         62823,
                         session,

cpaas-lite/src/main/java/io/nexilis/service/SdkCallback.kt

@@ -1,17 +1,12 @@
 package io.nexilis.service
 
-import android.content.Context
 import android.util.Log
 import io.newuniverse.SDK.nuSDKCallBack
-import io.newuniverse.SDK.nuSDKService
 import io.nexilis.service.core.Data
-import io.nexilis.service.core.Incoming
 import kotlin.concurrent.withLock
 
 class SdkCallback : nuSDKCallBack {
 
-    private lateinit var incoming: Incoming
-
     private val tag = "SdkCallback"
 
     override fun connectionStateChanged(
@@ -74,7 +69,7 @@ class SdkCallback : nuSDKCallBack {
                 p0?.let { s ->
                     data.packetId = s
                 }
-                incoming.process(data)
+                Api.entryPoint?.incoming()?.process(data)
             }
         } catch (e: Exception) {
             Log.e(tag, e.message, e)

cpaas-lite/src/main/java/io/nexilis/service/core/ApiComponent.kt

@@ -1,20 +0,0 @@
-package io.nexilis.service.core
-
-import android.content.Context
-import dagger.BindsInstance
-import dagger.Component
-import io.nexilis.service.SdkCallback
-
-@Component(dependencies = [ApiEntry.IncomingInterface::class])
-interface IncomingComponent {
-
-    fun inject(nuSdkCallback: SdkCallback)
-
-    @Component.Builder
-    interface Builder {
-        fun context(@BindsInstance context: Context): Builder
-        fun appDependencies(incomingInterface: ApiEntry.IncomingInterface): Builder
-        fun build(): IncomingComponent
-    }
-
-}

cpaas-lite/src/main/java/io/nexilis/service/core/ApiEntry.kt

@@ -4,13 +4,9 @@ import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 
-class ApiEntry {
-
-    @EntryPoint
-    @InstallIn(SingletonComponent::class)
-    interface IncomingInterface {
-        fun getIncoming(): Incoming
-
-    }
+@EntryPoint
+@InstallIn(SingletonComponent::class)
+interface IncomingInterface {
+    fun incoming(): Incoming
 
 }

cpaas-lite/src/main/java/io/nexilis/service/core/ApiModule.kt

@@ -112,8 +112,4 @@ object ApiModule {
         return database.workingAreaDao()
     }
 
-    @Provides
-    fun provideIncoming(context: Context): Incoming {
-        return Incoming(context);
-    }
 }