Merge 4.16.1 into master #3064

diegolmello · 2021-04-14T19:12:38Z

Proposed changes

Issue(s)

How to test or reproduce

Screenshots

Types of changes

Bugfix (non-breaking change which fixes an issue)
Improvement (non-breaking change which improves a current function)
New feature (non-breaking change which adds functionality)
Documentation update (if none of the other choices apply)

Checklist

I have read the CONTRIBUTING doc
I have signed the CLA
Lint and unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works (if applicable)
I have added necessary documentation (if applicable)
Any dependent changes have been merged and published in downstream modules

Further comments

* Button to preferences view Signed-off-by: Ezequiel De Oliveira <[email protected]> * Create screen to preferences and listItem to notifications Signed-off-by: Ezequiel De Oliveira <[email protected]> * Refactoring NotificationPreferencesView Signed-off-by: Ezequiel De Oliveira <[email protected]> * List notification preferences Signed-off-by: Ezequiel De Oliveira <[email protected]> * Adding translations to labels Signed-off-by: Ezequiel De Oliveira <[email protected]> * SetUserPreferences api call Signed-off-by: Ezequiel De Oliveira <[email protected]> * Saving new user preference in API Signed-off-by: Ezequiel De Oliveira <[email protected]> * Fix lint Signed-off-by: Ezequiel De Oliveira <[email protected]> * Add in-app notification test Signed-off-by: Ezequiel De Oliveira <[email protected]> * Fix in app mentions preference Signed-off-by: Ezequiel De Oliveira <[email protected]> * Improve object in testInAppNotification Signed-off-by: Ezequiel De Oliveira <[email protected]> * Removing improper options for NotificationpreferencesView Signed-off-by: Ezequiel De Oliveira <[email protected]> * Adding API version Signed-off-by: Ezequiel De Oliveira <[email protected]> * Use redux in UserNotificationPrefView Signed-off-by: Ezequiel De Oliveira <[email protected]> * Remove in app test Signed-off-by: Ezequiel De Oliveira <[email protected]> * Use components from another view Signed-off-by: Ezequiel De Oliveira <[email protected]> * Removing verification for testing in-app notifications Signed-off-by: Ezequiel De Oliveira <[email protected]> * Move to ProfileView Co-authored-by: Diego Mello <[email protected]>

* Add enterpriseModules on Redux * Fetch enterprise modules and put on redux * hasLicense * Clear modules * Hide omnichannel rooms * Minor refactor * Hide omnichannel toggle * Check license on user status * Apply on search * lint * Look for 'livechat-enterprise' * One module is enough to enable the features * Unhide omnichannel rooms * Sort tweaks * Move omnichannel toggle to RoomsListView * Remove omnichannel toggle from SettingsView * Fix toggle * Ask to enable omnichannel * Lint * Fix issues found on review

* [FIX] User Preferences * PreferencesView -> UserPreferencesView Co-authored-by: Diego Mello <[email protected]>

The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-LODASH-590103 Co-authored-by: Diego Mello <[email protected]>

* create play and foss build * update package.json to generate each build * check1 * requested changes * initial commit * Update config.yml * minor changes * remove bugsnag from foss build * remove bugsnag tasks from foss job * fix stuck screen * fixes * update * fix lint * finalise 🚀 * requested changes * share app for fdroid * update * use negation for builds * requested change * update share app * fix issues due to latest sync * add extra line * fix lint * update * update * fix bugsnag issue * Update config.yml * Fix store url * Foss release instead of debug * Add hold for foss * Fix build * requested changes * update name and icons * update * fix * Revert "Bump version to 4.11.0 (#2392)" This reverts commit ea28798. * finalise Co-authored-by: Djorkaeff Alexandre <[email protected]> Co-authored-by: Diego Mello <[email protected]>

#2423) * [IMPROVEMENT] Add subscription and room events on the same batch queue * Send both params * Unused var

* Logout from other logged in locations * Add UI feedback for the request result * Refactor request to use the proper REST API * Change backgroundColor * I18n Co-authored-by: Diego Mello <[email protected]>

