-
-
Notifications
You must be signed in to change notification settings - Fork 109
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Fix flickering of chat background image - Make keyboard auto-appear configurable - Improve error propagation when uploading/downloading files - Fix detection of omemo keys for groupchats - Make several UI elements translatable now - Fix error handling when creating groups - Show used / discovered MUC servers in server details
- Loading branch information
Showing
32 changed files
with
486 additions
and
239 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -136,24 +136,24 @@ struct AddContactMenu: View { | |
| } | ||
| showLoadingOverlay(overlay, headline: NSLocalizedString("Adding...", comment: "")) | ||
| account.checkJidType(jid, withCompletion: { type, errorMsg in | ||
| if(type == "account") { | ||
| if type == "account" { | ||
| hideLoadingOverlay(overlay) | ||
| let contact = MLContact.createContact(fromJid: jid, andAccountNo: account.accountNo) | ||
| self.newContact = contact | ||
| MLXMPPManager.sharedInstance().add(contact, withPreauthToken:preauthToken) | ||
| //import omemo fingerprints as manually trusted, if requested | ||
| trustFingerprints(self.importScannedFingerprints ? self.scannedFingerprints : [:], for:jid, on:account) | ||
| successAlert(title: Text("Permission Requested"), message: Text("The new contact will be added to your contacts list when the person you've added has approved your request.")) | ||
| } else if(type == "muc") { | ||
| } else if type == "muc" { | ||
| showLoadingOverlay(overlay, headline: NSLocalizedString("Adding Group/Channel...", comment: "")) | ||
| account.mucProcessor.addUIHandler({data in | ||
| let success : Bool = (data as! NSDictionary)["success"] as! Bool; | ||
| hideLoadingOverlay(overlay) | ||
| if(success) { | ||
| if success { | ||
| self.newContact = MLContact.createContact(fromJid: jid, andAccountNo: account.accountNo) | ||
| successAlert(title: Text("Success!"), message: Text(String.localizedStringWithFormat("Successfully joined group/channel %@!", jid))) | ||
| } else { | ||
| errorAlert(title: Text("Error entering group/channel!")) | ||
| errorAlert(title: Text("Error entering group/channel!"), message: Text((data as! NSDictionary)["errorMessage"] as! String)) | ||
| } | ||
| }, forMuc: jid) | ||
| account.joinMuc(jid) | ||
|
|
@@ -168,14 +168,14 @@ struct AddContactMenu: View { | |
| let account = self.connectedAccounts[selectedAccount] | ||
| let splitJid = HelperTools.splitJid(account.connectionProperties.identity.jid) | ||
| Form { | ||
| if(connectedAccounts.isEmpty) { | ||
| if connectedAccounts.isEmpty { | ||
| Text("Please make sure at least one account has connected before trying to add a contact or channel.") | ||
| .foregroundColor(.secondary) | ||
| } | ||
| else | ||
| { | ||
| Section(header:Text("Contact and Group/Channel Jids are usually in the format: [email protected]")) { | ||
| if(connectedAccounts.count > 1) { | ||
| if connectedAccounts.count > 1 { | ||
| Picker("Use account", selection: $selectedAccount) { | ||
| ForEach(Array(self.connectedAccounts.enumerated()), id: \.element) { idx, account in | ||
| Text(account.connectionProperties.identity.jid).tag(idx) | ||
|
|
@@ -196,15 +196,15 @@ struct AddContactMenu: View { | |
| toAdd = toAdd.replacingOccurrences(of: " ", with: "") | ||
| } | ||
| } | ||
| if(scannedFingerprints != nil && scannedFingerprints!.count > 0) { | ||
| if scannedFingerprints != nil && scannedFingerprints!.count > 0 { | ||
| Section(header: Text("A contact was scanned through the QR code scanner")) { | ||
| Toggle(isOn: $importScannedFingerprints, label: { | ||
| Toggle(isOn: $importScannedFingerprints) { | ||
| Text("Import and trust OMEMO fingerprints from QR code") | ||
| }) | ||
| } | ||
| } | ||
| } | ||
| Section { | ||
| if(scannedFingerprints != nil) { | ||
| if scannedFingerprints != nil { | ||
| Button(action: { | ||
| toAdd = "" | ||
| importScannedFingerprints = true | ||
|
|
@@ -217,9 +217,9 @@ struct AddContactMenu: View { | |
| Button(action: { | ||
| showAlert = toAddEmptyAlert || toAddInvalidAlert | ||
|
|
||
| if(!showAlert) { | ||
| if !showAlert { | ||
| let jidComponents = HelperTools.splitJid(toAdd) | ||
| if(jidComponents["host"] == nil || jidComponents["host"]!.isEmpty) { | ||
| if jidComponents["host"] == nil || jidComponents["host"]!.isEmpty { | ||
| errorAlert(title: Text("Error"), message: Text("Something went wrong while parsing the string...")) | ||
| showAlert = true | ||
| return | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.