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

Add google.sent_time extra to C2DM receive intent, fixes Telegram notifications #2344

Merged
merged 3 commits into from
Apr 29, 2024
Merged

Add google.sent_time extra to C2DM receive intent, fixes Telegram notifications #2344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
852542b
Add google.sent_time extra to C2DM receive intent
matteobtt Apr 28, 2024
5a26506
Only include sent time when valid, also add TTL
mar-v-in Apr 29, 2024
6ffec90
Push: Do not allow app data to override service fields
mar-v-in Apr 29, 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
1 change: 1 addition & 0 deletions play-services-basement/src/main/java/org/microg/gms/gcm/GcmConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public final class GcmConstants {
public static final String EXTRA_SENDER_LEGACY = "legacy.sender";
public static final String EXTRA_SEND_TO = "google.to";
public static final String EXTRA_SEND_FROM = "google.from";
public static final String EXTRA_SENT_TIME = "google.sent_time";
public static final String EXTRA_SIGNATURE = "sig";
public static final String EXTRA_SUBSCIPTION = "subscription";
public static final String EXTRA_SUBTYPE = "subtype";
Expand Down
7 changes: 7 additions & 0 deletions play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.atomic.AtomicInteger;

import javax.net.ssl.SSLContext;
Expand Down Expand Up @@ -548,6 +549,8 @@ private void handleAppMessage(DataMessageStanza msg) {
intent.setAction(ACTION_C2DM_RECEIVE);
intent.putExtra(EXTRA_FROM, msg.from);
intent.putExtra(EXTRA_MESSAGE_ID, msg.id);
if (msg.sent != null && msg.sent != 0) intent.putExtra(EXTRA_SENT_TIME, msg.sent);
if (msg.ttl != null && msg.ttl != 0) intent.putExtra(EXTRA_TTL, msg.ttl);
if (msg.persistent_id != null) intent.putExtra(EXTRA_MESSAGE_ID, msg.persistent_id);
if (msg.token != null) intent.putExtra(EXTRA_COLLAPSE_KEY, msg.token);
if (msg.raw_data != null) {
Expand All @@ -560,6 +563,10 @@ private void handleAppMessage(DataMessageStanza msg) {
intent.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES);
}
for (AppData appData : msg.app_data) {
if (appData.key == null) continue;
String key = appData.key.toLowerCase(Locale.US);
// Some keys are exclusively set by the client and not the app.
if (key.equals(EXTRA_FROM) || (key.startsWith("google.") && !key.startsWith("google.c."))) continue;
intent.putExtra(appData.key, appData.value_);
}

Expand Down