fix: Fix alias_ref being destroyed immediately

mrousavy · Sep 16, 2024 · eb90b8d · eb90b8d
1 parent adde14a
commit eb90b8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/react-native-nitro-modules/android/src/main/cpp/core/ByteBufferArrayBuffer.hpp b/packages/react-native-nitro-modules/android/src/main/cpp/core/ByteBufferArrayBuffer.hpp
@@ -36,7 +36,7 @@ class ByteBufferArrayBuffer final : public ArrayBuffer {
   }
 
 public:
-  [[nodiscard]] jni::alias_ref<jni::JByteBuffer> getBuffer() const {
+  [[nodiscard]] const jni::global_ref<jni::JByteBuffer>& getBuffer() const {
     return _byteBuffer;
   }
 

diff --git a/packages/react-native-nitro-modules/android/src/main/cpp/core/JArrayBuffer.hpp b/packages/react-native-nitro-modules/android/src/main/cpp/core/JArrayBuffer.hpp
@@ -68,11 +68,11 @@ class JArrayBuffer final : public jni::HybridClass<JArrayBuffer> {
    * `ByteBuffer`. In this case, `getBuffer()` will **copy** the data into a new `ByteBuffer` if
    * `copyIfNeeded` is `true`, and **wrap** the data into a new `ByteBuffer` if `copyIfNeeded` is false.
    */
-  jni::alias_ref<jni::JByteBuffer> getByteBuffer(bool copyIfNeeded) {
+  jni::local_ref<jni::JByteBuffer> getByteBuffer(bool copyIfNeeded) {
     auto byteBufferArrayBuffer = std::dynamic_pointer_cast<ByteBufferArrayBuffer>(_arrayBuffer);
     if (byteBufferArrayBuffer != nullptr) {
       // It is a `ByteBufferArrayBuffer`, which has a `ByteBuffer` underneath!
-      return byteBufferArrayBuffer->getBuffer();
+      return jni::make_local(byteBufferArrayBuffer->getBuffer());
     } else {
       // It is a different kind of `ArrayBuffer`, we need to copy or wrap the data.
       size_t size = _arrayBuffer->size();