Skip to content

Commit 903faae

Browse files
committed
Alway assign context
1 parent d857d64 commit 903faae

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

com.unity.mobile.notifications/Runtime/Android/Plugins/com/unity/androidnotifications/UnityNotificationManager.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ public class UnityNotificationManager extends BroadcastReceiver {
7171
static final String NOTIFICATION_IDS_SHARED_PREFS_KEY = "UNITY_NOTIFICATION_IDS";
7272

7373
private void initialize(Activity activity, NotificationCallback notificationCallback) {
74-
if (mContext == null)
75-
mContext = activity.getApplicationContext();
74+
// always assign these, as callback here is always new, activity and context might be
75+
mContext = activity.getApplicationContext();
7676
mActivity = activity;
7777
mNotificationCallback = notificationCallback;
7878
if (mScheduledNotifications == null)
@@ -114,11 +114,12 @@ private void initialize(Activity activity, NotificationCallback notificationCall
114114
static synchronized UnityNotificationManager getNotificationManagerImpl(Context context) {
115115
if (mUnityNotificationManager == null) {
116116
mUnityNotificationManager = new UnityNotificationManager();
117-
mUnityNotificationManager.mContext = context.getApplicationContext();
118117
mUnityNotificationManager.mVisibleNotifications = new HashSet<>();
119118
mUnityNotificationManager.mScheduledNotifications = new ConcurrentHashMap();
120119
}
121120

121+
// always assign context, as it might change
122+
mUnityNotificationManager.mContext = context.getApplicationContext();
122123
return mUnityNotificationManager;
123124
}
124125

0 commit comments

Comments
 (0)