Allow users to ping the configured push appserver for debugging

Author: tmolitor-stud-tu

Monal/Classes/HelperTools.h

@@ -92,6 +92,7 @@ void swizzle(Class c, SEL orig, SEL new);
 +(void) postError:(NSString*) description withNode:(XMPPStanza* _Nullable) node andAccount:(xmpp*) account andIsSevere:(BOOL) isSevere andDisableAccount:(BOOL) disableAccount;
 +(void) postError:(NSString*) description withNode:(XMPPStanza* _Nullable) node andAccount:(xmpp*) account andIsSevere:(BOOL) isSevere;
 +(NSString*) extractXMPPError:(XMPPStanza*) stanza withDescription:(NSString* _Nullable) description;
++(NSError*) getNSErrorFrom:(XMPPStanza*) stanza withDescription:(NSString*) description;
 +(void) showErrorOnAlpha:(NSString*) description withNode:(XMPPStanza* _Nullable) node andAccount:(xmpp* _Nullable) account andFile:(char*) file andLine:(int) line andFunc:(char*) func;
 
 +(NSDictionary<NSString*, NSString*>*) getInvalidPushServers;

Monal/Classes/HelperTools.m

@@ -664,6 +664,12 @@ +(NSString*) extractXMPPError:(XMPPStanza*) stanza withDescription:(NSString*) d
     return message;
 }
 
++(NSError*) getNSErrorFrom:(XMPPStanza*) stanza withDescription:(NSString*) description
+{
+    NSString* errorMessage = [HelperTools extractXMPPError:stanza withDescription:description];
+    return [NSError errorWithDomain:@"Monal" code:0 userInfo:@{NSLocalizedDescriptionKey: errorMessage}];
+}
+
 +(void) initSystem
 {
     BOOL enableDefaultLogAndCrashFramework = YES;

Monal/Classes/NotificationDebugging.swift

@@ -25,6 +25,7 @@ struct NotificationDebugging: View {
 
     @State private var pushPermissionEnabled = false // state because we get this value through an async call
     @State private var showPushToken = false
+    @State var runningPings: [String:any View]
 
     @ObservedObject var notificationDebuggingDefaultsDB = NotificationDebuggingDefaultsDB()
 
@@ -35,6 +36,7 @@ struct NotificationDebugging: View {
 
         // push server selector
         self.availablePushServers = HelperTools.getAvailablePushServers()
+        self.runningPings = [:]
     }
 
     var body: some View {
@@ -106,14 +108,35 @@ struct NotificationDebugging: View {
                     }
                 }
             }
-#if DEBUG
             Section(header: Text("Debugging").font(.title3)) {
+                Button("Ping push servers") {
+                    for account in self.xmppAccountInfo {
+                        runningPings[account.connectionProperties.identity.jid] = Text("Running...")
+                        account.pingPushserver().done { _ in
+                            runningPings[account.connectionProperties.identity.jid] = Text("Successful").foregroundColor(.green)
+                        }.catch { error in
+                            runningPings[account.connectionProperties.identity.jid] = Text(error.localizedDescription).foregroundColor(.red)
+                        }
+                    }
+                }
+                
+                if self.runningPings.count > 0 {
+                    VStack(alignment: .leading, spacing:10) {
+                        ForEach(self.runningPings.sorted(by:{ $0.0 < $1.0 }), id: \.key) { key, view in
+                            HStack {
+                                Text("\(String(describing:key)): ")
+                                AnyView(view)
+                            }
+                        }
+                    }
+                }
+#if DEBUG
                 Button("Reregister push token") {
                     UIApplication.shared.unregisterForRemoteNotifications()
                     UIApplication.shared.registerForRemoteNotifications()
                 }
-            }
 #endif
+            }
         }
         .navigationBarTitle(Text("Notifications"))
         .onAppear(perform: {

Monal/Classes/xmpp.h

@@ -150,6 +150,7 @@ typedef void (^monal_iq_handler_t)(XMPPIQ* _Nullable);
  Adds the stanza to the output Queue
  */
 -(void) send:(MLXMLNode*) stanza;
+-(AnyPromise*) sendIq:(XMPPIQ*) iq;
 -(void) sendIq:(XMPPIQ*) iq withResponseHandler:(monal_iq_handler_t) resultHandler andErrorHandler:(monal_iq_handler_t) errorHandler;
 -(void) sendIq:(XMPPIQ*) iq withHandler:(MLHandler* _Nullable) handler;
 
@@ -204,6 +205,7 @@ typedef void (^monal_iq_handler_t)(XMPPIQ* _Nullable);
  */
 -(void) enablePush;
 -(void) disablePush;
+-(AnyPromise*) pingPushserver;
 
 -(void) mamFinishedFor:(NSString*) archiveJid;
 

Monal/Classes/xmpp.m

@@ -3774,16 +3774,21 @@ -(NSString* _Nullable) channelBindingToUse
 
 #pragma mark stanza handling
 
-// -(AnyPromise*) sendIq:(XMPPIQ*) iq
-// {
-//     return [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
-//         [self sendIq:iq withResponseHandler:^(XMPPIQ* response) {
-//             resolve(response);
-//         } andErrorHandler:^(XMPPIQ* error) {
-//             resolve(error);
-//         }];
-//     }];
-// }
+-(AnyPromise*) sendIq:(XMPPIQ*) iq
+{
+    return [self sendIq:iq withErrorDescription:nil];
+}
+
+-(AnyPromise*) sendIq:(XMPPIQ*) iq withErrorDescription:(NSString*) description
+{
+    return [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
+        [self sendIq:iq withResponseHandler:^(XMPPIQ* response) {
+            resolve(response);
+        } andErrorHandler:^(XMPPIQ* error) {
+            resolve([HelperTools getNSErrorFrom:error withDescription:description]);
+        }];
+    }];
+}
 
 -(void) sendIq:(XMPPIQ*) iq withResponseHandler:(monal_iq_handler_t) resultHandler andErrorHandler:(monal_iq_handler_t) errorHandler
 {
@@ -6054,6 +6059,14 @@ -(void) publishStatusMessage:(NSString*) message
     [self sendPresence];
 }
 
+-(AnyPromise*) pingPushserver
+{
+    NSString* selectedPushServer = [[HelperTools defaultsDB] objectForKey:@"selectedPushServer"];
+    XMPPIQ* ping = [[XMPPIQ alloc] initWithType:kiqGetType to:selectedPushServer];
+    [ping setPing];
+    return [self sendIq:ping withErrorDescription:@"Ping error"];
+}
+
 -(NSString*) description
 {
     return [NSString stringWithFormat:@"%@[%@]: %@", self.accountID, _internalID, self.connectionProperties.identity.jid];