Merge branch 'tim/keepalive_stop' into 'master'

fix: Keep Tanker object alive in stop() until fully stopped See merge request TankerHQ/sdk-android!207
TankerHQ · May 3, 2021 · 0bab9e3 · 0bab9e3
2 parents 205eec6 + 4c9df2e
commit 0bab9e3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/tanker-bindings/src/main/kotlin/io/tanker/api/Tanker.kt b/tanker-bindings/src/main/kotlin/io/tanker/api/Tanker.kt
@@ -175,7 +175,9 @@ class Tanker(tankerOptions: TankerOptions) {
      */
     fun stop(): TankerFuture<Unit> {
         val futurePtr = lib.tanker_stop(tanker)
-        return TankerFuture(futurePtr, Unit::class.java)
+        return TankerFuture<Unit>(futurePtr, Unit::class.java).andThen(TankerCallbackWithKeepAlive(keepAlive = this) {
+            // Keep the GC from calling tanker_destroy() through the finalizer until stop() is finished
+        })
     }
 
     /**