Merge branch 'develop' into react-native-81

Author: Rohit3523

.github/actions/upload-android/action.yml

@@ -53,6 +53,26 @@ runs:
         echo "${{ inputs.FASTLANE_GOOGLE_SERVICE_ACCOUNT }}" | base64 --decode > service_account.json
       shell: bash
 
+    - uses: actions/download-artifact@v4
+      if: ${{ inputs.trigger == 'develop' }}
+      with:
+        name: release-changelog
+        path: .
+
+    - name: Prepare Play Store changelog metadata
+      if: ${{ inputs.trigger == 'develop' }}
+      run: |
+        mkdir -p android/fastlane/metadata/android/en-US/changelogs
+
+        if [ -f changelog.txt ]; then
+          node .github/scripts/prepare-changelog.js
+        else
+          printf "Internal improvements and bug fixes" > "android/fastlane/metadata/android/en-US/changelogs/${BUILD_VERSION}.txt"
+        fi
+      shell: bash
+      env:
+        BUILD_VERSION: ${{ inputs.BUILD_VERSION }}
+
     - name: Fastlane Play Store Upload
       working-directory: android
       run: |
@@ -65,7 +85,6 @@ runs:
         if [[ ${{ inputs.trigger }} == "develop" ]] && [[ ${{ inputs.type }} == 'official' ]]; then
           bundle exec fastlane android official_open_testing
         fi
-          
       shell: bash
 
     - name: Leave a comment on PR

.github/actions/upload-ios/action.yml

@@ -109,6 +109,12 @@ runs:
         yarn pod-install
       shell: bash
 
+    - uses: actions/download-artifact@v4
+      if: ${{ inputs.type == 'official' && inputs.trigger == 'develop' }}
+      with:
+        name: release-changelog
+        path: .
+
     - name: Fastlane Submit to TestFlight
       working-directory: ios
       run: |
@@ -157,4 +163,4 @@ runs:
         message="**iOS Build Available**"$'\n\n'"$app_name $VERSION_NAME.$BUILD_VERSION"
 
         gh pr comment "$PR_NUMBER" --body "$message"
-      shell: bash
+      shell: bash

.github/scripts/prepare-changelog.js

@@ -0,0 +1,20 @@
+const fs = require("fs");
+
+const buildVersion = process.env.BUILD_VERSION;
+const input = fs.readFileSync("changelog.txt", "utf8");
+
+const segmenter = new Intl.Segmenter("en", { granularity: "grapheme" });
+const chars = Array.from(segmenter.segment(input), s => s.segment);
+
+let output;
+if (chars.length > 500) {
+  output = chars.slice(0, 497).join("") + "...";
+} else {
+  output = input;
+}
+
+fs.writeFileSync(
+  `android/fastlane/metadata/android/en-US/changelogs/${buildVersion}.txt`,
+  output,
+  "utf8"
+);

.github/workflows/build-develop.yml

@@ -8,17 +8,26 @@ on:
     branches:
       - 'develop'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   run-eslint-and-test:
     name: ESLint and Test
     if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
     uses: ./.github/workflows/eslint.yml
 
+  generate-changelog:
+    name: Generate Release Changelog
+    needs: [run-eslint-and-test]
+    uses: ./.github/workflows/generate-changelog.yml
+
   android-build-experimental-store:
     name: Build Android Experimental
     if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
     uses: ./.github/workflows/build-android.yml
-    needs: [run-eslint-and-test]
+    needs: [run-eslint-and-test, generate-changelog]
     secrets: inherit
     with:
       type: experimental
@@ -28,7 +37,7 @@ jobs:
     name: Build Android Official
     if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
     uses: ./.github/workflows/build-official-android.yml
-    needs: [run-eslint-and-test]
+    needs: [run-eslint-and-test, generate-changelog]
     secrets: inherit
     with:
       type: official
@@ -38,7 +47,7 @@ jobs:
     name: Build iOS Experimental
     if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
     uses: ./.github/workflows/build-ios.yml
-    needs: [run-eslint-and-test]
+    needs: [run-eslint-and-test, generate-changelog]
     secrets: inherit
     with:
       type: experimental
@@ -48,7 +57,7 @@ jobs:
     name: Build iOS Official
     if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
     uses: ./.github/workflows/build-official-ios.yml
-    needs: [run-eslint-and-test]
+    needs: [run-eslint-and-test, generate-changelog]
     secrets: inherit
     with:
       type: official

.github/workflows/build-official-android.yml

@@ -72,7 +72,7 @@ jobs:
   upload-android:
     name: Upload
     runs-on: ubuntu-latest
-    needs: [upload-hold]
+    needs: [build-android, upload-hold]
     if: ${{ inputs.type == 'official' && (always() && (needs.upload-hold.result == 'success' || needs.upload-hold.result == 'skipped')) }}
     steps:
       - name: Checkout Repository