* New field in table of users Signed-off-by: Ezequiel De Oliveira <[email protected]> * Saving when the user logged in with email and password Signed-off-by: Ezequiel De Oliveira <[email protected]> * Saving login method info Signed-off-by: Ezequiel De Oliveira <[email protected]> * Ask for the user to clear cookies Signed-off-by: Ezequiel De Oliveira <[email protected]> * Fix lint Signed-off-by: Ezequiel De Oliveira <[email protected]> * Removing loginMethod from redux and add I18n Signed-off-by: Ezequiel De Oliveira <[email protected]> * Using async/await instead of then/catch Signed-off-by: Ezequiel De Oliveira <[email protected]> * Fix lint Signed-off-by: Ezequiel De Oliveira <[email protected]> * Pods * Added dismissText on showConfirmationAlert * Fix iOS * Rename function * I18n tweaks Co-authored-by: Diego Mello <[email protected]>

* Adding missing prop to item object Signed-off-by: Ezequiel De Oliveira <[email protected]> * Resolving the missing date in the files section in a more elegant way Signed-off-by: Ezequiel De Oliveira <[email protected]> * Using ts attribute always inside of an item object Signed-off-by: Ezequiel De Oliveira <[email protected]> Co-authored-by: Diego Mello <[email protected]>

Signed-off-by: Ezequiel De Oliveira <[email protected]> Co-authored-by: Diego Mello <[email protected]>

* Spotlight issues * Fix room tests * Fix roomactions tests

* [FIX] Logout from custom oauth when using password * Remove an useless const Co-authored-by: Diego Mello <[email protected]>

…2426) * [IMPROVEMENT] Move toggle and inquiry to Enterprise * Move inquiry stream to ee * Emit inquiry subscribe * imports to ee last * Add readme to ee Co-authored-by: Djorkaeff Alexandre <[email protected]>

* [FIX] Chrome debugging * Remove rn-fetch-blob

Co-authored-by: Diego Mello <[email protected]>

* Only enable HTTP and user CAs on debug builds and * Allow User CAs in prod * Add config on debug * Add lint Co-authored-by: Diego Mello <[email protected]>

* Add E2EKey to Subscription Model * Install react-native-simple-crypto * Install bytebuffer * Add translations * CreateChannel Encrypted toggle * Request E2E_Enabled setting * Add some E2E API methods * POC E2E Encryption * Garbage remove * Remove keys cleaner * Android cast JWK -> PKCS1 * Initialize E2E when Login Success * Add some translations * Add e2e property to Message model * Send Encrypted messages * (iOS) PKCS1 -> JWK & e2e.setUserPublicAndPrivateKeys * (Android) PKCS1 -> JWK & e2e.setUserPublicAndPrivateKeys * Create an encrypted channel * Fix app crashing on RoomsList * Create room key * Set Room E2E Key (Android) * Edit room encrypted * Show encrypted icon on messages * logEvents * Decrypt pending subscriptions & messages * Handle user cancel e2e password entry * E2ESavePasswordView * Update Snapshot * Add encrypted props to message on Send * Thread messages encryption * E2E -> Encryption * Share Extension: Share encrypted text * (POC) Search messages on Encrypted room * Provide room key to new users * Request roomKey on stream-notify-room-users * Add e2eKeyId to Room Model * (WIP) E2E Encryption Screens * Remove encryption subscription file * Move E2E_Enable to Server Model * Encryption List Banner * Move Encryption init to Sagas * Show banner only when enabled * Use RocketChat/react-native-simple-crypto * Search on WM only when is an Encrypted channel * (WIP) Encryption Banner * Encryption banner * Patch -> Fork * Improve send encrypted message * Update simple-crypto * Not decrypt already decrypted messages * Add comments * Change eslint disable to inline * Improve code * Remove comment * Some fixes * (WIP) Encryption Screens * Improve sub find * Resend an encrypted message * Fix comment * Code improvements * Hide e2e buttons on features if it is not enabled * InApp notifications of a encrypted room * Encryption stop logic * Edit encrypted message * DB batch on decryptPending * Encryption ready client * Comments * Handle getRoomInstance errors * Multiple messages decrypt * Remove unnecessary try/catch * Fix decrypt all messages history * Just add a questionmark * Fix some subscriptions missing decrypt * Disable request key logic * Fix unicode emojis * Fix e2ekey request * roomId -> subscription * Decrypt subscription after merge * E2ERoom -> EncryptionRoom * Fix infinite loading * Handle import key errors * Handle request key errors * Move e2eRequestRoomKey to Rocket.Chat * WIP handshake when key should be requested * Add search messages explanation * Remove some TODO and update comments * Improvements * Dont show message hash to user * Handle key request & prevent multiple calls * Request E2EKey on decryptSubscription that doesn't exists on database yet * Insert decrypted subscription * Fix crash after login * Decrypt sub when receive the key * Decrypt pending messages of a room * Encrypted as a switch * Buffer to Base64 URI Safe * Add a relevant comment * Prevent import key without a privateKey * Prevent create a new instance when client is not ready * Update simple-crypto & remove replace trick * More comments * Remove useless comment * Remove useless try/catch * I18n all E2E screens * E2ESavePassword -> E2ESaveYourPassword * Prevent multiple views on message when is not encrypted * Fix encryption toggle not working sometimes * follow some suggestions * dont rotate icons * remove unnecessary condition * remove unreachable event * create channel comment * disable no-bitwise rule for entire file * loadKeys -> persistKeys * getMasterKey -> generateMasterKey * explicit difference between E2EKey & e2eKeyId * roomId -> rid * group columns * Remove server selector * missing log events * remove comment * use stored public key * update simple-crypto & remove base64-js patch * add some logs * remove unreachable condition * log errors * handle errors on provide key directly on subscription * Downgrade RocketChat/react-native-simple-crypto * improve get room instance * migration of older apps * check encrypted status before send a message * wait client ready * use our own base64-js * add more jest tests * explain return * remove unncessary stop * thrown error to caller * remove superfluous checks * use Encryption property * change ready state logic * ready -> establishing * encryption.room -> encryptionRoom * EncryptionRoom -> Room * add documentation * wait establishing before provide a room key * remove superfluous condition * improve error handling logic * fallback e2ekey set * remove no longer necessary check * remove e.g. * improve getRoomInstance * import from index * use batch * fix a comment * decrypt tmsg * dont show hash when message is encrypted * Fix detox * Apply suggestions from code review Co-authored-by: Diego Mello <[email protected]>

