Merge branch '16-fix-outofmemoryerror-in-locationprovider' into 'master'

Martin Dinh · Martin Dinh · commit 2edef46841dc · 2020-11-16T14:21:24.000+01:00
Resolve "Fix OutOfMemoryError in LocationProvider"

Closes #16

See merge request pace/mobile/android/pace-cloud-sdk!13
diff --git a/app/src/main/java/cloud/pace/sdk/app/MainActivity.kt b/app/src/main/java/cloud/pace/sdk/app/MainActivity.kt
@@ -199,6 +199,6 @@ class MainActivity : AppCompatActivity() {
         private const val AUTHORIZE_CODE = 100
         private const val PAYMENT_APP_URL = "YOUR_PAYMENT_APP_URL"    // TODO: Replace with your payment app URL
         private const val FUELING_APP_URL = "YOUR_FUELING_APP_URL"    // TODO: Replace with your fueling app URL
-        private const val APP_DISTANCE_THRESHOLD = 200
+        private const val APP_DISTANCE_THRESHOLD = 15
     }
 }
diff --git a/library/src/main/java/cloud/pace/sdk/appkit/AppKit.kt b/library/src/main/java/cloud/pace/sdk/appkit/AppKit.kt
@@ -12,12 +12,12 @@ import cloud.pace.sdk.appkit.model.App
 import cloud.pace.sdk.appkit.model.Car
 import cloud.pace.sdk.appkit.model.Configuration
 import cloud.pace.sdk.appkit.persistence.SharedPreferencesModel
+import cloud.pace.sdk.utils.AppKitKoinComponent
 import cloud.pace.sdk.utils.Completion
-import cloud.pace.sdk.utils.CustomKoinComponent
 import cloud.pace.sdk.utils.KoinConfig
 import org.koin.core.inject
 
-object AppKit : CustomKoinComponent {
+object AppKit : AppKitKoinComponent {
 
     private val sharedPreferencesModel: SharedPreferencesModel by inject()
     private val appManager: AppManager by inject()
@@ -44,8 +44,8 @@ object AppKit : CustomKoinComponent {
             )
         )
 
+        KoinConfig.setupAppKit(context)
         setUserAgent(configuration)
-        KoinConfig.setup(context, configuration.environment, configuration.deviceId)
         sharedPreferencesModel.deleteAllAppStates()
     }
 
diff --git a/library/src/main/java/cloud/pace/sdk/appkit/AppManager.kt b/library/src/main/java/cloud/pace/sdk/appkit/AppManager.kt
@@ -28,8 +28,9 @@ import java.net.MalformedURLException
 import java.net.URL
 import java.util.*
 
