attempt to unregister when receiving push for channel no longer joined

when receiving a FCM push message for a channel the user is no longer in (this can happen when the disable command failed) an attempt will be made to explicitly unregister from the app server (which in turn will then send item-not-found on next push)

1 files changed, 14 insertions, 0 deletions

diff --git a/src/main/java/de/pixart/messenger/generator/IqGenerator.java b/src/main/java/de/pixart/messenger/generator/IqGenerator.java
index ad977c7b4..52f9f5b01 100644
--- a/src/main/java/de/pixart/messenger/generator/IqGenerator.java
+++ b/src/main/java/de/pixart/messenger/generator/IqGenerator.java
@@ -453,6 +453,20 @@ public class IqGenerator extends AbstractGenerator {
         return packet;
     }
 
+    public IqPacket unregisterChannelOnAppServer(Jid appServer, String deviceId, String channel) {
+        final IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
+        packet.setTo(appServer);
+        final Element command = packet.addChild("command", Namespace.COMMANDS);
+        command.setAttribute("node", "unregister-push-fcm");
+        command.setAttribute("action", "execute");
+        final Data data = new Data();
+        data.put("channel", channel);
+        data.put("android-id", deviceId);
+        data.submit();
+        command.addChild(data);
+        return packet;
+    }
+
     public IqPacket enablePush(final Jid jid, final String node, final String secret) {
         IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
         Element enable = packet.addChild("enable", Namespace.PUSH);