* Catching errors * [IMPROVEMENT] Show errors on server enter * "Not rc server" instead of "invalid or insecure url" msg

* Add dropdown Signed-off-by: Ezequiel De Oliveira <[email protected]> * Adding new table to serverSchema Signed-off-by: Ezequiel De Oliveira <[email protected]> * Saving if not exists Signed-off-by: Ezequiel De Oliveira <[email protected]> * list of visited servers finished Signed-off-by: Ezequiel De Oliveira <[email protected]> * Fix lint Signed-off-by: Ezequiel De Oliveira <[email protected]> * Rename ServerLinks to ServersHistory * Refactor * Save username * Sort servers desc * ServerInput * Item * Refactor * Layout tweaks * Layout * query by text * Small refactor * Redirecting to login * Save username for oauth * Fix keyboard persist * Add tests * Unnecessary yield * Stop rendering FlatList logic when there's no servers on history * Dismiss keyboard and autocomplete when tapped outside server TextInput Co-authored-by: Diego Mello <[email protected]>

* Fix clear cache * Write e2e tests * Fix lint * Fix isRTL

…mes (#3020)

* [CHORE] Go to room from hashtag * Layout tweaks Co-authored-by: Diego Mello <[email protected]>

Co-authored-by: Diego Mello <[email protected]>

* [FIX] Search input not using the whole space * Fix on getHeaderTitlePosition Co-authored-by: Diego Mello <[email protected]>

* [FIX] E2EE password hiding automatically * add e2e test * fixed hiding banner * move e2e tests to 01-e2eencryption * remove console.log * Fix tests Co-authored-by: Diego Mello <[email protected]>

* [E2E TEST] Move threads test to another file * changed descirbe title * Rearrange files Co-authored-by: Diego Mello <[email protected]>

* [FIX] Fix Regex Typo * Add story for testing Co-authored-by: Diego Mello <[email protected]>

* [FIX] Make attachment validation compatible with web client * Added stories Co-authored-by: Diego Mello <[email protected]>

* Remove time if no message_link * Fix message stories for replies * Final stories fix Co-authored-by: Diego Mello <[email protected]>

* Use I18n translate in login text input label * Add to register and add missing strings Co-authored-by: Diego Mello <[email protected]>

…2927)" (#3036) This reverts commit d620074.

