7.0

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

@@ -13,7 +13,7 @@ on:
 jobs:
   # This workflow contains a single job called "build"
   buildAndPublishBeta:
-    # The type of runner that the job will run on
+    name: "Build and Publish Beta Release"
     runs-on: self-hosted
     env:
       APP_NAME: "Monal"
@@ -70,28 +70,45 @@ jobs:
         run: ./scripts/uploadNonAlpha.sh beta
       - 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 org.monal-im.prod.catalyst.monal
-      - name: Update translations
-        run: |
-          chmod +x ./scripts/updateLocalization.sh
-          chmod +x ./scripts/xliff_extractor.py
-          ./scripts/updateLocalization.sh BUILDSERVER
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: monal-catalyst
           path: Monal/build/app/Monal.zip
           if-no-files-found: error
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: monal-ios
           path: Monal/build/ipa/Monal.ipa
           if-no-files-found: error
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: monal-catalyst-dsym
           path: Monal/build/macos_Monal.xcarchive/dSYMs
           if-no-files-found: error
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: monal-ios-dsym
           path: Monal/build/ios_Monal.xcarchive/dSYMs
           if-no-files-found: error
+
+  updateTranslations:
+    name: Update Translations using Beta-Branch
+    runs-on: self-hosted
+    needs: [buildAndPublishBeta]
+    env:
+      APP_NAME: "Monal"
+      APP_DIR: "Monal.app"
+      BUILD_TYPE: "Beta"
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          clean: true
+          submodules: true
+      - name: Checkout submodules
+        run: git submodule update -f --init --remote
+      - name: Update translations
+        run: |
+          chmod +x ./scripts/updateLocalization.sh
+          chmod +x ./scripts/xliff_extractor.py
+          ./scripts/updateLocalization.sh BUILDSERVER

.github/workflows/develop-push.yml

@@ -64,23 +64,28 @@ jobs:
         run: xcrun notarytool submit ./Monal/build/app/Monal.alpha.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: Update monal homebrew alpha repo
         run: scripts/updateAlphaHomebrew.sh
-      #- uses: actions/upload-artifact@v3
-      #  with:
-      #    name: monal-catalyst
-      #    path: "Monal/build/app/Monal.alpha.tar"
-      #    if-no-files-found: error
-      #- uses: actions/upload-artifact@v3
-      #  with:
-      #    name: monal-ios
-      #    path: "Monal/build/ipa/Monal.alpha.ipa"
-      #    if-no-files-found: error
-      #- uses: actions/upload-artifact@v3
-      #  with:
+      - uses: actions/upload-artifact@v4
+        with:
+         name: monal-catalyst
+         path: "Monal/build/app/Monal.alpha.tar"
+         if-no-files-found: error
+      - uses: actions/upload-artifact@v4
+        with:
+         name: monal-ios
+         path: "Monal/build/ipa/Monal.alpha.ipa"
+         if-no-files-found: error
+      # - uses: actions/upload-artifact@v4
+      #   with:
       #    name: monal-catalyst-dsym
       #    path: Monal/build/macos_Monal.xcarchive/dSYMs
       #    if-no-files-found: error
-      #- uses: actions/upload-artifact@v3
-      #  with:
+      # - uses: actions/upload-artifact@v4
+      #   with:
       #    name: monal-ios-dsym
       #    path: Monal/build/ios_Monal.xcarchive/dSYMs
       #    if-no-files-found: error
+      # - name: Update translations
+      #   run: |
+      #     chmod +x ./scripts/updateLocalization.sh
+      #     chmod +x ./scripts/xliff_extractor.py
+      #     ./scripts/updateLocalization.sh NOCOMMIT

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

@@ -76,41 +76,41 @@ jobs:
       - name: Extract version number and changelog from newest merge commit
         id: releasenotes
         run: |
