owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow configuring push notifications with UnifiedPush

Browse Source
This commit is contained in:
sim
2025-01-15 09:37:30 +01:00
parent 281e989749
commit 4e1f7839b3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/UnifiedPushNotificationReceiver.java
View File

@@ -39,10 +39,10 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
if (account != null) { if (account != null) {
PublicKeySet ks = endpoint.getPubKeySet(); PublicKeySet ks = endpoint.getPubKeySet();
if (ks != null){ if (ks != null){
account.getPushSubscriptionManager().registerAccountForPush(null, true, endpoint.getUrl(), ks.getPubKey(), ks.getAuth()); account.getPushSubscriptionManager().registerAccountForPush(account.pushSubscription, true, endpoint.getUrl(), ks.getPubKey(), ks.getAuth());
} else { } else {
// ks should never be null on new endpoint // ks should never be null on new endpoint
account.getPushSubscriptionManager().registerAccountForPush(null, endpoint.getUrl()); account.getPushSubscriptionManager().registerAccountForPush(account.pushSubscription, endpoint.getUrl());
} }
} }
} }

2
mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsNotificationsFragment.java
View File

@@ -127,7 +127,7 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
GlobalUserPreferences.save(); GlobalUserPreferences.save();
lp.keepOnlyLatestNotification=onlyLatestItem.checked; lp.keepOnlyLatestNotification=onlyLatestItem.checked;
lp.save(); lp.save();
if(needUpdateNotificationSettings && PushSubscriptionManager.arePushNotificationsAvailable()){ if(needUpdateNotificationSettings && (PushSubscriptionManager.arePushNotificationsAvailable() || useUnifiedPush)){
ps.alerts.mention=mentionsItem.checked; ps.alerts.mention=mentionsItem.checked;
ps.alerts.reblog=boostsItem.checked; ps.alerts.reblog=boostsItem.checked;
ps.alerts.favourite=favoritesItem.checked; ps.alerts.favourite=favoritesItem.checked;