* Database migration * RoomItem icon * Team icons * Teams group * Small tweak on RoomTypeIcon * RoomView Header * Add team's channels to RoomView header * Starting TeamChannelsView * Icon size * o data found * Update TeamChannelsView, add teams subscriptions and send params to TeamChannelsView * Use teams.ListRooms endpoint, render rooms list, remove unused functions * Show team main on TeamChannelsView * Disable swipe * Pagination working * Fix blinking no data found * Search working * Refactor to use BackgroundContainer while loading * Go to room * Cleanup * Go to actions * Events * Lint * Add debounce to go room * Fix for tablet * i18n * Small fix * Minor refactor * Use local data when it exists * Show last message * Force teams migration * Add stories to BackgroundContainer * Remove unused component * Move RoomViewHeader into containers folder * Refactoring * Testing RoomHeader * i18n * Fix server endpoint version * Fix events Co-authored-by: Gerzon Z <[email protected]>

* [Improvement] Improve mentions This PR focuses on improving command, emoji, channel and user mentions. * [Tests] Added e2e tests for mention improvement * [Improvement] Modify slash command mention logic. Added slash command with argument preview Slash command should show only if the message bigins with / * Return data on search for empty text * Minor fixes * Update e2e tests * Minor fix * [FIX] allow command mentioning in between text Co-authored-by: Diego Mello <[email protected]>

* Update StatusView.js * Minor tweak * Minor tweaks Co-authored-by: Diego Mello <[email protected]>

* Add search by name in members list * Update RoomMembersView search Co-authored-by: Diego Mello <[email protected]>

# Conflicts: # .circleci/config.yml # android/app/build.gradle # android/fastlane/Fastfile # app/containers/RoomHeader/RoomHeader.js # app/views/AuthenticationWebView.js # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/Info.plist # ios/ShareRocketChatRN/Info.plist # package.json

djorkaeffalexandre and others added 30 commits August 20, 2020 11:48

