Skip to content

fix(flutter,react-native): move the embedded Android Push code to its own package #2051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChiragAgg5k merged 3 commits into from
Oct 15, 2026
Merged

fix(flutter,react-native): move the embedded Android Push code to its own package #2051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e582c5
fix(flutter,react-native): move the embedded Android Push code to its…
ChiragAgg5k Oct 14, 2026
30f7761
test: follow the embedded Push packages in the Flutter and React Nati…
ChiragAgg5k Oct 14, 2026
1a1bf90
Merge remote-tracking branch 'origin/main' into fix/embedded-push-pac…
ChiragAgg5k Oct 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/SDK/Language/Flutter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,42 +228,42 @@ public function getFiles(): array
],
[
'scope' => 'default',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/services/PushCore.kt',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/flutter/services/PushCore.kt',
'template' => 'android/library/src/main/java/io/package/services/PushCore.kt.twig',
],
[
'scope' => 'default',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/services/PushBackground.kt',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/flutter/services/PushBackground.kt',
'template' => 'android/library/src/main/java/io/package/services/PushBackground.kt.twig',
],
[
'scope' => 'default',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/services/PushWakeups.kt',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/flutter/services/PushWakeups.kt',
'template' => 'android/library/src/main/java/io/package/services/PushWakeups.kt.twig',
],
[
'scope' => 'default',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/services/PushService.kt',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/flutter/services/PushService.kt',
'template' => 'android/library/src/main/java/io/package/services/PushService.kt.twig',
],
[
'scope' => 'default',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/services/PushReceiver.kt',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/flutter/services/PushReceiver.kt',
'template' => 'android/library/src/main/java/io/package/services/PushReceiver.kt.twig',
],
[
'scope' => 'default',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/services/PushOpenActivity.kt',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/flutter/services/PushOpenActivity.kt',
'template' => 'android/library/src/main/java/io/package/services/PushOpenActivity.kt.twig',
],
[
'scope' => 'default',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/services/PushBridge.kt',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/flutter/services/PushBridge.kt',
'template' => 'android/library/src/main/java/io/package/services/PushBridge.kt.twig',
],
[
'scope' => 'default',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/exceptions/{{ spec.info.title | caseUcfirst }}Exception.kt',
'destination' => '/android/src/main/kotlin/io/{{ spec.info.title | caseLower }}/flutter/exceptions/{{ spec.info.title | caseUcfirst }}Exception.kt',
'template' => 'android/push/Exception.kt.twig',
],
[
Expand Down
16 changes: 8 additions & 8 deletions src/SDK/Language/ReactNative.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,42 +89,42 @@ public function getFiles(): array
],
[
'scope' => 'default',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/services/PushCore.kt',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/reactnative/services/PushCore.kt',
'template' => 'android/library/src/main/java/io/package/services/PushCore.kt.twig',
],
[
'scope' => 'default',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/services/PushBackground.kt',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/reactnative/services/PushBackground.kt',
'template' => 'android/library/src/main/java/io/package/services/PushBackground.kt.twig',
],
[
'scope' => 'default',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/services/PushWakeups.kt',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/reactnative/services/PushWakeups.kt',
'template' => 'android/library/src/main/java/io/package/services/PushWakeups.kt.twig',
],
[
'scope' => 'default',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/services/PushService.kt',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/reactnative/services/PushService.kt',
'template' => 'android/library/src/main/java/io/package/services/PushService.kt.twig',
],
[
'scope' => 'default',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/services/PushReceiver.kt',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/reactnative/services/PushReceiver.kt',
'template' => 'android/library/src/main/java/io/package/services/PushReceiver.kt.twig',
],
[
'scope' => 'default',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/services/PushOpenActivity.kt',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/reactnative/services/PushOpenActivity.kt',
'template' => 'android/library/src/main/java/io/package/services/PushOpenActivity.kt.twig',
],
[
'scope' => 'default',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/services/PushBridge.kt',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/reactnative/services/PushBridge.kt',
'template' => 'android/library/src/main/java/io/package/services/PushBridge.kt.twig',
],
[
'scope' => 'default',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/exceptions/{{ spec.info.title | caseUcfirst }}Exception.kt',
'destination' => 'android/src/main/java/io/{{ spec.info.title | caseLower }}/reactnative/exceptions/{{ spec.info.title | caseUcfirst }}Exception.kt',
'template' => 'android/push/Exception.kt.twig',
],
[
Expand Down
2 changes: 1 addition & 1 deletion templates/android/library/src/main/AndroidManifest.xml.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
{% set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) %}
{% set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) ~ '.' ~ (language.name | lower) %}
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />
Expand Down
2 changes: 1 addition & 1 deletion templates/android/library/src/main/java/io/package/services/PushBackground.kt.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) -%}
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) ~ '.' ~ (language.name | lower) -%}
package {{ pushNamespace }}.services

import android.Manifest
Expand Down
2 changes: 1 addition & 1 deletion templates/android/library/src/main/java/io/package/services/PushBridge.kt.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) -%}
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) ~ '.' ~ (language.name | lower) -%}
package {{ pushNamespace }}.services

import android.content.Context
Expand Down
2 changes: 1 addition & 1 deletion templates/android/library/src/main/java/io/package/services/PushCore.kt.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) -%}
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) ~ '.' ~ (language.name | lower) -%}
package {{ pushNamespace }}.services

import android.content.Context
Expand Down
2 changes: 1 addition & 1 deletion templates/android/library/src/main/java/io/package/services/PushOpenActivity.kt.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) -%}
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) ~ '.' ~ (language.name | lower) -%}
package {{ pushNamespace }}.services

import android.app.Activity
Expand Down
2 changes: 1 addition & 1 deletion templates/android/library/src/main/java/io/package/services/PushReceiver.kt.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) -%}
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) ~ '.' ~ (language.name | lower) -%}
package {{ pushNamespace }}.services

import android.content.BroadcastReceiver
Expand Down
2 changes: 1 addition & 1 deletion templates/android/library/src/main/java/io/package/services/PushService.kt.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) -%}
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) ~ '.' ~ (language.name | lower) -%}
package {{ pushNamespace }}.services

import android.app.Service
Expand Down
2 changes: 1 addition & 1 deletion templates/android/library/src/main/java/io/package/services/PushWakeups.kt.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) -%}
{%- set pushNamespace = language.name == 'Android' ? (sdk.namespace | caseDot) : 'io.' ~ (spec.info.title | caseLower) ~ '.' ~ (language.name | lower) -%}
package {{ pushNamespace }}.services

import android.app.job.JobParameters
Expand Down
2 changes: 1 addition & 1 deletion templates/android/push/Exception.kt.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.{{ spec.info.title | caseLower }}.exceptions
package io.{{ spec.info.title | caseLower }}.{{ language.name | lower }}.exceptions

/** A push error. When the broker explained a refusal or a disconnect, that is its message. */
class {{ spec.info.title | caseUcfirst }}Exception(
Expand Down
4 changes: 2 additions & 2 deletions templates/flutter/README.md.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ await push.setForeground(true);

Foreground mode runs a `remoteMessaging` foreground service, which Google Play asks apps to
declare in the Play Console. Apps that never enable it can remove the service from their merged
manifest with `tools:node="remove"` on `io.{{ spec.info.title | caseLower }}.services.PushService` and
manifest with `tools:node="remove"` on `io.{{ spec.info.title | caseLower }}.flutter.services.PushService` and
`android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING`.

#### Delivery while the app is closed
Expand Down Expand Up @@ -131,7 +131,7 @@ recents), Android cancels its alarms and jobs: nothing is delivered until the ap
again, and the broker then replays what was sent meanwhile.

Set the notification icon with
`<meta-data android:name="io.{{ spec.info.title | caseLower }}.push.notification_icon" android:resource="@drawable/..." />` in your
`<meta-data android:name="io.{{ spec.info.title | caseLower }}.flutter.push.notification_icon" android:resource="@drawable/..." />` in your
`<application>`; without it a generic icon is used.

### Opening a tapped notification
Expand Down
6 changes: 3 additions & 3 deletions templates/flutter/android/src/main/kotlin/io/package/flutter/PushPlugin.kt.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import android.os.Handler
import android.os.Looper
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import io.{{ spec.info.title | caseLower }}.services.PushBridge
import io.{{ spec.info.title | caseLower }}.services.PushMessage
import io.{{ spec.info.title | caseLower }}.services.PushTaps
import io.{{ spec.info.title | caseLower }}.flutter.services.PushBridge
import io.{{ spec.info.title | caseLower }}.flutter.services.PushMessage
import io.{{ spec.info.title | caseLower }}.flutter.services.PushTaps
import io.flutter.embedding.engine.plugins.FlutterPlugin
import io.flutter.embedding.engine.plugins.activity.ActivityAware
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
Expand Down
4 changes: 2 additions & 2 deletions templates/react-native/README.md.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ recents), Android cancels its alarms and jobs: nothing is delivered until the ap
again, and the broker then replays what was sent meanwhile.

Set the notification icon with
`<meta-data android:name="io.{{ spec.info.title | caseLower }}.push.notification_icon" android:resource="@drawable/..." />` in your
`<meta-data android:name="io.{{ spec.info.title | caseLower }}.reactnative.push.notification_icon" android:resource="@drawable/..." />` in your
`<application>`; without it a generic icon is used.

```js
Expand Down Expand Up @@ -159,7 +159,7 @@ On Android the SDK's native module reports the taps. Elsewhere they come from `e

Foreground mode runs a `remoteMessaging` foreground service, which Google Play asks apps to
declare in the Play Console. Apps that never enable it can remove the service from their merged
manifest with `tools:node="remove"` on `io.{{ spec.info.title | caseLower }}.services.PushService` and
manifest with `tools:node="remove"` on `io.{{ spec.info.title | caseLower }}.reactnative.services.PushService` and
`android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING`.

{% if sdk.gettingStarted %}
Expand Down
8 changes: 4 additions & 4 deletions templates/react-native/android/src/main/java/io/package/reactnative/PushModule.kt.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import com.facebook.react.bridge.ReactApplicationContext
import com.facebook.react.bridge.ReactContextBaseJavaModule
import com.facebook.react.bridge.ReactMethod
import com.facebook.react.modules.core.DeviceEventManagerModule
import io.{{ spec.info.title | caseLower }}.services.PushBridge
import io.{{ spec.info.title | caseLower }}.services.PushMessage
import io.{{ spec.info.title | caseLower }}.services.PushTap
import io.{{ spec.info.title | caseLower }}.services.PushTaps
import io.{{ spec.info.title | caseLower }}.reactnative.services.PushBridge
import io.{{ spec.info.title | caseLower }}.reactnative.services.PushMessage
import io.{{ spec.info.title | caseLower }}.reactnative.services.PushTap
import io.{{ spec.info.title | caseLower }}.reactnative.services.PushTaps
import org.json.JSONObject

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/FlutterStableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ final class FlutterStableTest extends Base
'mkdir -p tests/e2e/sdks/flutter/android-test/src/main/java/io/appwrite tests/e2e/sdks/flutter/android-test/src/test/java tests/e2e/sdks/flutter/android-test/gradle/wrapper',
'cp tests/e2e/languages/flutter/android-test/settings.gradle.kts tests/e2e/languages/flutter/android-test/build.gradle.kts tests/e2e/languages/flutter/android-test/gradle.properties tests/e2e/sdks/flutter/android-test/',
'cp tests/e2e/languages/flutter/android-test/Tests.kt tests/e2e/sdks/flutter/android-test/src/test/java/Tests.kt',
'cp -R tests/e2e/sdks/flutter/android/src/main/kotlin/io/appwrite/services tests/e2e/sdks/flutter/android/src/main/kotlin/io/appwrite/exceptions tests/e2e/sdks/flutter/android/src/main/kotlin/io/appwrite/flutter tests/e2e/sdks/flutter/android-test/src/main/java/io/appwrite/',
'cp -R tests/e2e/sdks/flutter/android/src/main/kotlin/io/appwrite/flutter tests/e2e/sdks/flutter/android-test/src/main/java/io/appwrite/',
'cp tests/e2e/sdks/flutter/android/src/main/AndroidManifest.xml tests/e2e/sdks/flutter/android-test/src/main/AndroidManifest.xml',
'cp tests/e2e/sdks/flutter/android/build.gradle tests/e2e/sdks/flutter/android-test/plugin.gradle',
'cp templates/android/gradlew tests/e2e/sdks/flutter/android-test/gradlew',
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/ReactNativeAndroidTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ final class ReactNativeAndroidTest extends Base
'mkdir -p tests/e2e/sdks/react-native/android-test/src/main/java/io/appwrite tests/e2e/sdks/react-native/android-test/src/test/java tests/e2e/sdks/react-native/android-test/gradle/wrapper',
'cp tests/e2e/languages/react-native/android-test/settings.gradle.kts tests/e2e/languages/react-native/android-test/build.gradle.kts tests/e2e/languages/react-native/android-test/gradle.properties tests/e2e/sdks/react-native/android-test/',
'cp tests/e2e/languages/react-native/android-test/Tests.kt tests/e2e/sdks/react-native/android-test/src/test/java/Tests.kt',
'cp -R tests/e2e/sdks/react-native/android/src/main/java/io/appwrite/services tests/e2e/sdks/react-native/android/src/main/java/io/appwrite/exceptions tests/e2e/sdks/react-native/android/src/main/java/io/appwrite/reactnative tests/e2e/sdks/react-native/android-test/src/main/java/io/appwrite/',
'cp -R tests/e2e/sdks/react-native/android/src/main/java/io/appwrite/reactnative tests/e2e/sdks/react-native/android-test/src/main/java/io/appwrite/',
'cp tests/e2e/sdks/react-native/android/src/main/AndroidManifest.xml tests/e2e/sdks/react-native/android-test/src/main/AndroidManifest.xml',
'cp templates/android/gradlew tests/e2e/sdks/react-native/android-test/gradlew',
'cp templates/android/gradle/wrapper/gradle-wrapper.jar templates/android/gradle/wrapper/gradle-wrapper.properties tests/e2e/sdks/react-native/android-test/gradle/wrapper/',
Expand Down
10 changes: 5 additions & 5 deletions tests/e2e/languages/flutter/android-test/Tests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import android.os.Looper
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import io.appwrite.flutter.AppwritePushPlugin
import io.appwrite.services.PushBackground
import io.appwrite.services.PushMessage
import io.appwrite.services.PushOpenActivity
import io.appwrite.services.PushReceiver
import io.appwrite.flutter.services.PushBackground
import io.appwrite.flutter.services.PushMessage
import io.appwrite.flutter.services.PushOpenActivity
import io.appwrite.flutter.services.PushReceiver
import io.flutter.embedding.engine.plugins.FlutterPlugin
import io.flutter.plugin.common.BinaryMessenger
import io.flutter.plugin.common.MethodCall
Expand Down Expand Up @@ -135,7 +135,7 @@ class Tests {
val notifications = context.getSystemService(NotificationManager::class.java)
val alarms = shadowOf(context.getSystemService(AlarmManager::class.java))
shadowOf(context.packageManager).addResolveInfoForIntent(
Intent("io.appwrite.push.MESSAGE").setPackage(context.packageName),
Intent("io.appwrite.flutter.push.MESSAGE").setPackage(context.packageName),
ResolveInfo().apply {
activityInfo = ActivityInfo().apply {
name = E2EPushReceiver::class.java.name
Expand Down
14 changes: 7 additions & 7 deletions tests/e2e/languages/react-native/android-test/Tests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import com.facebook.react.bridge.WritableMap
import com.facebook.react.modules.network.ForwardingCookieHandler
import io.appwrite.reactnative.AppwriteCookiesModule
import io.appwrite.reactnative.AppwritePushModule
import io.appwrite.services.PushBackground
import io.appwrite.services.PushBridge
import io.appwrite.services.PushMessage
import io.appwrite.services.PushOpenActivity
import io.appwrite.services.PushReceiver
import io.appwrite.services.PushStore
import io.appwrite.reactnative.services.PushBackground
import io.appwrite.reactnative.services.PushBridge
import io.appwrite.reactnative.services.PushMessage
import io.appwrite.reactnative.services.PushOpenActivity
import io.appwrite.reactnative.services.PushReceiver
import io.appwrite.reactnative.services.PushStore
import org.json.JSONArray
import org.json.JSONObject
import org.junit.Assert.assertFalse
Expand Down Expand Up @@ -134,7 +134,7 @@ class Tests {
val notifications = context.getSystemService(NotificationManager::class.java)
val alarms = shadowOf(context.getSystemService(AlarmManager::class.java))
shadowOf(context.packageManager).addResolveInfoForIntent(
Intent("io.appwrite.push.MESSAGE").setPackage(context.packageName),
Intent("io.appwrite.reactnative.push.MESSAGE").setPackage(context.packageName),
ResolveInfo().apply {
activityInfo = ActivityInfo().apply {
name = E2EPushReceiver::class.java.name
Expand Down
Loading
Loading