6.4.2-rc5 (#1173)

- Add setting to configure if file transfers should show up in Files App - Fixed translatability - Bumped WebRTC lib to version 127 - Translations for appstore descriptions (DE, EN, RO, FR)
monal-im · Aug 1, 2024 · 516e5e0 · 516e5e0
2 parents 9cb55d5 + 2090e5d
commit 516e5e0
Show file tree

Hide file tree

Showing 17 changed files with 133 additions and 59 deletions.
diff --git a/.github/workflows/beta.build-push.yml b/.github/workflows/beta.build-push.yml
@@ -41,7 +41,7 @@ jobs:
         run: git submodule update -f --init --remote
       - name: Get last build tag and increment it
         run: |
-          oldBuildNumber=$(git tag --sort="v:refname" |grep "Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
+          oldBuildNumber=$(git tag --sort="v:refname" | grep "Build_iOS" | grep -v "Quicksy_Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
           buildNumber=$(expr $oldBuildNumber + 1)
           echo "New buildNumber is $buildNumber"
           git tag Build_iOS_$buildNumber
@@ -64,7 +64,7 @@ jobs:
                   printf("\n")
               }'
           }
-          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" | grep -v "Quicksy_Build_iOS" | tail -n1 | sed 's/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')"
           mkdir -p /Users/ci/releases
           OUTPUT_FILE="/Users/ci/releases/$buildNumber.output"
@@ -124,40 +124,64 @@ jobs:
         run: xcrun altool --validate-app --file ./Monal/build/ipa/Monal.ipa --type ios --asc-provider S8D843U34Y -u "$(cat /Users/ci/apple_connect_upload_mail.txt)" -p "$(cat /Users/ci/apple_connect_upload_secret.txt)"
       - name: Push beta tag to repo
         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" | grep -v "Quicksy_Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
           git push origin Build_iOS_$buildNumber
-      - name: Create fastlane whatsNew hash in environment
-        id: buildinfo
-        env:
-          CHANGELOG_IOS: ${{ steps.releasenotes.outputs.notes_ios }}
-          CHANGELOG_MACOS: ${{ steps.releasenotes.outputs.notes_macos }}
+#       - name: Create fastlane whatsNew hash in environment
+#         id: buildinfo
+#         env:
+#           CHANGELOG_IOS: ${{ steps.releasenotes.outputs.notes_ios }}
+#           CHANGELOG_MACOS: ${{ steps.releasenotes.outputs.notes_macos }}
+#         run: |
+#           get_changelog() {
+#             local escaped=$(printf '%s\n' "$1" | jq -sRr @json)
+#             local json="{\"default\": {\"whats_new\": $escaped},"
+#             # for dir in ./appstore_metadata/*/; do
+#             #   dir="$(basename "$dir")"
+#             #   if [[ -d "./appstore_metadata/$dir" && "$dir" == *-* ]]; then
+#             #     json="$json\"${dir%/}\": {\"whats_new\": $escaped},"
+#             #   fi
+#             # done
+#             json="${json%,}}"
+#             echo "$json"
+#           }
+#           echo "buildinfo_ios<<__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
+#           echo "$(get_changelog "$CHANGELOG_IOS")" | tee /dev/stderr >> "$GITHUB_OUTPUT"
+#           echo "__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
+#           
+#           echo "buildinfo_macos<<__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
+#           echo "$(get_changelog "$CHANGELOG_MACOS")" | tee /dev/stderr >> "$GITHUB_OUTPUT"
+#           echo "__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
+      - name: Create fastlane localized_app_info hash in environment
+        id: appinfo
         run: |
-          get_changelog() {
-            local escaped=$(printf '%s\n' "$1" | jq -sRr @json)
-            local json="{\"default\":{\"whats_new\":$escaped},"
-            for dir in ./appstore_metadata/*/; do
-              dir="$(basename "$dir")"
-              if [[ -d "./appstore_metadata/$dir" && "$dir" == *-* ]]; then
-                json="$json\"${dir%/}\":{\"whats_new\":$escaped},"
-              fi
-            done
-            json="${json%,}}"
+          build_appinfo_entry() {
+            local escaped_marketing_url=$(cat ./appstore_metadata/en-US/marketing_url.txt | jq -sRr @json)
+            local escaped_privacy_policy_url=$(cat ./appstore_metadata/en-US/privacy_url.txt | jq -sRr @json)
+            local json="{\"feedback_email\": \"[email protected]\", \"marketing_url\": $escaped_marketing_url, \"privacy_policy_url\": $escaped_privacy_policy_url, \"description\": \"\"}"
             echo "$json"
           }
-          echo "buildinfo_ios<<__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
-          echo "$(get_changelog "$CHANGELOG_IOS")" | tee /dev/stderr >> "$GITHUB_OUTPUT"
-          echo "__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
           
-          echo "buildinfo_macos<<__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
-          echo "$(get_changelog "$CHANGELOG_MACOS")" | tee /dev/stderr >> "$GITHUB_OUTPUT"
+          json="{"
+          json="$json\"default\": $(build_appinfo_entry),"
+          for dir in ./appstore_metadata/*/; do
+            dir="$(basename "$dir")"
+            if [[ -d "./appstore_metadata/$dir" && "$dir" == *-* ]]; then
+              json="$json\"${dir%/}\": $(build_appinfo_entry),"
+            fi
+          done
+          json="${json%,}}"
+          
+          echo "appinfo<<__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
+          echo "$json" | tee /dev/stderr >> "$GITHUB_OUTPUT"
           echo "__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
       - name: Publish ios to appstore connect
         #run: xcrun altool --upload-app -f ./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:
-          PILOT_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_ios }}
+          #PILOT_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_ios }}
+          PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo }}
           PILOT_CHANGELOG: ${{ steps.releasenotes.outputs.notes_ios }}
         run: |
