expo-sqlite 13.1.1 → 13.1.2

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 13.1.2 — 2023-12-21
+
+### 🐛 Bug fixes
+
+- Fixed `NativeStatementBinding` leakage on Android. ([#25996](https://github.com/expo/expo/pull/25996) by [@kudo](https://github.com/kudo))
+
 ## 13.1.1 — 2023-12-19
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'de.undercouch.download'
 
 group = 'host.exp.exponent'
-version = '13.1.1'
+version = '13.1.2'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -106,7 +106,7 @@ android {
   namespace "expo.modules.sqlite"
   defaultConfig {
     versionCode 18
-    versionName "13.1.1"
+    versionName "13.1.2"
 
     externalNativeBuild {
       cmake {

package/android/src/main/java/expo/modules/sqlite/NativeDatabase.kt

@@ -10,4 +10,9 @@ internal class NativeDatabase(val databaseName: String, val openOptions: OpenDat
   override fun equals(other: Any?): Boolean {
     return other is NativeDatabase && this.ref == other.ref
   }
+
+  override fun deallocate() {
+    super.deallocate()
+    this.ref.close()
+  }
 }

package/android/src/main/java/expo/modules/sqlite/NativeDatabaseBinding.kt

@@ -4,12 +4,13 @@ package expo.modules.sqlite
 
 import com.facebook.jni.HybridData
 import expo.modules.core.interfaces.DoNotStrip
+import java.io.Closeable
 
 private typealias UpdateListener = (databaseName: String, tableName: String, operationType: Int, rowID: Long) -> Unit
 
 @Suppress("KotlinJniMissingFunction")
 @DoNotStrip
-internal class NativeDatabaseBinding {
+internal class NativeDatabaseBinding : Closeable {
   @DoNotStrip
   private val mHybridData: HybridData
 
@@ -19,6 +20,10 @@ internal class NativeDatabaseBinding {
     mHybridData = initHybrid()
   }
 
+  override fun close() {
+    mHybridData.resetNative()
+  }
+
   /**
    * Enable data change notifications
    */

package/android/src/main/java/expo/modules/sqlite/NativeStatement.kt

@@ -7,6 +7,11 @@ import expo.modules.kotlin.sharedobjects.SharedRef
 internal class NativeStatement : SharedRef<NativeStatementBinding>(NativeStatementBinding()) {
   var isFinalized = false
 
+  override fun deallocate() {
+    super.deallocate()
+    this.ref.close()
+  }
+
   override fun equals(other: Any?): Boolean {
     return other is NativeStatement && this.ref == other.ref
   }

package/android/src/main/java/expo/modules/sqlite/NativeStatementBinding.kt

@@ -4,13 +4,14 @@ package expo.modules.sqlite
 
 import com.facebook.jni.HybridData
 import expo.modules.core.interfaces.DoNotStrip
+import java.io.Closeable
 
 internal typealias SQLiteColumnNames = ArrayList<String>
 internal typealias SQLiteColumnValues = ArrayList<Any>
 
 @Suppress("KotlinJniMissingFunction")
 @DoNotStrip
-internal class NativeStatementBinding {
+internal class NativeStatementBinding : Closeable {
   @DoNotStrip
   private val mHybridData: HybridData
 
@@ -18,6 +19,10 @@ internal class NativeStatementBinding {
     mHybridData = initHybrid()
   }
 
+  override fun close() {
+    mHybridData.resetNative()
+  }
+
   // region sqlite3 bindings
 
   external fun sqlite3_bind_parameter_index(name: String): Int

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-sqlite",
-  "version": "13.1.1",
+  "version": "13.1.2",
   "description": "Provides access to a database that can be queried through a WebSQL-like API (https://www.w3.org/TR/webdatabase/). The database is persisted across restarts of your app.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -47,5 +47,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "43f1b4f8a5a9bca649e4e7ca6e4155482a162431"
+  "gitHead": "36402c8b2bc9b63f003c04642d97bf091b35fe16"
 }