6.4.19-b1 (#1582)

- Sort media gallery items from most recent to oldest
- Allow users to ping the push appserver for debugging notification
problems
- Fixed omemo devicelist updates not published properly
- Fixed audio playback not working after recording a voice message
- Improved accessibility if users configure a dynamic font in settings
(bigger text sizes)

Author: tmolitor-stud-tu

.github/workflows/quicksy.build-push.yml

@@ -4,8 +4,9 @@ name: quicksy.build-push
 # Controls when the action will run.
 on:
   # Triggers the workflow on push
-  push:
-    branches: [ stable ]
+  #DISABLED UNTIL 7.0 RELEASE
+  #push:
+  #  branches: [ stable ]
 
   workflow_dispatch:
 

.github/workflows/stable.build-push.yml

@@ -133,10 +133,54 @@ jobs:
           if-no-files-found: error
       - name: validate ios app
         run: xcrun altool --validate-app --file ./Monal/build/ipa/Monal.ipa --type ios -u $(cat /Users/ci/apple_connect_upload_mail.txt) -p "$(cat /Users/ci/apple_connect_upload_secret.txt)"
+      - name: Notarize catalyst
+        run: xcrun notarytool submit ./Monal/build/app/Monal.zip --wait --team-id S8D843U34Y --key "/Users/ci/appstoreconnect/apiKey.p8" --key-id "$(cat /Users/ci/appstoreconnect/apiKeyId.txt)" --issuer "$(cat /Users/ci/appstoreconnect/apiIssuerId.txt)"
+      - name: Staple notarisation
+        run: |
+          cd Monal/build/app/tar_release/
+          xcrun stapler staple "$APP_DIR"
+          stapler validate "$APP_DIR"
+          /usr/bin/ditto -c -k --sequesterRsrc --keepParent "$APP_DIR" "../$APP_NAME.zip"
+          cd ../../../..
+      - uses: actions/upload-artifact@v4
+        with:
+          name: monal-catalyst-zip
+          path: Monal/build/app/Monal.zip
+          if-no-files-found: error
+      - uses: actions/upload-artifact@v4
+        with:
+          name: monal-catalyst-pkg
+          path: Monal/build/app/Monal.pkg
+          if-no-files-found: error
       - name: push tag to stable repo
         run: |
           buildNumber=$(git tag --sort="v:refname" |grep "Build_iOS" | grep -v "Quicksy_Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
           git push origin Build_iOS_$buildNumber
+      - name: Create Draft Release
+        id: draftrelease
+        uses: softprops/action-gh-release@v2
+        with:
+          name: "${{ steps.releasenotes.outputs.name }}"
+          tag_name: "${{ steps.releasenotes.outputs.tag }}"
+          target_commitish: stable
+          generate_release_notes: false
+          body: "${{ steps.releasenotes.outputs.notes }}"
+          files: |
+            ./Monal/build/ipa/Monal.ipa
+            ./Monal/build/ipa/monal-ios-dsym.zip
+            ./Monal/build/app/Monal.pkg
+            ./Monal/build/app/Monal.zip
+            ./Monal/build/app/monal-catalyst-dsym.zip
+          fail_on_unmatched_files: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+          prerelease: false
+          draft: true
+      - name: Write draft release id to build env
+        env:
+          RELEASE_ID: ${{ steps.draftrelease.outputs.id }}
+          OUTPUT_FILE: ${{ steps.releasenotes.outputs.OUTPUT_FILE }}
+        run: |
+          echo "releaseID=${RELEASE_ID}" | tee /dev/stderr >> "${OUTPUT_FILE}"
       - name: Create fastlane metadata directory
         id: metadata
         env:
@@ -187,28 +231,10 @@ jobs:
       - name: Publish ios to appstore connect
         #run: xcrun altool --upload-app --file ./Monal/build/ipa/Monal.ipa --type ios --asc-provider S8D843U34Y --team-id S8D843U34Y -u $(cat /Users/ci/apple_connect_upload_mail.txt) -p "$(cat /Users/ci/apple_connect_upload_secret.txt)"
         env:
+          APP_VERSION: ${{ steps.releasenotes.outputs.version }}
           DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path_ios }}
         run: |
