Mastodon
/
mastodon-app-ufficiale-android
mirror of https://github.com/mastodon/mastodon-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into donations

This commit is contained in:
Grishka 2024-05-22 12:22:06 +03:00
parent c94e1f939a b2c797fb46
commit 1dd40a77de
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
View File

@ -75,7 +75,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
} }
String accountID=account.getID(); String accountID=account.getID();
PushNotification pn=AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().decryptNotification(k, p, s); PushNotification pn=AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().decryptNotification(k, p, s);
new GetNotificationByID(pn.notificationId+"") new GetNotificationByID(pn.notificationId)
.setCallback(new Callback<>(){ .setCallback(new Callback<>(){
@Override @Override
public void onSuccess(org.joinmastodon.android.model.Notification result){ public void onSuccess(org.joinmastodon.android.model.Notification result){

2
mastodon/src/main/java/org/joinmastodon/android/model/PushNotification.java
View File

@ -10,7 +10,7 @@ import androidx.annotation.StringRes;
public class PushNotification extends BaseModel{ public class PushNotification extends BaseModel{
public String accessToken; public String accessToken;
public String preferredLocale; public String preferredLocale;
public long notificationId; public String notificationId;
@RequiredField @RequiredField
public Type notificationType; public Type notificationType;
@RequiredField @RequiredField