1.0.1 (#2)

* Bug fix when stopping a SolitariesLoop that hasn't been started

* Bug fix: don't launch another animation if the current one is canceled

* Add logs

Co-authored-by: Alexandre Roux <aroux@softbankrobotics.com>

Author: alexandre-roux

animated-solitaries-root/solitaries-loop/build.gradle

@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'

animated-solitaries-root/solitaries-loop/src/main/java/com/softbankrobotics/dx/solitariesloop/SolitariesLoop.kt

@@ -1,5 +1,6 @@
 package com.softbankrobotics.dx.solitariesloop
 
+import android.util.Log
 import com.aldebaran.qi.Future
 import com.aldebaran.qi.sdk.QiContext
 import com.aldebaran.qi.sdk.builder.AnimateBuilder
@@ -14,6 +15,10 @@ import java.util.concurrent.TimeUnit
  */
 class SolitariesLoop(private val qiContext: QiContext, private val delayInSeconds: Int = 60) {
 
+    companion object {
+        private const val TAG = "SolitariesLoop"
+    }
+
     private val animationNames = arrayOf(
         "CheckLeft_01.qianim",
         "CheckRight_01.qianim",
@@ -39,7 +44,7 @@ class SolitariesLoop(private val qiContext: QiContext, private val delayInSecond
     private var animationNamesQueue = mutableListOf<String>()
     private var lastAnimationName = ""
 
-    private lateinit var animationFuture: Future<Void>
+    private var animationFuture: Future<Void>? = null
 
     private fun buildAndRunAnimate(): Future<Void> {
         return FutureUtils.wait(delayInSeconds.toLong(), TimeUnit.SECONDS)
@@ -58,7 +63,7 @@ class SolitariesLoop(private val qiContext: QiContext, private val delayInSecond
                 animate.async().run()
             }
             .thenCompose {
-                if (it.isCancelled) {
+                if (!it.isCancelled) {
                     buildAndRunAnimate()
                 } else {
                     FutureUtils.wait(0, TimeUnit.NANOSECONDS)
@@ -87,15 +92,21 @@ class SolitariesLoop(private val qiContext: QiContext, private val delayInSecond
      * Starts periodically playing random animations, until stopped.
      */
     fun start() {
+        Log.i(TAG, "SolitariesLoop starting")
         animationFuture = buildAndRunAnimate()
     }
 
     /**
      * Stops the loop and cancels the current animation (if any); returns a future (that will finish
      * when the animation has effectively been stopped.
      */
-    fun stop(): Future<Void> {
-        animationFuture.requestCancellation()
+    fun stop(): Future<Void>? {
+        Log.i(TAG, "SolitariesLoop stopping")
+        if (animationFuture == null || animationFuture!!.isDone) {
+            Log.e(TAG, "Error: trying to stop a SolitariesLoop that hasn't been started")
+        } else {
+            animationFuture!!.requestCancellation()
+        }
         return animationFuture
     }
 }