-          fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" app_version:"${{ steps.releasenotes.outputs.version }}" reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata:false skip_screenshots:true precheck_include_in_app_purchases:false version_check_wait_retry_limit:10 force:true
-      - name: Notarize catalyst
-        run: xcrun notarytool submit ./Monal/build/app/Monal.zip --wait --team-id S8D843U34Y --key "/Users/ci/appstoreconnect/apiKey.p8" --key-id "$(cat /Users/ci/appstoreconnect/apiKeyId.txt)" --issuer "$(cat /Users/ci/appstoreconnect/apiIssuerId.txt)"
-      - name: Staple notarisation
-        run: |
-          cd Monal/build/app/tar_release/
-          xcrun stapler staple "$APP_DIR"
-          stapler validate "$APP_DIR"
-          /usr/bin/ditto -c -k --sequesterRsrc --keepParent "$APP_DIR" "../$APP_NAME.zip"
-          cd ../../../..
-      - uses: actions/upload-artifact@v4
-        with:
-          name: monal-catalyst-zip
-          path: Monal/build/app/Monal.zip
-          if-no-files-found: error
-      - uses: actions/upload-artifact@v4
-        with:
-          name: monal-catalyst-pkg
-          path: Monal/build/app/Monal.pkg
-          if-no-files-found: error
+          fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" app_version:"${APP_VERSION}" reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata:false skip_screenshots:true precheck_include_in_app_purchases:false version_check_wait_retry_limit:10 force:true
       - name: Upload new catalyst stable to monal-im.org
         env:
           UPLOAD_TYPE: stable
@@ -217,34 +243,16 @@ jobs:
       - name: Publish catalyst to appstore connect
         #run: xcrun altool --upload-app --file ./Monal/build/app/Monal.pkg --type macos --asc-provider S8D843U34Y -u "$(cat /Users/ci/apple_connect_upload_mail.txt)" -p "$(cat /Users/ci/apple_connect_upload_secret.txt)" --primary-bundle-id maccatalyst.G7YU7X7KRJ.SworIM
         env:
+          APP_VERSION: ${{ steps.releasenotes.outputs.version }}
           DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path_macos }}
         run: |
-          fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" pkg:"./Monal/build/app/Monal.pkg" app_version:"${{ steps.releasenotes.outputs.version }}" reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata:false skip_screenshots:true precheck_include_in_app_purchases:false version_check_wait_retry_limit:10 force:true
+          fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" pkg:"./Monal/build/app/Monal.pkg" app_version:"${APP_VERSION}" reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata:false skip_screenshots:true precheck_include_in_app_purchases:false version_check_wait_retry_limit:10 force:true
       # - name: Update xmpp.org client list with new timestamp
       #   run: ./scripts/push_xmpp.org.sh
       - name: Remove fastlane metadata directory
+        env:
+          METADATA_IOS: ${{ steps.metadata.outputs.path_ios }}
+          METADATA_MACOS: ${{ steps.metadata.outputs.path_macos }}
         run: |
-          rm -rf "${{ steps.metadata.outputs.path_ios }}"
-          rm -rf "${{ steps.metadata.outputs.path_macos }}"
-      - name: Create Draft Release
-        id: draftrelease
-        uses: softprops/action-gh-release@v2
-        with:
-          name: "${{ steps.releasenotes.outputs.name }}"
-          tag_name: "${{ steps.releasenotes.outputs.tag }}"
-          target_commitish: stable
-          generate_release_notes: false
-          body: "${{ steps.releasenotes.outputs.notes }}"
-          files: |
-            ./Monal/build/ipa/Monal.ipa
-            ./Monal/build/ipa/monal-ios-dsym.zip
-            ./Monal/build/app/Monal.pkg
-            ./Monal/build/app/Monal.zip
-            ./Monal/build/app/monal-catalyst-dsym.zip
-          fail_on_unmatched_files: true
-          token: ${{ secrets.GITHUB_TOKEN }}
-          prerelease: false
-          draft: true
-      - name: Write draft release id to build env
-        run: |
-          echo "releaseID=${{ steps.draftrelease.outputs.id }}" | tee /dev/stderr >> "${{ steps.releasenotes.outputs.OUTPUT_FILE }}"
+          rm -rf "${METADATA_IOS}"
+          rm -rf "${METADATA_MACOS}"

Monal/Classes/ContactEntry.swift

