6.4.3 (#1192)

- Fix omemo handling when chatting with users not in the contact list - Improve PLAIN-only warning message on first login - Don't show spurious "new message" notifications for outgoing media files - Make sure to open the receiver's chat when sharing via sharesheet - Fix hang on startup - Fix SASL2 upgrade path for servers using LDAP as auth backend MACOS_ONLY - Fix crash when deleting account
monal-im · Aug 15, 2024 · 161e099 · 161e099
2 parents 61cff31 + cee3822
commit 161e099
Show file tree

Hide file tree

Showing 42 changed files with 531 additions and 384 deletions.
diff --git a/.github/workflows/beta.build-push.yml b/.github/workflows/beta.build-push.yml
@@ -39,6 +39,13 @@ jobs:
           lfs: true
       - name: Checkout submodules
         run: git submodule update -f --init --remote
+      - name: Check for proper semantic versioning
+        run: |
+          version="$(git log -n 1 --merges --pretty=format:%s | sed -E 's/^[\t\n ]*([^\n\t ]+)[\t\n ]+\(([^\n\t ]+)\)[\t\n ]*$/\1/g')"
+          if ! [[ "$version" =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$ ]]; then
+            echo "Invalid semver: '$version'!"
+            exit 1
+          fi
       - name: Get last build tag and increment it
         run: |
           oldBuildNumber=$(git tag --sort="v:refname" | grep "Build_iOS" | grep -v "Quicksy_Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
@@ -203,7 +210,10 @@ jobs:
           path: Monal/build/app/Monal.pkg
           if-no-files-found: error
       - name: Upload new catalyst beta to monal-im.org
-        run: ./scripts/uploadNonAlpha.sh beta
+        env:
+          UPLOAD_TYPE: beta
+          buildNumber: ${{ steps.releasenotes.outputs.buildNumber }}
+        run: ./scripts/uploadNonAlpha.sh
       - 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
         env:

diff --git a/.github/workflows/publish-quicksy-release.yml b/.github/workflows/publish-quicksy-release.yml
@@ -13,18 +13,18 @@ jobs:
       release-notes: ${{ steps.releasenotes.outputs.notes }}
       release-notes_ios: ${{ steps.releasenotes.outputs.notes_ios }}
     # create release only if the ios app made it to the appstore and ignore the macos appstore state
-    if: github.event.client_payload.Platform == 'iOS'
+    if: github.event.client_payload.platform == 'iOS'
     steps:
       # - run: |
-      #     echo ${{ github.event.client_payload.AppName }}
-      #     echo ${{ github.event.client_payload.Platform }}
-      #     echo ${{ github.event.client_payload.AppVersionNumber }}
+      #     echo ${{ github.event.client_payload.appName }}
+      #     echo ${{ github.event.client_payload.platform }}
+      #     echo ${{ github.event.client_payload.appVersionNumber }}
       - name: Load release info
         id: releasenotes
         run: |
-          buildNumber="$(fastlane run app_store_build_number api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" app_identifier:"G7YU7X7KRJ.SworIM" live:false version:"${{ github.event.client_payload.AppVersionNumber }}" 2>&1 | tee /dev/stderr | grep Result | sed -E 's/^.*Result: ([0-9]+).*$/\1/g')"
+          buildNumber="$(fastlane run app_store_build_number api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" app_identifier:"G7YU7X7KRJ.SworIM" live:false version:"${{ github.event.client_payload.appVersionNumber }}" 2>&1 | tee /dev/stderr | grep Result | sed -E 's/^.*Result: ([0-9]+).*$/\1/g')"
           mkdir -p /Users/ci/releases
-          OUTPUT_FILE="/Users/ci/releases/$buildNumber.output"
+          OUTPUT_FILE="/Users/ci/quicksy_releases/$buildNumber.output"
           touch "$OUTPUT_FILE"
           cat "$OUTPUT_FILE" >> "$GITHUB_OUTPUT"
 
diff --git a/.github/workflows/publish-stable-release.yml b/.github/workflows/publish-stable-release.yml
@@ -15,16 +15,16 @@ jobs:
       release-notes_macos: ${{ steps.releasenotes.outputs.notes_macos }}
       release-id: ${{ steps.releasenotes.outputs.releaseID }}
     # create release only if the ios app made it to the appstore and ignore the macos appstore state