-internal class AppManager(private val context: Context) : CustomKoinComponent {
+internal class AppManager : AppKitKoinComponent {
 
+    private val context: Context by inject()
     private val appLocationManager: AppLocationManager by inject()
     private val appRepository: AppRepository by inject()
     private val networkChangeListener: NetworkChangeListener by inject()
@@ -50,7 +51,7 @@ internal class AppManager(private val context: Context) : CustomKoinComponent {
         }
         checkRunning = true
 
-        appLocationManager.getLocation { result ->
+        appLocationManager.start { result ->
             result.onSuccess {
                 getAppsByLocation(it, completion)
             }
diff --git a/library/src/main/java/cloud/pace/sdk/appkit/app/AppActivity.kt b/library/src/main/java/cloud/pace/sdk/appkit/app/AppActivity.kt
@@ -7,11 +7,11 @@ import cloud.pace.sdk.R
 import cloud.pace.sdk.appkit.app.webview.AppWebViewClient
 import cloud.pace.sdk.appkit.communication.AppEventManager
 import cloud.pace.sdk.appkit.communication.AppModel
-import cloud.pace.sdk.utils.CustomKoinComponent
+import cloud.pace.sdk.utils.AppKitKoinComponent
 import kotlinx.android.synthetic.main.fragment_app.*
 import org.koin.android.ext.android.inject
 
-class AppActivity : AppCompatActivity(), CustomKoinComponent {
+class AppActivity : AppCompatActivity(), AppKitKoinComponent {
 
     private var backToFinish = true
     private val eventManager: AppEventManager by inject()
diff --git a/library/src/main/java/cloud/pace/sdk/appkit/app/AppFragment.kt b/library/src/main/java/cloud/pace/sdk/appkit/app/AppFragment.kt
@@ -9,11 +9,11 @@ import androidx.browser.customtabs.CustomTabsIntent
 import androidx.fragment.app.Fragment
 import cloud.pace.sdk.R
 import cloud.pace.sdk.appkit.app.webview.AppWebViewClient
-import cloud.pace.sdk.utils.CustomKoinComponent
+import cloud.pace.sdk.utils.AppKitKoinComponent
 import kotlinx.android.synthetic.main.fragment_app.*
 import org.koin.android.viewmodel.ext.android.viewModel
 
-class AppFragment : Fragment(), CustomKoinComponent {
+class AppFragment : Fragment(), AppKitKoinComponent {
 
     private val viewModel: AppFragmentViewModel by viewModel()
 
diff --git a/library/src/main/java/cloud/pace/sdk/appkit/app/drawer/AppDrawer.kt b/library/src/main/java/cloud/pace/sdk/appkit/app/drawer/AppDrawer.kt
@@ -18,13 +18,13 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.Observer
 import cloud.pace.sdk.R
 import cloud.pace.sdk.appkit.model.App
-import cloud.pace.sdk.utils.CustomKoinComponent
+import cloud.pace.sdk.utils.AppKitKoinComponent
 import cloud.pace.sdk.utils.Event
 import cloud.pace.sdk.utils.dp
 import kotlinx.android.synthetic.main.app_drawer.view.*
 import org.koin.core.inject
 
-class AppDrawer(context: Context, attrs: AttributeSet?) : ConstraintLayout(context, attrs), CustomKoinComponent {
+class AppDrawer(context: Context, attrs: AttributeSet?) : ConstraintLayout(context, attrs), AppKitKoinComponent {
 
     private val viewModel: AppDrawerViewModel by inject()
     private val minBackgroundWidth = context.resources.getDimension(R.dimen.app_drawer_height).toInt()
diff --git a/library/src/main/java/cloud/pace/sdk/appkit/app/webview/AppWebView.kt b/library/src/main/java/cloud/pace/sdk/appkit/app/webview/AppWebView.kt
@@ -15,12 +15,12 @@ import cloud.pace.sdk.R
 import cloud.pace.sdk.appkit.AppKit
 import cloud.pace.sdk.appkit.model.AuthenticationMode
 import cloud.pace.sdk.appkit.utils.BiometricUtils
-import cloud.pace.sdk.utils.CustomKoinComponent
+import cloud.pace.sdk.utils.AppKitKoinComponent
 import cloud.pace.sdk.utils.Event
 import kotlinx.android.synthetic.main.app_web_view.view.*
 import org.koin.core.inject
 
-class AppWebView(context: Context, attributeSet: AttributeSet) : RelativeLayout(context, attributeSet), CustomKoinComponent {
+class AppWebView(context: Context, attributeSet: AttributeSet) : RelativeLayout(context, attributeSet), AppKitKoinComponent {
 
     private val webViewModel: AppWebViewModel by inject()
     private var fragment: Fragment? = null
diff --git a/library/src/main/java/cloud/pace/sdk/appkit/geofences/GeofenceBroadcastReceiver.kt b/library/src/main/java/cloud/pace/sdk/appkit/geofences/GeofenceBroadcastReceiver.kt
@@ -3,7 +3,7 @@ package cloud.pace.sdk.appkit.geofences
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import cloud.pace.sdk.utils.CustomKoinComponent
+import cloud.pace.sdk.utils.AppKitKoinComponent
 import com.google.android.gms.location.GeofencingEvent
 import org.koin.core.inject
 
@@ -16,7 +16,7 @@ class GeofenceBroadcastReceiver : BroadcastReceiver() {
     }
 }
 
-class BroadcastReceiverHelper : CustomKoinComponent {
+class BroadcastReceiverHelper : AppKitKoinComponent {
 
     private val eventCallback: GeofenceCallback by inject()
 
diff --git a/library/src/main/java/cloud/pace/sdk/appkit/geofences/GeofenceManager.kt b/library/src/main/java/cloud/pace/sdk/appkit/geofences/GeofenceManager.kt
@@ -8,7 +8,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ProcessLifecycleOwner
 import cloud.pace.sdk.R
 import cloud.pace.sdk.appkit.utils.NotificationUtils
-import cloud.pace.sdk.utils.CustomKoinComponent
+import cloud.pace.sdk.utils.AppKitKoinComponent
 import cloud.pace.sdk.utils.Log
 import com.google.android.gms.location.Geofence
 import com.google.android.gms.location.GeofencingClient
@@ -17,7 +17,7 @@ import com.google.android.gms.location.GeofencingRequest
 import org.koin.core.inject
 import java.util.*
 
-abstract class GeofenceManager : CustomKoinComponent {
+abstract class GeofenceManager : AppKitKoinComponent {
 
     abstract fun enable(locations: List<GeofenceLocation>, callback: (event: GeofencingEvent) -> Unit, setupCallback: (Result<Void>) -> Unit = {})
 
diff --git a/library/src/main/java/cloud/pace/sdk/appkit/location/AppLocationManager.kt b/library/src/main/java/cloud/pace/sdk/appkit/location/AppLocationManager.kt
@@ -1,6 +1,8 @@
 package cloud.pace.sdk.appkit.location
 
 import android.location.Location
+import android.os.Handler
+import androidx.lifecycle.Observer
 import cloud.pace.sdk.appkit.AppKit
 import cloud.pace.sdk.appkit.utils.NoLocationFound
 import cloud.pace.sdk.appkit.utils.PermissionDenied
@@ -11,44 +13,53 @@ import cloud.pace.sdk.utils.SystemManager
 
 interface AppLocationManager {
 
-    fun getLocation(callback: (Result<Location>) -> Unit)
+    fun start(callback: (Result<Location>) -> Unit)
+    fun stop()
 }
 
 class AppLocationManagerImpl(
     private val locationProvider: LocationProvider,
     private val systemManager: SystemManager
 ) : AppLocationManager {
 
-    override fun getLocation(callback: (Result<Location>) -> Unit) {
-        val startTime = systemManager.getCurrentTimeMillis()
-        val handler = systemManager.getHandler()
-        val locationTimeoutRunnable = Runnable {
+    private var callback: ((Result<Location>) -> Unit)? = null
+    private var startTime = 0L
+    private val handler: Handler by lazy { systemManager.getHandler() }
+    private val locationTimeoutRunnable: Runnable by lazy {
+        Runnable {
             Log.w("AppLocationManager timeout after $LOCATION_TIMEOUT ms")
-            callback(Result.failure(NoLocationFound))
+            callback?.invoke(Result.failure(NoLocationFound))
         }
-        handler.postDelayed(locationTimeoutRunnable, LOCATION_TIMEOUT)
-
-        locationProvider.location.observeForever {
+    }
+    private val locationObserver: Observer<Location> by lazy {
+        Observer<Location> {
             if (isLocationValid(it, startTime)) {
-                locationProvider.removeLocationUpdates()
-                handler.removeCallbacks(locationTimeoutRunnable)
-                callback(Result.success(it))
+                callback?.invoke(Result.success(it))
+                stop()
             }
         }
-
-        locationProvider.locationState.observeForever {
+    }
+    private val locationStateObserver: Observer<LocationState> by lazy {
+        Observer<LocationState> {
             if (it == LocationState.PERMISSION_DENIED) {
-                locationProvider.removeLocationUpdates()
-                handler.removeCallbacks(locationTimeoutRunnable)
-                callback(Result.failure(PermissionDenied))
+                callback?.invoke(Result.failure(PermissionDenied))
+                stop()
             } else if (it == LocationState.NO_LOCATION_FOUND) {
-                locationProvider.removeLocationUpdates()
-                handler.removeCallbacks(locationTimeoutRunnable)
-                callback(Result.failure(NoLocationFound))
+                callback?.invoke(Result.failure(NoLocationFound))
+                stop()
             }
         }
+    }
 
-        locationProvider.requestLocationUpdates()
+    override fun start(callback: (Result<Location>) -> Unit) {
+        this.callback = callback
+        startTime = systemManager.getCurrentTimeMillis()
+        handler.postDelayed(locationTimeoutRunnable, LOCATION_TIMEOUT)
+        locationProvider.apply {
+            location.observeForever(locationObserver)
+            locationState.observeForever(locationStateObserver)
+            requestLocationUpdates()
+        }
     }
 
     private fun isLocationValid(location: Location?, startTime: Long): Boolean {
@@ -86,6 +97,15 @@ class AppLocationManagerImpl(
         }
     }
 
+    override fun stop() {
+        handler.removeCallbacks(locationTimeoutRunnable)
+        locationProvider.apply {
+            location.removeObserver(locationObserver)
+            locationState.removeObserver(locationStateObserver)
+            removeLocationUpdates()
+        }
+    }
+
     companion object {
         private const val LOCATION_TIMEOUT = 30 * 1000L // 30sec
         private const val LOCATION_SEGMENTS = 5
diff --git a/library/src/main/java/cloud/pace/sdk/idkit/IDKit.kt b/library/src/main/java/cloud/pace/sdk/idkit/IDKit.kt
@@ -9,21 +9,19 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ProcessLifecycleOwner
-import cloud.pace.sdk.utils.Completion
+import cloud.pace.sdk.utils.*
 import cloud.pace.sdk.utils.Constants.TAG
-import cloud.pace.sdk.utils.Failure
-import cloud.pace.sdk.utils.SharedPreferenceUtils
-import cloud.pace.sdk.utils.Success
 import net.openid.appauth.*
+import org.koin.core.inject
 
-object IDKit : LifecycleObserver {
+object IDKit : IDKitKoinComponent, LifecycleObserver {
 
-    private lateinit var context: Context
+    private val context: Context by inject()
+    private val authorizationService: AuthorizationService by inject()
     private lateinit var configuration: OIDConfiguration
-    private var additionalCaching = true
-    private lateinit var authorizationService: AuthorizationService
     private lateinit var authorizationRequest: AuthorizationRequest
     private lateinit var session: AuthState
+    private var additionalCaching = true
 
     /**
      * Sets up [IDKit] with the passed [configuration].
@@ -34,17 +32,11 @@ object IDKit : LifecycleObserver {
      */
     @JvmOverloads
     fun setup(context: Context, configuration: OIDConfiguration, additionalCaching: Boolean = true) {
+        KoinConfig.setupIDKit(context)
         ProcessLifecycleOwner.get().lifecycle.addObserver(this)
 
-        this.context = context
         this.configuration = configuration
         this.additionalCaching = additionalCaching
-
-        if (::authorizationService.isInitialized) {
-            Log.i(TAG, "Discarding existing AuthService instance")
-            dispose()
-        }
-        authorizationService = AuthorizationService(context)
         authorizationRequest = createAuthorizationRequest()
 
         if (additionalCaching) {
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/POIKit.kt b/library/src/main/java/cloud/pace/sdk/poikit/POIKit.kt
@@ -21,7 +21,7 @@ import io.reactivex.rxjava3.core.Observable
 import org.koin.core.inject
 import java.util.*
 
-object POIKit : CustomKoinComponent, LifecycleObserver {
+object POIKit : POIKitKoinComponent, LifecycleObserver {
 
     private val database: POIKitDatabase by inject()
     private val navigationApi: NavigationApiClient by inject()
@@ -34,7 +34,7 @@ object POIKit : CustomKoinComponent, LifecycleObserver {
     var maxPoiSearchBoxSize = 15000.0
 
     fun setup(context: Context, environment: Environment, deviceId: String) {
-        KoinConfig.setup(context, environment, deviceId)
+        KoinConfig.setupPOIKit(context, environment, deviceId)
         TileDownloader.env = environment
     }
 
@@ -43,14 +43,18 @@ object POIKit : CustomKoinComponent, LifecycleObserver {
         return locationProvider.also { it.requestLocationUpdates() }
     }
 
+    fun stopLocationListener() {
+        locationProvider.removeLocationUpdates()
+    }
+
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     private fun onLifecycleStart() {
         locationProvider.requestLocationUpdates()
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
     private fun onLifecycleStop() {
-        locationProvider.removeLocationUpdates()
+        stopLocationListener()
     }
 
     @JvmOverloads
diff --git a/library/src/main/java/cloud/pace/sdk/utils/CustomKoinComponent.kt b/library/src/main/java/cloud/pace/sdk/utils/CustomKoinComponent.kt
@@ -2,7 +2,17 @@ package cloud.pace.sdk.utils
 
 import org.koin.core.KoinComponent
 
-interface CustomKoinComponent : KoinComponent {
+interface IDKitKoinComponent : KoinComponent {
 
-    override fun getKoin() = KoinConfig.koinApplication.koin
+    override fun getKoin() = KoinConfig.idKitKoinApp.koin
+}
+
+interface AppKitKoinComponent : KoinComponent {
+
+    override fun getKoin() = KoinConfig.appKitKoinApp.koin
+}
+
+interface POIKitKoinComponent : KoinComponent {
+
+    override fun getKoin() = KoinConfig.poiKitKoinApp.koin
 }
diff --git a/library/src/main/java/cloud/pace/sdk/utils/KoinConfig.kt b/library/src/main/java/cloud/pace/sdk/utils/KoinConfig.kt
diff --git a/library/src/test/java/cloud/pace/sdk/appkit/AppLocationManagerTest.kt b/library/src/test/java/cloud/pace/sdk/appkit/AppLocationManagerTest.kt
diff --git a/library/src/test/java/cloud/pace/sdk/appkit/AppManagerTest.kt b/library/src/test/java/cloud/pace/sdk/appkit/AppManagerTest.kt
diff --git a/library/src/test/java/cloud/pace/sdk/appkit/GeofenceManagerTest.kt b/library/src/test/java/cloud/pace/sdk/appkit/GeofenceManagerTest.kt
diff --git a/library/src/test/java/cloud/pace/sdk/appkit/utils/MockFactory.kt b/library/src/test/java/cloud/pace/sdk/appkit/utils/MockFactory.kt

Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,6 @@ class MainActivity : AppCompatActivity() {`
`199`	`199`	`private const val AUTHORIZE_CODE = 100`
`200`	`200`	`private const val PAYMENT_APP_URL = "YOUR_PAYMENT_APP_URL" // TODO: Replace with your payment app URL`
`201`	`201`	`private const val FUELING_APP_URL = "YOUR_FUELING_APP_URL" // TODO: Replace with your fueling app URL`
`202`		`- private const val APP_DISTANCE_THRESHOLD = 200`
	`202`	`+ private const val APP_DISTANCE_THRESHOLD = 15`
`203`	`203`	`}`
`204`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package cloud.pace.sdk.appkit.geofences`
`3`	`3`	`import android.content.BroadcastReceiver`
`4`	`4`	`import android.content.Context`
`5`	`5`	`import android.content.Intent`
`6`		`-import cloud.pace.sdk.utils.CustomKoinComponent`
	`6`	`+import cloud.pace.sdk.utils.AppKitKoinComponent`
`7`	`7`	`import com.google.android.gms.location.GeofencingEvent`
`8`	`8`	`import org.koin.core.inject`
`9`	`9`
`@@ -16,7 +16,7 @@ class GeofenceBroadcastReceiver : BroadcastReceiver() {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-class BroadcastReceiverHelper : CustomKoinComponent {`
	`19`	`+class BroadcastReceiverHelper : AppKitKoinComponent {`
`20`	`20`
`21`	`21`	`private val eventCallback: GeofenceCallback by inject()`
`22`	`22`