-          fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" distribute_external:true groups:"Internal Pre-Beta Testers","Public Beta" reject_build_waiting_for_review:true submit_beta_review:true
+          fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" distribute_external:true notify_external_testers:true groups:"Internal Pre-Beta Testers","Public Beta" reject_build_waiting_for_review:true submit_beta_review: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
@@ -182,10 +206,11 @@ 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 org.monal-im.prod.catalyst.monal
         env:
-          PILOT_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_macos }}
+          #PILOT_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_macos }}
+          PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo }}
           PILOT_CHANGELOG: ${{ steps.releasenotes.outputs.notes_macos }}
         run: |
-          fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" pkg:"./Monal/build/app/Monal.pkg" distribute_external:true groups:"Internal Pre-Beta Testers","Public Beta" reject_build_waiting_for_review:true submit_beta_review:true
+          fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" pkg:"./Monal/build/app/Monal.pkg" distribute_external:true notify_external_testers:true groups:"Internal Pre-Beta Testers","Public Beta" reject_build_waiting_for_review:true submit_beta_review:true
       - name: Release
         uses: softprops/action-gh-release@v2
         with:

diff --git a/.github/workflows/quicksy.build-push.yml b/.github/workflows/quicksy.build-push.yml
@@ -35,7 +35,7 @@ jobs:
         run: git submodule update -f --init --remote
       - 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')
+          oldBuildNumber=$(git tag --sort="v:refname" | grep "Quicksy_Build_iOS" | tail -n1 | sed 's/Quicksy_Build_iOS_//g')
           buildNumber=$(expr $oldBuildNumber + 1)
           echo "New buildNumber is $buildNumber"
           git tag Quicksy_Build_iOS_$buildNumber
@@ -58,15 +58,16 @@ jobs:
                   printf("\n")
               }'
           }
-          buildNumber="$(git tag --sort="v:refname" | grep "Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')"
+          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"
           touch "$OUTPUT_FILE"
           echo "OUTPUT_FILE=$OUTPUT_FILE" | tee /dev/stderr >> "$GITHUB_OUTPUT"
           
           echo "buildNumber=$buildNumber" | tee /dev/stderr >> "$OUTPUT_FILE"
-          echo "tag=Build_iOS_$buildNumber" | tee /dev/stderr >> "$OUTPUT_FILE"
+          echo "tag=Quicksy_Build_iOS_$buildNumber" | tee /dev/stderr >> "$OUTPUT_FILE"
           echo "version=$version" | tee /dev/stderr >> "$OUTPUT_FILE"
           echo "buildVersion=$(echo "$version" | grep -oE '^[0-9]+(\.[0-9]+){0,2}')" | tee /dev/stderr >> "$OUTPUT_FILE"
           
@@ -114,7 +115,7 @@ jobs:
       - 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')
-          git push origin Build_iOS_$buildNumber
+          git push origin Quicksy_Build_iOS_$buildNumber
       - name: Create fastlane metadata directory
         id: metadata
         env:

diff --git a/.github/workflows/stable.build-push.yml b/.github/workflows/stable.build-push.yml
@@ -37,7 +37,7 @@ jobs:
         run: git submodule update -f --init --remote
       - name: Get last build tag and increment it
         run: |