-    if: github.event.client_payload.Platform == 'iOS'
+    if: github.event.client_payload.platform == 'iOS'
     steps:
       # - run: |
-      #     echo ${{ github.event.client_payload.AppName }}
-      #     echo ${{ github.event.client_payload.Platform }}
-      #     echo ${{ github.event.client_payload.AppVersionNumber }}
+      #     echo ${{ github.event.client_payload.appName }}
+      #     echo ${{ github.event.client_payload.platform }}
+      #     echo ${{ github.event.client_payload.appVersionNumber }}
       - name: Load release info
         id: releasenotes
         run: |
-          buildNumber="$(fastlane run app_store_build_number api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" app_identifier:"G7YU7X7KRJ.SworIM" live:false version:"${{ github.event.client_payload.AppVersionNumber }}" 2>&1 | tee /dev/stderr | grep Result | sed -E 's/^.*Result: ([0-9]+).*$/\1/g')"
+          buildNumber="$(fastlane run app_store_build_number api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" app_identifier:"G7YU7X7KRJ.SworIM" live:false version:"${{ github.event.client_payload.appVersionNumber }}" 2>&1 | tee /dev/stderr | grep Result | sed -E 's/^.*Result: ([0-9]+).*$/\1/g')"
           mkdir -p /Users/ci/releases
           OUTPUT_FILE="/Users/ci/releases/$buildNumber.output"
           touch "$OUTPUT_FILE"

diff --git a/.github/workflows/quicksy.build-push.yml b/.github/workflows/quicksy.build-push.yml
@@ -18,8 +18,7 @@ jobs:
     env:
       APP_NAME: "Quicksy"
       BUILD_SCHEME: "Quicksy"
-      APP_DIR: "Monal.app"
-      BUILD_TYPE: "AppStore"
+      BUILD_TYPE: "AppStore-Quicksy"
       EXPORT_OPTIONS_IOS: "../scripts/exportOptions/Quicksy_Stable_iOS_ExportOptions.plist"
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -33,6 +32,18 @@ jobs:
           lfs: true
       - name: Checkout submodules
         run: git submodule update -f --init --remote
+      - name: Check for proper semantic versioning
+        run: |
+          buildNumber="$(git tag --sort="v:refname" | grep "Quicksy_Build_iOS" | tail -n1 | sed 's/Quicksy_Build_iOS_//g')"
+          version="$(git log -n 1 --merges --pretty=format:%s | sed -E 's/^[\t\n ]*([^\n\t ]+)[\t\n ]+\(([^\n\t ]+)\)[\t\n ]*$/\1/g')"
+          if [ "${{ github.ref }}" != "refs/heads/stable" ]; then
+            version="1.$buildNumber.0"
+          fi
+          
+          if ! [[ "$version" =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$ ]]; then
+            echo "Invalid semver: '$version'!"
+            exit 1
+          fi
       - name: Get last build tag and increment it
         run: |
           oldBuildNumber=$(git tag --sort="v:refname" | grep "Quicksy_Build_iOS" | tail -n1 | sed 's/Quicksy_Build_iOS_//g')
@@ -60,9 +71,11 @@ jobs:
           }
           buildNumber="$(git tag --sort="v:refname" | grep "Quicksy_Build_iOS" | tail -n1 | sed 's/Quicksy_Build_iOS_//g')"
           version="$(git log -n 1 --merges --pretty=format:%s | sed -E 's/^[\t\n ]*([^\n\t ]+)[\t\n ]+\(([^\n\t ]+)\)[\t\n ]*$/\1/g')"
-          version="6.4.2"
-          mkdir -p /Users/ci/releases
-          OUTPUT_FILE="/Users/ci/releases/$buildNumber.output"
+          if [ "${{ github.ref }}" != "refs/heads/stable" ]; then
+            version="1.$buildNumber"
+          fi
+          mkdir -p /Users/ci/quicksy_releases
+          OUTPUT_FILE="/Users/ci/quicksy_releases/$buildNumber.output"
           touch "$OUTPUT_FILE"
           echo "OUTPUT_FILE=$OUTPUT_FILE" | tee /dev/stderr >> "$GITHUB_OUTPUT"
           
