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

Fix unifiedpush (#785)

Browse Source 
* [UnifiedPush] Register the new endpoint

* [UnifiedPush] Get account linked to instance
This commit is contained in:
S1m
2023-08-29 12:22:12 +02:00
committed by GitHub
parent e66078e52e
commit 580ae15af6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,9 +27,9 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
public void onNewEndpoint(@NotNull Context context, @NotNull String endpoint, @NotNull String instance) { public void onNewEndpoint(@NotNull Context context, @NotNull String endpoint, @NotNull String instance) {
// Called when a new endpoint be used for sending push messages // Called when a new endpoint be used for sending push messages
Log.d(TAG, "onNewEndpoint: New Endpoint " + endpoint + " for "+ instance); Log.d(TAG, "onNewEndpoint: New Endpoint " + endpoint + " for "+ instance);
AccountSession account = AccountSessionManager.getInstance().getLastActiveAccount(); AccountSession account = AccountSessionManager.getInstance().tryGetAccount(instance);
if (account != null) if (account != null)
account.getPushSubscriptionManager().registerAccountForPush(null); account.getPushSubscriptionManager().registerAccountForPush(null, endpoint);
} }
@Override @Override
@@ -37,7 +37,7 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
// called when the registration is not possible, eg. no network // called when the registration is not possible, eg. no network
Log.d(TAG, "onRegistrationFailed: " + instance); Log.d(TAG, "onRegistrationFailed: " + instance);
//re-register for gcm //re-register for gcm
AccountSession account = AccountSessionManager.getInstance().getLastActiveAccount(); AccountSession account = AccountSessionManager.getInstance().tryGetAccount(instance);
if (account != null) if (account != null)
account.getPushSubscriptionManager().registerAccountForPush(null); account.getPushSubscriptionManager().registerAccountForPush(null);
} }
@@ -47,7 +47,7 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
// called when this application is unregistered from receiving push messages // called when this application is unregistered from receiving push messages
Log.d(TAG, "onUnregistered: " + instance); Log.d(TAG, "onUnregistered: " + instance);
//re-register for gcm //re-register for gcm
AccountSession account = AccountSessionManager.getInstance().getLastActiveAccount(); AccountSession account = AccountSessionManager.getInstance().tryGetAccount(instance);
if (account != null) if (account != null)
account.getPushSubscriptionManager().registerAccountForPush(null); account.getPushSubscriptionManager().registerAccountForPush(null);
} }
@@ -55,7 +55,10 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
@Override @Override
public void onMessage(@NotNull Context context, @NotNull byte[] message, @NotNull String instance) { public void onMessage(@NotNull Context context, @NotNull byte[] message, @NotNull String instance) {
// Called when a new message is received. The message contains the full POST body of the push message // Called when a new message is received. The message contains the full POST body of the push message
AccountSession account = AccountSessionManager.getInstance().getAccount(instance); AccountSession account = AccountSessionManager.getInstance().tryGetAccount(instance);
if (account == null)
return;
//this is stupid //this is stupid
// Mastodon stores the info to decrypt the message in the HTTP headers, which are not accessible in UnifiedPush, // Mastodon stores the info to decrypt the message in the HTTP headers, which are not accessible in UnifiedPush,