-          oldBuildNumber=$(git tag --sort="v:refname" |grep "Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
+          oldBuildNumber=$(git tag --sort="v:refname" | grep "Build_iOS" | grep -v "Quicksy_Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
           buildNumber=$(expr $oldBuildNumber + 1)
           echo "New buildNumber is $buildNumber"
           git tag Build_iOS_$buildNumber
@@ -60,7 +60,7 @@ jobs:
                   printf("\n")
               }'
           }
-          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" | grep -v "Quicksy_Build_iOS" | tail -n1 | sed 's/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')"
           mkdir -p /Users/ci/releases
           OUTPUT_FILE="/Users/ci/releases/$buildNumber.output"
@@ -120,7 +120,7 @@ jobs:
         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: push tag to stable repo
         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" | grep -v "Quicksy_Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
           git push origin Build_iOS_$buildNumber
       - name: Create fastlane metadata directory
         id: metadata

diff --git a/Monal/Podfile.lock b/Monal/Podfile.lock
@@ -62,7 +62,7 @@ PODS:
   - "sqlite3/common (3.46.0+1)"
   - "sqlite3/perf-threadsafe (3.46.0+1)":
     - sqlite3/common
-  - WebRTC-lib (126.0.0)
+  - WebRTC-lib (127.0.0)
 
 DEPENDENCIES:
   - ASN1Decoder
@@ -133,7 +133,7 @@ SPEC CHECKSUMS:
   SignalProtocolObjC: 1beb46b1d35733e7ab96a919f88bac20ec771c73
   SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
   sqlite3: 292c3e1bfe89f64e51ea7fc7dab9182a017c8630
-  WebRTC-lib: 7e2e15d90ebca6e08a1eb5d4afc365d70e4b95b0
+  WebRTC-lib: 3e56b5c5fe21b0d6b682e543c39f68c81ccc8f26
 
 PODFILE CHECKSUM: e66b7bd410467c69adaa2ca9b0fca4fb025d8aa4
 

diff --git a/appstore_metadata/en-US/description.txt b/appstore_metadata/en-US/description.txt
@@ -2,19 +2,19 @@ There has never been a better time to get into XMPP, a free public chat network
 
 Notable features:
 - Open Source
-- No Ads! Strong focus on privacy. Does not phone home and does not have "metrics" software 
-- Does not read any personal information. 
-- With a direct connection to your server, your password  and all other info is never sent to a third party.
+- No Ads! Strong focus on privacy. Does not phone home and does not have software "metrics" 
+- Does not read any personal information
+- With a direct connection to your server, your password and all other info are never sent to a third-party
 - OMEMO encrypted chat
 - Will work with corporate XMPP servers that require VPN
-- MUC multi user chat
+- Multi user chat (MUC) support for group chats
 - Audio/Video calls
 
-Implements XMPP certain extensions intended to improve mobile communication.
+Implements certain XMPP extensions intended to improve mobile communication:
 - XEP-0357: Push Notifications