-          buildNumber=$(git tag --sort="v:refname" |grep "Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
+          buildNumber=$(git tag --sort="v:refname" | grep "Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
           echo "tag=Build_iOS_$buildNumber" >> "$GITHUB_OUTPUT"
-          echo "name=$(git log -n 1 --merges --pretty=format:%s)" >> "$GITHUB_OUTPUT"
+          echo "name=$(git log -n 1 --merges --pretty=format:%s | sed -E 's/^\s*([^\s]+)\s+\(([^\s]+)\)$/\1 (Build '$buildNumber', PR \2)/g')" >> "$GITHUB_OUTPUT"
           echo "notes=$(git log -n 1 --merges --pretty=format:%b)" >> "$GITHUB_OUTPUT"
       - name: Release
         uses: softprops/action-gh-release@v2
         with:
-          name: Release ${{ steps.releasenotes.outputs.name }}
-          tag_name: ${{ steps.releasenotes.outputs.tag }}
+          name: "Release ${{ steps.releasenotes.outputs.name }}"
+          tag_name: "${{ steps.releasenotes.outputs.tag }}"
           target_commitish: stable
           generate_release_notes: false
-          body: ${{ steps.releasenotes.outputs.notes }}
+          body: "${{ steps.releasenotes.outputs.notes }}"
           files: |
             ./Monal/build/ipa/Monal.ipa
             ./Monal/build/app/Monal.zip
           fail_on_unmatched_files: true
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: false
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: monal-catalyst-pkg
           path: Monal/build/app/Monal.pkg
           if-no-files-found: error
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: monal-ios
           path: Monal/build/ipa/Monal.ipa
           if-no-files-found: error
-      - uses: actions/upload-artifact@v3
-        with:
-          name: monal-catalyst-dsym
-          path: Monal/build/macos_Monal.xcarchive/dSYMs
-          if-no-files-found: error
-      - uses: actions/upload-artifact@v3
-        with:
-          name: monal-ios-dsym
-          path: Monal/build/ios_Monal.xcarchive/dSYMs
-          if-no-files-found: error
+      # - uses: actions/upload-artifact@v4
+      #   with:
+      #     name: monal-catalyst-dsym
+      #     path: Monal/build/macos_Monal.xcarchive/dSYMs
+      #     if-no-files-found: error
+      # - uses: actions/upload-artifact@v4
+      #   with:
+      #     name: monal-ios-dsym
+      #     path: Monal/build/ios_Monal.xcarchive/dSYMs
+      #     if-no-files-found: error

.github/workflows/update-translations.yml

@@ -0,0 +1,33 @@
+# build a new beta release and push it to apple
+name: update-translations
+
+# Controls when the action will run.
+on:
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  updateTranslations:
+    # The type of runner that the job will run on
+    runs-on: self-hosted
+    env:
+      APP_NAME: "Monal"
+      APP_DIR: "Monal.app"
+      BUILD_TYPE: "Beta"
+      EXPORT_OPTIONS_CATALYST_APPSTORE: "../scripts/exportOptions/Stable_Catalyst_ExportOptions.plist"
+      EXPORT_OPTIONS_CATALYST_APP_EXPORT: "../scripts/exportOptions/Beta_Catalyst_ExportOptions.plist"
+      EXPORT_OPTIONS_IOS: "../scripts/exportOptions/Beta_iOS_ExportOptions.plist"
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          clean: true
+          submodules: true
+      - name: Checkout submodules
+        run: git submodule update -f --init --remote
+      - name: Update translations
+        run: |
+          chmod +x ./scripts/updateLocalization.sh
+          chmod +x ./scripts/xliff_extractor.py
+          ./scripts/updateLocalization.sh BUILDSERVER

Monal/Alpha.Monal.macos.entitlements

@@ -4,6 +4,8 @@
 <dict>
 	<key>aps-environment</key>
 	<string>production</string>
+	<key>com.apple.developer.usernotifications.filtering</key>
+	<true/>
 	<key>com.apple.developer.usernotifications.communication</key>
 	<true/>
 	<key>com.apple.security.app-sandbox</key>
@@ -20,6 +22,8 @@
 	<true/>
 	<key>com.apple.security.network.client</key>
 	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
 	<key>com.apple.security.personal-information.location</key>
 	<true/>
 	<key>keychain-access-groups</key>

Monal/Classes/AccountPicker.swift

@@ -6,9 +6,6 @@
 //  Copyright © 2023 monal-im.org. All rights reserved.
 //
 
-import SwiftUI
-import monalxmpp
-
 struct AccountPicker: View {
     let delegate: SheetDismisserProtocol
     let contacts: [MLContact]
@@ -43,25 +40,15 @@ struct AccountPicker: View {
                 .frame(maxWidth: .infinity)
                 .background(Color(UIColor.systemBackground))
 
-                let appDelegate = UIApplication.shared.delegate as! MonalAppDelegate
                 List {
                     ForEach(contacts) { contact in
                         if let accountEntry = DataLayer.sharedInstance().details(forAccount:contact.accountId) {
                             let accountJid = "\(accountEntry["username"] ?? "<unknown>" as NSString)@\(accountEntry["domain"] ?? "<unknown>" as NSString)"
-                            let accountDisplayName = MLContact.ownDisplayName(forAccount:MLXMPPManager.sharedInstance().getConnectedAccount(forID: contact.accountId)!) as String
                             let accountContact = MLContact.createContact(fromJid:accountJid, andAccountNo:accountEntry["account_id"] as! NSNumber)
                             Button {
-                                appDelegate.activeChats!.call(contact, with:callType)
+                                (UIApplication.shared.delegate as! MonalAppDelegate).activeChats!.call(contact, with:callType)
                             } label: {
-                                HStack(alignment: .center) {
-                                    Image(uiImage: MLImageManager.sharedInstance().getIconFor(accountContact)!)
-                                        .resizable()
-                                        .frame(width: 40, height: 40, alignment: .center)
-                                    VStack(alignment: .leading) {
-                                        Text(accountDisplayName)
-                                        Text(accountJid).font(.footnote).opacity(0.6)
-                                    }
-                                }
+                                ContactEntry(contact:ObservableKVOWrapper(accountContact), selfnotesPrefix:false)
                             }
                         }
                     }

Monal/Classes/ActiveChatsViewController.h

@@ -39,6 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
 -(void) deleteConversation;
 -(void) showSettings;
 -(void) showPrivacySettings;
+-(void) showNotificationSettings;
 -(void) showDetails;
 -(void) showRegisterWithUsername:(NSString*) username onHost:(NSString*) host withToken:(NSString* _Nullable) token usingCompletion:(monal_id_block_t _Nullable) callback;
 -(void) showAddContactWithJid:(NSString*) jid preauthToken:(NSString* _Nullable) preauthToken prefillAccount:(xmpp* _Nullable) account andOmemoFingerprints:(NSDictionary* _Nullable) fingerprints;

Monal/Classes/ActiveChatsViewController.m

@@ -454,7 +454,7 @@ -(void) showWarningsIfNeeded
 
             if(![_mamWarningDisplayed containsObject:accountNo] && account.accountState >= kStateBound && account.connectionProperties.accountDiscoDone)
             {
-                if(!account.connectionProperties.supportsMam2)
+                if(![account.connectionProperties.accountDiscoFeatures containsObject:@"urn:xmpp:mam:2"])
                 {
                     UIAlertController* messageAlert = [UIAlertController alertControllerWithTitle:[NSString stringWithFormat:NSLocalizedString(@"Account %@", @""), account.connectionProperties.identity.jid] message:NSLocalizedString(@"Your server does not support MAM (XEP-0313). That means you could frequently miss incoming messages!! You should switch your server or talk to the server admin to enable this!", @"") preferredStyle:UIAlertControllerStyleAlert];
                     [messageAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Close", @"") style:UIAlertActionStyleCancel handler:^(UIAlertAction* action __unused) {
@@ -482,7 +482,7 @@ -(void) showWarningsIfNeeded
 
             if(![_pushWarningDisplayed containsObject:accountNo] && account.accountState >= kStateBound && account.connectionProperties.accountDiscoDone)
             {
-                if(!account.connectionProperties.supportsMam2)
+                if(![account.connectionProperties.accountDiscoFeatures containsObject:@"urn:xmpp:push:0"])
                 {
                     UIAlertController* messageAlert = [UIAlertController alertControllerWithTitle:[NSString stringWithFormat:NSLocalizedString(@"Account %@", @""), account.connectionProperties.identity.jid] message:NSLocalizedString(@"Your server does not support PUSH (XEP-0357). That means you have to manually open the app to retrieve new incoming messages!! You should switch your server or talk to the server admin to enable this!", @"") preferredStyle:UIAlertControllerStyleAlert];
                     [messageAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Close", @"") style:UIAlertActionStyleCancel handler:^(UIAlertAction* action __unused) {
@@ -508,6 +508,12 @@ -(void) openConversationPlaceholder:(MLContact*) contact
     }
 }
 
+-(void) showNotificationSettings
+{
+    UIViewController* view = [[SwiftuiInterface new] makeViewWithName:@"ActiveChatsNotificatioSettings"];
+    [self presentViewController:view animated:YES completion:^{}];
+}
+
 -(void) showPrivacySettings
 {
     UIViewController* view = [[SwiftuiInterface new] makeViewWithName:@"ActiveChatsPrivacySettings"];