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

Android 14 update #2894

Merged
merged 17 commits into from
Dec 10, 2024
Merged

Android 14 update #2894

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
241b9a8
Bump compile and target SDK to version 34
avazirna Sep 4, 2024
b93b72e
Bump AGP version to version 8.1.1
avazirna Oct 29, 2024
000fef6
Set foreground service type
avazirna Nov 14, 2024
e8879bc
Set exported attribute to receivers
avazirna Nov 14, 2024
5f83b76
Merge branch 'master' into android-14-update
avazirna Nov 14, 2024
88760e3
Set exported attribute to dynamic broadcast receivers
avazirna Nov 15, 2024
569476d
Migrate from Google Play core
avazirna Nov 15, 2024
124f9f1
Migrate to configuration avoindance APIs
avazirna Nov 27, 2024
65a8b2a
Remove package attribute from manifest files
avazirna Nov 27, 2024
476f0dd
Revert "Set foreground service type"
avazirna Nov 28, 2024
ecee832
Set CommCareSessionService foreground service type
avazirna Nov 28, 2024
ef25be8
Fix pendingIntent mutability flag
avazirna Nov 28, 2024
641857f
update test libs and work manager
shubham1g5 Nov 29, 2024
0e86fb6
Bump Support Library compile SDK to 35 and target SDK to 34
avazirna Dec 2, 2024
38a4dc9
Update broacast receivers exported attribute
avazirna Dec 9, 2024
26eb7c3
Merge pull request #2905 from dimagi/standardLibsUpdate
avazirna Dec 9, 2024
86ef226
Downgrade Espresso to 3.4
avazirna Dec 9, 2024
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
10 changes: 5 additions & 5 deletions app/src/org/commcare/services/CommCareFirebaseMessagingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ private void showNotification(RemoteMessage.Notification notification) {
i.setAction(Intent.ACTION_MAIN);
i.addCategory(Intent.CATEGORY_LAUNCHER);

PendingIntent contentIntent;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
contentIntent = PendingIntent.getActivity(this, 0, i, PendingIntent.FLAG_IMMUTABLE);
else
contentIntent = PendingIntent.getActivity(this, 0, i, 0);
int pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
pendingIntentFlags = pendingIntentFlags | PendingIntent.FLAG_IMMUTABLE;
}
PendingIntent contentIntent = PendingIntent.getActivity(this, 0, i, pendingIntentFlags);

NotificationCompat.Builder fcmNotification = new NotificationCompat.Builder(this,
CommCareNoficationManager.NOTIFICATION_CHANNEL_PUSH_NOTIFICATIONS_ID)
Expand Down
11 changes: 5 additions & 6 deletions app/src/org/commcare/services/CommCareSessionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,12 +706,11 @@ private Notification createSessionNotification(){
callable.setAction("android.intent.action.MAIN");
callable.addCategory("android.intent.category.LAUNCHER");

// The PendingIntent to launch our activity if the user selects this notification
PendingIntent contentIntent;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
contentIntent = PendingIntent.getActivity(this, 0, callable, PendingIntent.FLAG_IMMUTABLE);
else
contentIntent = PendingIntent.getActivity(this, 0, callable, 0);
int pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
pendingIntentFlags = pendingIntentFlags | PendingIntent.FLAG_IMMUTABLE;
}
PendingIntent contentIntent = PendingIntent.getActivity(this, 0, callable, pendingIntentFlags);

String notificationText;
if (AppUtils.getInstalledAppRecords().size() > 1) {
Expand Down