Merge beta into master #2520

diegolmello · 2020-10-05T17:00:39Z

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

* [FIX] SAML incorrect close * [FIX] Pathname Co-authored-by: Diego Mello <diegolmello@gmail.com>

* [FIX] Change user own status * [IMPROVEMENT] Set activeUsers Co-authored-by: Diego Mello <diegolmello@gmail.com>

* [FIX] Loading all updated rooms after app resume * Fix room date on RoomItem Co-authored-by: Diego Mello <diegolmello@gmail.com>

* [FIX] Change notifications preferences * [IMPROVEMENT] Picker View * [I18N] Translations * [FIX] Picker Selection * [FIX] List border * [FIX] Prevent crash * [FIX] Not-Pref tablet * [FIX] Use same style of LanguageView * [IMPROVEMENT] Send listItem title Co-authored-by: Diego Mello <diegolmello@gmail.com>

* [FIX] Split get settings into two requests * [FIX] Clear settings only when change server * [IMPROVEMENT] Move the way to clear settings * [REVERT] Revert some changes * [FIX] Server Icon Co-authored-by: Diego Mello <diegolmello@gmail.com>

Co-authored-by: Diego Mello <diegolmello@gmail.com>

* [FIX] Read only channel/broadcast * [FIX] Roles missing * [FIX] Check roles to readOnly * [FIX] Can post * [FIX] Respect post-readonly permission * [FIX] Search a room readOnly Co-authored-by: Diego Mello <diegolmello@gmail.com>

Co-authored-by: Diego Mello <diegolmello@gmail.com>

* [FIX] Login TOTP Compatibility to older servers * [FIX] Android crashes if use double negation Co-authored-by: Diego Mello <diegolmello@gmail.com>

Co-authored-by: Diego Mello <diegolmello@gmail.com>

* [FIX] Message with only one block * [FIX] Update headers Co-authored-by: Diego Mello <diegolmello@gmail.com>

Co-authored-by: Diego Mello <diegolmello@gmail.com>

…s stream if room is focused (#2069) * [IMPROVEMENT] No insert last message if the room is focused * fix discussion/threads Co-authored-by: Diego Mello <diegolmello@gmail.com>

Co-authored-by: Diego Mello <diegolmello@gmail.com>

* added-feature-save-video * fix sha256 Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com>

* fixed-issue * removed-variable-name-errors * reverted-last-commit Co-authored-by: Diego Mello <diegolmello@gmail.com>

* [FIX] Jitsi breaking changes * Update yarn cache

* [FIX] Jitsi breaking changes * Update yarn cache * Update watermelon to 0.19

* I18n: Add Traditional Chinese language file(zh_TW) * Minor fixes * I18n: Add missing translation and fix some weird words * fix escape char * Fix minor issues Co-authored-by: Diego Mello <diegolmello@gmail.com>

* I18n: Improve Simplified Chinese(zh_CN) language file * I18n: Add missing translation Co-authored-by: Diego Mello <diegolmello@gmail.com>

* change database location of experimental apps * fix migration from older versions

Co-authored-by: Diego Mello <diegolmello@gmail.com>

* poc push encryption android * eof * format code * react-native-simple-crypto update * prevent find sub twice * remove storage and use ejson storage * invalidate yarn cache * Bump crypto and fix db path * Fix google-services path Co-authored-by: Diego Mello <diegolmello@gmail.com>

Co-authored-by: Diego Mello <diegolmello@gmail.com>

fix some existing ones too

* link pods to notification service * push encryption poc * decrypt room key poc * read user key from mmkv and cast into a pkcs * push decrypt poc (iOS) * expose needed watermelon methods * watermelon -> database * indent & simple-crypto update * string extensions * storage * toBase64 -> toData * remove a forced unwrap * remove unused import * database driver * improvement * folder structure & watermelon bridge * more improvement stuff * watermelon -> database * reuse database instance * improvement * database fix: bypass watermelon cache * some code improvements * encryption instances * start api stuff * network layer * improve notification service * improve folder structure * watermelon patch * retry fetch logic * rocketchat class * fix try to decrypt without a roomKey * fallback to original content that is translated * some fixes to rocketchat logic * merge develop * remove unnecessary extension * [CHORE] Improve reply notification code (iOS) * undo sign changes * remove mocked value * import direct from library * send message request * reply notification with encrypted message working properly * revert apple sign * fix api onerror * trick to display sender name on group notifications * revert data.host change * fix some multithread issues * use sendername sent by server * small improvement * Bump crypto lib * Update ios/NotificationService/NotificationService.swift * add experimental string * remove trailing slash * remove trailing slash on reply * fix decrypt messages Co-authored-by: Diego Mello <diegolmello@gmail.com>

)