@@ -103,15 +116,15 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: monal-ios
-          path: Monal/build/ipa/Monal.ipa
+          path: Monal/build/ipa/Quicksy.ipa
           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
       - 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)"
+        run: xcrun altool --validate-app --file ./Monal/build/ipa/Quicksy.ipa --type ios -u $(cat /Users/ci/apple_connect_upload_mail.txt) -p "$(cat /Users/ci/apple_connect_upload_secret.txt)"
       - name: push tag to stable repo
         run: |
           buildNumber=$(git tag --sort="v:refname" | grep "Quicksy_Build_iOS" | tail -n1 | sed 's/Quicksy_Build_iOS_//g')
@@ -132,11 +145,11 @@ jobs:
           done
           echo "path_ios=$path_ios" | tee /dev/stderr >> "$GITHUB_OUTPUT"
       - 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)"
+        #run: xcrun altool --upload-app --file ./Monal/build/ipa/Quicksy.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:
           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 }}" platform:ios 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" ipa:"./Monal/build/ipa/Quicksy.ipa" app_version:"${{ steps.releasenotes.outputs.version }}" platform:ios 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: Remove fastlane metadata directory
         run: |
           rm -rf "${{ steps.metadata.outputs.path }}"
diff --git a/.github/workflows/stable.build-push.yml b/.github/workflows/stable.build-push.yml
@@ -35,6 +35,13 @@ jobs:
           lfs: true
       - name: Checkout submodules
         run: git submodule update -f --init --remote
+      - name: Check for proper semantic versioning
+        run: |
+          version="$(git log -n 1 --merges --pretty=format:%s | sed -E 's/^[\t\n ]*([^\n\t ]+)[\t\n ]+\(([^\n\t ]+)\)[\t\n ]*$/\1/g')"
+          if ! [[ "$version" =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$ ]]; then
+            echo "Invalid semver: '$version'!"
+            exit 1
+          fi
       - name: Get last build tag and increment it
         run: |
           oldBuildNumber=$(git tag --sort="v:refname" | grep "Build_iOS" | grep -v "Quicksy_Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
@@ -175,7 +182,10 @@ jobs:
           path: Monal/build/app/Monal.pkg
           if-no-files-found: error
       - name: Upload new catalyst stable to monal-im.org
-        run: ./scripts/uploadNonAlpha.sh stable
+        env:
+          UPLOAD_TYPE: stable
+          buildNumber: ${{ steps.releasenotes.outputs.buildNumber }}
+        run: ./scripts/uploadNonAlpha.sh
       - 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:

diff --git a/Monal/Classes/AVCallUI.swift b/Monal/Classes/AVCallUI.swift
@@ -284,9 +284,14 @@ struct AVCallUI: View {
                             VStack {
                                 Spacer().frame(height: 8)
                                 Button(action: {
-                                    self.delegate.dismissWithoutAnimation()
                                     if let activeChats = self.appDelegate.obj.activeChats {
-                                        activeChats.presentChat(with:self.contact.obj)
+                                        //make sure we don't animate anything
+                                        activeChats.dismissCompleteViewChain(withAnimation: false) {
+                                            activeChats.presentChat(with:self.contact.obj)
+                                        }
+                                    } else {
+                                        //self.delegate.dismissWithoutAnimation()
+                                        unreachable("active chats should always be accessible from AVCallUI!")
                                     }
                                 }, label: {
                                     Image(systemName: "text.bubble")

diff --git a/Monal/Classes/ActiveChatsViewController.h b/Monal/Classes/ActiveChatsViewController.h
@@ -49,6 +49,8 @@ NS_ASSUME_NONNULL_BEGIN
 -(void) showAddContact;
 -(void) sheetDismissed;
 
+-(void) dismissCompleteViewChainWithAnimation:(BOOL) animation andCompletion:(monal_void_block_t _Nullable) completion;
+
 @end
 
 NS_ASSUME_NONNULL_END