@developer_tribe/react-native-comnyx 0.15.0 → 0.16.0

package/Comnyx.podspec

@@ -11,13 +11,21 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
   s.swift_version = "5.9"
 
-  s.platforms    = { :ios => min_ios_version_supported }
+  # Explicit minimum target. The podspec used to rely on
+  # `min_ios_version_supported`, which is only defined when React Native's
+  # cocoapods helpers are loaded. If a host builds with a different setup that
+  # helper is undefined and the podspec fails to parse.
+  s.platforms    = { :ios => '14.0' }
   s.source       = { :git => "https://www.npmjs.com.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
-  
+
   # Exclude generated files to avoid duplicate definitions
   s.exclude_files = "ios/generated/**/*"
+
+  s.resource_bundles = {
+    'Comnyx_Privacy' => ['ios/PrivacyInfo.xcprivacy']
+  }
   
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

package/README.md

@@ -31,6 +31,37 @@ npx react-native run-android
 
 **Note:** If you don't install `react-native-mmkv`, the SDK will use in-memory storage as a fallback. This means your data will not persist between app restarts.
 
+### iOS Podfile (required for React Native 0.85+)
+
+React Native 0.85 ships React-Core as a prebuilt XCFramework whose umbrella header is not compatible with Xcode 26's strict Clang explicit modules. Without the patch below, `pod install` succeeds but `xcodebuild` fails while compiling the React-Core umbrella.
+
+Comnyx ships a helper that applies the required build setting to every pod target. Wire it into your `ios/Podfile`:
+
+```ruby
+require_relative '../node_modules/@developer_tribe/react-native-comnyx/ios/comnyx_post_install'
+
+# ...
+
+target 'YourApp' do
+  config = use_native_modules!
+  use_react_native!(:path => config[:reactNativePath], :app_path => "#{Pod::Config.instance.installation_root}/..")
+
+  post_install do |installer|
+    comnyx_post_install(installer)
+
+    react_native_post_install(installer, config[:reactNativePath], :mac_catalyst_enabled => false)
+  end
+end
+```
+
+Then reinstall pods:
+
+```bash
+cd ios && pod install && cd ..
+```
+
+The helper is a no-op on React Native < 0.85, so it is safe to add before upgrading.
+
 ## Basic Setup (Required)
 
 ### 1. Initialization and Login
@@ -77,6 +108,25 @@ const SupportScreen = () => {
 };
 ```
 
+### 3. Media Attachments in Support (iOS Info.plist)
+
+The support UI lets users attach images and videos. On Android the system
+Photo Picker (Android 13+) or the document picker (older) handles this
+permission-free. On iOS the SDK uses `PHPicker` on iOS 14+ (no permission
+needed) and falls back to `UIImagePickerController` on iOS 13.
+
+If you ship iOS 13 support, add the following to your host app's
+`Info.plist` so the fallback works without crashing:
+
+```xml
+<key>NSPhotoLibraryUsageDescription</key>
+<string>Needed to attach photos and videos to support conversations.</string>
+```
+
+If your deployment target is iOS 14+, this key is not strictly required but
+App Store reviewers often expect it whenever `PHPickerViewController` is
+linked.
+
 ## Push Notifications Setup (Optional)
 
 ### 1. Account Prerequisites

package/android/build.gradle

@@ -48,6 +48,7 @@ android {
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    consumerProguardFiles "consumer-rules.pro"
   }
 
   buildFeatures {

package/android/consumer-rules.pro

@@ -0,0 +1,23 @@
+# ProGuard / R8 rules bundled with the Comnyx RN library. These are applied
+# automatically by host apps when they consume the library's AAR.
+
+# React Native bridge uses reflection to resolve @ReactMethod and the
+# generated TurboModule spec. Keep the module, package, and codegen spec.
+-keep class com.comnyx.ComnyxModule { *; }
+-keep class com.comnyx.ComnyxMediaPickerModule { *; }
+-keep class com.comnyx.ComnyxPackage { *; }
+-keep class com.comnyx.NativeComnyxSpec { *; }
+
+# Firebase messaging reflectively instantiates the overridden service and
+# calls its lifecycle methods.
+-keep class com.comnyx.messaging.ComnyxFirebaseMessagingService { *; }
+
+# Keep the video player activity referenced from manifest by name.
+-keep class com.comnyx.VideoPlayerActivity { *; }
+
+# Methods reached via @ReactMethod annotations. The annotation itself is a
+# runtime one; keep everything it marks.
+-keep @com.facebook.react.bridge.ReactMethod class * { *; }
+-keepclassmembers class * {
+    @com.facebook.react.bridge.ReactMethod <methods>;
+}

package/android/generated/java/com/comnyx/NativeComnyxSpec.java

@@ -0,0 +1,46 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.comnyx;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import javax.annotation.Nonnull;
+
+public abstract class NativeComnyxSpec extends ReactContextBaseJavaModule implements TurboModule {
+  public static final String NAME = "Comnyx";
+
+  public NativeComnyxSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void initialize(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void checkOptIn(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void optIn(Promise promise);
+}

package/android/generated/jni/RNComnyxSpec-generated.cpp

@@ -12,10 +12,32 @@
 
 namespace facebook::react {
 
+static facebook::jsi::Value __hostFunction_NativeComnyxSpecJSI_initialize(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "initialize", "(Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
 
+static facebook::jsi::Value __hostFunction_NativeComnyxSpecJSI_checkOptIn(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "checkOptIn", "(Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
 
-std::shared_ptr<TurboModule> RNComnyxSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
+static facebook::jsi::Value __hostFunction_NativeComnyxSpecJSI_optIn(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "optIn", "(Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
 
+NativeComnyxSpecJSI::NativeComnyxSpecJSI(const JavaTurboModule::InitParams &params)
+  : JavaTurboModule(params) {
+  methodMap_["initialize"] = MethodMetadata {0, __hostFunction_NativeComnyxSpecJSI_initialize};
+  methodMap_["checkOptIn"] = MethodMetadata {0, __hostFunction_NativeComnyxSpecJSI_checkOptIn};
+  methodMap_["optIn"] = MethodMetadata {0, __hostFunction_NativeComnyxSpecJSI_optIn};
+}
+
+std::shared_ptr<TurboModule> RNComnyxSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
+  if (moduleName == "Comnyx") {
+    return std::make_shared<NativeComnyxSpecJSI>(params);
+  }
   return nullptr;
 }
 

package/android/generated/jni/RNComnyxSpec.h

@@ -16,6 +16,13 @@
 
 namespace facebook::react {
 
+/**
+ * JNI C++ class for module 'NativeComnyx'
+ */
+class JSI_EXPORT NativeComnyxSpecJSI : public JavaTurboModule {
+public:
+  NativeComnyxSpecJSI(const JavaTurboModule::InitParams &params);
+};
 
 
 JSI_EXPORT

package/android/generated/jni/react/renderer/components/RNComnyxSpec/RNComnyxSpecJSI-generated.cpp

@@ -11,7 +11,28 @@
 
 namespace facebook::react {
 
+static jsi::Value __hostFunction_NativeComnyxCxxSpecJSI_initialize(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeComnyxCxxSpecJSI *>(&turboModule)->initialize(
+    rt
+  );
+}
+static jsi::Value __hostFunction_NativeComnyxCxxSpecJSI_checkOptIn(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeComnyxCxxSpecJSI *>(&turboModule)->checkOptIn(
+    rt
+  );
+}
+static jsi::Value __hostFunction_NativeComnyxCxxSpecJSI_optIn(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeComnyxCxxSpecJSI *>(&turboModule)->optIn(
+    rt
+  );
+}
 
+NativeComnyxCxxSpecJSI::NativeComnyxCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
+  : TurboModule("Comnyx", jsInvoker) {
+  methodMap_["initialize"] = MethodMetadata {0, __hostFunction_NativeComnyxCxxSpecJSI_initialize};
+  methodMap_["checkOptIn"] = MethodMetadata {0, __hostFunction_NativeComnyxCxxSpecJSI_checkOptIn};
+  methodMap_["optIn"] = MethodMetadata {0, __hostFunction_NativeComnyxCxxSpecJSI_optIn};
+}
 
 
 } // namespace facebook::react

package/android/generated/jni/react/renderer/components/RNComnyxSpec/RNComnyxSpecJSI.h

@@ -15,5 +15,75 @@
 namespace facebook::react {
 
 
+  class JSI_EXPORT NativeComnyxCxxSpecJSI : public TurboModule {
+protected:
+  NativeComnyxCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
+
+public:
+  virtual jsi::Value initialize(jsi::Runtime &rt) = 0;
+  virtual jsi::Value checkOptIn(jsi::Runtime &rt) = 0;
+  virtual jsi::Value optIn(jsi::Runtime &rt) = 0;
+
+};
+
+template <typename T>
+class JSI_EXPORT NativeComnyxCxxSpec : public TurboModule {
+public:
+  jsi::Value create(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
+    return delegate_.create(rt, propName);
+  }
+
+  std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& runtime) override {
+    return delegate_.getPropertyNames(runtime);
+  }
+
+  static constexpr std::string_view kModuleName = "Comnyx";
+
+protected:
+  NativeComnyxCxxSpec(std::shared_ptr<CallInvoker> jsInvoker)
+    : TurboModule(std::string{NativeComnyxCxxSpec::kModuleName}, jsInvoker),
+      delegate_(reinterpret_cast<T*>(this), jsInvoker) {}
+
+
+private:
+  class Delegate : public NativeComnyxCxxSpecJSI {
+  public:
+    Delegate(T *instance, std::shared_ptr<CallInvoker> jsInvoker) :
+      NativeComnyxCxxSpecJSI(std::move(jsInvoker)), instance_(instance) {
+
+    }
+
+    jsi::Value initialize(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::initialize) == 1,
+          "Expected initialize(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::initialize, jsInvoker_, instance_);
+    }
+    jsi::Value checkOptIn(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::checkOptIn) == 1,
+          "Expected checkOptIn(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::checkOptIn, jsInvoker_, instance_);
+    }
+    jsi::Value optIn(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::optIn) == 1,
+          "Expected optIn(...) to have 1 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::optIn, jsInvoker_, instance_);
+    }
+
+  private:
+    friend class NativeComnyxCxxSpec;
+    T *instance_;
+  };
+
+  Delegate delegate_;
+};
 
 } // namespace facebook::react

package/android/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
         <service
             android:name="com.comnyx.messaging.ComnyxFirebaseMessagingService"
             android:priority="-1500"
-            android:exported="true">
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
@@ -14,5 +14,15 @@
             android:name="com.comnyx.VideoPlayerActivity"
             android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
             android:exported="false" />
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.comnyx.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/comnyx_file_paths" />
+        </provider>
     </application>
 </manifest>

package/android/src/main/AndroidManifestNew.xml

@@ -3,7 +3,7 @@
   <service
     android:name="com.comnyx.messaging.ComnyxFirebaseMessagingService"
     android:priority="-1500"
-    android:exported="true">
+    android:exported="false">
     <intent-filter>
       <action android:name="com.google.firebase.MESSAGING_EVENT" />
     </intent-filter>
@@ -12,5 +12,15 @@
     android:name="com.comnyx.VideoPlayerActivity"
     android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
     android:exported="false" />
+
+  <provider
+    android:name="androidx.core.content.FileProvider"
+    android:authorities="${applicationId}.comnyx.fileprovider"
+    android:exported="false"
+    android:grantUriPermissions="true">
+    <meta-data
+      android:name="android.support.FILE_PROVIDER_PATHS"
+      android:resource="@xml/comnyx_file_paths" />
+  </provider>
   </application>
 </manifest>

package/android/src/main/java/com/comnyx/ComnyxMediaPickerModule.kt

@@ -5,12 +5,13 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.net.Uri
+import android.os.Build
+import android.provider.MediaStore
 import android.provider.OpenableColumns
-import android.webkit.MimeTypeMap
+import androidx.core.content.FileProvider
 import com.facebook.react.bridge.*
 import java.io.File
 import java.io.FileOutputStream
-import java.io.InputStream
 import android.media.MediaMetadataRetriever
 
 class ComnyxMediaPickerModule(reactContext: ReactApplicationContext) :
@@ -25,6 +26,8 @@ class ComnyxMediaPickerModule(reactContext: ReactApplicationContext) :
     private const val COMPRESS_QUALITY = 80
   }
 
+  private enum class PickerFilter { IMAGE, VIDEO, ANY }
+
   private var promise: Promise? = null
 
   private fun rejectPendingPromise() {
@@ -38,65 +41,59 @@ class ComnyxMediaPickerModule(reactContext: ReactApplicationContext) :
 
   override fun getName(): String = NAME
 
-
-
-  // MARK: - Pick Media (both images and videos)
-
-  @ReactMethod
-  fun pickMedia(promise: Promise) {
-    rejectPendingPromise()
-    this.promise = promise
-    val activity = reactApplicationContext.currentActivity
-    if (activity == null) {
-      promise.reject("NO_ACTIVITY", "Activity is not available")
-      return
-    }
-    val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
-      type = "*/*"
-      putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("image/*", "video/*"))
-      putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
-      addCategory(Intent.CATEGORY_OPENABLE)
+  /**
+   * On Android 13+ use the system Photo Picker (MediaStore.ACTION_PICK_IMAGES)
+   * which needs no runtime permission and is the recommended Google flow.
+   * Fall back to ACTION_GET_CONTENT on older releases.
+   */
+  private fun buildPickerIntent(filter: PickerFilter): Intent {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      Intent(MediaStore.ACTION_PICK_IMAGES).apply {
+        when (filter) {
+          PickerFilter.IMAGE -> type = "image/*"
+          PickerFilter.VIDEO -> type = "video/*"
+          PickerFilter.ANY -> {
+            // No type set: picker shows both images and videos.
+          }
+        }
+        putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit())
+      }
+    } else {
+      Intent(Intent.ACTION_GET_CONTENT).apply {
+        when (filter) {
+          PickerFilter.IMAGE -> type = "image/*"
+          PickerFilter.VIDEO -> type = "video/*"
+          PickerFilter.ANY -> {
+            type = "*/*"
+            putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("image/*", "video/*"))
+          }
+        }
+        putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
+        addCategory(Intent.CATEGORY_OPENABLE)
+      }
     }
-    activity.startActivityForResult(intent, REQUEST_MEDIA)
   }
 
-  // MARK: - Pick Image Only
-
-  @ReactMethod
-  fun pickImage(promise: Promise) {
+  private fun launchPicker(filter: PickerFilter, requestCode: Int, promise: Promise) {
     rejectPendingPromise()
     this.promise = promise
     val activity = reactApplicationContext.currentActivity
     if (activity == null) {
       promise.reject("NO_ACTIVITY", "Activity is not available")
+      this.promise = null
       return
     }
-    val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
-      type = "image/*"
-      putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
-      addCategory(Intent.CATEGORY_OPENABLE)
-    }
-    activity.startActivityForResult(intent, REQUEST_IMAGE)
+    activity.startActivityForResult(buildPickerIntent(filter), requestCode)
   }
 
-  // MARK: - Pick Video Only
+  @ReactMethod
+  fun pickMedia(promise: Promise) = launchPicker(PickerFilter.ANY, REQUEST_MEDIA, promise)
 
   @ReactMethod
-  fun pickVideo(promise: Promise) {
-    rejectPendingPromise()
-    this.promise = promise
-    val activity = reactApplicationContext.currentActivity
-    if (activity == null) {
-      promise.reject("NO_ACTIVITY", "Activity is not available")
-      return
-    }
-    val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
-      type = "video/*"
-      putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
-      addCategory(Intent.CATEGORY_OPENABLE)
-    }
-    activity.startActivityForResult(intent, REQUEST_VIDEO)
-  }
+  fun pickImage(promise: Promise) = launchPicker(PickerFilter.IMAGE, REQUEST_IMAGE, promise)
+
+  @ReactMethod
+  fun pickVideo(promise: Promise) = launchPicker(PickerFilter.VIDEO, REQUEST_VIDEO, promise)
 
   // MARK: - Generate Thumbnail from Video URL
 
@@ -308,14 +305,37 @@ class ComnyxMediaPickerModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  /**
+   * Returns a content:// URI for a cached media file, backed by the
+   * Comnyx FileProvider declared in AndroidManifest.xml. Use this whenever
+   * a URI is about to cross the process boundary (e.g. ACTION_VIEW,
+   * ACTION_SEND) — file:// URIs throw FileUriExposedException on
+   * Android 7+.
+   */
+  @ReactMethod
+  fun getShareableUri(fileUri: String, promise: Promise) {
+    try {
+      val path = fileUri.removePrefix("file://")
+      val file = File(path)
+      if (!file.exists()) {
+        promise.reject("FILE_NOT_FOUND", "File does not exist: $path")
+        return
+      }
+      val authority = "${reactApplicationContext.packageName}.comnyx.fileprovider"
+      val uri = FileProvider.getUriForFile(reactApplicationContext, authority, file)
+      promise.resolve(uri.toString())
+    } catch (e: Exception) {
+      promise.reject("SHAREABLE_URI_ERROR", e.message, e)
+    }
+  }
+
   @ReactMethod
   fun deleteTempFile(uri: String, promise: Promise) {
     Thread {
       try {
-        val path = uri.removePrefix("file://")
-        val file = File(path)
-        if (file.exists()) {
-          file.delete()
+        val resolved = resolveCachePath(uri)
+        if (resolved != null && resolved.exists()) {
+          resolved.delete()
         }
         promise.resolve(null)
       } catch (e: Exception) {
@@ -324,6 +344,26 @@ class ComnyxMediaPickerModule(reactContext: ReactApplicationContext) :
     }.start()
   }
 
+  /**
+   * Resolve either a file:// URI or a content:// URI served by this
+   * library's FileProvider back to a File inside the app's cache dir.
+   * Returns null for any URI that does not point into our cache.
+   */
+  private fun resolveCachePath(uri: String): File? {
+    if (uri.startsWith("file://")) {
+      return File(uri.removePrefix("file://"))
+    }
+    if (uri.startsWith("content://")) {
+      val parsed = Uri.parse(uri)
+      val expectedAuthority =
+        "${reactApplicationContext.packageName}.comnyx.fileprovider"
+      if (parsed.authority != expectedAuthority) return null
+      val name = parsed.lastPathSegment ?: return null
+      return File(reactApplicationContext.cacheDir, name)
+    }
+    return null
+  }
+
   @ReactMethod
   fun cleanupTempFiles(promise: Promise) {
     Thread {

package/android/src/main/java/com/comnyx/ComnyxModule.kt

@@ -196,6 +196,13 @@ class ComnyxModule(reactContext: ReactApplicationContext) :
     return false
   }
 
+  internal fun emitTokenInit(token: String) {
+    Logger.v("emitTokenInit forwarded", NAME)
+    val params = Arguments.createMap()
+    params.putString("token", token)
+    sendEvent(reactApplicationContext, "TOKEN_INIT", params)
+  }
+
   fun onNotificationShown(params: WritableMap) {
     Logger.v("onNotificationShown event forwarded", NAME)
     sendEvent(reactApplicationContext, "NOTIFICATION_RECEIVED", params)

package/android/src/main/java/com/comnyx/src/messaging/firebase/FirebaseMessagingService.kt

@@ -36,12 +36,10 @@ open class ComnyxFirebaseMessagingService : FirebaseMessagingService() {
 
     override fun onNewToken(token: String) {
         Logger.v("onNewToken received", "Comnyx")
-        sendRegistrationToServer(token)
-    }
-
-    private fun sendRegistrationToServer(token: String) {
-        //TODO: send token to server
-        Logger.i("sendRegistrationTokenToServer called", "Comnyx")
+        // Forward refreshed token to JS via TOKEN_INIT; JS layer forwards to backend.
+        // If the module isn't attached yet (e.g. app not foregrounded), JS will fetch
+        // the current token via initialize() when it wakes up.
+        ComnyxModule.__self?.emitTokenInit(token)
     }
 
 

package/android/src/main/res/xml/comnyx_file_paths.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Paths exposed by the Comnyx FileProvider. The picker writes image/video
+  temp files to Context.cacheDir; expose that directory so host apps can
+  safely obtain content:// URIs (e.g. for ACTION_VIEW / ACTION_SEND on
+  Android 7+ where file:// URIs throw FileUriExposedException).
+-->
+<paths>
+    <cache-path
+        name="comnyx_cache"
+        path="." />
+</paths>

package/ios/APNService.swift

@@ -26,25 +26,25 @@ class APNService {
   
   func setAPNTokenListener(completion: @escaping (String, String?) -> Void) {
     self.tokenCompletion = completion
-    if(self.token != nil){
-      completion("cache", self.token!)
+    if let cachedToken = self.token {
+      completion("cache", cachedToken)
     }
-    
-    UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
-      guard granted else {
+
+    UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound, .badge]) { [weak self] granted, _ in
+      guard granted, let self = self else {
         return
       }
-      
-      DispatchQueue.main.async {
+
+      DispatchQueue.main.async { [weak self] in
+        guard let self = self else { return }
         UIApplication.shared.registerForRemoteNotifications()
-        // Register for token notifications
         NotificationCenter.default.addObserver(
           self,
           selector: #selector(self.didRegisterForRemoteNotifications),
           name: NSNotification.Name("RCTRemoteNotificationRegistered"),
           object: nil
         )
-        
+
         NotificationCenter.default.addObserver(
           self,
           selector: #selector(self.didFailToRegisterForRemoteNotifications),