Merge pull request #73 from Couchbase-Ecosystem/fix/null-issue-fix

jayant-dhingra-cb · web-flow · commit 4cfe0d4281c8 · 2025-10-09T15:56:44.000+05:30
refactor: simplify array handling and improve blob data validation in DataAdapter, Fixed #72
diff --git a/android/src/main/java/com/cblreactnative/DataAdapter.kt b/android/src/main/java/com/cblreactnative/DataAdapter.kt
@@ -123,23 +123,19 @@ object DataAdapter {
     indexProperties?.let { ip ->
       if (indexType == "value") {
         for (countValue in 0 until ip.size()) {
-          val arItems = ip.getArray(countValue)
-          arItems?.let { items ->
+          ip.getArray(countValue)?.let { items ->
             for (countArray in 0 until items.size()) {
-              val item = items.getString(countArray)
-              item?.let { itemValue ->
+              items.getString(countArray)?.let { itemValue ->
                 valueIndexProperties.add(ValueIndexItem.property(itemValue))
               }
             }
           }
         }
       } else {
         for (countValue in 0 until ip.size()) {
-          val arItems = ip.getArray(countValue)
-          arItems?.let { items ->
+          ip.getArray(countValue)?.let { items ->
             for (countArray in 0 until items.size()) {
-              val item = items.getString(countArray)
-              item?.let { itemValue ->
+              items.getString(countArray)?.let { itemValue ->
                 fullTextIndexProperties.add(FullTextIndexItem.property(itemValue))
               }
             }
diff --git a/android/src/main/java/com/cblreactnative/cbl-js-kotlin b/android/src/main/java/com/cblreactnative/cbl-js-kotlin
@@ -1 +1 @@
-Subproject commit c4e3f7d7c6dd4c2b1dfcaf404c9c19f78ae9fb0a
+Subproject commit 27569575b375fc67965a80d69868587f199e1928

Original file line number	Diff line number	Diff line change
`@@ -123,23 +123,19 @@ object DataAdapter {`
`123`	`123`	`indexProperties?.let { ip ->`
`124`	`124`	`if (indexType == "value") {`
`125`	`125`	`for (countValue in 0 until ip.size()) {`
`126`		`- val arItems = ip.getArray(countValue)`
`127`		`- arItems?.let { items ->`
	`126`	`+ ip.getArray(countValue)?.let { items ->`
`128`	`127`	`for (countArray in 0 until items.size()) {`
`129`		`- val item = items.getString(countArray)`
`130`		`- item?.let { itemValue ->`
	`128`	`+ items.getString(countArray)?.let { itemValue ->`
`131`	`129`	`valueIndexProperties.add(ValueIndexItem.property(itemValue))`
`132`	`130`	`}`
`133`	`131`	`}`
`134`	`132`	`}`
`135`	`133`	`}`
`136`	`134`	`} else {`
`137`	`135`	`for (countValue in 0 until ip.size()) {`
`138`		`- val arItems = ip.getArray(countValue)`
`139`		`- arItems?.let { items ->`
	`136`	`+ ip.getArray(countValue)?.let { items ->`
`140`	`137`	`for (countArray in 0 until items.size()) {`
`141`		`- val item = items.getString(countArray)`
`142`		`- item?.let { itemValue ->`
	`138`	`+ items.getString(countArray)?.let { itemValue ->`
`143`	`139`	`fullTextIndexProperties.add(FullTextIndexItem.property(itemValue))`
`144`	`140`	`}`
`145`	`141`	`}`