@@ -85,7 +85,7 @@ jobs:
           trigger: ${{ inputs.trigger }}
           FASTLANE_GOOGLE_SERVICE_ACCOUNT: ${{ secrets.FASTLANE_GOOGLE_SERVICE_ACCOUNT }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BUILD_VERSION: ${{ needs.upload-hold.outputs.BUILD_VERSION }}
+          BUILD_VERSION: ${{ needs.build-android.outputs.BUILD_VERSION }}
 
   upload-internal:
     name: Internal Sharing

.github/workflows/generate-changelog.yml

@@ -0,0 +1,38 @@
+name: Generate Release Changelog
+
+on:
+  workflow_call:
+
+jobs:
+  generate-changelog:
+    name: Generate changelog
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Generate changelog
+        shell: bash
+        run: |
+          LATEST_RELEASE_TAG=$(git tag --sort=-creatordate | head -n 1)
+
+          if [ -z "$LATEST_RELEASE_TAG" ]; then
+            echo "- Improvements and bug fixes" > changelog.txt
+            exit 0
+          fi
+
+          git log "$LATEST_RELEASE_TAG"..HEAD --pretty=format:"- %s" --no-merges > changelog.txt
+
+          if [ ! -s changelog.txt ]; then
+            echo "- Improvements and bug fixes" > changelog.txt
+          fi
+
+      - name: Upload changelog artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-changelog
+          path: changelog.txt
+          retention-days: 15

android/app/build.gradle

@@ -90,7 +90,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.68.0"
+        versionName "4.69.0"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
         resValue "string", "rn_config_reader_custom_package", "chat.rocket.reactnative"

android/app/src/main/java/chat/rocket/reactnative/MainActivity.kt

@@ -9,9 +9,7 @@ import android.os.Bundle
 import com.zoontek.rnbootsplash.RNBootSplash
 import android.content.Intent
 import android.content.res.Configuration
-import chat.rocket.reactnative.notification.VideoConfModule
-import chat.rocket.reactnative.notification.VideoConfNotification
-import com.google.gson.GsonBuilder
+import chat.rocket.reactnative.notification.NotificationIntentHandler
 
 class MainActivity : ReactActivity() {
 
@@ -32,56 +30,16 @@ class MainActivity : ReactActivity() {
     RNBootSplash.init(this, R.style.BootTheme)
     super.onCreate(null)
 
-    // Handle video conf action from notification
-    intent?.let { handleVideoConfIntent(it) }
+    // Handle notification intents
+    intent?.let { NotificationIntentHandler.handleIntent(this, it) }
   }
 
   public override fun onNewIntent(intent: Intent) {
     super.onNewIntent(intent)
-    // Handle video conf action when activity is already running
-    handleVideoConfIntent(intent)
-  }
-  
-  private fun handleVideoConfIntent(intent: Intent) {
-    if (intent.getBooleanExtra("videoConfAction", false)) {
-      val notificationId = intent.getIntExtra("notificationId", 0)
-      val event = intent.getStringExtra("event") ?: return
-      val rid = intent.getStringExtra("rid") ?: ""
-      val callerId = intent.getStringExtra("callerId") ?: ""
-      val callerName = intent.getStringExtra("callerName") ?: ""
-      val host = intent.getStringExtra("host") ?: ""
-      val callId = intent.getStringExtra("callId") ?: ""
-      
-      android.util.Log.d("RocketChat.MainActivity", "Handling video conf intent - event: $event, rid: $rid, host: $host, callId: $callId")
-      
-      // Cancel the notification
-      if (notificationId != 0) {
-        VideoConfNotification.cancelById(this, notificationId)
-      }
-      
-      // Store action for JS to pick up - include all required fields
-      val data = mapOf(
-        "notificationType" to "videoconf",
-        "rid" to rid,
-        "event" to event,
-        "host" to host,
-        "callId" to callId,
-        "caller" to mapOf(
-          "_id" to callerId,
-          "name" to callerName
-        )
-      )
-      
-      val gson = GsonBuilder().create()
-      val jsonData = gson.toJson(data)
-      
-      android.util.Log.d("RocketChat.MainActivity", "Storing video conf action: $jsonData")
-      
-      VideoConfModule.storePendingAction(this, jsonData)
-      
-      // Clear the video conf flag to prevent re-processing
-      intent.removeExtra("videoConfAction")
-    }
+    setIntent(intent)
+    
+    // Handle notification intents when activity is already running
+    NotificationIntentHandler.handleIntent(this, intent)
   }
 
   override fun invokeDefaultOnBackPressed() {

android/app/src/main/java/chat/rocket/reactnative/MainApplication.kt

@@ -19,8 +19,8 @@ import expo.modules.ApplicationLifecycleDispatcher
 import chat.rocket.reactnative.networking.SSLPinningTurboPackage;
 import chat.rocket.reactnative.storage.MMKVKeyManager;
 import chat.rocket.reactnative.storage.SecureStoragePackage;
-import chat.rocket.reactnative.notification.CustomPushNotification;
 import chat.rocket.reactnative.notification.VideoConfTurboPackage
+import chat.rocket.reactnative.notification.PushNotificationTurboPackage
 
 /**
  * Main Application class.
@@ -43,6 +43,7 @@ open class MainApplication : Application(), ReactApplication {
               add(SSLPinningTurboPackage())
               add(WatermelonDBJSIPackage())
               add(VideoConfTurboPackage())
+              add(PushNotificationTurboPackage())
               add(SecureStoragePackage())
             }
 
@@ -69,13 +70,6 @@ open class MainApplication : Application(), ReactApplication {
     // Load the native entry point for the New Architecture
     loadReactNative(this)
 
-    // Register listener to set React context when initialized
-    reactHost.addReactInstanceEventListener(object : ReactInstanceEventListener {
-      override fun onReactContextInitialized(context: ReactContext) {
-        CustomPushNotification.setReactContext(context as ReactApplicationContext)
-      }
-    })
-    
 		ApplicationLifecycleDispatcher.onApplicationCreate(this)
   }