From 325e6ec43f34cec87b81927609f4c7b74fad0be6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Corre=CC=82a?= <carlscorrea@gmail.com>
Date: Mon, 30 Aug 2021 16:32:51 +0100
Subject: [PATCH] feat: changes to compliance with android 12

references: https://outsystemsrd.atlassian.net/browse/RMET-824

desc: added tag exported in android manifest and added flag immutable to pending intent
---
 .../onesignal/src/main/AndroidManifest.xml    | 35 ++++++++++++-------
 .../com/onesignal/GenerateNotification.java   |  4 +--
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/OneSignalSDK/onesignal/src/main/AndroidManifest.xml b/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
index 0a711e8807..6637214492 100644
--- a/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
+++ b/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
@@ -61,7 +61,8 @@
 
     <application>
 
-        <receiver android:name="com.onesignal.NotificationOpenedReceiver" />
+        <receiver android:name="com.onesignal.NotificationOpenedReceiver"
+            android:exported="false"/>
 
         <service
             android:name="com.onesignal.HmsMessageServiceOneSignal"
@@ -70,41 +71,51 @@
                 <action android:name="com.huawei.push.action.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-        
+
         <activity android:name="com.onesignal.NotificationOpenedActivityHMS"
-                  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.GcmIntentService" />
+        <service android:name="com.onesignal.GcmIntentService"
+            exported="false"/>
 
         <service android:name="com.onesignal.GcmIntentJobService"
-            android:permission="android.permission.BIND_JOB_SERVICE"/>
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            exported="false"/>
 
         <service android:name="com.onesignal.RestoreJobService"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="false"/>
 
         <service android:name="com.onesignal.RestoreKickoffJobService"
-            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" />
         <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"/>
 
-        <service android:name="com.onesignal.NotificationRestoreService" />
+        <service android:name="com.onesignal.NotificationRestoreService"
+            android:exported="false"/>
 
-        <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>
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java
index b3fe4a7dc9..a8f816413f 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java
+++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java
@@ -191,8 +191,8 @@ private static CharSequence getTitle(JSONObject gcmBundle) {
 
    private static PendingIntent getNewActionPendingIntent(int requestCode, Intent intent) {
       if (openerIsBroadcast)
-         return PendingIntent.getBroadcast(currentContext, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-      return PendingIntent.getActivity(currentContext, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+         return PendingIntent.getBroadcast(currentContext, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+      return PendingIntent.getActivity(currentContext, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
    }
 
    private static Intent getNewBaseIntent(int notificationId) {