* Update about the inspection tool for our app. Information about the Reactotron tool was missing in the contribution file. * Update CONTRIBUTING.md Co-authored-by: Diego Mello <diegolmello@gmail.com>

# Conflicts: # .circleci/config.yml # CONTRIBUTING.md # __tests__/__snapshots__/Storyshots.test.js.snap # android/Gemfile.lock # android/app/build.gradle # android/app/src/debug/AndroidManifest.xml # android/app/src/main/AndroidManifest.xml # android/app/src/main/assets/fonts/custom.ttf # android/app/src/main/java/chat/rocket/reactnative/CustomPushNotification.java # android/app/src/main/java/chat/rocket/reactnative/MainActivity.java # android/app/src/main/java/chat/rocket/reactnative/MainApplication.java # android/app/src/main/res/xml/network_security_config.xml # android/build.gradle # android/fastlane/Fastfile # android/fastlane/README.md # app/actions/actionsTypes.js # app/actions/crashReport.js # app/actions/server.js # app/constants/links.js # app/constants/settings.js # app/containers/FormContainer.js # app/containers/HeaderButton.js # app/containers/LoginServices.js # app/containers/MessageActions/index.js # app/containers/MessageBox/index.js # app/containers/Passcode/PasscodeEnter.js # app/containers/message/Content.js # app/containers/message/RepliedThread.js # app/containers/message/index.js # app/i18n/index.js # app/i18n/locales/de.js # app/i18n/locales/en.js # app/i18n/locales/es-ES.js # app/i18n/locales/fr.js # app/i18n/locales/it.js # app/i18n/locales/ja.js # app/i18n/locales/nl.js # app/i18n/locales/pt-BR.js # app/i18n/locales/ru.js # app/i18n/locales/zh-CN.js # app/index.js # app/lib/database/index.js # app/lib/database/model/Message.js # app/lib/database/model/Room.js # app/lib/database/model/Server.js # app/lib/database/model/Subscription.js # app/lib/database/model/Thread.js # app/lib/database/model/ThreadMessage.js # app/lib/database/model/User.js # app/lib/database/model/migrations.js # app/lib/database/model/serversMigrations.js # app/lib/database/schema/app.js # app/lib/database/schema/servers.js # app/lib/database/utils.js # app/lib/methods/getSettings.js # app/lib/methods/helpers/findSubscriptionsRooms.js # app/lib/methods/helpers/mergeSubscriptionsRooms.js # app/lib/methods/loadThreadMessages.js # app/lib/methods/logout.js # app/lib/methods/sendMessage.js # app/lib/methods/subscriptions/room.js # app/lib/methods/subscriptions/rooms.js # app/lib/methods/updateMessages.js # app/lib/rocketchat.js # app/lib/selection.json # app/presentation/RoomItem/LastMessage.js # app/reducers/crashReport.js # app/reducers/index.js # app/sagas/createChannel.js # app/sagas/deepLinking.js # app/sagas/index.js # app/sagas/init.js # app/sagas/login.js # app/sagas/rooms.js # app/sagas/selectServer.js # app/share.js # app/stacks/InsideStack.js # app/stacks/MasterDetailStack/index.js # app/utils/info.js # app/utils/localAuthentication.js # app/utils/log/events.js # app/utils/log/index.js # app/utils/openLink.js # app/utils/review.js # app/views/AttachmentView.js # app/views/CreateChannelView.js # app/views/DefaultBrowserView.js # app/views/LanguageView/index.js # app/views/LoginView.js # app/views/MessagesView/index.js # app/views/NewServerView.js # app/views/NotificationPreferencesView/index.js # app/views/ProfileView/index.js # app/views/ReadReceiptView/index.js # app/views/RoomActionsView/index.js # app/views/RoomInfoEditView/index.js # app/views/RoomMembersView/index.js # app/views/RoomView/Header/Header.js # app/views/RoomView/index.js # app/views/RoomsListView/ListHeader/Directory.js # app/views/RoomsListView/ListHeader/Sort.js # app/views/RoomsListView/ListHeader/index.js # app/views/RoomsListView/ServerDropdown.js # app/views/RoomsListView/SortDropdown/index.js # app/views/RoomsListView/index.js # app/views/RoomsListView/styles.js # app/views/SearchMessagesView/index.js # app/views/SettingsView/index.js # app/views/ShareListView/index.js # app/views/SidebarView/index.js # app/views/ThemeView.js # e2e/tests/assorted/03-profile.spec.js # e2e/tests/assorted/06-status.spec.js # e2e/tests/room/01-createroom.spec.js # e2e/tests/room/02-room.spec.js # e2e/tests/room/03-roomactions.spec.js # e2e/tests/room/04-roominfo.spec.js # ios/NotificationService/Info.plist # ios/NotificationService/NotificationService.entitlements # ios/NotificationService/NotificationService.swift # ios/Podfile # ios/Podfile.lock # ios/Pods/Manifest.lock # ios/Pods/Pods.xcodeproj/project.pbxproj # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.markdown # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.plist # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.debug.xcconfig # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.release.xcconfig # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.markdown # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.plist # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.debug.xcconfig # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.release.xcconfig # ios/RocketChatRN-Bridging-Header.h # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/AppDelegate.m # ios/RocketChatRN/Info.plist # ios/RocketChatRN/RocketChatRN.entitlements # ios/ShareRocketChatRN/Images.xcassets/Icons/hashtag.imageset/Contents.json # ios/ShareRocketChatRN/Images.xcassets/Icons/hashtag.imageset/hashtag.png # ios/ShareRocketChatRN/Images.xcassets/Icons/hashtag.imageset/hashtag@2x.png # ios/ShareRocketChatRN/Images.xcassets/Icons/hashtag.imageset/hashtag@3x.png # ios/ShareRocketChatRN/Images.xcassets/Icons/lock.imageset/Contents.json # ios/ShareRocketChatRN/Images.xcassets/Icons/lock.imageset/lock.png # ios/ShareRocketChatRN/Images.xcassets/Icons/lock.imageset/lock@2x.png # ios/ShareRocketChatRN/Images.xcassets/Icons/lock.imageset/lock@3x.png # ios/ShareRocketChatRN/Info.plist # ios/ShareRocketChatRN/ShareRocketChatRN.entitlements # ios/ShareRocketChatRN/ShareRocketChatRN.m # ios/custom.ttf # ios/fastlane/README.md # ios/fastlane/report.xml # package.json # patches/react-native+0.63.1.patch # patches/react-native-jitsi-meet+2.1.1.patch # patches/react-native-notifications+2.1.7.patch # storybook/stories/Message.js # yarn.lock

CLAassistant · 2020-10-05T17:00:51Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
9 out of 10 committers have signed the CLA.

✅ youssef-md
✅ djorkaeffalexandre
✅ diegolmello
✅ GOVINDDIXIT
✅ grahamsmith
✅ David-Tsui
✅ aenonGit
✅ EzequielDeOliveira
✅ imrishabh18
❌ snyk-bot
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

lgtm-com · 2020-10-05T17:07:20Z

This pull request introduces 3 alerts when merging e753ea5 into 6c37333 - view on LGTM.com

new alerts:

1 for Direct state mutation
1 for Potentially inconsistent state update
1 for Unused variable, import, function or class

djorkaeffalexandre

LGTM

diegolmello and others added 30 commits April 6, 2020 16:07

[FIX] Single message thread inserting thread without rid (#1999)

afb68c7

[FIX] ThreadMessagesView crashing on load (#1997)

0298c38

[FIX] Saml (#1996)

32d1050

* [FIX] SAML incorrect close * [FIX] Pathname Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Change user own status (#1995)

c24c16c

* [FIX] Change user own status * [IMPROVEMENT] Set activeUsers Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Loading all updated rooms after app resume (#1998)

78441bf

* [FIX] Loading all updated rooms after app resume * Fix room date on RoomItem Co-authored-by: Diego Mello <diegolmello@gmail.com>

Bump version to 4.6.1 (#2001)

4666057

[FIX] DM header blink (#2011)

2e65a79

[REGRESSION] Invite Links (#2007)

1427e53

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Read only channel/broadcast (#1951)

404c381

* [FIX] Read only channel/broadcast * [FIX] Roles missing * [FIX] Check roles to readOnly * [FIX] Can post * [FIX] Respect post-readonly permission * [FIX] Search a room readOnly Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Cas auth (#2024)

acf7079

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Login TOTP Compatibility to older servers (#2018)

2b3ccf4

* [FIX] Login TOTP Compatibility to older servers * [FIX] Android crashes if use double negation Co-authored-by: Diego Mello <diegolmello@gmail.com>

Bump version to 4.6.4 (#2029)

a7641c1

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Lint (#2030)

8445baf

[FIX] UIKit with only one block (#2022)

91ff6e4

* [FIX] Message with only one block * [FIX] Update headers Co-authored-by: Diego Mello <diegolmello@gmail.com>

Bump version to 4.7.0 (#2035)

5698701

[FIX] Action Tint Color on Black theme (#2081)

e3cfcf7

[FIX] Prevent crash when thread is not found (#2080)

cce5efe

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Prevent double click (#2079)

f3b98c2

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Show slash commands when disconnected (#2078)

6c2bc1c

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Backhandler onboarding (#2077)

8201602

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Respect UI_Allow_room_names_with_special_chars setting (#2076)

200f94e

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] RoomsList update sometimes isn't fired (#2071)

022b033

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[IMPROVEMENT] Stop inserting last message as message object from room…

4e948f8

…s stream if room is focused (#2069) * [IMPROVEMENT] No insert last message if the room is focused * fix discussion/threads Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Hide system messages (#2067)

a34929f

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Pending update (#2066)

56dc724

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Prevent crash when room.uids was not inserted yet (#2055)

3f79ab7

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FEATURE] Save video (#2063)

25b5c95

* added-feature-save-video * fix sha256 Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Send totp-code to meteor call (#2050)

c4a749c

* fixed-issue * removed-variable-name-errors * reverted-last-commit Co-authored-by: Diego Mello <diegolmello@gmail.com>

diegolmello and others added 22 commits September 16, 2020 10:32

[FIX] Jitsi breaking changes (#2468)

709c7aa

* [FIX] Jitsi breaking changes * Update yarn cache

Update WatermelonDB to 0.19.0 (#2469)

7b67ae4

* [FIX] Jitsi breaking changes * Update yarn cache * Update watermelon to 0.19

[FIX] SanitizeLikeString util crashes for empty strings (#2471)

fb3e8bc

[i18n] Add Traditional Chinese (zh_TW) (#2465)

60dd61d

* I18n: Add Traditional Chinese language file(zh_TW) * Minor fixes * I18n: Add missing translation and fix some weird words * fix escape char * Fix minor issues Co-authored-by: Diego Mello <diegolmello@gmail.com>

[I18n] Improve Simplified Chinese (zh_CN) (#2466)

f5a3cb6

* I18n: Improve Simplified Chinese(zh_CN) language file * I18n: Add missing translation Co-authored-by: Diego Mello <diegolmello@gmail.com>

[CHORE] Simplify i18n files (#2472)

a8c4609

[FIX] Remove assets from share extension on iOS (#2473)

e1c8b10

[CHORE] Change database location to Experimental Apps (#2483)

8ae4890

* change database location of experimental apps * fix migration from older versions

[FIX] WatermelonDB caching Date as String (#2484)

8643f17

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[FIX] Language set by web client (#2488)

b9a79a1

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[i18n] Improve Chinese translation (zh-TW, zh-CN) (#2486)

088a926

Co-authored-by: Diego Mello <diegolmello@gmail.com>

[i18n] Add missing italian strings (#2487)

f30c405

fix some existing ones too

[REGRESSION] HTTP Basic Auth (#2490)

101aad4

[FIX] Logout when install fresh Official and Experimental iOS app (#2493

f86b274

)

[FIX] Show images in iOS 14 (#2494)

b73421d

[DOCS] Add Reactotron (#2498)

4d6ebf4

* Update about the inspection tool for our app. Information about the Reactotron tool was missing in the contribution file. * Update CONTRIBUTING.md Co-authored-by: Diego Mello <diegolmello@gmail.com>

[REGRESSION] SSL Pinning stopped working after #2449 (#2510)

48fe40c

[CHORE] Reset yarn cache (#2512)

2b3a5f8

[FIX] Fastlane iOS (#2513)

91ad210

diegolmello requested a review from djorkaeffalexandre October 5, 2020 17:00

diegolmello added 👀 needs review 💎 release labels Oct 5, 2020

djorkaeffalexandre approved these changes Oct 5, 2020

View reviewed changes

diegolmello merged commit f9ccf38 into master Oct 5, 2020

diegolmello deleted the beta branch October 5, 2020 20:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge beta into master #2520

Merge beta into master #2520

diegolmello commented Oct 5, 2020

CLAassistant commented Oct 5, 2020 •

edited

Loading

lgtm-com bot commented Oct 5, 2020

djorkaeffalexandre left a comment •

edited

Loading

Merge beta into master #2520

Merge beta into master #2520

Conversation

diegolmello commented Oct 5, 2020

Proposed changes

Issue(s)

How to test or reproduce

Screenshots

Types of changes

Checklist

Further comments

CLAassistant commented Oct 5, 2020 • edited Loading

lgtm-com bot commented Oct 5, 2020

djorkaeffalexandre left a comment • edited Loading

Choose a reason for hiding this comment

CLAassistant commented Oct 5, 2020 •

edited

Loading

djorkaeffalexandre left a comment •

edited

Loading