[FIX] Android crashing on receive a notification (#2415)

a07b4cf

[FIX] Change some icons (#2419)

ccb36f1

[FIX] User Preferences (#2418)

7813ed3

* [FIX] User Preferences * PreferencesView -> UserPreferencesView Co-authored-by: Diego Mello <[email protected]>

[IMPROVEMENT] Customize Sign in with Apple button (#2420)

51d914e

[Snyk] Security upgrade lodash from 4.17.19 to 4.17.20 (#2416)

15f174b

The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-LODASH-590103 Co-authored-by: Diego Mello <[email protected]>

[FIX] Commit pods after #2171 (#2424)

49cdb7e

[IMPROVEMENT] Add subscription and room events on the same batch queue (

7f7bab8

#2423) * [IMPROVEMENT] Add subscription and room events on the same batch queue * Send both params * Unused var

[IMPROVEMENT] Show "Chats in Progress" group (#2425)

49ea816

[NEW] Logout from other logged in locations (#2386)

67ecab7

* Logout from other logged in locations * Add UI feedback for the request result * Refactor request to use the proper REST API * Change backgroundColor * I18n Co-authored-by: Diego Mello <[email protected]>

[FIX] App can't reopening a room in some cases (#2429)

77ecd12

[FIX] Verify useRealName setting on files screen (#2427)

2122817

Signed-off-by: Ezequiel De Oliveira <[email protected]> Co-authored-by: Diego Mello <[email protected]>

[FIX] Apply theme on Directory description (#2428)

664ddb4

Signed-off-by: Ezequiel De Oliveira <[email protected]> Co-authored-by: Diego Mello <[email protected]>

[FIX] Wrong merge resolution after #2171 (#2431)

7851496

[FIX] Upload to internal looking for the wrong path after #2171 (#2432)

cefce62

[FIX] Detox tests (#2433)

1d38ff0

* Spotlight issues * Fix room tests * Fix roomactions tests

[FIX] Crashlytics reportError not working after #2171 (#2436)

7c61455

[FIX] Logout from custom oauth when using password (#2435)

0351276

* [FIX] Logout from custom oauth when using password * Remove an useless const Co-authored-by: Diego Mello <[email protected]>

[IMPROVEMENT] Move toggle and inquiry to Enterprise Edition license (#…

7172c02

…2426) * [IMPROVEMENT] Move toggle and inquiry to Enterprise * Move inquiry stream to ee * Emit inquiry subscribe * imports to ee last * Add readme to ee Co-authored-by: Djorkaeff Alexandre <[email protected]>

[CHORE] App Group path as a iOS constant (#2439)

91a2e9b

* [FIX] Chrome debugging * Remove rn-fetch-blob

[CHORE] Use Rocket.Chat JS SDK's official repo (#2440)

8e4eb49

Co-authored-by: Diego Mello <[email protected]>

[IMPROVEMENT] Disable HTTP for production on Android (#2357)

e953129

* Only enable HTTP and user CAs on debug builds and * Allow User CAs in prod * Add config on debug * Add lint Co-authored-by: Diego Mello <[email protected]>

[CHORE] Update run-ios and run-android scripts (#2450)

03aba6f

[IMPROVEMENT] Show errors on server enter (#2449)

334140d

* Catching errors * [IMPROVEMENT] Show errors on server enter * "Not rc server" instead of "invalid or insecure url" msg

diegolmello and others added 25 commits April 1, 2021 09:58

[REGRESSION] Clear local server cache not loading rooms (#3007)

bb844e5

* Fix clear cache * Write e2e tests * Fix lint * Fix isRTL

[FIX] Custom OAuth and iframe login attempts being called multiple ti…

31d3594

…mes (#3020)

[FIX] App crashing when attachment color is an invalid HEX (#3021)

656127a

[IMPROVEMENT] Add "Message" option to Room Info (#3029)

0ff916d

* [CHORE] Go to room from hashtag * Layout tweaks Co-authored-by: Diego Mello <[email protected]>

[FIX] Can't change status (#3018)

8f0eae7

Co-authored-by: Diego Mello <[email protected]>

[FIX] Search input not using the whole header space (#3012)

6327518

* [FIX] Search input not using the whole space * Fix on getHeaderTitlePosition Co-authored-by: Diego Mello <[email protected]>

[FIX] E2EE password hiding automatically (#2972)

704e071

* [FIX] E2EE password hiding automatically * add e2e test * fixed hiding banner * move e2e tests to 01-e2eencryption * remove console.log * Fix tests Co-authored-by: Diego Mello <[email protected]>

[TESTS] Move threads tests to its own file (#2965)

45fe061

* [E2E TEST] Move threads test to another file * changed descirbe title * Rearrange files Co-authored-by: Diego Mello <[email protected]>

[FIX] Regex typo on markdown (#2928)

e32ed8b

* [FIX] Fix Regex Typo * Add story for testing Co-authored-by: Diego Mello <[email protected]>

[FIX] Make attachment validation compatible with web client (#2927)

d620074

* [FIX] Make attachment validation compatible with web client * Added stories Co-authored-by: Diego Mello <[email protected]>

[FIX] Non-reply attachments displaying time (#2902)

28ab908

* Remove time if no message_link * Fix message stories for replies * Final stories fix Co-authored-by: Diego Mello <[email protected]>

[FIX] i18n not being applied on login/register labels (#2930)

71da1e3

* Use I18n translate in login text input label * Add to register and add missing strings Co-authored-by: Diego Mello <[email protected]>

Revert "[FIX] Make attachment validation compatible with web client (#…

8649c17

…2927)" (#3036) This reverts commit d620074.

Bump version to 4.16.0 (#3037)

5a96f1f

[FIX] Status text not being updated on sidebar (#3041)

23a7f0f

* Update StatusView.js * Minor tweak * Minor tweaks Co-authored-by: Diego Mello <[email protected]>

[FIX] Unable to search non-latin alphabet names on members list (#3039)

5a800fe

* Add search by name in members list * Update RoomMembersView search Co-authored-by: Diego Mello <[email protected]>

Search stops working after some time (#3044)

ecc0052

Bump version to 4.17.0 (#3058)

69c0ccd

[CHORE] Add job to upload Experimental to Google Play production (#3050)

f7f13da

[REGRESSION] SAML stopped working after #2978 (#3060)

d718053

[REGRESSION] Room actions not loading on tablet (#3061)

d555f19

Bump version to 4.16.1 (#3063)

14078c0

diegolmello added the 💎 release label Apr 14, 2021

diegolmello added 2 commits April 15, 2021 10:31

[REGRESSION] Fallback language stopped working (#3072)

f148686

Merge branch 'develop' into beta-4.16.1

ef7f040

diegolmello merged commit 7899f4b into master Apr 16, 2021

diegolmello deleted the beta-4.16.1 branch April 16, 2021 13:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 4.16.1 into master #3064

Merge 4.16.1 into master #3064

Uh oh!

diegolmello commented Apr 14, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Merge 4.16.1 into master #3064

Merge 4.16.1 into master #3064

Uh oh!

Conversation

diegolmello commented Apr 14, 2021

Proposed changes

Issue(s)

How to test or reproduce

Screenshots

Types of changes

Checklist

Further comments

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants