From 560203ac0c834d1e1c2e21c10b9e2680c7dd2cee Mon Sep 17 00:00:00 2001
From: Josh Kasten <josh@onesignal.com>
Date: Wed, 16 Jun 2021 21:50:46 -0700
Subject: [PATCH 1/2] Add android:exported required by Android 12 to SDK

* All components in AndroidManifest.xml that have intent-filters now
requires the `android:exported` attribute.
   - See Android's Documentation on this:
      - https://developer.android.com/about/versions/12/behavior-changes-12#exported
* Also added exported attribute to other components for consistently
---
 .../onesignal/src/debug/AndroidManifest.xml   |  3 +-
 .../onesignal/src/main/AndroidManifest.xml    | 43 +++++++++++++------
 .../onesignal/src/release/AndroidManifest.xml |  3 +-
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/OneSignalSDK/onesignal/src/debug/AndroidManifest.xml b/OneSignalSDK/onesignal/src/debug/AndroidManifest.xml
index d9d67149cc..420ebfb322 100644
--- a/OneSignalSDK/onesignal/src/debug/AndroidManifest.xml
+++ b/OneSignalSDK/onesignal/src/debug/AndroidManifest.xml
@@ -9,7 +9,8 @@
 
         <receiver
             android:name="com.onesignal.FCMBroadcastReceiver"
-            android:permission="com.google.android.c2dm.permission.SEND" >
+            android:permission="com.google.android.c2dm.permission.SEND"
+            android:exported="true">
             <!-- High priority so OneSignal payloads can be filtered from other FCM receivers -->
             <intent-filter android:priority="999" >
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
diff --git a/OneSignalSDK/onesignal/src/main/AndroidManifest.xml b/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
index e61472397f..ed445b01d1 100644
--- a/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
+++ b/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
@@ -74,43 +74,59 @@
         <activity
           android:name="com.onesignal.NotificationOpenedActivityHMS"
           android:noHistory="true"
-          android:theme="@android:style/Theme.Translucent.NoTitleBar">
+          android:theme="@android:style/Theme.Translucent.NoTitleBar"
+          android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>
         </activity>
 
-        <service android:name="com.onesignal.FCMIntentService" />
+        <service
+            android:name="com.onesignal.FCMIntentService"
+            android:exported="false" />
 
-        <service android:name="com.onesignal.FCMIntentJobService"
-            android:permission="android.permission.BIND_JOB_SERVICE"/>
+        <service
+            android:name="com.onesignal.FCMIntentJobService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="false" />
 
         <service
           android:name="com.onesignal.FocusDelaySyncService"
-          android:stopWithTask="true" />
+          android:stopWithTask="true"
+          android:exported="false"/>
         <service
           android:name="com.onesignal.FocusDelaySyncJobService"
-          android:permission="android.permission.BIND_JOB_SERVICE" />
+          android:permission="android.permission.BIND_JOB_SERVICE"
+          android:exported="false" />
 
         <service
           android:name="com.onesignal.SyncService"
-          android:stopWithTask="true" />
+          android:stopWithTask="true"
+          android:exported="false" />
         <service
           android:name="com.onesignal.SyncJobService"
-          android:permission="android.permission.BIND_JOB_SERVICE" />
+          android:permission="android.permission.BIND_JOB_SERVICE"
+          android:exported="false" />
 
         <activity android:name="com.onesignal.PermissionsActivity"
-                  android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+                  android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                  android:exported="false" />
 
-        <receiver android:name="com.onesignal.NotificationDismissReceiver" />
+        <receiver
+            android:name="com.onesignal.NotificationDismissReceiver"
+            android:exported="true"/>
 
-        <receiver android:name="com.onesignal.BootUpReceiver">
+        <receiver
+            android:name="com.onesignal.BootUpReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
-        <receiver android:name="com.onesignal.UpgradeReceiver" >
+        <receiver
+            android:name="com.onesignal.UpgradeReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
@@ -119,7 +135,8 @@
         <activity
           android:name="com.onesignal.NotificationOpenedReceiver"
           android:noHistory="true"
-          android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+          android:theme="@android:style/Theme.Translucent.NoTitleBar"
+          android:exported="true" />
 
     </application>
 
diff --git a/OneSignalSDK/onesignal/src/release/AndroidManifest.xml b/OneSignalSDK/onesignal/src/release/AndroidManifest.xml
index d9d67149cc..420ebfb322 100644
--- a/OneSignalSDK/onesignal/src/release/AndroidManifest.xml
+++ b/OneSignalSDK/onesignal/src/release/AndroidManifest.xml
@@ -9,7 +9,8 @@
 
         <receiver
             android:name="com.onesignal.FCMBroadcastReceiver"
-            android:permission="com.google.android.c2dm.permission.SEND" >
+            android:permission="com.google.android.c2dm.permission.SEND"
+            android:exported="true">
             <!-- High priority so OneSignal payloads can be filtered from other FCM receivers -->
             <intent-filter android:priority="999" >
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />

From 7c08e873ba09096067ec8dac814bd5ce5158490f Mon Sep 17 00:00:00 2001
From: Josh Kasten <josh@onesignal.com>
Date: Wed, 16 Jun 2021 21:59:15 -0700
Subject: [PATCH 2/2] Android 12 required exported flag to example app

* Same as the last commit in this PR but for the example app
---
 Examples/OneSignalDemo/app/src/main/AndroidManifest.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml b/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml
index 36fbf1dec8..03ae90f836 100644
--- a/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml
+++ b/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml
@@ -49,7 +49,8 @@
 
         <receiver
             android:name="com.onesignal.ADMMessageHandler$Receiver"
-            android:permission="com.amazon.device.messaging.permission.SEND" >
+            android:permission="com.amazon.device.messaging.permission.SEND"
+            android:exported="true">
 
             <!-- To interact with ADM, your app must listen for the following intents. -->
             <intent-filter>
@@ -64,7 +65,9 @@
         <meta-data android:name="com.onesignal.NotificationServiceExtension"
             android:value="com.onesignal.sdktest.notification.NotificationServiceExtension" />
 
-        <activity android:name=".activity.SplashActivity">
+        <activity
+            android:name=".activity.SplashActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />