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

Workaround to fix #497

Browse Source
This commit is contained in:
Grishka
2023-01-18 18:41:48 +03:00
parent ab3a98fd60
commit af1c7194e6
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/RegisterForPushNotifications.java
View File

@@ -9,7 +9,7 @@ public class RegisterForPushNotifications extends MastodonAPIRequest<PushSubscri
Request r=new Request(); Request r=new Request();
r.subscription.endpoint="https://app.joinmastodon.org/relay-to/fcm/"+deviceToken+"/"+accountID; r.subscription.endpoint="https://app.joinmastodon.org/relay-to/fcm/"+deviceToken+"/"+accountID;
r.data.alerts=alerts; r.data.alerts=alerts;
r.data.policy=policy; r.policy=policy;
r.subscription.keys.p256dh=encryptionKey; r.subscription.keys.p256dh=encryptionKey;
r.subscription.keys.auth=authKey; r.subscription.keys.auth=authKey;
setRequestBody(r); setRequestBody(r);
@@ -18,6 +18,7 @@ public class RegisterForPushNotifications extends MastodonAPIRequest<PushSubscri
private static class Request{ private static class Request{
public Subscription subscription=new Subscription(); public Subscription subscription=new Subscription();
public Data data=new Data(); public Data data=new Data();
public PushSubscription.Policy policy;
private static class Keys{ private static class Keys{
public String p256dh; public String p256dh;
@@ -31,7 +32,6 @@ public class RegisterForPushNotifications extends MastodonAPIRequest<PushSubscri
private static class Data{ private static class Data{
public PushSubscription.Alerts alerts; public PushSubscription.Alerts alerts;
public PushSubscription.Policy policy;
} }
} }
} }

17
mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/UpdatePushSettings.java
View File

@@ -3,23 +3,36 @@ package org.joinmastodon.android.api.requests.notifications;
import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.api.MastodonAPIRequest;
import org.joinmastodon.android.model.PushSubscription; import org.joinmastodon.android.model.PushSubscription;
import java.io.IOException;
import okhttp3.Response;
public class UpdatePushSettings extends MastodonAPIRequest<PushSubscription>{ public class UpdatePushSettings extends MastodonAPIRequest<PushSubscription>{
private final PushSubscription.Policy policy;
public UpdatePushSettings(PushSubscription.Alerts alerts, PushSubscription.Policy policy){ public UpdatePushSettings(PushSubscription.Alerts alerts, PushSubscription.Policy policy){
super(HttpMethod.PUT, "/push/subscription", PushSubscription.class); super(HttpMethod.PUT, "/push/subscription", PushSubscription.class);
setRequestBody(new Request(alerts, policy)); setRequestBody(new Request(alerts, policy));
this.policy=policy;
}
@Override
public void validateAndPostprocessResponse(PushSubscription respObj, Response httpResponse) throws IOException{
super.validateAndPostprocessResponse(respObj, httpResponse);
respObj.policy=policy;
} }
private static class Request{ private static class Request{
public Data data=new Data(); public Data data=new Data();
public PushSubscription.Policy policy;
public Request(PushSubscription.Alerts alerts, PushSubscription.Policy policy){ public Request(PushSubscription.Alerts alerts, PushSubscription.Policy policy){
this.data.alerts=alerts; this.data.alerts=alerts;
this.data.policy=policy; this.policy=policy;
} }
private static class Data{ private static class Data{
public PushSubscription.Alerts alerts; public PushSubscription.Alerts alerts;
public PushSubscription.Policy policy;
} }
} }
} }

1
mastodon/src/main/java/org/joinmastodon/android/model/PushSubscription.java
View File

@@ -23,6 +23,7 @@ public class PushSubscription extends BaseModel implements Cloneable{
", endpoint='"+endpoint+'\''+ ", endpoint='"+endpoint+'\''+
", alerts="+alerts+ ", alerts="+alerts+
", serverKey='"+serverKey+'\''+ ", serverKey='"+serverKey+'\''+
", policy="+policy+
'}'; '}';
} }