@@ -10,6 +10,7 @@ struct ContactEntry<AdditionalContent: View>: View {
     let selfnotesPrefix: Bool
     let fallback: String?
     @ViewBuilder let additionalContent: () -> AdditionalContent
+    @ScaledMetric(relativeTo:.body) private var size40px: CGFloat = 40
 
     @StateObject var contact: ObservableKVOWrapper<MLContact>
 
@@ -45,7 +46,7 @@ struct ContactEntry<AdditionalContent: View>: View {
             HStack(alignment: .center) {
                 Image(uiImage: contact.avatar)
                     .resizable()
-                    .frame(width: 40, height: 40, alignment: .center)
+                    .frame(width: size40px, height: size40px, alignment: .center)
                 VStack(alignment: .leading) {
                     if selfnotesPrefix {
                         // use the if to make sure this view gets updated if the contact display name changes

Monal/Classes/DataLayer.m

@@ -2342,7 +2342,7 @@ -(NSMutableArray*) allAttachmentsFromContact:(NSString*) contact forAccount:(NSS
         return nil;
 
     return [self.db idReadTransaction:^{
-        NSString* query = @"SELECT message_history_id FROM message_history WHERE messageType=? AND account_id=? AND buddy_name=? GROUP BY message ORDER BY message_history_id ASC;";
+        NSString* query = @"SELECT message_history_id FROM message_history WHERE messageType=? AND account_id=? AND buddy_name=? GROUP BY message ORDER BY message_history_id DESC;";
         NSArray* params = @[kMessageTypeFiletransfer, accountNo, contact];
 
         NSMutableArray* retval = [NSMutableArray new];

Monal/Classes/GeneralSettings.swift

@@ -132,6 +132,7 @@ class GeneralSettingsDefaultsDB: ObservableObject {
 
 struct GeneralSettings: View {
     @ObservedObject var generalSettingsDefaultsDB = GeneralSettingsDefaultsDB()
+    @ScaledMetric(relativeTo:.body) private var size20px: CGFloat = 20
 
     var body: some View {
         Form {
@@ -141,7 +142,7 @@ struct GeneralSettings: View {
                         Image(systemName: "hand.tap.fill")
                             .resizable()
                             .aspectRatio(contentMode: .fit)
-                            .frame(width: 20, height: 20)
+                            .frame(width: size20px, height: size20px)
                         Text("User Interface")
                     }
                 }
@@ -150,7 +151,7 @@ struct GeneralSettings: View {
                         Image(systemName: "shield.checkerboard")
                             .resizable()
                             .aspectRatio(contentMode: .fit)
-                            .frame(width: 20, height: 20)
+                            .frame(width: size20px, height: size20px)
                         Text("Security")
                     }
                 }
@@ -159,7 +160,7 @@ struct GeneralSettings: View {
                         Image(systemName: "eye")
                             .resizable()
                             .aspectRatio(contentMode: .fit)
-                            .frame(width: 20, height: 20)
+                            .frame(width: size20px, height: size20px)
                         Text("Privacy")
                     }
                 }
@@ -168,7 +169,7 @@ struct GeneralSettings: View {
                         Image(systemName: "text.bubble")
                             .resizable()
                             .aspectRatio(contentMode: .fit)
-                            .frame(width: 20, height: 20)
+                            .frame(width: size20px, height: size20px)
                         Text("Notifications")
                     }
                 }
@@ -177,7 +178,7 @@ struct GeneralSettings: View {
                         Image(systemName: "paperclip")
                             .resizable()
                             .aspectRatio(contentMode: .fit)
-                            .frame(width: 20, height: 20)
+                            .frame(width: size20px, height: size20px)
                         Text("Attachments")
                     }
                 }
@@ -189,7 +190,7 @@ struct GeneralSettings: View {
                         Image(systemName: "gear")
                             .resizable()
                             .aspectRatio(contentMode: .fit)
-                            .frame(width: 20, height: 20)
+                            .frame(width: size20px, height: size20px)
                         #if targetEnvironment(macCatalyst)
                             Text("Open macOS settings")
                         #else

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

@@ -529,6 +529,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/MLCall.m

@@ -287,14 +287,12 @@ +(NSSet*) keyPathsForValuesAffectingState
 
 -(xmpp*) account
 {
-    @synchronized(self) {
-        xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:self.contact.accountId];
-        MLAssert(account != nil, @"Account of call must be listed in MLXMPPManager connected accounts!", (@{
-            @"contact": nilWrapper(self.contact),
-            @"call": nilWrapper(self),
-        }));
-        return account;
-    }
+    xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:self.contact.accountId];
+    MLAssert(account != nil, @"Account of call must be listed in MLXMPPManager connected accounts!", (@{
+        @"contact": nilWrapper(self.contact),
+        @"call": nilWrapper(self),
+    }));
+    return account;
 }
 -(void) startCallDuartionTimer
 {
@@ -1320,16 +1318,44 @@ -(void) processIncomingICECandidate:(NSNotification*) notification
         return;
     }
 
+    //always fake candidate iqs to only contain one single candidate, even if multiple ones are listed (seems to be allowed as per XEP-0176)
+    NSMutableArray<XMPPIQ*>* candidates = [NSMutableArray new];
+    for(MLXMLNode* content in [iqNode find:@"{urn:xmpp:jingle:1}jingle/content"])
+    {
+        MLXMLNode* transport = [content findFirst:@"{urn:xmpp:jingle:transports:ice-udp:1}transport"];
+        for(MLXMLNode* candidate in [transport find:@"{urn:xmpp:jingle:transports:ice-udp:1}candidate"])
+        {
+            XMPPIQ* fakeCandidateIQ = [[XMPPIQ alloc] initWithType:kiqSetType];
+            fakeCandidateIQ.from = self.fullRemoteJid;
+            fakeCandidateIQ.to = self.account.connectionProperties.identity.fullJid;
+            MLXMLNode* shallowTransport = [transport shallowCopyWithData:YES];
+            [shallowTransport addChildNode:[transport removeChildNode:candidate]];
+            MLXMLNode* shallowContent = [content shallowCopyWithData:YES];
+            [shallowContent addChildNode:shallowTransport];
+            [fakeCandidateIQ addChildNode:[[MLXMLNode alloc] initWithElement:@"jingle" andNamespace:@"urn:xmpp:jingle:1" withAttributes:@{
+                @"action": @"transport-info",
+                @"sid": self.jmiid,
+            } andChildren:@[shallowContent] andData:nil]];
+            DDLogDebug(@"Adding faked incoming ICE candidate iq to candidates list: %@", fakeCandidateIQ);
+            [candidates addObject:fakeCandidateIQ];
+        }
+    }
+    
     @synchronized(self.candidateQueueLock) {
         //queue candidate if sdp offer or answer have not been processed yet
         if(self.remoteSDP == nil || self.localSDP == nil)
         {
-            DDLogDebug(@"Adding incoming ICE candidate iq to candidate queue: %@", iqNode);
-            [self.incomingCandidateQueue addObject:iqNode];
+            for(XMPPIQ* candidateIq in candidates)
+            {
+                DDLogDebug(@"Adding incoming ICE candidate iq to candidate queue: %@", candidateIq);
+                [self.incomingCandidateQueue addObject:candidateIq];
+            }
             return;
         }
     }
-    [self processRemoteICECandidate:iqNode];
+    
+    for(XMPPIQ* candidateIq in candidates)
+        [self processRemoteICECandidate:candidateIq];
 }
 
 -(void) processRemoteICECandidate:(XMPPIQ*) iqNode
@@ -1603,7 +1629,7 @@ -(void) processIncomingSDP:(NSNotification*) notification
     //handle session-terminate: fake jmi finish message and handle it
     else if([iqNode check:@"{urn:xmpp:jingle:1}jingle<action=session-terminate>"])
     {
-        if(self.jmiProceed == nil)
+        if(self.jmiProceed != nil)
         {
             DDLogDebug(@"Got jingle session-terminate after jmi proceed, faking incoming jmi:finish for Conversations compatibility...");
             XMPPMessage* jmiNode = [[XMPPMessage alloc] initWithType:kMessageChatType to:self.account.connectionProperties.identity.jid];

Monal/Classes/MLOMEMO.m

@@ -562,6 +562,7 @@ -(void) handleOwnDevicelistUpdate:(NSSet<NSNumber*>*) receivedDevices
 
 -(void) cleanupOwnOldDevices
 {
+    NSMutableArray* deletedDevices = [NSMutableArray new];
     NSString* jid = self.account.connectionProperties.identity.jid;
     for(NSNumber* device in [self.ownDeviceList copy])
     {
@@ -578,8 +579,14 @@ -(void) cleanupOwnOldDevices
         //remove own old devices (these clients will add thei id back, if they are still active)
         //this is what conversations does, too
         if(trust == MLOmemoToFUButNoMsgSeenInTime || trust == MLOmemoTrustedButNoMsgSeenInTime)
+        {
             [self bulkDeleteDeviceForSource:jid andRid:device];
+            [deletedDevices addObject:device];
+        }
     }
+    //publish our changes, but only if we actually changed someting
+    if(deletedDevices.count > 0)
+        [self publishOwnDeviceList];
 }
 
 -(void) publishOwnDeviceList