-- XEP-0280: Message Carbons keep messages in synch between clients.
-- XEP-0198: Stream Management to quickly reconnect.
-- XEP-0199: XMPP Ping to maintain connections.
-- XEP-0313: Message Archive Management to download chat history.
-- XEP-0352: Client State Indication for dramatic reduction on power use.
-- XEP-0363: HTTP File Upload to send images in conversations.
+- XEP-0280: Message Carbons keep messages in synch between clients
+- XEP-0198: Stream Management to quickly reconnect
+- XEP-0199: XMPP Ping to maintain connections
+- XEP-0313: Message Archive Management to download chat history
+- XEP-0352: Client State Indication for dramatic reduction on power use
+- XEP-0363: HTTP File Upload to send images in conversations
diff --git a/appstore_metadata/fr-FR/description.txt b/appstore_metadata/fr-FR/description.txt
@@ -0,0 +1,20 @@
+C’est le meilleur moment pour se mettre à XMPP, un réseau de chat public libre que personne ne contrôle ou possède. Monal est une application facile à utiliser pour rejoindre le réseau XMPP. Téléchargez l’application, créez un compte, et ça y est vous pouvez chatter en quelques minutes. Elle est fonctionnellement identique aux applications de chat que vous connaissez, donc il n’y a aucun besoin d’« apprendre XMPP » ou même de se préoccuper de ce que c’est.
+
+Fonctionalités notables :
+- Open Source
+- Aucune pub ! Mettant l’accent sur la vie privée, Monal n’utilise aucune fonctionnalité de tracking.
+- Ne lit aucune information personnelle.
+- Avec une connexion directe à votre serveur, votre mot de passe et toutes vos autres informations ne sont jamais envoyées à un tiers.
+- Chat chiffré avec OMEMO.
+- Fonctionne avec les serveurs XMPP d’entreprises qui nécessitent un VPN.
+- Chat multi-utilisateur·ice·s grâce à MUC.
+- Appels audio/video.
+
+Implémente certaines extensions XMPP pour améliorer les communications mobiles :
+- XEP-0357: Push Notifications, pour avoir des notifications même quand l’application est fermée.
+- XEP-0280: Message Carbons, pour garder les messages synchronisés entre clients.
+- XEP-0198: Stream Management, pour se reconnecter rapidement.
+- XEP-0199: XMPP Ping, pour maintenir la connexion.
+- XEP-0313: Message Archive Management, pour récupérer l’historique des messages.
+- XEP-0352: Client State Indication, pour diminuer drastiquement la consommation énergétique.
+- XEP-0363: HTTP File Upload, pour envoyer des images, des messages vocaux ou des fichiers dans les conversations.
diff --git a/appstore_metadata/fr-FR/keywords.txt b/appstore_metadata/fr-FR/keywords.txt
@@ -0,0 +1 @@
+xmpp, jabber, chat, messagerie instantanée, messages, ejabberd, prosody, OMEMO
diff --git a/appstore_metadata/fr-FR/marketing_url.txt b/appstore_metadata/fr-FR/marketing_url.txt
@@ -0,0 +1 @@
+https://monal-im.org/
diff --git a/appstore_metadata/fr-FR/privacy_url.txt b/appstore_metadata/fr-FR/privacy_url.txt
@@ -0,0 +1 @@
+https://monal-im.org/privacy/
diff --git a/appstore_metadata/fr-FR/support_url.txt b/appstore_metadata/fr-FR/support_url.txt
@@ -0,0 +1 @@
+https://monal-im.org/support/
diff --git a/appstore_metadata/ro-RO/description.txt b/appstore_metadata/ro-RO/description.txt
@@ -0,0 +1,20 @@
+Nu a existat niciodată un moment mai bun pentru a utiliza XMPP, o rețea publică gratuită de chat pe care nimeni nu o controlează și nu o deține. Monal este un mod rapid și prietenos de a utiliza XMPP. Trebuie doar să descărcați aplicația, să vă autentificați sau să vă înregistrați și sunteți gata de discuții în câteva minute. Arată și funcționează la fel ca alte aplicații, deci nu este nevoie să "învățați XMPP" sau chiar să vă pese ce este.
+
+Caracteristici notabile:
+- Sursă deschisă
+- Fără reclame! Accent puternic pe confidențialitate. Nu transmite date altora și nu vă analizează acțiunile
+- Nu citește nicio informație personală
+- Cu o conexiune directă la serverul dvs., parola dvs. și toate celelalte informații nu sunt niciodată trimise unei terțe părți
+- Discuții criptate cu OMEMO
+- Va funcționa cu servere XMPP corporatiste care necesită VPN
+- Discuții de grup MUC
+- Apeluri audio/video
+
+Implementează anumite extensii XMPP menite să îmbunătățească comunicarea mobilă.
+- XEP-0357: Notificări push
+- XEP-0280: Message Carbons menține mesajele sincronizate între clienți
+- XEP-0198: Stream Management pentru reconectarea rapidă
+- XEP-0199: Ping XMPP pentru menținerea conexiunilor
+- XEP-0313: Message Archive Management pentru a descărca istoricul conversațiilor
+- XEP-0352: Client State Indication pentru reducerea drastică a consumului de energie
+- XEP-0363: HTTP File Upload pentru a trimite imagini în conversații
diff --git a/appstore_metadata/ro-RO/keywords.txt b/appstore_metadata/ro-RO/keywords.txt
@@ -0,0 +1 @@
+xmpp, jabber, discutie, mesagerie instantanee, mesagerie, ejabberd, prosody, OMEMO
diff --git a/appstore_metadata/ro-RO/marketing_url.txt b/appstore_metadata/ro-RO/marketing_url.txt
@@ -0,0 +1 @@
+https://monal-im.org/
diff --git a/appstore_metadata/ro-RO/privacy_url.txt b/appstore_metadata/ro-RO/privacy_url.txt
@@ -0,0 +1 @@
+https://monal-im.org/privacy/
diff --git a/appstore_metadata/ro-RO/support_url.txt b/appstore_metadata/ro-RO/support_url.txt
@@ -0,0 +1 @@
+https://monal-im.org/support/
diff --git a/rust/Cargo.lock b/rust/Cargo.lock