Merge pull request #3 from jedlix/version-1.2.0

Version 1.2.0

Author: Nick Hubbers

README.md

@@ -14,7 +14,7 @@ Add the following to your `build.gradle`:
 
 ```groovy
 dependencies {
-    implementation("com.jedlix:sdk:1.1.0")
+    implementation("com.jedlix:sdk:1.2.0")
 }
 ```
 
@@ -60,20 +60,23 @@ class SomeActivity : AppCompatActivity() {
 }
 ```
 
-A convenience method `startVehicleConnectSession(userIdentifier)` can also be called
-
-
 To start a charger connect session, you need to specify a charging location identifier:
 
 ```swift
 connectSessionManager.startConnectSession(
     "<USER ID>",
-    ConnectSessionType.Charger("CHARGING LOCATION ID")
+    ConnectSessionType.Charger("<CHARGING LOCATION ID>")
 )
 ```
 
-A convenience method `startChargerConnectSession(userIdentifier, "CHARGING LOCATION ID")` can also be called
+A user might leave the app at any moment. If the connect session hasn't been finished, you should resume by providing a session identifier you obtain from the Smart Charging API:
 
+```kotlin
+connectSessionManager.resumeConnectSession(
+    "<USER ID>",
+    "<CONNECT SESSION ID>"
+)
+```
 
 ### Logging
 

azure-pipelines-qa.yml

@@ -0,0 +1,86 @@
+trigger:
+  batch: true
+  branches:
+    include:
+      - main
+pr: none
+pool:
+  vmImage: 'ubuntu-latest'
+  demands:
+  - allowFrontend
+resources:
+- repo: self
+
+variables:
+  ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/') }}:
+    branchName: $[replace(variables['Build.SourceBranch'], 'refs/heads/', '')]
+  ${{ if startsWith(variables['Build.SourceBranch'], 'refs/pull/') }}:
+    branchName: $[replace(variables['System.PullRequest.SourceBranch'], 'refs/heads/', '')]
+  gradleProperties: -PkeystorePath=$(keystoreFile.secureFilePath) -PkeystorePassword=$(keystorePassword) -PserviceAccountLocation=$(serviceAccount.secureFilePath) -PbuildCode=$(Build.BuildId)
+
+stages:
+- stage: Setup
+  jobs:
+  - job: Setup
+    steps:
+    - checkout: self
+      persistCredentials: true
+      submodules: recursive
+    - task: CmdLine@2
+      displayName: 'Git checkout'
+      inputs:
+        script: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "Azure Pipeline"
+          git checkout $(branchName)
+    - task: CmdLine@2
+      displayName: 'Set parameters'
+      inputs:
+        script: |
+          export file=android/example/src/main/java/com/jedlix/sdk/example/ExampleApplication.kt
+          sed -i '\|//|s|^//||' $file
+          sed -i 's|<AUTH0 CLIENT ID>|$(auth0ClientId)|' $file
+          sed -i 's|<AUTH0 DOMAIN>|$(auth0Domain)|' $file
+          sed -i 's|<AUTH0 AUDIENCE>|$(auth0Audience)|' $file
+          sed -i 's|<USER IDENTIFIER KEY>|$(userIdentifierKey)|' $file
+          sed -i 's|<YOUR BASE URL>|$(baseUrl)|' $file
+
+- stage: Build
+  jobs:
+  - job: 'JedlixSDK'
+    steps:
+    - task: DownloadSecureFile@1
+      name: keystoreFile
+      displayName: 'Download Keystore File'
+      inputs:
+        secureFile: upload-keystore.jks
+    - task: DownloadSecureFile@1
+      name: serviceAccount
+      displayName: 'Download Secure Service Account JSON'
+      inputs:
+        secureFile: jedlix-service-account.json
+    - task: Gradle@2
+      displayName: 'Build'
+      continueOnError: true
+      inputs:
+        workingDirectory: 'android'
+        gradleWrapperFile: 'android/gradlew'
+        gradleOptions: '-Xmx3072m'
+        tasks: ":example:publishReleaseBundle $(gradleProperties)"
+
+- stage: GitTag
+  jobs:
+  - job: GitTag
+    steps:
+    - checkout: self
+      persistCredentials: true
+    - bash: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "Azure Pipeline"
+          VERSION=$(cat android/example/build.gradle.kts | grep -m1 'versionName' | cut -d'=' -f2 | tr -d ' ' | tr -d ';' | tr -d '"')
+          TAG=v$VERSION-$BUILD_NUMBER
+          git tag $TAG
+          git push origin $TAG
+      displayName: 'Git tag'
+      env:
+        BUILD_NUMBER: $(Build.BuildId)

example/src/main/AndroidManifest.xml

@@ -20,7 +20,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.ConnectActivity"/>
+        <activity android:name=".activity.ConnectionsActivity"/>
     </application>
 
 </manifest>

example/src/main/java/com/jedlix/sdk/example/ExampleApplication.kt

@@ -28,7 +28,6 @@ import kotlinx.coroutines.cancel
 import java.net.URL
 
 class ExampleApplication : Application() {
-
     companion object {
         lateinit var baseURL: URL
         lateinit var authentication: Authentication
@@ -40,15 +39,15 @@ class ExampleApplication : Application() {
         super.onCreate()
 
         baseURL = URL("<YOUR BASE URL>")
-//        authentication = DefaultAuthentication(this)
-        authentication = Auth0Authentication(
-            "<AUTH0 CLIENT ID>",
-            "<AUTH0 DOMAIN>",
-            "<AUTH0 AUDIENCE>",
-            "<USER IDENTIFIER KEY>",
-            coroutineScope,
-            this
-        )
+        authentication = DefaultAuthentication(this)
+//        authentication = Auth0Authentication(
+//            "<AUTH0 CLIENT ID>",
+//            "<AUTH0 DOMAIN>",
+//            "<AUTH0 AUDIENCE>",
+//            "<USER IDENTIFIER KEY>",
+//            coroutineScope,
+//            this
+//        )
         JedlixSDK.configure(
             baseURL,
             authentication

example/src/main/java/com/jedlix/sdk/example/activity/AuthenticationActivity.kt

@@ -43,10 +43,10 @@ class AuthenticationActivity : AppCompatActivity() {
                 startActivity(
                     Intent(
                         this@AuthenticationActivity,
-                        ConnectActivity::class.java
+                        ConnectionsActivity::class.java
                     ).apply {
                         flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
-                        putExtra(ConnectActivity.USER_IDENTIFIER, userIdentifier)
+                        putExtra(ConnectionsActivity.USER_IDENTIFIER, userIdentifier)
                     }
                 )
             }

example/src/main/java/com/jedlix/sdk/example/activity/ConnectActivity.kt example/src/main/java/com/jedlix/sdk/example/activity/ConnectionsActivity.kt

@@ -23,26 +23,26 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.jedlix.sdk.connectSession.registerConnectSessionManager
-import com.jedlix.sdk.example.databinding.ActivityConnectBinding
-import com.jedlix.sdk.example.viewModel.ConnectViewModel
+import com.jedlix.sdk.example.databinding.ActivityConnectionsBinding
+import com.jedlix.sdk.example.viewModel.ConnectionsViewModel
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
-class ConnectActivity : AppCompatActivity() {
+class ConnectionsActivity : AppCompatActivity() {
 
     companion object {
         const val USER_IDENTIFIER = "userIdentifier"
     }
 
-    private val viewModel: ConnectViewModel by viewModels {
-        ConnectViewModel.Factory(
+    private val viewModel: ConnectionsViewModel by viewModels {
+        ConnectionsViewModel.Factory(
             intent.extras!!.getString(USER_IDENTIFIER)!!
         )
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val binding = ActivityConnectBinding.inflate(LayoutInflater.from(this), null, false)
+        val binding = ActivityConnectionsBinding.inflate(LayoutInflater.from(this), null, false)
         setContentView(binding.root)
         binding.viewModel = viewModel
         binding.lifecycleOwner = this
@@ -55,7 +55,7 @@ class ConnectActivity : AppCompatActivity() {
             viewModel.didDeauthenticate.collect {
                 startActivity(
                     Intent(
-                        this@ConnectActivity,
+                        this@ConnectionsActivity,
                         AuthenticationActivity::class.java
                     ).apply {
                         flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
@@ -69,5 +69,11 @@ class ConnectActivity : AppCompatActivity() {
                 connectSessionManager.startConnectSession(userIdentifier, type)
             }
         }
+
+        lifecycleScope.launch {
+            viewModel.didResumeConnectSession.collect { (userIdentifier, sessionIdentifier) ->
+                connectSessionManager.resumeConnectSession(userIdentifier, sessionIdentifier)
+            }
+        }
     }
 }