From 624f7d3caa33a4177b652732b83213c4757c4200 Mon Sep 17 00:00:00 2001 From: erinn Date: Fri, 2 Jul 2021 16:27:09 -0700 Subject: [PATCH 1/2] fixing notification bugs --- android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt | 2 +- lib/main.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt b/android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt index 7cb33d71..8fcf423b 100644 --- a/android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt +++ b/android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt @@ -238,7 +238,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) : .setOngoing(true) // Add the cancel action to the notification which can // be used to cancel the worker - .addAction(android.R.drawable.ic_delete, cancel, PendingIntent.getActivity(applicationContext, 1, cancelIntent, PendingIntent.FLAG_UPDATE_CURRENT)) + .addAction(android.R.drawable.ic_delete, cancel, PendingIntent.getActivity(applicationContext, 2, cancelIntent, PendingIntent.FLAG_UPDATE_CURRENT)) .build() return ForegroundInfo(101, notification) diff --git a/lib/main.dart b/lib/main.dart index f74ddbdc..d066e39b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -173,9 +173,9 @@ class FlwtchState extends State { // single pane mode pushes; double pane mode reads AppState.selectedProfile/Conversation var isLandscape = Provider.of(navKey.currentContext!, listen: false).isLandscape(navKey.currentContext!); if (Provider.of(navKey.currentContext!, listen: false).uiColumns(isLandscape).length == 1) { - if (navKey.currentContext?.findAncestorWidgetOfExactType() != null) { + while (navKey.currentState!.canPop()) { print("messageview already open; popping before pushing replacement"); - navKey.currentState?.pop(); + navKey.currentState!.pop(); } navKey.currentState?.push( MaterialPageRoute( From 3798ca9d60daf6823cccd182eb327ea030699de1 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Mon, 5 Jul 2021 13:17:15 -0700 Subject: [PATCH 2/2] Add Polish Template --- lib/l10n/intl_pl.arb | 191 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 lib/l10n/intl_pl.arb diff --git a/lib/l10n/intl_pl.arb b/lib/l10n/intl_pl.arb new file mode 100644 index 00000000..44c464c4 --- /dev/null +++ b/lib/l10n/intl_pl.arb @@ -0,0 +1,191 @@ +{ + "@@locale": "pl", + "@@last_modified": "2021-07-05T21:26:10+02:00", + "tooltipRejectContactRequest": "Reject this contact request", + "tooltipAcceptContactRequest": "Accept this contact request.", + "notificationNewMessageFromGroup": "New message in a group!", + "notificationNewMessageFromPeer": "New message from a contact!", + "tooltipHidePassword": "Hide Password", + "tooltipShowPassword": "Show Password", + "serverNotSynced": "Syncing New Messages (This can take some time)...", + "groupInviteSettingsWarning": "You have been invited to join a group! Please enable the Group Chat Experiment in Settings to view this Invitation.", + "shutdownCwtchAction": "Shutdown Cwtch", + "shutdownCwtchDialog": "Are you sure you want to shutdown Cwtch? This will close all connections, and exit the application.", + "shutdownCwtchDialogTitle": "Shutdown Cwtch?", + "shutdownCwtchTooltip": "Shutdown Cwtch", + "malformedMessage": "Malformed message", + "profileDeleteSuccess": "Successfully deleted profile", + "debugLog": "Turn on console debug logging", + "torNetworkStatus": "Tor network status", + "addContactFirst": "Add or pick a contact to begin chatting.", + "createProfileToBegin": "Please create or unlock a profile to begin", + "nickChangeSuccess": "Profile nickname changed successfully", + "addServerFirst": "You need to add a server before you can create a group", + "deleteProfileSuccess": "Successfully deleted profile", + "sendInvite": "Send a contact or group invite", + "sendMessage": "Send Message", + "cancel": "Cancel", + "resetTor": "Reset", + "torStatus": "Tor Status", + "torVersion": "Tor Version", + "sendAnInvitation": "You sent an invitation for: ", + "contactSuggestion": "This is a contact suggestion for: ", + "rejected": "Rejected!", + "accepted": "Accepted!", + "chatHistoryDefault": "This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.", + "newPassword": "New Password", + "yesLeave": "Yes, Leave This Conversation", + "reallyLeaveThisGroupPrompt": "Are you sure you want to leave this conversation? All messages and attributes will be deleted.", + "leaveGroup": "Leave This Conversation", + "inviteToGroup": "You have been invited to join a group:", + "pasteAddressToAddContact": "Paste a cwtch address, invitation or key bundle here to add a new conversation", + "tooltipAddContact": "Add a new contact or conversation", + "titleManageContacts": "Conversations", + "titleManageServers": "Manage Servers", + "dateNever": "Never", + "dateLastYear": "Last Year", + "dateYesterday": "Yesterday", + "dateLastMonth": "Last Month", + "dateRightNow": "Right Now", + "successfullAddedContact": "Successfully added ", + "descriptionBlockUnknownConnections": "If turned on, this option will automatically close connections from Cwtch users that have not been added to your contact list.", + "descriptionExperimentsGroups": "The group experiment allows Cwtch to connect with untrusted server infrastructure to facilitate communication with more than one contact.", + "descriptionExperiments": "Cwtch experiments are optional, opt-in features that add additional functionality to Cwtch that may have different privacy considerations than traditional 1:1 metadata resistant chat e.g. group chat, bot integration etc.", + "titleManageProfiles": "Manage Cwtch Profiles", + "tooltipUnlockProfiles": "Unlock encrypted profiles by entering their password.", + "tooltipOpenSettings": "Open the settings pane", + "invalidImportString": "Invalid import string", + "contactAlreadyExists": "Contact Already Exists", + "conversationSettings": "Conversation Settings", + "enterCurrentPasswordForDelete": "Please enter current password to delete this profile.", + "enableGroups": "Enable Group Chat", + "experimentsEnabled": "Enable Experiments", + "localeIt": "Italiana", + "localeEs": "Espanol", + "addListItem": "Add a New List Item", + "addNewItem": "Add a new item to the list", + "todoPlaceholder": "Todo...", + "newConnectionPaneTitle": "New Connection", + "networkStatusOnline": "Online", + "networkStatusConnecting": "Connecting to network and peers...", + "networkStatusAttemptingTor": "Attempting to connect to Tor network", + "networkStatusDisconnected": "Disconnected from the internet, check your connection", + "viewGroupMembershipTooltip": "View Group Membership", + "loadingTor": "Loading tor...", + "smallTextLabel": "Small", + "defaultScalingText": "Default size text (scale factor:", + "builddate": "Built on: %2", + "version": "Version %1", + "versionTor": "Version %1 with tor %2", + "themeDark": "Dark", + "themeLight": "Light", + "settingTheme": "Theme", + "largeTextLabel": "Large", + "settingInterfaceZoom": "Zoom level", + "localeDe": "Deutsche", + "localePt": "Portuguesa", + "localeFr": "Frances", + "localeEn": "English", + "settingLanguage": "Language", + "blockUnknownLabel": "Block Unknown Peers", + "zoomLabel": "Interface zoom (mostly affects text and button sizes)", + "versionBuilddate": "Version: %1 Built on: %2", + "cwtchSettingsTitle": "Cwtch Settings", + "unlock": "Unlock", + "yourServers": "Your Servers", + "yourProfiles": "Your Profiles", + "error0ProfilesLoadedForPassword": "0 profiles loaded with that password", + "password": "Password", + "enterProfilePassword": "Enter a password to view your profiles", + "addNewProfileBtn": "Add new profile", + "deleteConfirmText": "DELETE", + "deleteProfileConfirmBtn": "Really Delete Profile", + "deleteConfirmLabel": "Type DELETE to confirm", + "deleteProfileBtn": "Delete Profile", + "passwordChangeError": "Error changing password: Supplied password rejected", + "passwordErrorMatch": "Passwords do not match", + "saveProfileBtn": "Save Profile", + "createProfileBtn": "Create Profile", + "passwordErrorEmpty": "Password cannot be empty", + "password2Label": "Reenter password", + "password1Label": "Password", + "currentPasswordLabel": "Current Password", + "yourDisplayName": "Your Display Name", + "profileOnionLabel": "Send this address to peers you want to connect with", + "noPasswordWarning": "Not using a password on this account means that all data stored locally will not be encrypted", + "radioNoPassword": "Unencrypted (No password)", + "radioUsePassword": "Password", + "copiedToClipboardNotification": "Copied to Clipboard", + "copyBtn": "Copy", + "editProfile": "Edit Profille", + "newProfile": "New Profile", + "defaultProfileName": "Alice", + "profileName": "Display name", + "editProfileTitle": "Edit Profile", + "addProfileTitle": "Add new profile", + "deleteBtn": "Delete", + "unblockBtn": "Unblock Peer", + "dontSavePeerHistory": "Delete Peer History", + "savePeerHistoryDescription": "Determines whether or not to delete any history associated with the peer.", + "savePeerHistory": "Save Peer History", + "blockBtn": "Block Peer", + "saveBtn": "Save", + "displayNameLabel": "Display Name", + "addressLabel": "Address", + "puzzleGameBtn": "Puzzle Game", + "bulletinsBtn": "Bulletins", + "listsBtn": "Lists", + "chatBtn": "Chat", + "rejectGroupBtn": "Reject", + "acceptGroupBtn": "Accept", + "acceptGroupInviteLabel": "Do you want to accept the invitation to", + "newGroupBtn": "Create new group", + "copiedClipboardNotification": "Copied to clipboard", + "peerOfflineMessage": "Peer is offline, messages can't be delivered right now", + "peerBlockedMessage": "Peer is blocked", + "pendingLabel": "Pending", + "acknowledgedLabel": "Acknowledged", + "couldNotSendMsgError": "Could not send this message", + "dmTooltip": "Click to DM", + "membershipDescription": "Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.", + "addListItemBtn": "Add Item", + "peerNotOnline": "Peer is Offline. Applications cannot be used right now.", + "searchList": "Search List", + "update": "Update", + "inviteBtn": "Invite", + "inviteToGroupLabel": "Invite to group", + "groupNameLabel": "Group Name", + "viewServerInfo": "Server Info", + "serverSynced": "Synced", + "serverConnectivityDisconnected": "Server Disconnected", + "serverConnectivityConnected": "Server Connected", + "serverInfo": "Server Information", + "invitationLabel": "Invitation", + "serverLabel": "Server", + "search": "Search...", + "cycleColoursDesktop": "Click to cycle colours.\nRight-click to reset.", + "cycleColoursAndroid": "Click to cycle colours.\nLong-press to reset.", + "cycleMorphsDesktop": "Click to cycle morphs.\nRight-click to reset.", + "cycleMorphsAndroid": "Click to cycle morphs.\nLong-press to reset.", + "cycleCatsDesktop": "Click to cycle category.\nRight-click to reset.", + "cycleCatsAndroid": "Click to cycle category.\nLong-press to reset.", + "blocked": "Blocked", + "titlePlaceholder": "title...", + "postNewBulletinLabel": "Post new bulletin", + "newBulletinLabel": "New Bulletin", + "joinGroup": "Join group", + "createGroup": "Create group", + "addPeer": "Add Peer", + "groupAddr": "Address", + "invitation": "Invitation", + "server": "Server", + "groupName": "Group name", + "peerName": "Name", + "peerAddress": "Address", + "joinGroupTab": "Join a group", + "createGroupTab": "Create a group", + "addPeerTab": "Add a peer", + "createGroupBtn": "Create", + "defaultGroupName": "Awesome Group", + "createGroupTitle": "Create Group" +} \ No newline at end of file