Skip to content
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

[MOB-9897] Feature/changes needed for notification #817

Closed
wants to merge 10 commits into from
Closed

[MOB-9897] Feature/changes needed for notification #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
425594f
Changes to display notification properly and navigate user on differe…
megha-iterable Oct 15, 2024
a5a136b
Removed unnecessary logs and white spaces
megha-iterable Oct 16, 2024
860cf66
Set Pending Intent to MUTABLE in test cases
megha-iterable Oct 16, 2024
dbeaac3
Merge branch 'master' into feature/changes_needed_for_notification
Ayyanchira Dec 11, 2024
9037aed
Reverting back not needed changes form IterableFirebaseMessagingService
megha-iterable Dec 23, 2024
021b0c0
Removing unwanted white-spaces and duplicate imports
megha-iterable Dec 23, 2024
599265a
Merge branch 'master' into feature/changes_needed_for_notification
evantk91 Jan 7, 2025
83416e2
updated test name
Jan 7, 2025
5f1c547
Merge branch 'master' into feature/changes_needed_for_notification
evantk91 Jan 13, 2025
66bd83d
Merge branch 'master' into feature/changes_needed_for_notification
evantk91 Jan 21, 2025
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
1 change: 1 addition & 0 deletions iterableapi/src/main/java/com/iterable/iterableapi/IterableFirebaseMessagingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import android.content.Context;
import android.os.AsyncTask;
import android.os.Bundle;

import androidx.annotation.NonNull;

import com.google.android.gms.tasks.Tasks;
Expand Down
5 changes: 3 additions & 2 deletions iterableapi/src/main/java/com/iterable/iterableapi/IterableNotificationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Bundle;

import androidx.core.app.NotificationCompat;
import androidx.core.app.RemoteInput;

Expand Down Expand Up @@ -134,12 +135,12 @@ private PendingIntent getPendingIntent(Context context, IterableNotificationData
buttonIntent.setClass(context, IterableTrampolineActivity.class);
buttonIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
pendingButtonIntent = PendingIntent.getActivity(context, buttonIntent.hashCode(),
buttonIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
buttonIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
} else {
IterableLogger.d(TAG, "Go through IterablePushActionReceiver");
buttonIntent.setClass(context, IterablePushActionReceiver.class);
pendingButtonIntent = PendingIntent.getBroadcast(context, buttonIntent.hashCode(),
buttonIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
buttonIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
}

return pendingButtonIntent;
Expand Down
2 changes: 1 addition & 1 deletion iterableapi/src/main/java/com/iterable/iterableapi/IterableNotificationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public IterableNotificationBuilder createNotification(Context context, Bundle ex
}

PendingIntent notificationClickedIntent = PendingIntent.getActivity(context, notificationBuilder.requestCode,
trampolineActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
trampolineActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);

notificationBuilder.setContentIntent(notificationClickedIntent);
notificationBuilder.setIsGhostPush(isGhostPush(extras));
Expand Down
20 changes: 10 additions & 10 deletions iterableapi/src/test/java/com/iterable/iterableapi/IterableNotificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package com.iterable.iterableapi;

import static com.iterable.iterableapi.IterableTestUtils.getResourceString;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
import static org.robolectric.Shadows.shadowOf;

import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
Expand All @@ -19,11 +24,6 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.shadows.ShadowPendingIntent;

import static com.iterable.iterableapi.IterableTestUtils.getResourceString;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
import static org.robolectric.Shadows.shadowOf;

@RunWith(RobolectricTestRunner.class)
public class IterableNotificationTest {

Expand Down Expand Up @@ -93,18 +93,18 @@ public void testNoAction() throws Exception {
}

@Test
public void testPendingIntentImmutable() throws Exception {
public void testPendingIntentMutable() throws Exception {
Bundle notif = new Bundle();
notif.putString(IterableConstants.ITERABLE_DATA_KEY, getResourceString("push_payload_action_buttons.json"));

IterableNotificationBuilder iterableNotification = postNotification(notif);
StatusBarNotification statusBarNotification = mNotificationManager.getActiveNotifications()[0];
Notification notification = statusBarNotification.getNotification();

assertTrue((shadowOf(notification.contentIntent).getFlags() & PendingIntent.FLAG_IMMUTABLE) != 0);
assertTrue((shadowOf(notification.actions[0].actionIntent).getFlags() & PendingIntent.FLAG_IMMUTABLE) != 0);
assertTrue((shadowOf(notification.actions[1].actionIntent).getFlags() & PendingIntent.FLAG_IMMUTABLE) != 0);
assertTrue((shadowOf(notification.actions[2].actionIntent).getFlags() & PendingIntent.FLAG_IMMUTABLE) != 0);
assertTrue((shadowOf(notification.contentIntent).getFlags() & PendingIntent.FLAG_MUTABLE) != 0);
assertTrue((shadowOf(notification.actions[0].actionIntent).getFlags() & PendingIntent.FLAG_MUTABLE) != 0);
assertTrue((shadowOf(notification.actions[1].actionIntent).getFlags() & PendingIntent.FLAG_MUTABLE) != 0);
assertTrue((shadowOf(notification.actions[2].actionIntent).getFlags() & PendingIntent.FLAG_MUTABLE) != 0);
}

}
Loading