Merge branch '21-replace-pwa-actions-with-js-handlers' into 'master'

Resolve "Replace PWA actions with JS handlers"

Closes #21

See merge request pace/mobile/android/pace-cloud-sdk!34

Author: Martin Dinh

library/src/main/java/cloud/pace/sdk/PACECloudSDK.kt

@@ -3,15 +3,11 @@ package cloud.pace.sdk
 import android.content.Context
 import cloud.pace.sdk.api.API
 import cloud.pace.sdk.appkit.AppKit
-import cloud.pace.sdk.appkit.persistence.SharedPreferencesModel
-import cloud.pace.sdk.utils.CloudSDKKoinComponent
 import cloud.pace.sdk.utils.Configuration
 import cloud.pace.sdk.utils.KoinConfig
-import org.koin.core.inject
 
-object PACECloudSDK : CloudSDKKoinComponent {
+object PACECloudSDK {
 
-    private val sharedPreferencesModel: SharedPreferencesModel by inject()
     internal lateinit var configuration: Configuration
     var additionalQueryParams: Map<String, String> = mapOf()
 
@@ -28,7 +24,6 @@ object PACECloudSDK : CloudSDKKoinComponent {
         AppKit.locationAccuracy = configuration.locationAccuracy
         KoinConfig.setupCloudSDK(context, configuration.environment, configuration.apiKey)
         AppKit.updateUserAgent()
-        sharedPreferencesModel.deleteAllAppStates()
     }
 
     /**

library/src/main/java/cloud/pace/sdk/appkit/app/AppActivity.kt

@@ -4,7 +4,6 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 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.CloudSDKKoinComponent
@@ -62,7 +61,7 @@ class AppActivity : AppCompatActivity(), CloudSDKKoinComponent {
         val appLinkAction = intent.action
         val appLinkData = intent.data
         if (Intent.ACTION_VIEW == appLinkAction) {
-            appLinkData?.getQueryParameter(AppWebViewClient.TO)?.let { finalRedirect ->
+            appLinkData?.getQueryParameter(TO)?.let { finalRedirect ->
                 eventManager.onReceivedRedirect(finalRedirect)
             }
         }
@@ -72,5 +71,6 @@ class AppActivity : AppCompatActivity(), CloudSDKKoinComponent {
         const val APP_URL = "APP_URL"
         const val BACK_TO_FINISH = "BACK_TO_FINISH"
         const val AUTO_CLOSE = "AUTO_CLOSE"
+        const val TO = "to"
     }
 }

library/src/main/java/cloud/pace/sdk/appkit/app/AppFragment.kt

@@ -8,7 +8,6 @@ import android.view.ViewGroup
 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.CloudSDKKoinComponent
 import kotlinx.android.synthetic.main.fragment_app.*
 import org.koin.android.viewmodel.ext.android.viewModel
@@ -25,7 +24,7 @@ class AppFragment : Fragment(), CloudSDKKoinComponent {
         super.onViewCreated(view, savedInstanceState)
 
         val url = activity?.intent?.extras?.getString(AppActivity.APP_URL)
-            ?: activity?.intent?.data?.getQueryParameter(AppWebViewClient.TO)
+            ?: activity?.intent?.data?.getQueryParameter(AppActivity.TO)
             ?: throw RuntimeException("Missing app URL")
 
         val autoClose = activity?.intent?.extras?.getBoolean(AppActivity.AUTO_CLOSE) ?: true

library/src/main/java/cloud/pace/sdk/appkit/app/api/UriManager.kt

@@ -8,7 +8,6 @@ import java.util.regex.Pattern
 interface UriManager {
 
     fun getStartUrls(baseUrl: String, manifestUrl: String, sdkStartUrl: String?, references: List<String>?): Map<String?, String>
-    fun getURI(baseUrl: String, parameters: Map<String, String>): String
     fun buildUrl(baseUrl: String, path: String): String
 }
 
@@ -51,14 +50,6 @@ class UriManagerImpl : UriManager {
         return baseUri.appendPath(path).build().toString()
     }
 
-    override fun getURI(baseUrl: String, parameters: Map<String, String>): String {
-        val uriBuilder = Uri.parse(baseUrl).buildUpon()
-        for (parameter in parameters) {
-            uriBuilder.appendQueryParameter(parameter.key, parameter.value)
-        }
-        return uriBuilder.build().toString()
-    }
-
     companion object {
         const val PARAM_REFERENCES = "REFERENCES"
         const val PARAM_R = "r"

library/src/main/java/cloud/pace/sdk/appkit/app/drawer/AppDrawerViewModel.kt

@@ -14,6 +14,7 @@ import java.net.URL
 
 abstract class AppDrawerViewModel : ViewModel() {
 
+    abstract val url: LiveData<String>
     abstract val title: LiveData<String>
     abstract val subtitle: LiveData<String?>
     abstract val background: LiveData<Int>
@@ -29,6 +30,7 @@ abstract class AppDrawerViewModel : ViewModel() {
 
 class AppDrawerViewModelImpl(private val eventManager: AppEventManager) : AppDrawerViewModel() {
 
+    override val url = MutableLiveData<String>()
     override val title = MutableLiveData<String>()
     override val subtitle = MutableLiveData<String?>()
     override val background = MutableLiveData<Int>()
@@ -37,19 +39,15 @@ class AppDrawerViewModelImpl(private val eventManager: AppEventManager) : AppDra
     override val logo = MutableLiveData<Bitmap>()
     override val closeEvent = MutableLiveData<Event<Unit>>()
 
-    private var url: String? = null
-    private var initialTitle: String? = null
-    private var initialSubtitle: String? = null
-
     private val invalidAppsObserver = Observer<List<String>> {
-        if (it.contains(url)) {
+        if (it.contains(url.value)) {
             closeEvent.value = Event(Unit)
         }
     }
 
     private val disabledHostObserver = Observer<String> {
         try {
-            val host = URL(url).host
+            val host = URL(url.value).host
             if (it == host) {
                 closeEvent.value = Event(Unit)
             }
@@ -58,17 +56,8 @@ class AppDrawerViewModelImpl(private val eventManager: AppEventManager) : AppDra
         }
     }
 
-    private val buttonChangedObserver = Observer<AppEventManager.AppDrawerInfo> {
-        if (url != it.url) return@Observer
-
-        title.value = it.title ?: initialTitle
-        subtitle.value = it.subtitle ?: initialSubtitle
-    }
-
     override fun init(app: App, darkBackground: Boolean) {
-        url = app.url
-        initialTitle = app.name
-        initialSubtitle = app.description
+        url.value = app.url
         title.value = app.name
         subtitle.value = app.description
 
@@ -111,13 +100,11 @@ class AppDrawerViewModelImpl(private val eventManager: AppEventManager) : AppDra
 
     override fun onCreate() {
         eventManager.invalidApps.observeForever(invalidAppsObserver)
-        eventManager.appDrawerInfo.observeForever(buttonChangedObserver)
         eventManager.disabledHost.observeForever(disabledHostObserver)
     }
 
     override fun onDestroy() {
         eventManager.invalidApps.removeObserver(invalidAppsObserver)
-        eventManager.appDrawerInfo.removeObserver(buttonChangedObserver)
         eventManager.disabledHost.removeObserver(disabledHostObserver)
     }
 }