Bump app build number to 320 (#4740)

(cherry picked from commit ea4e21de93)

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>

.circleci/config.yml

@@ -1,7 +1,6 @@
 version: 2.1
 orbs:
   owasp: entur/owasp@0.0.10
-  node: circleci/node@4.5.1
 
 executors:
   android:
@@ -14,7 +13,7 @@ executors:
       NODE_ENV: production
       BABEL_ENV: production
     docker:
-      - image: circleci/android:api-29-node
+      - image: circleci/android:api-27-node
     working_directory: ~/mattermost-mobile
     resource_class: <<parameters.resource_class>>
 
@@ -24,7 +23,7 @@ executors:
       NODE_ENV: production
       BABEL_ENV: production
     macos:
-      xcode: "12.1.0"
+      xcode: "11.0.0"
     working_directory: ~/mattermost-mobile
     shell: /bin/bash --login -o pipefail
 
@@ -45,6 +44,7 @@ commands:
       for:
         type: string
     steps:
+      - ruby-setup
       - restore_cache:
           name: Restore Fastlane cache
           key: v1-gems-<< parameters.for >>-{{ checksum "fastlane/Gemfile.lock" }}-{{ arch }}
@@ -82,7 +82,7 @@ commands:
           key: v1-assets-{{ checksum "assets/base/config.json" }}-{{ arch }}
       - run:
           name: Generate assets
-          command: node ./scripts/generate-assets.js
+          command: make dist/assets
       - save_cache:
           name: Save assets cache
           key: v1-assets-{{ checksum "assets/base/config.json" }}-{{ arch }}
@@ -92,23 +92,20 @@ commands:
   npm-dependencies:
     description: "Get JavaScript dependencies"
     steps:
-      - node/install:
-          node-version: '16.2.0'
-          install-npm: false
       - restore_cache:
           name: Restore npm cache
           key: v2-npm-{{ checksum "package.json" }}-{{ arch }}
       - run:
           name: Getting JavaScript dependencies
-          command: NODE_ENV=development npm ci --ignore-scripts
+          command: NODE_ENV=development npm install --ignore-scripts
       - save_cache:
           name: Save npm cache
           key: v2-npm-{{ checksum "package.json" }}-{{ arch }}
           paths:
             - node_modules
       - run:
-          name: "Patch dependencies"
-          command: npx patch-package
+          name: "Run post install scripts"
+          command: make post-install
 
   pods-dependencies:
     description: "Get cocoapods dependencies"
@@ -116,12 +113,10 @@ commands:
       - restore_cache:
           name: Restore cocoapods specs and pods
           key: v1-cocoapods-{{ checksum "ios/Podfile.lock" }}-{{ arch }}
-      - run:
-          name: iOS gems
-          command: npm run ios-gems
       - run:
           name: Getting cocoapods dependencies
-          command: npm run pod-install
+          working_directory: ios
+          command: pod install
       - save_cache:
           name: Save cocoapods specs and pods cache
           key: v1-cocoapods-{{ checksum "ios/Podfile.lock" }}-{{ arch }}
@@ -148,14 +143,11 @@ commands:
             echo MATTERMOST_RELEASE_STORE_FILE=${STORE_FILE} | tee -a android/gradle.properties > /dev/null
             echo ${STORE_ALIAS} | tee -a android/gradle.properties > /dev/null
             echo ${STORE_PASSWORD} | tee -a android/gradle.properties > /dev/null
-      - run:
-          name: Jetify android libraries
-          command: ./node_modules/.bin/jetify
       - run:
           working_directory: fastlane
           name: Run fastlane to build android
           no_output_timeout: 30m
-          command: export TERM=xterm && bundle exec fastlane android build
+          command: bundle exec fastlane android build
 
   build-ios:
     description: "Build the iOS app"
@@ -173,7 +165,7 @@ commands:
           no_output_timeout: 30m
           command: |
             HOMEBREW_NO_AUTO_UPDATE=1 brew install watchman
-            export TERM=xterm && bundle exec fastlane ios build
+            bundle exec fastlane ios build
 
   deploy-to-store:
     description: "Deploy build to store"
@@ -206,13 +198,14 @@ commands:
       filename:
         type: string
     steps:
-      - run:
-          name: Copying artifacts
-          command: |
-            mkdir /tmp/artifacts;
-            cp ~/mattermost-mobile/<<parameters.filename>> /tmp/artifacts;
       - store_artifacts:
-          path: /tmp/artifacts
+          path: ~/mattermost-mobile/<<parameters.filename>>
+
+  ruby-setup:
+    steps:
+      - run:
+          name: Set Ruby Version
+          command: echo "ruby-2.6.3" > ~/.ruby-version
 
 jobs:
   test:
@@ -232,7 +225,7 @@ jobs:
           command: npm test
       - run:
           name: Check i18n
-          command: ./scripts/precommit/i18n.sh
+          command: make i18n-extract-ci
 
   check-deps:
     parameters:
@@ -259,16 +252,11 @@ jobs:
           steps:
             # Taken from https://github.com/entur/owasp-orb/blob/master/src/%40orb.yml#L349-L361
             - owasp/generate_cache_keys:
-                cache_key: commmandline-default-cache-key-v7
+                cache_key: commmandline-default-cache-key-v6
             - owasp/restore_owasp_cache
             - run:
                 name: Update OWASP Dependency-Check Database
-                command: |
-                  if ! ~/.owasp/dependency-check/bin/dependency-check.sh --data << parameters.cve_data_directory >> --updateonly; then
-                    # Update failed, probably due to a bad DB version; delete cached DB and try again
-                    rm -rv ~/.owasp/dependency-check-data/*.db
-                    ~/.owasp/dependency-check/bin/dependency-check.sh --data << parameters.cve_data_directory >> --updateonly
-                  fi
+                command: ~/.owasp/dependency-check/bin/dependency-check.sh --data << parameters.cve_data_directory >> --updateonly
             - owasp/store_owasp_cache:
                 cve_data_directory: <<parameters.cve_data_directory>>
             - run:
@@ -292,7 +280,7 @@ jobs:
       - build-android
       - persist
       - save:
-          filename: "*.apk"
+          filename: "Mattermost_Beta.apk"
 
   build-android-release:
     executor: android
@@ -300,7 +288,7 @@ jobs:
       - build-android
       - persist
       - save:
-          filename: "*.apk"
+          filename: "Mattermost.apk"
 
   build-android-pr:
     executor: android
@@ -309,7 +297,7 @@ jobs:
     steps:
       - build-android
       - save:
-          filename: "*.apk"
+          filename: "Mattermost_Beta.apk"
 
   build-android-unsigned:
     executor: android
@@ -321,9 +309,6 @@ jobs:
       - fastlane-dependencies:
           for: android
       - gradle-dependencies
-      - run:
-          name: Jetify Android libraries
-          command: ./node_modules/.bin/jetify
       - run:
           working_directory: fastlane
           name: Run fastlane to build unsigned android
@@ -331,7 +316,7 @@ jobs:
           command: bundle exec fastlane android unsigned
       - persist
       - save:
-          filename: "*.apk"
+          filename: "Mattermost-unsigned.apk"
 
   build-ios-beta:
     executor: ios
@@ -339,7 +324,7 @@ jobs:
       - build-ios
       - persist
       - save:
-          filename: "*.ipa"
+          filename: "Mattermost_Beta.ipa"
 
   build-ios-release:
     executor: ios
@@ -347,7 +332,7 @@ jobs:
       - build-ios
       - persist
       - save:
-          filename: "*.ipa"
+          filename: "Mattermost.ipa"
 
   build-ios-pr:
     executor: ios
@@ -356,13 +341,14 @@ jobs:
     steps:
       - build-ios
       - save:
-          filename: "*.ipa"
+          filename: "Mattermost_Beta.ipa"
 
   build-ios-unsigned:
     executor: ios
     steps:
       - checkout:
           path: ~/mattermost-mobile
+      - ruby-setup
       - npm-dependencies
       - pods-dependencies
       - assets
@@ -378,15 +364,16 @@ jobs:
       - persist_to_workspace:
           root: ~/
           paths:
-            - mattermost-mobile/*.ipa
+            - mattermost-mobile/Mattermost-unsigned.ipa
       - save:
-          filename: "*.ipa"
+          filename: "Mattermost-unsigned.ipa"
 
   build-ios-simulator:
     executor: ios
     steps:
       - checkout:
           path: ~/mattermost-mobile
+      - ruby-setup
       - npm-dependencies
       - pods-dependencies
       - assets
@@ -411,42 +398,47 @@ jobs:
       name: android
       resource_class: medium
     steps:
+      - ruby-setup
       - deploy-to-store:
           task: "Deploy to Google Play"
           target: android
-          file: "*.apk"
+          file: Mattermost.apk
 
   deploy-android-beta:
     executor:
       name: android
       resource_class: medium
     steps:
+      - ruby-setup
       - deploy-to-store:
           task: "Deploy to Google Play"
           target: android
-          file: "*.apk"
+          file: Mattermost_Beta.apk
 
   deploy-ios-release:
     executor: ios
     steps:
+      - ruby-setup
       - deploy-to-store:
           task: "Deploy to TestFlight"
           target: ios
-          file: "*.ipa"
+          file: Mattermost.ipa
 
   deploy-ios-beta:
     executor: ios
     steps:
+      - ruby-setup
       - deploy-to-store:
           task: "Deploy to TestFlight"
           target: ios
-          file: "*.ipa"
+          file: Mattermost_Beta.ipa
 
   github-release:
     executor:
       name: android
       resource_class: medium
     steps:
+      - ruby-setup
       - attach_workspace:
           at: ~/
       - run:
@@ -459,10 +451,10 @@ workflows:
   build:
     jobs:
       - test
-      # - check-deps:
-      #     context: sast-webhook
-      #     requires:
-      #       - test
+      - check-deps:
+          context: sast-webhook
+          requires:
+            - test
 
       - build-android-release:
           context: mattermost-mobile-android-release
@@ -554,14 +546,14 @@ workflows:
             - test
           filters:
             branches:
-              only: /^(build|android)-pr-.*/
+              only: /^build-pr-.*/
       - build-ios-pr:
           context: mattermost-mobile-ios-pr
           requires:
             - test
           filters:
             branches:
-              only: /^(build|ios)-pr-.*/
+              only: /^build-pr-.*/
 
       - build-android-unsigned:
           context: mattermost-mobile-unsigned
@@ -591,7 +583,6 @@ workflows:
                 - /^build-\d+$/
                 - /^build-ios-\d+$/
                 - /^build-ios-beta-\d+$/
-                - /^build-ios-sim-\d+$/
                 
       - github-release:
           context: mattermost-mobile-unsigned
@@ -602,4 +593,4 @@ workflows:
             tags:
               only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
             branches:
-              only: unsigned
+              only: unsigned

.env

@@ -1,2 +0,0 @@
-STORYBOOK_PORT=
-STORYBOOK_HOST=

.eslintrc.json

@@ -6,9 +6,8 @@
   ],
   "parser": "@typescript-eslint/parser",
   "plugins": [
-    "@typescript-eslint",
     "mattermost",
-    "import"
+    "@typescript-eslint"
   ],
   "settings": {
     "react": {
@@ -23,18 +22,16 @@
     "__DEV__": true
   },
   "rules": {
-    "eol-last": ["error", "always"],
     "global-require": 0,
     "no-undefined": 0,
     "react/display-name": [2, { "ignoreTranspilerName": false }],
     "react/jsx-filename-extension": 0,
-    "camelcase": [
-      0,
+    "@typescript-eslint/camelcase": [
+      2,
       {
         "properties": "never"
       }
     ],
-    "@typescript-eslint/ban-types": 0,
     "@typescript-eslint/no-non-null-assertion": 0,
     "@typescript-eslint/no-unused-vars": [
       2,
@@ -44,43 +41,9 @@
       }
     ],
     "@typescript-eslint/no-explicit-any": "warn",
-    "no-use-before-define": "off",
     "@typescript-eslint/no-use-before-define": 0,
     "@typescript-eslint/no-var-requires": 0,
-    "@typescript-eslint/explicit-function-return-type": 0,
-    "@typescript-eslint/explicit-module-boundary-types": "off",
-    "@typescript-eslint/member-delimiter-style": 2,
-    "import/order": [
-      2,
-      {
-        "groups": ["builtin", "external", "parent", "sibling", "index", "type"],
-        "newlines-between": "always",
-        "pathGroups": [
-          {
-            "pattern": "@(@react-native-community|@react-native-cookies|@react-navigation|@rudderstack|@sentry|@testing-library|@storybook)/**",
-            "group": "external",
-            "position": "before"
-          },
-          {
-            "pattern": "@{**,*/**}",
-            "group": "external",
-            "position": "after"
-          },
-          {
-            "pattern": "app/**",
-            "group": "parent",
-            "position": "before"
-          }
-        ],
-        "alphabetize": {
-          "order": "asc",
-          "caseInsensitive": true
-        },
-        "pathGroupsExcludedImportTypes": ["type"]
-      }
-    ],
-    "no-shadow": "off",
-    "@typescript-eslint/no-shadow": "error"
+    "@typescript-eslint/explicit-function-return-type": 0
   },
   "overrides": [
     {
@@ -88,23 +51,6 @@
       "env": {
         "jest": true
       }
-    },
-    {
-      "files": ["detox/e2e/**"],
-      "globals": {
-        "by": true,
-        "detox": true,
-        "device": true,
-        "element": true,
-        "waitFor": true
-      },
-      "rules": {
-        "func-names": 0,
-        "import/no-unresolved": 0,
-        "max-nested-callbacks": 0,
-        "no-process-env": 0,
-        "no-unused-expressions": 0
-      }
     }
   ]
 }

.flowconfig

@@ -8,6 +8,10 @@
 ; Ignore polyfills
 node_modules/react-native/Libraries/polyfills/.*
 
+; These should not be required directly
+; require from fbjs/lib instead: require('fbjs/lib/warning')
+node_modules/warning/.*
+
 ; Flow doesn't support platforms
 .*/Libraries/Utilities/LoadingView.js
 
@@ -26,8 +30,6 @@ emoji=true
 esproposal.optional_chaining=enable
 esproposal.nullish_coalescing=enable
 
-exact_by_default=true
-
 module.file_ext=.js
 module.file_ext=.json
 module.file_ext=.ios.js
@@ -42,6 +44,10 @@ suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
+
 [lints]
 sketchy-null-number=warn
 sketchy-null-mixed=warn
@@ -53,6 +59,7 @@ unsafe-getters-setters=warn
 inexact-spread=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
+deprecated-utility=error
 
 [strict]
 deprecated-type
@@ -64,4 +71,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.137.0
+^0.113.0

.gitattributes

@@ -1,3 +1,4 @@
-# Windows files should use crlf line endings
-# https://help.github.com/articles/dealing-with-line-endings/
-*.bat text eol=crlf
+*.pbxproj -text
+
+# specific for windows script files
+*.bat text eol=crlf

.github/ISSUE_TEMPLATE.md

@@ -1,32 +0,0 @@
-Per Mattermost guidelines, GitHub issues are for bug reports: <http://www.mattermost.org/filing-issues/>.
-
-For troubleshooting see: http://forum.mattermost.org/.
-For feature proposals see: http://www.mattermost.org/feature-requests/
-
-If you've found a bug--something appears unintentional--please follow these steps:
-
-1. Confirm you’re filing a new issue. [Search existing tickets in Jira](https://mattermost.atlassian.net/jira/software/c/projects/MM/issues/) to ensure that the ticket does not already exist.
-2. Confirm your issue does not involve security. Otherwise, please see our [Responsible Disclosure Policy](https://about.mattermost.com/report-security-issue/).
-3. [File a new issue](https://github.com/mattermost/mattermost-mobile/issues/new) using the format below. Mattermost will confirm steps to reproduce and file in Jira, or ask for more details if there is trouble reproducing it. If there's already an existing bug in Jira, it will be linked back to the GitHub issue so you can track when it gets fixed.
-
-#### Summary
-Bug report in one concise sentence
-
-### Environment Information
-  - Device Name:
-  - OS Version:
-  - Mattermost App Version:
-  - Mattermost Server Version:
-
-#### Steps to reproduce
-How can we reproduce the issue (what version are you using?)
-
-#### Expected behavior
-Describe your issue in detail
-
-#### Observed behavior (that appears unintentional)
-What did you see happen? Please include relevant error messages, screenshots and/or video recordings.
-
-#### Possible fixes
-If you can, link to the line of code that might be responsible for the problem
-

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,61 +0,0 @@
-<!-- Thank you for contributing a pull request! Here are a few tips to help you:
-
-1. If this is your first contribution, make sure you've read the Contribution Checklist https://developers.mattermost.com/contribute/getting-started/contribution-checklist/
-2. Read our blog post about "Submitting Great PRs" https://developers.mattermost.com/blog/2019-01-24-submitting-great-prs
-3. Take a look at other repository specific documentation at https://developers.mattermost.com/contribute
--->
-
-#### Summary
-<!--
-A brief description of what this pull request does.
--->
-
-#### Ticket Link
-<!--
-If this pull request addresses a Help Wanted ticket or fixes a reported issue, please link the relevant GitHub issue, e.g.
-
-  Fixes https://github.com/mattermost/mattermost-mobile/issues/XXXXX
-
-Otherwise, link the JIRA ticket.
--->
-
-#### Checklist
-<!--
-Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.
--->
-- [ ] Added or updated unit tests (required for all new features)
-- [ ] Has UI changes
-- [ ] Includes text changes and localization file updates
-
-#### Device Information
-This PR was tested on: <!-- Device name(s), OS version(s) -->
-
-#### Screenshots
-<!--
-If the PR includes UI changes, include screenshots/GIFs/Videos (for both iOS and Android if possible).
--->
-
-#### Release Note
-<!--
-Add a release note for each of the following conditions:
-
-* New features and improvements, including behavioural changes, UI changes
-* Bug fixes and fixes of previous known issues
-* Deprecation warnings, breaking changes, or compatibility notes
-
-If no release notes are required write NONE. Use past-tense. Newlines are stripped.
-
-Example:
-
-```release-note
-Added a new config setting ServiceSettings.FooBar. Added a new column Foo to the Users table.
-```
-
-```release-note
-NONE
-```
--->
-
-```release-note
-
-```

.github/workflows/codeql-analysis.yml

@@ -1,43 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '0 0 * * 0'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.gitignore

@@ -5,8 +5,6 @@ build-ios
 server.PID
 mattermost.keystore
 tmp/
-.env
-env.d.ts
 
 # OSX
 #
@@ -91,12 +89,6 @@ ios/sentry.properties
 coverage
 .tmp
 
-# E2E testing
-mattermost-license.txt
-*.mattermost-license
-detox/artifacts
-detox/detox_pixel_4_xl_api_30
-
 # Bundle artifact
 *.jsbundle
 

.husky/.gitignore

@@ -1 +0,0 @@
-_

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-sh ./scripts/pre-commit.sh

.storybook/main.js

@@ -1,6 +0,0 @@
-module.exports = {
-  "stories": [
-    "../app/components/**/*.stories.mdx",
-    "../app/components/**/*.stories.@(js|jsx|ts|tsx)"
-  ],
-}

.storybook/preview.js

@@ -1,5 +0,0 @@
-
-export const parameters = {
-  actions: { argTypesRegex: "^on[A-Z].*" },
-}
-

Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "cocoapods", "1.10.1"
+gem "cocoapods", "1.7.5"

Gemfile.lock

@@ -1,28 +1,24 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
-    activesupport (5.2.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+    CFPropertyList (3.0.2)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
       minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    algoliasearch (1.27.5)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.10.1)
-      addressable (~> 2.6)
+    cocoapods (1.7.5)
+      activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.1)
+      cocoapods-core (= 1.7.5)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -31,63 +27,50 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.19.0, < 2.0)
-    cocoapods-core (1.10.1)
-      activesupport (> 5.0, < 6)
-      addressable (~> 2.6)
-      algoliasearch (~> 1.0)
-      concurrent-ruby (~> 1.1)
+      xcodeproj (>= 1.10.0, < 2.0)
+    cocoapods-core (1.7.5)
+      activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-      netrc (~> 0.11)
-      public_suffix
-      typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.4.0)
+    cocoapods-downloader (1.3.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-trunk (1.5.0)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
-    cocoapods-try (1.2.0)
+    cocoapods-try (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.5)
     escape (0.0.4)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    ffi (1.15.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.5.1)
-    minitest (5.14.4)
+    minitest (5.14.0)
     molinillo (0.6.6)
-    nanaimo (0.3.0)
+    nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
-    public_suffix (4.0.6)
     ruby-macho (1.4.0)
     thread_safe (0.3.6)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.9)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    xcodeproj (1.19.0)
+    xcodeproj (1.15.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
+      nanaimo (~> 0.2.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.10.1)
+  cocoapods (= 1.7.5)
 
 BUNDLED WITH
-   2.1.4
+   2.0.2

Makefile

@@ -0,0 +1,245 @@
+.PHONY: pre-run pre-build clean
+.PHONY: check-style
+.PHONY: i18n-extract-ci
+.PHONY: start stop
+.PHONY: run run-ios run-android
+.PHONY: build build-ios build-android unsigned-ios unsigned-android ios-sim-x86_64
+.PHONY: build-pr can-build-pr prepare-pr
+.PHONY: test help
+
+OS := $(shell sh -c 'uname -s 2>/dev/null')
+BASE_ASSETS = $(shell find assets/base -type d) $(shell find assets/base -type f -name '*')
+OVERRIDE_ASSETS = $(shell find assets/override -type d 2> /dev/null) $(shell find assets/override -type f -name '*' 2> /dev/null)
+MM_UTILITIES_DIR = ../mattermost-utilities
+
+node_modules: package.json
+	@if ! [ $(shell which npm 2> /dev/null) ]; then \
+		echo "npm is not installed https://npmjs.com"; \
+		exit 1; \
+	fi
+
+	@echo Getting Javascript dependencies
+	@npm install
+
+npm-ci: package.json
+	@if ! [ $(shell which npm 2> /dev/null) ]; then \
+		echo "npm is not installed https://npmjs.com"; \
+		exit 1; \
+	fi
+
+	@echo Getting Javascript dependencies
+	@npm ci
+
+.podinstall:
+ifeq ($(OS), Darwin)
+	@echo "Required version of Cocoapods is not installed"
+	@echo Installing gems;
+	@bundle install
+	@echo Getting Cocoapods dependencies;
+	@cd ios && bundle exec pod install;
+endif
+	@touch $@
+
+dist/assets: $(BASE_ASSETS) $(OVERRIDE_ASSETS)
+	@mkdir -p dist
+
+	@if [ -e dist/assets ] ; then \
+		rm -rf dist/assets; \
+	fi
+
+	@echo "Generating app assets"
+	@node scripts/make-dist-assets.js
+
+pre-run: | node_modules .podinstall dist/assets ## Installs dependencies and assets
+
+pre-build: | npm-ci .podinstall dist/assets ## Install dependencies and assets before building
+
+check-style: node_modules ## Runs eslint
+	@echo Checking for style guide compliance
+	@npm run check
+
+clean: ## Cleans dependencies, previous builds and temp files
+	@echo Cleaning started
+
+	@rm -f .podinstall
+	@rm -rf ios/Pods
+	@rm -rf node_modules
+	@rm -rf dist
+	@rm -rf ios/build
+	@rm -rf android/app/build
+
+	@echo Cleanup finished
+
+post-install:
+	@./node_modules/.bin/patch-package
+	@./node_modules/.bin/jetify
+
+	@rm -f node_modules/intl/.babelrc
+	@# Hack to get react-intl and its dependencies to work with react-native
+	@# Based off of https://github.com/este/este/blob/master/gulp/native-fix.js
+	@sed -i'' -e 's|"./locale-data/index.js": false|"./locale-data/index.js": "./locale-data/index.js"|g' node_modules/react-intl/package.json
+	@sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-messageformat/package.json
+	@sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-relativeformat/package.json
+	@sed -i'' -e 's|"./locale-data/complete.js": false|"./locale-data/complete.js": "./locale-data/complete.js"|g' node_modules/intl/package.json
+
+start: | pre-run ## Starts the React Native packager server
+	$(call start_packager)
+
+stop: ## Stops the React Native packager server
+	$(call stop_packager)
+
+check-device-ios:
+	@if ! [ $(shell which xcodebuild) ]; then \
+		echo "xcode is not installed"; \
+		exit 1; \
+	fi
+	@if ! [ $(shell which watchman) ]; then \
+		echo "watchman is not installed"; \
+		exit 1; \
+	fi
+
+check-device-android:
+	@if ! [ $(ANDROID_HOME) ]; then \
+		echo "ANDROID_HOME is not set"; \
+		exit 1; \
+	fi
+	@if ! [ $(shell which adb 2> /dev/null) ]; then \
+		echo "adb is not installed"; \
+		exit 1; \
+	fi
+
+	@echo "Connect your Android device or open the emulator"
+	@adb wait-for-device
+
+	@if ! [ $(shell which watchman 2> /dev/null) ]; then \
+		echo "watchman is not installed"; \
+		exit 1; \
+	fi
+
+prepare-android-build:
+	@rm -rf ./node_modules/react-native/local-cli/templates/HelloWorld
+	@rm -rf ./node_modules/react-native-linear-gradient/Examples/
+	@rm -rf ./node_modules/react-native-orientation/demo/
+
+run: run-ios ## alias for run-ios
+
+run-ios: | check-device-ios pre-run ## Runs the app on an iOS simulator
+	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
+		echo Starting React Native packager server; \
+		npm start & echo Running iOS app in development; \
+		if [ ! -z "${SIMULATOR}" ]; then \
+			react-native run-ios --simulator="${SIMULATOR}"; \
+		else \
+			react-native run-ios; \
+		fi; \
+		wait; \
+	else \
+		echo Running iOS app in development; \
+		if [ ! -z "${SIMULATOR}" ]; then \
+			react-native run-ios --simulator="${SIMULATOR}"; \
+		else \
+			react-native run-ios; \
+		fi; \
+	fi
+
+run-android: | check-device-android pre-run prepare-android-build ## Runs the app on an Android emulator or dev device
+	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
+        echo Starting React Native packager server; \
+    	npm start & echo Running Android app in development; \
+	if [ ! -z ${VARIANT} ]; then \
+    		react-native run-android --no-packager --variant=${VARIANT}; \
+    	else \
+    		react-native run-android --no-packager; \
+    	fi; \
+    	wait; \
+    else \
+    	echo Running Android app in development; \
+        if [ ! -z ${VARIANT} ]; then \
+			react-native run-android --no-packager --variant=${VARIANT}; \
+		else \
+			react-native run-android --no-packager; \
+		fi; \
+    fi
+
+build: | stop pre-build check-style i18n-extract-ci ## Builds the app for Android & iOS
+	$(call start_packager)
+	@echo "Building App"
+	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane build
+	$(call stop_packager)
+
+
+build-ios: | stop pre-build check-style i18n-extract-ci ## Builds the iOS app
+	$(call start_packager)
+	@echo "Building iOS app"
+	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane ios build
+	$(call stop_packager)
+
+build-android: | stop pre-build check-style i18n-extract-ci prepare-android-build ## Build the Android app
+	$(call start_packager)
+	@echo "Building Android app"
+	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane android build
+	$(call stop_packager)
+
+unsigned-ios: stop pre-build check-style ## Build an unsigned version of the iOS app
+	$(call start_packager)
+	@cd fastlane && NODE_ENV=production bundle exec fastlane ios unsigned
+	$(call stop_packager)
+
+ios-sim-x86_64: stop pre-build check-style ## Build an unsigned x86_64 version of the iOS app for iPhone simulator
+	$(call start_packager)
+	@echo "Building unsigned x86_64 iOS app for iPhone simulator"
+	@cd fastlane && NODE_ENV=production bundle exec fastlane ios simulator
+	$(call stop_packager)
+
+unsigned-android: stop pre-build check-style prepare-android-build ## Build an unsigned version of the Android app
+	@cd fastlane && NODE_ENV=production bundle exec fastlane android unsigned
+
+test: | pre-run check-style ## Runs tests
+	@npm test
+
+build-pr: | can-build-pr stop pre-build check-style i18n-extract-ci ## Build a PR from the mattermost-mobile repo
+	$(call start_packager)
+	@echo "Building App from PR ${PR_ID}"
+	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane build_pr pr:PR-${PR_ID}
+	$(call stop_packager)
+
+can-build-pr:
+	@if [ -z ${PR_ID} ]; then \
+		echo a PR number needs to be specified; \
+		exit 1; \
+	fi
+
+i18n-extract: ## Extract strings for translation from the source code
+	npm run mmjstool -- i18n extract-mobile
+
+i18n-extract-ci:
+	mkdir -p tmp
+	cp assets/base/i18n/en.json tmp/en.json
+	mkdir -p tmp/fake-webapp-dir/i18n/
+	echo '{}' > tmp/fake-webapp-dir/i18n/en.json
+	npm run mmjstool -- i18n extract-mobile --webapp-dir tmp/fake-webapp-dir --mobile-dir .
+	diff tmp/en.json assets/base/i18n/en.json
+	rm -rf tmp
+
+## Help documentation https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
+help:
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+define start_packager
+	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
+		echo Starting React Native packager server; \
+		npm start & echo; \
+	else \
+		echo React Native packager server already running; \
+	fi
+endef
+
+define stop_packager
+	@echo Stopping React Native packager server
+	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 1 ]; then \
+		ps -ef | grep -i "cli.js start" | grep -iv grep | awk '{print $$2}' | xargs kill -9; \
+		echo React Native packager server stopped; \
+	else \
+		echo No React Native packager server running; \
+	fi
+endef

NOTICE.txt

@@ -113,64 +113,6 @@ SOFTWARE.
 
 ---
 
-## @react-native-community/clipboard
-
-This product contains '@react-native-community/clipboard' by React Native Community.
-
-React Native Clipboard API for both iOS and Android
-
-* HOMEPAGE:
-  * https://github.com/react-native-community/clipboard
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) 2015-present, Facebook, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## @react-native-community/datetimepicker
-
-This product contains '@react-native-community/datetimepicker' by React Native Community.
-
-React Native date & time picker component for iOS, Android and Windows.
-
-* HOMEPAGE:
-  * https://github.com/react-native-datetimepicker/datetimepicker
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) 2019 React Native Community
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
 ## @react-native-community/masked-view
 
 This product contains '@react-native-community/masked-view' by React Native Community.
@@ -553,66 +495,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---
 
-## array.prototype.flat
-
-This product contains a modified version of 'array.prototype.flat' by ECMAScript Shims.
-
-An ES2019 spec-compliant Array.prototype.flat shim/polyfill/replacement that works as far down as ES3.
-
-* HOMEPAGE:
-  * https://github.com/es-shims/Array.prototype.flat
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) 2017 ECMAScript Shims
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## base-64
-
-This product contains a modified version of 'base-64' by Dan Kogai.
-
-Yet another Base64 transcoder.
-
-* HOMEPAGE:
-  * https://github.com/dankogai/js-base64
-
-* LICENSE: BSD 3-Clause "New" or "Revised" License
-
-Copyright (c) 2014, Dan Kogai All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-Neither the name of {{{project}}} nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
 ## commonmark
 
 This product contains a modified version of 'commonmark' by John MacFarlane.
@@ -777,6 +659,37 @@ SOFTWARE.
 
 ---
 
+## core-js
+
+This product contains 'core-js' by Denis Pushkarev.
+
+Modular standard library for JavaScript.
+
+* HOMEPAGE:
+  * https://github.com/zloirock/core-js
+
+* LICENSE: Copyright (c) 2014-2019 Denis Pushkarev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+---
+
 ## deep-equal
 
 This product contains 'deep-equal' by James Halliday.
@@ -1573,6 +1486,47 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 
+## react-native-circular-progress
+
+This product contains 'react-native-circular-progress' by Bart Gryszko.
+
+React Native component for creating animated, circular progress with react-native-svg
+
+* HOMEPAGE:
+  * https://github.com/bgryszko/react-native-circular-progress
+
+* LICENSE: MIT
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Bart Gryszko
+
+
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+---
+
 ## react-native-cookies
 
 This product contains a modified version of 'react-native-cookies' by Joseph P. Ferraro.
@@ -1907,6 +1861,30 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---
 
+## react-native-image-gallery
+
+This product contains a modified version of 'react-native-image-gallery' by Archriss.
+
+Pure JavaScript image gallery component for iOS and Android
+
+* HOMEPAGE:
+  * https://github.com/archriss/react-native-image-gallery#readme
+
+* LICENSE: ISC
+
+Note: An original license file for this dependency is not available. We determined the type of license based on the package registry entry for this project. The following text has been prepared using a template from the SPDX Workgroup (https://spdx.org) for this type of license.
+
+ISC License:
+
+Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
+Copyright (c) 1995-2003 by Internet Software Consortium
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+---
+
 ## react-native-image-picker
 
 This product contains 'react-native-image-picker' by Marc Shilling.
@@ -2341,39 +2319,6 @@ SOFTWARE.
 
 ---
 
-## react-native-redash
-
-This product contains 'react-native-redash' by William Candillon.
-
-The React Native Reanimated and Gesture Handler Toolbelt.
-
-* HOMEPAGE:
-  * https://github.com/wcandillon/react-native-redash
-
-* LICENSE: MIT License
-
-Copyright (c) 2020 William Candillon
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
 ## react-native-safe-area
 
 This product contains 'react-native-safe-area' by Masayuki Iwai.
@@ -2502,39 +2447,6 @@ limitations under the License.
 
 ---
 
-## react-native-share
-
-This product contains 'react-native-share' by react-native-share.
-
-React Native Share, a simple tool for share message and file to other apps.
-
-* HOMEPAGE:
-  * https://github.com/react-native-share/react-native-share
-
-* LICENSE: The MIT License (MIT)
-
-Copyright (c) 2015 Esteban Fuentealba
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
 ## react-native-slider
 
 This product contains 'react-native-slider' by Jean Regisser.
@@ -2570,20 +2482,45 @@ SOFTWARE.
 
 ---
 
-## react-native-startup-time
+## react-native-status-bar-size
 
-This product contains 'react-native-startup-time' by doomsower.
+This product contains 'react-native-status-bar-size' by Brent Vatne.
 
-This module helps you to measure your app launch time.
+Watch and respond to changes in the iOS status bar height
 
 * HOMEPAGE:
-  * https://github.com/doomsower/react-native-startup-time
+  * https://github.com/jgkim/react-native-status-bar-size#readme
+
+* LICENSE: MIT
+
+Note: An original license file for this dependency is not available. We determined the type of license based on the package registry entry for this project. The following text has been prepared using a template from the SPDX Workgroup (https://spdx.org) for this type of license.
+
+MIT License
+
+Copyright (c) 2019 Brent Vatne
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+## react-native-svg
+
+This product contains 'react-native-svg' by React Native Community.
+
+SVG library for react-native
+
+* HOMEPAGE:
+  * https://github.com/react-native-community/react-native-svg#readme
 
 * LICENSE: MIT
 
 The MIT License (MIT)
 
-Copyright (c) 2019 Konstantin Kuznetsov
+Copyright (c) [2015-2016] [Horcrux]
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -2605,20 +2542,20 @@ SOFTWARE.
 
 ---
 
-## react-native-svg
+## react-native-v8
 
-This product contains 'react-native-svg' by React Native Community.
+This product contains 'react-native-v8' by Kudo Chien.
 
-SVG library for react-native
+Opt-in V8 runtime for React Native Android
 
 * HOMEPAGE:
-  * https://github.com/react-native-community/react-native-svg#readme
+  * https://github.com/Kudo/react-native-v8
 
 * LICENSE: MIT
 
-The MIT License (MIT)
+MIT License
 
-Copyright (c) [2015-2016] [Horcrux]
+Copyright (c) 2019 Kudo
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 # Mattermost Mobile
 
-- **Minimum Server versions:** Current ESR version (5.31.3)
+- **Minimum Server versions:** Current ESR version (5.19)
 - **Supported iOS versions:** 11+
 - **Supported Android versions:** 7.0+
 
@@ -63,7 +63,7 @@ We plan to add support for tablets in the future, but the timeline depends on ho
 
 ### I keep getting a message "Cannot connect to the server. Please check your server URL and internet connection."
 
-This sometimes appears when there is an issue with the SSL certificate configuration. 
+This sometimes appears when there is an issue with the SSL certitificate configuration. 
 
 To check that your SSL certificate is set up correctly, test the SSL certificate by visiting a site such as https://www.ssllabs.com/ssltest/index.html. If there’s an error about the missing chain or certificate path, there is likely an intermediate certificate missing that needs to be included.
 

android/app/build.gradle

@@ -101,14 +101,15 @@ if (System.getenv("SENTRY_ENABLED") == "true") {
  * Upload all the APKs to the Play Store and people will download
  * the correct one based on the CPU architecture of their device.
  */
-def enableSeparateBuildPerCPUArchitecture = project.hasProperty('separateApk') ? project.property('separateApk').toBoolean() : false
+def enableSeparateBuildPerCPUArchitecture = false
 
 /**
  * Run Proguard to shrink the Java bytecode in release builds.
  */
 def enableProguardInReleaseBuilds = false
 
-def jscFlavor = 'org.webkit:android-jsc-intl:+'
+// Add v8-android - prebuilt libv8android.so into APK
+def jscFlavor = 'org.chromium:v8-android:+'
 
 /**
  * Whether to enable the Hermes VM.
@@ -132,11 +133,13 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
-        versionCode 368
-        versionName "1.46.0"
+        versionCode 320
+        versionName "1.34.1"
         multiDexEnabled = true
-        testBuildType System.getProperty('testBuildType', 'debug')
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        ndk {
+            abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
+        }
+
     }
     signingConfigs {
         release {
@@ -152,7 +155,7 @@ android {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
-            universalApk enableSeparateBuildPerCPUArchitecture  // If true, also generate a universal APK
+            universalApk false  // If true, also generate a universal APK
             include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
@@ -181,7 +184,7 @@ android {
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
-                        versionCodes.get(abi) * 1000000 + defaultConfig.versionCode
+                        versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
             }
         }
     }
@@ -192,9 +195,13 @@ android {
     }
 
     packagingOptions {
-        pickFirst '**/*.so'
+        // Make sure libjsc.so does not packed in APK
+        exclude "**/libjsc.so"
+        pickFirst "lib/armeabi-v7a/libc++_shared.so"
+        pickFirst "lib/arm64-v8a/libc++_shared.so"
+        pickFirst "lib/x86/libc++_shared.so"
+        pickFirst "lib/x86_64/libc++_shared.so"
     }
-
 }
 
 repositories {
@@ -254,7 +261,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     implementation project(':reactnativenotifications')
-    implementation "com.google.firebase:firebase-messaging:$firebaseVersion"
+    implementation 'com.google.firebase:firebase-messaging:17.3.4'
 
     // For animated GIF support
     implementation 'com.facebook.fresco:fresco:2.0.0'
@@ -262,8 +269,6 @@ dependencies {
     // For WebP support, including animated WebP
     implementation 'com.facebook.fresco:animated-webp:2.0.0'
     implementation  'com.facebook.fresco:webpsupport:2.0.0'
-
-    androidTestImplementation('com.wix:detox:+')
 }
 
 // Run this once to be able to run the application with BUCK

android/app/src/androidTest/java/com/mattermost/rnbeta/DetoxTest.java

@@ -1,28 +0,0 @@
-package com.mattermost.rnbeta;
-
-import com.wix.detox.Detox;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-import androidx.test.rule.ActivityTestRule;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class DetoxTest {
-
-    @Rule
-    public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<>(MainActivity.class, false, false);
-
-    @Test
-    public void runDetoxTests() {
-        Detox.DetoxIdlePolicyConfig idlePolicyConfig = new Detox.DetoxIdlePolicyConfig();
-        idlePolicyConfig.masterTimeoutSec = 60;
-        idlePolicyConfig.idleResourceTimeoutSec = 30;
-
-        Detox.runTests(mActivityRule, idlePolicyConfig);
-    }
-}

android/app/src/debug/AndroidManifest.xml

@@ -4,10 +4,5 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <application
-        android:usesCleartextTraffic="true"
-        tools:targetApi="28"
-        tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-    </application>
+    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -19,20 +19,18 @@
       android:theme="@style/AppTheme"
       android:installLocation="auto"
       android:networkSecurityConfig="@xml/network_security_config"
-      android:resizeableActivity="true"
-      android:requestLegacyExternalStorage="true"
-      android:usesCleartextTraffic="true"
     >
         <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
         <meta-data android:name="android.content.APP_RESTRICTIONS"
                    android:resource="@xml/app_restrictions" />
+
+        <meta-data android:name="com.wix.reactnativenotifications.gcmSenderId" android:value="184930218130\"/>
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:windowSoftInputMode="adjustResize"
-        android:launchMode="singleTask"
-        android:taskAffinity="">
+        android:launchMode="singleTask">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
@@ -44,13 +42,8 @@
           <category android:name="android.intent.category.BROWSABLE" />
           <data android:scheme="mattermost" />
         </intent-filter>
-        <intent-filter>
-          <action android:name="android.intent.action.VIEW" />
-          <category android:name="android.intent.category.DEFAULT" />
-          <category android:name="android.intent.category.BROWSABLE" />
-          <data android:scheme="mmauthbeta" />
-        </intent-filter>
       </activity>
+      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
       <service android:name=".NotificationDismissService"
                 android:enabled="true"
                 android:exported="false" />

android/app/src/main/java/com/mattermost/rnbeta/CustomMMKVJSIModulePackage.java

@@ -1,21 +0,0 @@
-package com.mattermost.rnbeta;
-
-import com.facebook.react.bridge.JSIModulePackage;
-import com.facebook.react.bridge.JSIModuleSpec;
-import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.ReactApplicationContext;
-import java.util.Collections;
-import java.util.List;
-
-import com.swmansion.reanimated.ReanimatedJSIModulePackage;
-import com.ammarahmed.mmkv.RNMMKVModule;
-
-public class CustomMMKVJSIModulePackage extends ReanimatedJSIModulePackage {
-    @Override
-    public List<JSIModuleSpec> getJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext) {
-        super.getJSIModules(reactApplicationContext, jsContext);
-        reactApplicationContext.getNativeModule(RNMMKVModule.class).installLib(jsContext, reactApplicationContext.getFilesDir().getAbsolutePath() + "/mmkv");
-
-        return Collections.emptyList();
-    }
-}

android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java

@@ -1,103 +1,114 @@
 package com.mattermost.rnbeta;
 
 import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.Person;
+import android.app.Person.Builder;
+import android.app.RemoteInput;
+import android.content.Intent;
 import android.content.Context;
-import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.media.AudioManager;
+import android.media.RingtoneManager;
+import android.net.Uri;
 import android.os.Bundle;
-import android.util.Log;
-
+import android.os.Build;
+import android.provider.Settings.System;
 import androidx.annotation.Nullable;
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
-
+import android.util.Log;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import com.wix.reactnativenotifications.core.notification.PushNotification;
+import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
 import com.wix.reactnativenotifications.core.AppLaunchHelper;
 import com.wix.reactnativenotifications.core.AppLifecycleFacade;
 import com.wix.reactnativenotifications.core.JsIOHelper;
+
 import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_NAME;
 
 import com.mattermost.react_native_interface.ResolvePromise;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
+import com.facebook.react.bridge.WritableMap;
 
 public class CustomPushNotification extends PushNotification {
-    private static final String PUSH_NOTIFICATIONS = "PUSH_NOTIFICATIONS";
+    public static final int MESSAGE_NOTIFICATION_ID = 435345;
+    public static final String GROUP_KEY_MESSAGES = "mm_group_key_messages";
+    public static final String NOTIFICATION_ID = "notificationId";
+    public static final String KEY_TEXT_REPLY = "CAN_REPLY";
+    public static final String NOTIFICATION_REPLIED_EVENT_NAME = "notificationReplied";
+
     private static final String PUSH_TYPE_MESSAGE = "message";
     private static final String PUSH_TYPE_CLEAR = "clear";
     private static final String PUSH_TYPE_SESSION = "session";
-    private static final String NOTIFICATIONS_IN_CHANNEL = "notificationsInChannel";
+    private static final String PUSH_TYPE_UPDATE_BADGE = "update_badge";
+
+    private NotificationChannel mHighImportanceChannel;
+    private NotificationChannel mMinImportanceChannel;
+
+    private static Map<String, Integer> channelIdToNotificationCount = new HashMap<String, Integer>();
+    private static Map<String, List<Bundle>> channelIdToNotification = new HashMap<String, List<Bundle>>();
+    private static AppLifecycleFacade lifecycleFacade;
+    private static Context context;
+    private static int badgeCount = 0;
 
     public CustomPushNotification(Context context, Bundle bundle, AppLifecycleFacade appLifecycleFacade, AppLaunchHelper appLaunchHelper, JsIOHelper jsIoHelper) {
         super(context, bundle, appLifecycleFacade, appLaunchHelper, jsIoHelper);
-        CustomPushNotificationHelper.createNotificationChannels(context);
+        this.context = context;
+        createNotificationChannels();
     }
 
-    public static void cancelNotification(Context context, String channelId, Integer notificationId) {
-        if (!android.text.TextUtils.isEmpty(channelId)) {
-            Map<String, List<Integer>> notificationsInChannel = loadNotificationsMap(context);
-            List<Integer> notifications = notificationsInChannel.get(channelId);
-            if (notifications == null) {
-                return;
+    public static void clearNotification(Context mContext, int notificationId, String channelId) {
+        if (notificationId != -1) {
+            Integer count = channelIdToNotificationCount.get(channelId);
+            if (count == null) {
+                count = -1;
             }
 
-            notifications.remove(notificationId);
-            saveNotificationsMap(context, notificationsInChannel);
-            final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
-            notificationManager.cancel(notificationId);
-        }
-    }
+            channelIdToNotificationCount.remove(channelId);
+            channelIdToNotification.remove(channelId);
 
-    public static void clearChannelNotifications(Context context, String channelId) {
-        if (!android.text.TextUtils.isEmpty(channelId)) {
-            Map<String, List<Integer>> notificationsInChannel = loadNotificationsMap(context);
-            List<Integer> notifications = notificationsInChannel.get(channelId);
-            if (notifications == null) {
-                return;
-            }
-
-            notificationsInChannel.remove(channelId);
-            saveNotificationsMap(context, notificationsInChannel);
-
-            for (final Integer notificationId : notifications) {
-                final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
+            if (mContext != null) {
+                final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
                 notificationManager.cancel(notificationId);
+
+                if (count != -1) {
+                    int total = CustomPushNotification.badgeCount - count;
+                    int badgeCount = total < 0 ? 0 : total;
+                    CustomPushNotification.badgeCount = badgeCount;
+                }
             }
         }
     }
 
-    public static void clearAllNotifications(Context context) {
-        if (context != null) {
-            Map<String, List<Integer>> notificationsInChannel = loadNotificationsMap(context);
-            notificationsInChannel.clear();
-            saveNotificationsMap(context, notificationsInChannel);
-            final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
+    public static void clearAllNotifications(Context mContext) {
+        channelIdToNotificationCount.clear();
+        channelIdToNotification.clear();
+        if (mContext != null) {
+            final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
             notificationManager.cancelAll();
         }
     }
 
     @Override
-    public void onReceived() {
+    public void onReceived() throws InvalidNotificationException {
         final Bundle initialData = mNotificationProps.asBundle();
         final String type = initialData.getString("type");
         final String ackId = initialData.getString("ack_id");
         final String postId = initialData.getString("post_id");
         final String channelId = initialData.getString("channel_id");
-        final boolean isIdLoaded = initialData.getString("id_loaded") != null && initialData.getString("id_loaded").equals("true");
-        int notificationId = CustomPushNotificationHelper.MESSAGE_NOTIFICATION_ID;
-        if (postId != null) {
-            notificationId = postId.hashCode();
-        } else if (channelId != null) {
-            notificationId = channelId.hashCode();
-        }
+        final boolean isIdLoaded = initialData.getString("id_loaded") != null ? initialData.getString("id_loaded").equals("true") : false;
+        int notificationId = MESSAGE_NOTIFICATION_ID;
 
         if (ackId != null) {
             notificationReceiptDelivery(ackId, postId, type, isIdLoaded, new ResolvePromise() {
@@ -116,135 +127,437 @@ public class CustomPushNotification extends PushNotification {
             });
         }
 
-        switch (type) {
-            case PUSH_TYPE_MESSAGE:
-            case PUSH_TYPE_SESSION:
-                if (!mAppLifecycleFacade.isAppVisible()) {
-                    boolean createSummary = type.equals(PUSH_TYPE_MESSAGE);
+        // notificationReceiptDelivery can override mNotificationProps
+        // so we fetch the bundle again
+        final Bundle data = mNotificationProps.asBundle();
 
-                    if (type.equals(PUSH_TYPE_MESSAGE)) {
-                        if (channelId != null) {
-                            Map<String, List<Integer>> notificationsInChannel = loadNotificationsMap(mContext);
-                            List<Integer> list = notificationsInChannel.get(channelId);
-                            if (list == null) {
-                                list = Collections.synchronizedList(new ArrayList(0));
-                            }
+        if (channelId != null) {
+            notificationId = channelId.hashCode();
 
-                            list.add(0, notificationId);
-                            if (list.size() > 1) {
-                                createSummary = false;
-                            }
-
-                            if (createSummary) {
-                                // Add the summary notification id as well
-                                list.add(0, notificationId + 1);
-                            }
-
-                            notificationsInChannel.put(channelId, list);
-                            saveNotificationsMap(mContext, notificationsInChannel);
-                        }
-                    }
-
-                    buildNotification(notificationId, createSummary);
+            synchronized (channelIdToNotificationCount) {
+                Integer count = channelIdToNotificationCount.get(channelId);
+                if (count == null) {
+                    count = 0;
                 }
-                break;
-            case PUSH_TYPE_CLEAR:
-                clearChannelNotifications(mContext, channelId);
-                break;
+
+                count += 1;
+
+                channelIdToNotificationCount.put(channelId, count);
+            }
+
+            synchronized (channelIdToNotification) {
+                List<Bundle> list = channelIdToNotification.get(channelId);
+                if (list == null) {
+                    list = Collections.synchronizedList(new ArrayList(0));
+                }
+
+                if (PUSH_TYPE_MESSAGE.equals(type)) {
+                    String senderName = getSenderName(data);
+                    data.putLong("time", new Date().getTime());
+                    data.putString("sender_name", senderName);
+                    data.putString("sender_id", data.getString("sender_id"));
+                }
+                list.add(0, data);
+                channelIdToNotification.put(channelId, list);
+            }
         }
 
-        if (mAppLifecycleFacade.isReactInitialized()) {
-            notifyReceivedToJS();
+        switch(type) {
+        case PUSH_TYPE_MESSAGE:
+        case PUSH_TYPE_SESSION:
+            super.postNotification(notificationId);
+            break;
+        case PUSH_TYPE_CLEAR:
+            cancelNotification(data, notificationId);
+            break;
         }
+
+        notifyReceivedToJS();
     }
 
     @Override
     public void onOpened() {
-        digestNotification();
-
         Bundle data = mNotificationProps.asBundle();
         final String channelId = data.getString("channel_id");
-        final String postId = data.getString("post_id");
-        Integer notificationId = CustomPushNotificationHelper.MESSAGE_NOTIFICATION_ID;
-
-        if (postId != null) {
-            notificationId = postId.hashCode();
-        }
-
         if (channelId != null) {
-            Map<String, List<Integer>> notificationsInChannel = loadNotificationsMap(mContext);
-            List<Integer> notifications = notificationsInChannel.get(channelId);
-            notifications.remove(notificationId);
-            saveNotificationsMap(mContext, notificationsInChannel);
-            clearChannelNotifications(mContext, channelId);
+            channelIdToNotificationCount.remove(channelId);
+            channelIdToNotification.remove(channelId);
         }
-    }
-
-    private void buildNotification(Integer notificationId, boolean createSummary) {
-        final PendingIntent pendingIntent = super.getCTAPendingIntent();
-        final Notification notification = buildNotification(pendingIntent);
-        if (createSummary) {
-            final Notification summary = getNotificationSummaryBuilder(pendingIntent).build();
-            super.postNotification(summary, notificationId + 1);
-        }
-        super.postNotification(notification, notificationId);
+        digestNotification();
     }
 
     @Override
-    protected NotificationCompat.Builder getNotificationBuilder(PendingIntent intent) {
+    protected Notification.Builder getNotificationBuilder(PendingIntent intent) {
+        // First, get a builder initialized with defaults from the core class.
+        final Notification.Builder notification = new Notification.Builder(mContext);
+
         Bundle bundle = mNotificationProps.asBundle();
-        return CustomPushNotificationHelper.createNotificationBuilder(mContext, intent, bundle, false);
+
+        addNotificationExtras(notification, bundle);
+        setNotificationIcons(notification, bundle);
+        setNotificationMessagingStyle(notification, bundle);
+        setNotificationChannel(notification, bundle);
+        setNotificationBadgeIconType(notification);
+
+        NotificationPreferences notificationPreferences = NotificationPreferences.getInstance(mContext);
+        setNotificationSound(notification, notificationPreferences);
+        setNotificationVibrate(notification, notificationPreferences);
+        setNotificationBlink(notification, notificationPreferences);
+
+        String channelId = bundle.getString("channel_id");
+        int notificationId = channelId != null ? channelId.hashCode() : MESSAGE_NOTIFICATION_ID;
+        setNotificationNumber(notification, channelId);
+        setNotificationDeleteIntent(notification, notificationId);
+        addNotificationReplyAction(notification, notificationId, bundle);
+
+        notification
+            .setContentIntent(intent)
+            .setVisibility(Notification.VISIBILITY_PRIVATE)
+            .setPriority(Notification.PRIORITY_HIGH)
+            .setAutoCancel(true);
+
+        return notification;
     }
 
-    protected NotificationCompat.Builder getNotificationSummaryBuilder(PendingIntent intent) {
-        Bundle bundle = mNotificationProps.asBundle();
-        return CustomPushNotificationHelper.createNotificationBuilder(mContext, intent, bundle, true);
+    private void addNotificationExtras(Notification.Builder notification, Bundle bundle) {
+        Bundle userInfoBundle = bundle.getBundle("userInfo");
+        if (userInfoBundle == null) {
+            userInfoBundle = new Bundle();
+        }
+
+        String channelId = bundle.getString("channel_id");
+        if (channelId != null) {
+            userInfoBundle.putString("channel_id", channelId);
+        }
+
+        notification.addExtras(userInfoBundle);
     }
 
-    private void notificationReceiptDelivery(String ackId, String postId, String type, boolean isIdLoaded, ResolvePromise promise) {
-        ReceiptDelivery.send(mContext, ackId, postId, type, isIdLoaded, promise);
+    private void setNotificationIcons(Notification.Builder notification, Bundle bundle) {
+        String smallIcon = bundle.getString("smallIcon");
+        String largeIcon = bundle.getString("largeIcon");
+
+        int smallIconResId = getSmallIconResourceId(smallIcon);
+        notification.setSmallIcon(smallIconResId);
+
+        int largeIconResId = getLargeIconResourceId(largeIcon);
+        final Resources res = mContext.getResources();
+        Bitmap largeIconBitmap = BitmapFactory.decodeResource(res, largeIconResId);
+        if (largeIconResId != 0 && (largeIconBitmap != null || Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)) {
+            notification.setLargeIcon(largeIconBitmap);
+        }
+    }
+
+    private int getSmallIconResourceId(String iconName) {
+        if (iconName == null) {
+            iconName = "ic_notification";
+        }
+
+        int resourceId = getIconResourceId(iconName);
+
+        if (resourceId == 0) {
+            iconName = "ic_launcher";
+            resourceId = getIconResourceId(iconName);
+
+            if (resourceId == 0) {
+                resourceId = android.R.drawable.ic_dialog_info;
+            }
+        }
+
+        return resourceId;
+    }
+
+    private int getLargeIconResourceId(String iconName) {
+        if (iconName == null) {
+            iconName = "ic_launcher";
+        }
+
+        return getIconResourceId(iconName);
+    }
+
+    private int getIconResourceId(String iconName) {
+        final Resources res = mContext.getResources();
+        String packageName = mContext.getPackageName();
+        String defType = "mipmap";
+
+        return res.getIdentifier(iconName, defType, packageName);
+    }
+
+    private void setNotificationNumber(Notification.Builder notification, String channelId) {
+        Integer number = channelIdToNotificationCount.get(channelId);
+        if (number == null) {
+            number = 0;
+        }
+        notification.setNumber(number);
+    }
+
+    private void setNotificationMessagingStyle(Notification.Builder notification, Bundle bundle) {
+        Notification.MessagingStyle messagingStyle = getMessagingStyle(bundle);
+        notification.setStyle(messagingStyle);
+    }
+
+    private Notification.MessagingStyle getMessagingStyle(Bundle bundle) {
+        Notification.MessagingStyle messagingStyle;
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            messagingStyle = new Notification.MessagingStyle("");
+        } else {
+            String senderId = bundle.getString("sender_id");
+            Person sender = new Person.Builder()
+                .setKey(senderId)
+                .setName("")
+                .build();
+            messagingStyle = new Notification.MessagingStyle(sender);
+        }
+
+        String conversationTitle = getConversationTitle(bundle);
+        setMessagingStyleConversationTitle(messagingStyle, conversationTitle, bundle);
+        addMessagingStyleMessages(messagingStyle, conversationTitle, bundle);
+
+        return messagingStyle;
+    }
+
+    private String getConversationTitle(Bundle bundle) {
+        String title = null;
+
+        String version = bundle.getString("version");
+        if (version != null && version.equals("v2")) {
+            title = bundle.getString("channel_name");
+        } else {
+            title = bundle.getString("title");
+        }
+
+        if (android.text.TextUtils.isEmpty(title)) {
+            ApplicationInfo appInfo = mContext.getApplicationInfo();
+            title = mContext.getPackageManager().getApplicationLabel(appInfo).toString();
+        }
+
+        return title;
+    }
+
+    private void setMessagingStyleConversationTitle(Notification.MessagingStyle messagingStyle, String conversationTitle, Bundle bundle) {
+        String channelName = getConversationTitle(bundle);
+        String senderName = bundle.getString("sender_name");
+        if (android.text.TextUtils.isEmpty(senderName)) {
+            senderName = getSenderName(bundle);
+        }
+
+        if (conversationTitle != null && (!conversationTitle.startsWith("@") || channelName != senderName)) {
+            messagingStyle.setConversationTitle(conversationTitle);
+        }
+    }
+
+    private void addMessagingStyleMessages(Notification.MessagingStyle messagingStyle, String conversationTitle, Bundle bundle) {
+        List<Bundle> bundleList;
+
+        String channelId = bundle.getString("channel_id");
+        List<Bundle> bundleArray = channelIdToNotification.get(channelId);
+        if (bundleArray != null) {
+            bundleList = new ArrayList<Bundle>(bundleArray);
+        } else {
+            bundleList = new ArrayList<Bundle>();
+            bundleList.add(bundle);
+        }
+
+        int bundleCount = bundleList.size() - 1;
+        for (int i = bundleCount; i >= 0; i--) {
+            Bundle data = bundleList.get(i);
+            String message = data.getString("message");
+            String senderId = data.getString("sender_id");
+            if (senderId == null) {
+                senderId = "sender_id";
+            }
+            Bundle userInfoBundle = data.getBundle("userInfo");
+            String senderName = getSenderName(data);
+            if (userInfoBundle != null) {
+                boolean localPushNotificationTest = userInfoBundle.getBoolean("localTest");
+                if (localPushNotificationTest) {
+                    senderName = "Test";
+                }
+            }
+
+            if (conversationTitle == null || !android.text.TextUtils.isEmpty(senderName.trim())) {
+                message = removeSenderNameFromMessage(message, senderName);
+            }
+
+            long timestamp = data.getLong("time");
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+                messagingStyle.addMessage(message, timestamp, senderName);
+            } else {
+                Person sender = new Person.Builder()
+                    .setKey(senderId)
+                    .setName(senderName)
+                    .build();
+                messagingStyle.addMessage(message, timestamp, sender);
+            }
+        }
+    }
+
+    private void setNotificationChannel(Notification.Builder notification, Bundle bundle) {
+        // If Android Oreo or above we need to register a channel
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return;
+        }
+
+        NotificationChannel notificationChannel = mHighImportanceChannel;
+
+        boolean localPushNotificationTest = false;
+        Bundle userInfoBundle = bundle.getBundle("userInfo");
+        if (userInfoBundle != null) {
+            localPushNotificationTest = userInfoBundle.getBoolean("localTest");
+        }
+
+        if (mAppLifecycleFacade.isAppVisible() && !localPushNotificationTest) {
+            notificationChannel = mMinImportanceChannel;
+        }
+
+        notification.setChannelId(notificationChannel.getId());
+    }
+
+    private void setNotificationBadgeIconType(Notification.Builder notification) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            notification.setBadgeIconType(Notification.BADGE_ICON_SMALL);
+        }
+    }
+
+    private void setNotificationGroup(Notification.Builder notification) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            notification
+                .setGroup(GROUP_KEY_MESSAGES)
+                .setGroupSummary(true);
+        }
+    }
+
+    private void setNotificationSound(Notification.Builder notification, NotificationPreferences notificationPreferences) {
+        String soundUri = notificationPreferences.getNotificationSound();
+        if (soundUri != null) {
+            if (soundUri != "none") {
+                notification.setSound(Uri.parse(soundUri), AudioManager.STREAM_NOTIFICATION);
+            }
+        } else {
+            Uri defaultUri = System.DEFAULT_NOTIFICATION_URI;
+            notification.setSound(defaultUri, AudioManager.STREAM_NOTIFICATION);
+        }
+    }
+
+    private void setNotificationVibrate(Notification.Builder notification, NotificationPreferences notificationPreferences) {
+        boolean vibrate = notificationPreferences.getShouldVibrate();
+        if (vibrate) {
+            // Use the system default for vibration
+            notification.setDefaults(Notification.DEFAULT_VIBRATE);
+        }
+    }
+
+    private void setNotificationBlink(Notification.Builder notification, NotificationPreferences notificationPreferences) {
+        boolean blink = notificationPreferences.getShouldBlink();
+        if (blink) {
+            notification.setLights(Color.CYAN, 500, 500);
+        }
+    }
+
+    private void setNotificationDeleteIntent(Notification.Builder notification, int notificationId) {
+        // Let's add a delete intent when the notification is dismissed
+        Intent delIntent = new Intent(mContext, NotificationDismissService.class);
+        delIntent.putExtra(NOTIFICATION_ID, notificationId);
+        PendingIntent deleteIntent = NotificationIntentAdapter.createPendingNotificationIntent(mContext, delIntent, mNotificationProps);
+        notification.setDeleteIntent(deleteIntent);
+    }
+
+    private void addNotificationReplyAction(Notification.Builder notification, int notificationId, Bundle bundle) {
+        String postId = bundle.getString("post_id");
+
+        if (android.text.TextUtils.isEmpty(postId) || Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            return;
+        }
+
+        Intent replyIntent = new Intent(mContext, NotificationReplyBroadcastReceiver.class);
+        replyIntent.setAction(KEY_TEXT_REPLY);
+        replyIntent.putExtra(NOTIFICATION_ID, notificationId);
+        replyIntent.putExtra("pushNotification", bundle);
+
+        PendingIntent replyPendingIntent = PendingIntent.getBroadcast(
+            mContext,
+            notificationId,
+            replyIntent,
+            PendingIntent.FLAG_UPDATE_CURRENT);
+
+        RemoteInput remoteInput = new RemoteInput.Builder(KEY_TEXT_REPLY)
+            .setLabel("Reply")
+            .build();
+
+        int icon = R.drawable.ic_notif_action_reply;
+        CharSequence title = "Reply";
+        Notification.Action replyAction = new Notification.Action.Builder(icon, title, replyPendingIntent)
+            .addRemoteInput(remoteInput)
+            .setAllowGeneratedReplies(true)
+            .build();
+
+        notification
+            .setShowWhen(true)
+            .addAction(replyAction);
     }
 
     private void notifyReceivedToJS() {
         mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_EVENT_NAME, mNotificationProps.asBundle(), mAppLifecycleFacade.getRunningReactContext());
     }
 
-    private static void saveNotificationsMap(Context context, Map<String, List<Integer>> inputMap) {
-        SharedPreferences pSharedPref = context.getSharedPreferences(PUSH_NOTIFICATIONS, Context.MODE_PRIVATE);
-        if (pSharedPref != null && context != null) {
-            JSONObject json = new JSONObject(inputMap);
-            String jsonString = json.toString();
-            SharedPreferences.Editor editor = pSharedPref.edit();
-            editor.remove(NOTIFICATIONS_IN_CHANNEL).commit();
-            editor.putString(NOTIFICATIONS_IN_CHANNEL, jsonString);
-            editor.commit();
-        }
+    private void cancelNotification(Bundle data, int notificationId) {
+        final String channelId = data.getString("channel_id");
+        final String badge = data.getString("badge");
+
+        CustomPushNotification.badgeCount = Integer.parseInt(badge);
+        CustomPushNotification.clearNotification(mContext.getApplicationContext(), notificationId, channelId);
     }
 
-    private static Map<String, List<Integer>> loadNotificationsMap(Context context) {
-        Map<String, List<Integer>> outputMap = new HashMap<>();
-        if (context != null) {
-            SharedPreferences pSharedPref = context.getSharedPreferences(PUSH_NOTIFICATIONS, Context.MODE_PRIVATE);
-            try {
-                if (pSharedPref != null) {
-                    String jsonString = pSharedPref.getString(NOTIFICATIONS_IN_CHANNEL, (new JSONObject()).toString());
-                    JSONObject json = new JSONObject(jsonString);
-                    Iterator<String> keysItr = json.keys();
-                    while (keysItr.hasNext()) {
-                        String key = keysItr.next();
-                        JSONArray array = json.getJSONArray(key);
-                        List<Integer> values = new ArrayList<>();
-                        for (int i = 0; i < array.length(); ++i) {
-                            values.add(array.getInt(i));
-                        }
-                        outputMap.put(key, values);
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
+    private String getSenderName(Bundle bundle) {
+        String senderName = bundle.getString("sender_name");
+        if (senderName != null) {
+            return senderName;
+        }
+
+        String channelName = bundle.getString("channel_name");
+        if (channelName != null && channelName.startsWith("@")) {
+            return channelName;
+        }
+
+        String message = bundle.getString("message");
+        if (message != null) {
+            String name = message.split(":")[0];
+            if (name != message) {
+                return name;
             }
         }
 
-        return outputMap;
+        return getConversationTitle(bundle);
+    }
+
+    private String removeSenderNameFromMessage(String message, String senderName) {
+        Integer index = message.indexOf(senderName);
+        if (index == 0) {
+            message = message.substring(senderName.length());
+        }
+
+        return message.replaceFirst(": ", "").trim();
+    }
+
+    private void notificationReceiptDelivery(String ackId, String postId, String type, boolean isIdLoaded, ResolvePromise promise) {
+        ReceiptDelivery.send(context, ackId, postId, type, isIdLoaded, promise);
+    }
+
+    private void createNotificationChannels() {
+        // Notification channels are not supported in Android Nougat and below
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return;
+        }
+
+        final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+
+        mHighImportanceChannel = new NotificationChannel("channel_01", "High Importance", NotificationManager.IMPORTANCE_HIGH);
+        mHighImportanceChannel.setShowBadge(true);
+        notificationManager.createNotificationChannel(mHighImportanceChannel);
+
+        mMinImportanceChannel = new NotificationChannel("channel_02", "Min Importance", NotificationManager.IMPORTANCE_MIN);
+        mMinImportanceChannel.setShowBadge(true);
+        notificationManager.createNotificationChannel(mMinImportanceChannel);
     }
 }

android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotificationDrawer.java

@@ -4,6 +4,10 @@ import android.content.Context;
 
 import com.wix.reactnativenotifications.core.AppLaunchHelper;
 import com.wix.reactnativenotifications.core.notificationdrawer.PushNotificationsDrawer;
+import com.wix.reactnativenotifications.core.notificationdrawer.IPushNotificationsDrawer;
+import com.wix.reactnativenotifications.core.notificationdrawer.INotificationsDrawerApplication;
+
+import static com.wix.reactnativenotifications.Defs.LOGTAG;
 
 public class CustomPushNotificationDrawer extends PushNotificationsDrawer {
     final protected Context mContext;

android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotificationHelper.java

@@ -1,457 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
-import androidx.core.app.Person;
-import androidx.core.app.RemoteInput;
-import androidx.core.graphics.drawable.IconCompat;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
-import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
-import com.wix.reactnativenotifications.core.notification.PushNotificationProps;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.Objects;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-public class CustomPushNotificationHelper {
-    public static final String CHANNEL_HIGH_IMPORTANCE_ID = "channel_01";
-    public static final String CHANNEL_MIN_IMPORTANCE_ID = "channel_02";
-    public static final String KEY_TEXT_REPLY = "CAN_REPLY";
-    public static final int MESSAGE_NOTIFICATION_ID = 435345;
-    public static final String NOTIFICATION_ID = "notificationId";
-
-    private static NotificationChannel mHighImportanceChannel;
-    private static NotificationChannel mMinImportanceChannel;
-
-    private static void addMessagingStyleMessages(Context context, NotificationCompat.MessagingStyle messagingStyle, String conversationTitle, Bundle bundle) {
-        String message = bundle.getString("message", bundle.getString("body"));
-        String senderId = bundle.getString("sender_id");
-        if (senderId == null) {
-            senderId = "sender_id";
-        }
-        Bundle userInfoBundle = bundle.getBundle("userInfo");
-        String senderName = getSenderName(bundle);
-        if (userInfoBundle != null) {
-            boolean localPushNotificationTest = userInfoBundle.getBoolean("test");
-            if (localPushNotificationTest) {
-                senderName = "Test";
-            }
-        }
-
-        if (conversationTitle == null || !android.text.TextUtils.isEmpty(senderName.trim())) {
-            message = removeSenderNameFromMessage(message, senderName);
-        }
-
-        long timestamp = new Date().getTime();
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            messagingStyle.addMessage(message, timestamp, senderName);
-        } else {
-            Person.Builder sender = new Person.Builder()
-                    .setKey(senderId)
-                    .setName(senderName);
-
-            try {
-                Bitmap avatar = userAvatar(context, senderId);
-                if (avatar != null) {
-                    sender.setIcon(IconCompat.createWithBitmap(avatar));
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            messagingStyle.addMessage(message, timestamp, sender.build());
-        }
-    }
-
-    private static void addNotificationExtras(NotificationCompat.Builder notification, Bundle bundle) {
-        Bundle userInfoBundle = bundle.getBundle("userInfo");
-        if (userInfoBundle == null) {
-            userInfoBundle = new Bundle();
-        }
-
-        String channelId = bundle.getString("channel_id");
-        if (channelId != null) {
-            userInfoBundle.putString("channel_id", channelId);
-        }
-
-        notification.addExtras(userInfoBundle);
-    }
-
-    private static void addNotificationReplyAction(Context context, NotificationCompat.Builder notification, Bundle bundle, int notificationId) {
-        String postId = bundle.getString("post_id");
-
-        if (android.text.TextUtils.isEmpty(postId)) {
-            return;
-        }
-
-        Intent replyIntent = new Intent(context, NotificationReplyBroadcastReceiver.class);
-        replyIntent.setAction(KEY_TEXT_REPLY);
-        replyIntent.putExtra(NOTIFICATION_ID, notificationId);
-        replyIntent.putExtra("pushNotification", bundle);
-
-        PendingIntent replyPendingIntent = PendingIntent.getBroadcast(
-                context,
-                notificationId,
-                replyIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-
-        RemoteInput remoteInput = new RemoteInput.Builder(KEY_TEXT_REPLY)
-                .setLabel("Reply")
-                .build();
-
-        int icon = R.drawable.ic_notif_action_reply;
-        CharSequence title = "Reply";
-        NotificationCompat.Action replyAction = new NotificationCompat.Action.Builder(icon, title, replyPendingIntent)
-                .addRemoteInput(remoteInput)
-                .setAllowGeneratedReplies(true)
-                .build();
-
-        notification
-                .setShowWhen(true)
-                .addAction(replyAction);
-    }
-
-    public static NotificationCompat.Builder createNotificationBuilder(Context context, PendingIntent intent, Bundle bundle, boolean createSummary) {
-        final NotificationCompat.Builder notification = new NotificationCompat.Builder(context, CHANNEL_HIGH_IMPORTANCE_ID);
-
-        String channelId = bundle.getString("channel_id");
-        String postId = bundle.getString("post_id");
-        int notificationId = postId != null ? postId.hashCode() : MESSAGE_NOTIFICATION_ID;
-        NotificationPreferences notificationPreferences = NotificationPreferences.getInstance(context);
-
-        addNotificationExtras(notification, bundle);
-        setNotificationIcons(context, notification, bundle);
-        setNotificationMessagingStyle(context, notification, bundle);
-        setNotificationGroup(notification, channelId, createSummary);
-        setNotificationBadgeType(notification);
-        setNotificationSound(notification, notificationPreferences);
-        setNotificationVibrate(notification, notificationPreferences);
-        setNotificationBlink(notification, notificationPreferences);
-
-        setNotificationChannel(notification, bundle);
-        setNotificationDeleteIntent(context, notification, bundle, notificationId);
-        addNotificationReplyAction(context, notification, bundle, notificationId);
-
-        notification
-                .setContentIntent(intent)
-                .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
-                .setPriority(Notification.PRIORITY_HIGH)
-                .setCategory(Notification.CATEGORY_MESSAGE)
-                .setAutoCancel(true);
-
-        return notification;
-    }
-
-    public static void createNotificationChannels(Context context) {
-        // Notification channels are not supported in Android Nougat and below
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
-        }
-
-        final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
-
-        if (mHighImportanceChannel == null) {
-            mHighImportanceChannel = new NotificationChannel(CHANNEL_HIGH_IMPORTANCE_ID, "High Importance", NotificationManager.IMPORTANCE_HIGH);
-            mHighImportanceChannel.setShowBadge(true);
-            notificationManager.createNotificationChannel(mHighImportanceChannel);
-        }
-
-        if (mMinImportanceChannel == null) {
-            mMinImportanceChannel = new NotificationChannel(CHANNEL_MIN_IMPORTANCE_ID, "Min Importance", NotificationManager.IMPORTANCE_MIN);
-            mMinImportanceChannel.setShowBadge(true);
-            notificationManager.createNotificationChannel(mMinImportanceChannel);
-        }
-    }
-
-    private static Bitmap getCircleBitmap(Bitmap bitmap) {
-        final Bitmap output = Bitmap.createBitmap(bitmap.getWidth(),
-                bitmap.getHeight(), Bitmap.Config.ARGB_8888);
-        final Canvas canvas = new Canvas(output);
-
-        final int color = Color.RED;
-        final Paint paint = new Paint();
-        final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
-        final RectF rectF = new RectF(rect);
-
-        paint.setAntiAlias(true);
-        canvas.drawARGB(0, 0, 0, 0);
-        paint.setColor(color);
-        canvas.drawOval(rectF, paint);
-
-        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-        canvas.drawBitmap(bitmap, rect, rect, paint);
-
-        bitmap.recycle();
-
-        return output;
-    }
-
-    private static String getConversationTitle(Bundle bundle) {
-        String title = bundle.getString("channel_name");
-
-        if (android.text.TextUtils.isEmpty(title)) {
-            title = bundle.getString("sender_name");
-        }
-
-        return title;
-    }
-
-    private static int getIconResourceId(Context context, String iconName) {
-        final Resources res = context.getResources();
-        String packageName = context.getPackageName();
-        String defType = "mipmap";
-
-        return res.getIdentifier(iconName, defType, packageName);
-    }
-
-    private static NotificationCompat.MessagingStyle getMessagingStyle(Context context, Bundle bundle) {
-        NotificationCompat.MessagingStyle messagingStyle;
-        String senderId = "me";
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            messagingStyle = new NotificationCompat.MessagingStyle("Me");
-        } else {
-            Person.Builder sender = new Person.Builder()
-                    .setKey(senderId)
-                    .setName("Me");
-
-            try {
-                Bitmap avatar = userAvatar(context, "me");
-                if (avatar != null) {
-                    sender.setIcon(IconCompat.createWithBitmap(avatar));
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            messagingStyle = new NotificationCompat.MessagingStyle(sender.build());
-        }
-
-        String conversationTitle = getConversationTitle(bundle);
-        setMessagingStyleConversationTitle(messagingStyle, conversationTitle, bundle);
-        addMessagingStyleMessages(context, messagingStyle, conversationTitle, bundle);
-
-        return messagingStyle;
-    }
-
-    private static String getSenderName(Bundle bundle) {
-        String senderName = bundle.getString("sender_name");
-        if (senderName != null) {
-            return senderName;
-        }
-
-        String channelName = bundle.getString("channel_name");
-        if (channelName != null && channelName.startsWith("@")) {
-            return channelName;
-        }
-
-        String message = bundle.getString("message");
-        if (message != null) {
-            String name = message.split(":")[0];
-            if (!name.equals(message)) {
-                return name;
-            }
-        }
-
-        return getConversationTitle(bundle);
-    }
-
-    public static int getSmallIconResourceId(Context context, String iconName) {
-        if (iconName == null) {
-            iconName = "ic_notification";
-        }
-
-        int resourceId = getIconResourceId(context, iconName);
-
-        if (resourceId == 0) {
-            iconName = "ic_launcher";
-            resourceId = getIconResourceId(context, iconName);
-
-            if (resourceId == 0) {
-                resourceId = android.R.drawable.ic_dialog_info;
-            }
-        }
-
-        return resourceId;
-    }
-
-    private static String removeSenderNameFromMessage(String message, String senderName) {
-        int index = message.indexOf(senderName);
-        if (index == 0) {
-            message = message.substring(senderName.length());
-        }
-
-        return message.replaceFirst(": ", "").trim();
-    }
-
-    private static void setMessagingStyleConversationTitle(NotificationCompat.MessagingStyle messagingStyle, String conversationTitle, Bundle bundle) {
-        String channelName = getConversationTitle(bundle);
-        String senderName = bundle.getString("sender_name");
-        if (TextUtils.isEmpty(senderName)) {
-            senderName = getSenderName(bundle);
-        }
-
-        if (conversationTitle != null && !channelName.equals(senderName)) {
-            messagingStyle.setConversationTitle(conversationTitle);
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                messagingStyle.setGroupConversation(true);
-            }
-        }
-    }
-
-    private static void setNotificationBadgeType(NotificationCompat.Builder notification) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            notification.setBadgeIconType(NotificationCompat.BADGE_ICON_LARGE);
-        }
-    }
-
-    private static void setNotificationBlink(NotificationCompat.Builder notification, NotificationPreferences notificationPreferences) {
-        boolean blink = notificationPreferences.getShouldBlink();
-        if (blink) {
-            notification.setLights(Color.CYAN, 500, 500);
-        }
-    }
-
-    private static void setNotificationChannel(NotificationCompat.Builder notification, Bundle bundle) {
-        // If Android Oreo or above we need to register a channel
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
-        }
-
-        NotificationChannel notificationChannel = mHighImportanceChannel;
-
-        boolean testNotification = false;
-        boolean localNotification = false;
-        Bundle userInfoBundle = bundle.getBundle("userInfo");
-        if (userInfoBundle != null) {
-            testNotification = userInfoBundle.getBoolean("test");
-            localNotification = userInfoBundle.getBoolean("local");
-        }
-
-        if (testNotification || localNotification) {
-            notificationChannel = mMinImportanceChannel;
-        }
-
-        notification.setChannelId(notificationChannel.getId());
-    }
-
-    private static void setNotificationDeleteIntent(Context context, NotificationCompat.Builder notification, Bundle bundle, int notificationId) {
-        // Let's add a delete intent when the notification is dismissed
-        Intent delIntent = new Intent(context, NotificationDismissService.class);
-        PushNotificationProps notificationProps = new PushNotificationProps(bundle);
-        delIntent.putExtra(NOTIFICATION_ID, notificationId);
-        PendingIntent deleteIntent = NotificationIntentAdapter.createPendingNotificationIntent(context, delIntent, notificationProps);
-        notification.setDeleteIntent(deleteIntent);
-    }
-
-    private static void setNotificationMessagingStyle(Context context, NotificationCompat.Builder notification, Bundle bundle) {
-        NotificationCompat.MessagingStyle messagingStyle = getMessagingStyle(context, bundle);
-        notification.setStyle(messagingStyle);
-    }
-
-    private static void setNotificationGroup(NotificationCompat.Builder notification, String channelId, boolean setAsSummary) {
-        notification.setGroup(channelId);
-
-        if (setAsSummary) {
-            // if this is the first notification for the channel then set as summary, otherwise skip
-            notification.setGroupSummary(true);
-        }
-    }
-
-    private static void setNotificationIcons(Context context, NotificationCompat.Builder notification, Bundle bundle) {
-        String smallIcon = bundle.getString("smallIcon");
-        String channelName = getConversationTitle(bundle);
-        String senderName = bundle.getString("sender_name");
-
-        int smallIconResId = getSmallIconResourceId(context, smallIcon);
-        notification.setSmallIcon(smallIconResId);
-
-        if (channelName.equals(senderName)) {
-            try {
-                String senderId = bundle.getString("sender_id");
-                Bitmap avatar = userAvatar(context, senderId);
-                if (avatar != null) {
-                    notification.setLargeIcon(avatar);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static void setNotificationSound(NotificationCompat.Builder notification, NotificationPreferences notificationPreferences) {
-        String soundUri = notificationPreferences.getNotificationSound();
-        if (soundUri != null) {
-            if (!soundUri.equals("none")) {
-                notification.setSound(Uri.parse(soundUri));
-            }
-        } else {
-            Uri defaultUri = Settings.System.DEFAULT_NOTIFICATION_URI;
-            notification.setSound(defaultUri);
-        }
-    }
-
-    private static void setNotificationVibrate(NotificationCompat.Builder notification, NotificationPreferences notificationPreferences) {
-        boolean vibrate = notificationPreferences.getShouldVibrate();
-        if (vibrate) {
-            // Use the system default for vibration
-            notification.setDefaults(Notification.DEFAULT_VIBRATE);
-        }
-    }
-
-    private static Bitmap userAvatar(Context context, final String userId) throws IOException {
-        final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
-        final ReadableMap credentials = MattermostCredentialsHelper.getCredentialsSync(reactApplicationContext);
-        final String serverUrl = credentials.getString("serverUrl");
-        final String token = credentials.getString("token");
-
-
-        final OkHttpClient client = new OkHttpClient();
-        final String url = String.format("%s/api/v4/users/%s/image", serverUrl, userId);
-        Request request = new Request.Builder()
-                .header("Authorization", String.format("Bearer %s", token))
-                .url(url)
-                .build();
-        Response response = client.newCall(request).execute();
-        if (response.code() == 200) {
-            assert response.body() != null;
-            byte[] bytes = response.body().bytes();
-            Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
-
-            Log.i("ReactNative", String.format("Fetch profile %s", url));
-            return getCircleBitmap(bitmap);
-        }
-
-        return null;
-    }
-}

android/app/src/main/java/com/mattermost/rnbeta/MainActivity.java

@@ -1,8 +1,6 @@
 package com.mattermost.rnbeta;
 
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import android.view.KeyEvent;
 import android.content.res.Configuration;
@@ -21,7 +19,7 @@ public class MainActivity extends NavigationActivity {
     }
 
     @Override
-    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+    public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
         if (newConfig.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO) {
@@ -44,7 +42,7 @@ public class MainActivity extends NavigationActivity {
             return true;
         }
         return super.dispatchKeyEvent(event);
-    }
+    };
 
     private void setHWKeyboardConnected() {
         HWKeyboardConnected = getResources().getConfiguration().keyboard == Configuration.KEYBOARD_QWERTY;

android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java

@@ -1,9 +1,11 @@
 package com.mattermost.rnbeta;
 
+import androidx.annotation.Nullable;
 import android.content.Context;
 import android.content.RestrictionsManager;
 import android.os.Bundle;
 import android.util.Log;
+import java.lang.reflect.InvocationTargetException;
 import java.io.File;
 import java.util.HashMap;
 import java.util.List;
@@ -28,20 +30,30 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMarker;
+import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.soloader.SoLoader;
 
-import com.facebook.react.bridge.JSIModulePackage;
-
-
 public class MainApplication extends NavigationApplication implements INotificationsApplication, INotificationsDrawerApplication {
   public static MainApplication instance;
 
   public Boolean sharedExtensionIsOpened = false;
 
+  public long APP_START_TIME;
+
+  public long RELOAD;
+  public long CONTENT_APPEARED;
+
+  public long PROCESS_PACKAGES_START;
+  public long PROCESS_PACKAGES_END;
+
   private Bundle mManagedConfig = null;
 
 private final ReactNativeHost mReactNativeHost =
@@ -53,8 +65,9 @@ private final ReactNativeHost mReactNativeHost =
 
     @Override
     protected List<ReactPackage> getPackages() {
+      @SuppressWarnings("UnnecessaryLocalVariable")
       List<ReactPackage> packages = new PackageList(this).getPackages();
-      // Packages that cannot be auto linked yet can be added manually here, for example:
+      // Packages that cannot be autolinked yet can be added manually here, for example:
       // packages.add(new MyReactNativePackage());
       packages.add(new RNNotificationsPackage(MainApplication.this));
       packages.add(new RNPasteableTextInputPackage());
@@ -78,13 +91,16 @@ private final ReactNativeHost mReactNativeHost =
 
               @Override
               public ReactModuleInfoProvider getReactModuleInfoProvider() {
-                return () -> {
-                  Map<String, ReactModuleInfo> map = new HashMap<>();
-                  map.put("MattermostManaged", new ReactModuleInfo("MattermostManaged", "com.mattermost.rnbeta.MattermostManagedModule", false, false, false, false, false));
-                  map.put("MattermostShare", new ReactModuleInfo("MattermostShare", "com.mattermost.share.ShareModule", false, false, true, false, false));
-                  map.put("NotificationPreferences", new ReactModuleInfo("NotificationPreferences", "com.mattermost.rnbeta.NotificationPreferencesModule", false, false, false, false, false));
-                  map.put("RNTextInputReset", new ReactModuleInfo("RNTextInputReset", "com.mattermost.rnbeta.RNTextInputResetModule", false, false, false, false, false));
-                  return map;
+                return new ReactModuleInfoProvider() {
+                  @Override
+                  public Map<String, ReactModuleInfo> getReactModuleInfos() {
+                    Map<String, ReactModuleInfo> map = new HashMap<>();
+                    map.put("MattermostManaged", new ReactModuleInfo("MattermostManaged", "com.mattermost.rnbeta.MattermostManagedModule", false, false, false, false, false));
+                    map.put("MattermostShare", new ReactModuleInfo("MattermostShare", "com.mattermost.share.ShareModule", false, false, true, false, false));
+                    map.put("NotificationPreferences", new ReactModuleInfo("NotificationPreferences", "com.mattermost.rnbeta.NotificationPreferencesModule", false, false, false, false, false));
+                    map.put("RNTextInputReset", new ReactModuleInfo("RNTextInputReset", "com.mattermost.rnbeta.RNTextInputResetModule", false, false, false, false, false));
+                    return map;
+                  }
                 };
               }
             }
@@ -97,11 +113,6 @@ private final ReactNativeHost mReactNativeHost =
     protected String getJSMainModuleName() {
       return "index";
     }
-
-    @Override
-    protected JSIModulePackage getJSIModulePackage() {
-      return (JSIModulePackage) new CustomMMKVJSIModulePackage();
-    }
   };
 
   @Override
@@ -121,6 +132,9 @@ private final ReactNativeHost mReactNativeHost =
 
     SoLoader.init(this, /* native exopackage */ false);
     initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+
+    // Uncomment to listen to react markers for build that has telemetry enabled
+    // addReactMarkerListener();
   }
 
   @Override
@@ -155,6 +169,7 @@ private final ReactNativeHost mReactNativeHost =
               (RestrictionsManager) ctx.getSystemService(Context.RESTRICTIONS_SERVICE);
 
       mManagedConfig = myRestrictionsMgr.getApplicationRestrictions();
+      myRestrictionsMgr = null;
 
       if (mManagedConfig!= null && mManagedConfig.size() > 0) {
         return mManagedConfig;
@@ -180,12 +195,44 @@ private final ReactNativeHost mReactNativeHost =
     return null;
   }
 
+  private void addReactMarkerListener() {
+    ReactMarker.addListener(new ReactMarker.MarkerListener() {
+      @Override
+      public void logMarker(ReactMarkerConstants name, @Nullable String tag, int instanceKey) {
+        if (name.toString() == ReactMarkerConstants.RELOAD.toString()) {
+          APP_START_TIME = System.currentTimeMillis();
+          RELOAD = System.currentTimeMillis();
+        } else if (name.toString() == ReactMarkerConstants.PROCESS_PACKAGES_START.toString()) {
+          PROCESS_PACKAGES_START = System.currentTimeMillis();
+        } else if (name.toString() == ReactMarkerConstants.PROCESS_PACKAGES_END.toString()) {
+          PROCESS_PACKAGES_END = System.currentTimeMillis();
+        } else if (name.toString() == ReactMarkerConstants.CONTENT_APPEARED.toString()) {
+          CONTENT_APPEARED = System.currentTimeMillis();
+          ReactContext ctx = getRunningReactContext();
+
+          if (ctx != null) {
+            WritableMap map = Arguments.createMap();
+
+            map.putDouble("appReload", RELOAD);
+            map.putDouble("appContentAppeared", CONTENT_APPEARED);
+
+            map.putDouble("processPackagesStart", PROCESS_PACKAGES_START);
+            map.putDouble("processPackagesEnd", PROCESS_PACKAGES_END);
+
+            ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).
+                    emit("nativeMetrics", map);
+          }
+        }
+      }
+    });
+  }
+
   /**
    * Loads Flipper in React Native templates. Call this in the onCreate method with something like
    * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
    *
-   * @param context application context
-   * @param reactInstanceManager instance of React
+   * @param context
+   * @param reactInstanceManager
    */
   private static void initializeFlipper(
       Context context, ReactInstanceManager reactInstanceManager) {
@@ -195,11 +242,17 @@ private final ReactNativeHost mReactNativeHost =
          We use reflection here to pick up the class that initializes Flipper,
         since Flipper library is not available in release mode
         */
-        Class<?> aClass = Class.forName("com.rn.ReactNativeFlipper");
+        Class<?> aClass = Class.forName("com.rndiffapp.ReactNativeFlipper");
         aClass
             .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
             .invoke(null, context, reactInstanceManager);
-      } catch (Exception e) {
+      } catch (ClassNotFoundException e) {
+        e.printStackTrace();
+      } catch (NoSuchMethodException e) {
+        e.printStackTrace();
+      } catch (IllegalAccessException e) {
+        e.printStackTrace();
+      } catch (InvocationTargetException e) {
         e.printStackTrace();
       }
     }

android/app/src/main/java/com/mattermost/rnbeta/MattermostCredentialsHelper.java

@@ -1,14 +1,12 @@
 package com.mattermost.rnbeta;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.content.Context;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.oblador.keychain.KeychainModule;
 
@@ -18,17 +16,12 @@ import com.mattermost.react_native_interface.KeysReadableArray;
 
 public class MattermostCredentialsHelper {
     static final String CURRENT_SERVER_URL = "@currentServerUrl";
-    static KeychainModule keychainModule;
 
     public static void getCredentialsForCurrentServer(ReactApplicationContext context, ResolvePromise promise) {
-        final ArrayList<String> keys = new ArrayList<>(1);
+        final KeychainModule keychainModule = new KeychainModule(context);
+        final AsyncStorageHelper asyncStorage = new AsyncStorageHelper(context);
+        final ArrayList<String> keys = new ArrayList<String>(1);
         keys.add(CURRENT_SERVER_URL);
-
-        if (keychainModule == null) {
-            keychainModule = new KeychainModule(context);
-        }
-
-        AsyncStorageHelper asyncStorage = new AsyncStorageHelper(context);
         KeysReadableArray asyncStorageKeys = new KeysReadableArray() {
             @Override
             public int size() {
@@ -36,7 +29,6 @@ public class MattermostCredentialsHelper {
             }
 
             @Override
-            @NonNull
             public String getString(int index) {
                 return keys.get(index);
             }
@@ -44,42 +36,7 @@ public class MattermostCredentialsHelper {
 
         HashMap<String, String> asyncStorageResults = asyncStorage.multiGet(asyncStorageKeys);
         String serverUrl = asyncStorageResults.get(CURRENT_SERVER_URL);
-        final WritableMap options = Arguments.createMap();
-        // KeyChain module fails if `authenticationPrompt` is not set
-        final WritableMap authPrompt = Arguments.createMap();
-        authPrompt.putString("title", "Authenticate to retrieve secret");
-        authPrompt.putString("cancel", "Cancel");
-        options.putMap("authenticationPrompt", authPrompt);
-        options.putString("service", serverUrl);
 
-        keychainModule.getGenericPasswordForOptions(options, promise);
-    }
-
-    public static ReadableMap getCredentialsSync(ReactApplicationContext context) {
-        final String[] serverUrl = new String[1];
-        final String[] token = new String[1];
-        MattermostCredentialsHelper.getCredentialsForCurrentServer(context, new ResolvePromise() {
-            @Override
-            public void resolve(@Nullable Object value) {
-                WritableMap map = (WritableMap) value;
-                if (map != null) {
-                    token[0] = map.getString("password");
-                    serverUrl[0] = map.getString("service");
-                    assert serverUrl[0] != null;
-                    if (serverUrl[0].isEmpty()) {
-                        String[] credentials = token[0].split(",[ ]*");
-                        if (credentials.length == 2) {
-                            token[0] = credentials[0];
-                            serverUrl[0] = credentials[1];
-                        }
-                    }
-                }
-            }
-        });
-        final WritableMap result = Arguments.createMap();
-        result.putString("serverUrl", serverUrl[0]);
-        result.putString("token", token[0]);
-
-        return result;
+        keychainModule.getGenericPasswordForOptions(serverUrl, promise);
     }
 }

android/app/src/main/java/com/mattermost/rnbeta/MattermostManagedModule.java

@@ -1,6 +1,7 @@
 package com.mattermost.rnbeta;
 
 import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -11,12 +12,10 @@ import android.view.WindowManager.LayoutParams;
 import android.util.ArraySet;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-
-import java.util.Objects;
 import java.util.Set;
 
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -66,7 +65,6 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule implemen
     }
 
     @Override
-    @NonNull
     public String getName() {
         return "MattermostManaged";
     }
@@ -94,7 +92,7 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule implemen
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         getReactApplicationContext().startActivity(intent);
 
-        Objects.requireNonNull(getCurrentActivity()).finish();
+        getCurrentActivity().finish();
         System.exit(0);
     }
 
@@ -113,7 +111,7 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule implemen
 
     @ReactMethod
     public void quitApp() {
-        Objects.requireNonNull(getCurrentActivity()).finish();
+        getCurrentActivity().finish();
         System.exit(0);
     }
 
@@ -165,7 +163,6 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule implemen
             blurAppScreen = Boolean.parseBoolean(config.getString("blurApplicationScreen"));
         }
 
-        assert activity != null;
         if (blurAppScreen) {
             activity.getWindow().setFlags(LayoutParams.FLAG_SECURE, LayoutParams.FLAG_SECURE);
         } else {
@@ -197,7 +194,7 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule implemen
         if(one.size() != two.size())
             return false;
 
-        Set<String> setOne = new ArraySet<>();
+        Set<String> setOne = new ArraySet<String>();
         setOne.addAll(one.keySet());
         setOne.addAll(two.keySet());
         Object valueOne;

android/app/src/main/java/com/mattermost/rnbeta/NotificationDismissService.java

@@ -9,24 +9,18 @@ import android.util.Log;
 import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
 
 public class NotificationDismissService extends IntentService {
+    private Context mContext;
     public NotificationDismissService() {
             super("notificationDismissService");
     }
 
     @Override
     protected void onHandleIntent(Intent intent) {
-        final Context context = getApplicationContext();
-        final Bundle bundle = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
-        final String channelId = bundle.getString("channel_id");
-        final String postId = bundle.getString("post_id");
-        int notificationId = CustomPushNotificationHelper.MESSAGE_NOTIFICATION_ID;
-        if (postId != null) {
-            notificationId = postId.hashCode();
-        } else if (channelId != null) {
-            notificationId = channelId.hashCode();
-        }
-
-        CustomPushNotification.cancelNotification(context, channelId, notificationId);
+        mContext = getApplicationContext();
+        Bundle bundle = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
+        int notificationId = intent.getIntExtra(CustomPushNotification.NOTIFICATION_ID, -1);
+        String channelId = bundle.getString("channel_id");
+        CustomPushNotification.clearNotification(mContext, notificationId, channelId);
         Log.i("ReactNative", "Dismiss notification");
     }
 }

android/app/src/main/java/com/mattermost/rnbeta/NotificationPreferences.java

@@ -10,7 +10,8 @@ public class NotificationPreferences {
     public final String SOUND_PREF = "NotificationSound";
     public final String VIBRATE_PREF = "NotificationVibrate";
     public final String BLINK_PREF = "NotificationLights";
-    private final SharedPreferences mSharedPreferences;
+
+    private SharedPreferences mSharedPreferences;
 
     private NotificationPreferences(Context context) {
         mSharedPreferences = context.getSharedPreferences(SHARED_NAME, Context.MODE_PRIVATE);
@@ -39,18 +40,18 @@ public class NotificationPreferences {
     public void setNotificationSound(String soundUri) {
         SharedPreferences.Editor editor = mSharedPreferences.edit();
         editor.putString(SOUND_PREF, soundUri);
-        editor.apply();
+        editor.commit();
     }
 
     public void setShouldVibrate(boolean vibrate) {
         SharedPreferences.Editor editor = mSharedPreferences.edit();
         editor.putBoolean(VIBRATE_PREF, vibrate);
-        editor.apply();
+        editor.commit();
     }
 
     public void setShouldBlink(boolean blink) {
         SharedPreferences.Editor editor = mSharedPreferences.edit();
         editor.putBoolean(BLINK_PREF, blink);
-        editor.apply();
+        editor.commit();
     }
 }

android/app/src/main/java/com/mattermost/rnbeta/NotificationPreferencesModule.java

@@ -1,5 +1,6 @@
 package com.mattermost.rnbeta;
 
+import android.app.Application;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.content.Context;
@@ -10,10 +11,10 @@ import android.os.Bundle;
 import android.net.Uri;
 import android.service.notification.StatusBarNotification;
 
-import androidx.annotation.NonNull;
-
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.Promise;
@@ -23,12 +24,13 @@ import com.facebook.react.bridge.WritableMap;
 public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
     private static NotificationPreferencesModule instance;
     private final MainApplication mApplication;
-    private final NotificationPreferences mNotificationPreference;
+    private NotificationPreferences mNotificationPreference;
 
     private NotificationPreferencesModule(MainApplication application, ReactApplicationContext reactContext) {
         super(reactContext);
         mApplication = application;
-        mNotificationPreference = NotificationPreferences.getInstance(reactContext);
+        Context context = mApplication.getApplicationContext();
+        mNotificationPreference = NotificationPreferences.getInstance(context);
     }
 
     public static NotificationPreferencesModule getInstance(MainApplication application, ReactApplicationContext reactContext) {
@@ -44,7 +46,6 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
     }
 
     @Override
-    @NonNull
     public String getName() {
         return "NotificationPreferences";
     }
@@ -52,7 +53,7 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
     @ReactMethod
     public void getPreferences(final Promise promise) {
         try {
-            final Context context = mApplication.getApplicationContext();
+            Context context = mApplication.getApplicationContext();
             RingtoneManager manager = new RingtoneManager(context);
             manager.setType(RingtoneManager.TYPE_NOTIFICATION);
             Cursor cursor = manager.getCursor();
@@ -87,7 +88,7 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void previewSound(String url) {
-        final Context context = mApplication.getApplicationContext();
+        Context context = mApplication.getApplicationContext();
         Uri uri = Uri.parse(url);
         Ringtone r = RingtoneManager.getRingtone(context, uri);
         r.play();
@@ -110,7 +111,7 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void getDeliveredNotifications(final Promise promise) {
-        final Context context = mApplication.getApplicationContext();
+        Context context = mApplication.getApplicationContext();
         final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         StatusBarNotification[] statusBarNotifications = notificationManager.getActiveNotifications();
         WritableArray result = Arguments.createArray();
@@ -118,7 +119,9 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
             WritableMap map = Arguments.createMap();
             Notification n = sbn.getNotification();
             Bundle bundle = n.extras;
+            int identifier = sbn.getId();
             String channelId = bundle.getString("channel_id");
+            map.putInt("identifier", identifier);
             map.putString("channel_id", channelId);
             result.pushMap(map);
         }
@@ -126,8 +129,8 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void removeDeliveredNotifications(String channelId) {
-        final Context context = mApplication.getApplicationContext();
-        CustomPushNotification.clearChannelNotifications(context, channelId);
+    public void removeDeliveredNotifications(int identifier, String channelId) {
+        Context context = mApplication.getApplicationContext();
+        CustomPushNotification.clearNotification(context, identifier, channelId);
     }
 }

android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java

@@ -1,21 +1,18 @@
 package com.mattermost.rnbeta;
 
 import android.app.Notification;
-import android.app.PendingIntent;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.RemoteInput;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Build;
 import android.os.Bundle;
+import androidx.annotation.Nullable;
 import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
-import androidx.core.app.Person;
-
 import java.io.IOException;
-import java.util.Objects;
 
 import okhttp3.Call;
 import okhttp3.MediaType;
@@ -27,17 +24,16 @@ import okhttp3.Response;
 import org.json.JSONObject;
 import org.json.JSONException;
 
-import com.facebook.react.bridge.ReadableMap;
+import com.mattermost.react_native_interface.ResolvePromise;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.WritableMap;
 
 import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
-import com.wix.reactnativenotifications.core.ProxyService;
-import com.wix.reactnativenotifications.core.notification.PushNotificationProps;
 
 public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
     private Context mContext;
     private Bundle bundle;
-    private NotificationManagerCompat notificationManager;
+    private NotificationManager notificationManager;
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -49,13 +45,28 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
 
             mContext = context;
             bundle = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
-            notificationManager = NotificationManagerCompat.from(context);
+            notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
             final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
-            final int notificationId = intent.getIntExtra(CustomPushNotificationHelper.NOTIFICATION_ID, -1);
+            final int notificationId = intent.getIntExtra(CustomPushNotification.NOTIFICATION_ID, -1);
 
-            ReadableMap results = MattermostCredentialsHelper.getCredentialsSync(reactApplicationContext);
-            replyToMessage(results.getString("serverUrl"), results.getString("token"), notificationId, message);
+
+            MattermostCredentialsHelper.getCredentialsForCurrentServer(reactApplicationContext, new ResolvePromise() {
+                @Override
+                public void resolve(@Nullable Object value) {
+                    if (value instanceof Boolean && !(Boolean)value) {
+                        return;
+                    }
+
+                    WritableMap map = (WritableMap) value;
+                    if (map != null) {
+                        String token = map.getString("password");
+                        String serverUrl = map.getString("service");
+
+                        replyToMessage(serverUrl, token, notificationId, message);
+                    }
+                }
+            });
         }
     }
 
@@ -68,7 +79,7 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
         }
 
         if (token == null || serverUrl == null) {
-            onReplyFailed(notificationId);
+            onReplyFailed(notificationManager, notificationId, channelId);
             return;
         }
 
@@ -89,20 +100,19 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
 
         client.newCall(request).enqueue(new okhttp3.Callback() {
             @Override
-            public void onFailure(@NonNull Call call, @NonNull IOException e) {
+            public void onFailure(Call call, IOException e) {
                 Log.i("ReactNative", String.format("Reply FAILED exception %s", e.getMessage()));
-                onReplyFailed(notificationId);
+                onReplyFailed(notificationManager, notificationId, channelId);
             }
 
             @Override
-            public void onResponse(@NonNull Call call, @NonNull final Response response) throws IOException {
+            public void onResponse(Call call, final Response response) throws IOException {
                 if (response.isSuccessful()) {
-                    onReplySuccess(notificationId, message);
+                    onReplySuccess(notificationManager, notificationId, channelId);
                     Log.i("ReactNative", "Reply SUCCESS");
                 } else {
-                    assert response.body() != null;
-                    Log.i("ReactNative", String.format("Reply FAILED status %s BODY %s", response.code(), Objects.requireNonNull(response.body()).string()));
-                    onReplyFailed(notificationId);
+                    Log.i("ReactNative", String.format("Reply FAILED status %s BODY %s", response.code(), response.body().string()));
+                    onReplyFailed(notificationManager, notificationId, channelId);
                 }
             }
         });
@@ -120,31 +130,37 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
         }
     }
 
-    protected void onReplyFailed(int notificationId) {
-        recreateNotification(notificationId, "Message failed to send.");
-    }
+    protected void onReplyFailed(NotificationManager notificationManager, int notificationId, String channelId) {
+        String CHANNEL_ID = "Reply job";
+        Resources res = mContext.getResources();
+        String packageName = mContext.getPackageName();
+        int smallIconResId = res.getIdentifier("ic_notification", "mipmap", packageName);
 
-    protected void onReplySuccess(int notificationId, final CharSequence message) {
-        recreateNotification(notificationId, message);
-    }
+        Bundle userInfoBundle = new Bundle();
+        userInfoBundle.putString("channel_id", channelId);
 
-    private void recreateNotification(int notificationId, final CharSequence message) {
-        final Intent cta = new Intent(mContext, ProxyService.class);
-        final PushNotificationProps notificationProps = new PushNotificationProps(bundle);
-        final PendingIntent pendingIntent = NotificationIntentAdapter.createPendingNotificationIntent(mContext, cta, notificationProps);
-        NotificationCompat.Builder builder = CustomPushNotificationHelper.createNotificationBuilder(mContext, pendingIntent, bundle, false);
-        Notification notification =  builder.build();
-        NotificationCompat.MessagingStyle messagingStyle = NotificationCompat.MessagingStyle.extractMessagingStyleFromNotification(notification);
-        assert messagingStyle != null;
-        messagingStyle.addMessage(message, System.currentTimeMillis(), (Person)null);
-        notification = builder.setStyle(messagingStyle).build();
+        NotificationChannel channel = new NotificationChannel(CHANNEL_ID, CHANNEL_ID, NotificationManager.IMPORTANCE_LOW);
+        notificationManager.createNotificationChannel(channel);
+        Notification notification =
+                new Notification.Builder(mContext, CHANNEL_ID)
+                        .setContentTitle("Message failed to send.")
+                        .setSmallIcon(smallIconResId)
+                        .addExtras(userInfoBundle)
+                        .build();
+
+        CustomPushNotification.clearNotification(mContext, notificationId, channelId);
         notificationManager.notify(notificationId, notification);
     }
 
+    protected void onReplySuccess(NotificationManager notificationManager, int notificationId, String channelId) {
+        notificationManager.cancel(notificationId);
+        CustomPushNotification.clearNotification(mContext, notificationId, channelId);
+    }
+
     private CharSequence getReplyMessage(Intent intent) {
         Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
         if (remoteInput != null) {
-            return remoteInput.getCharSequence(CustomPushNotificationHelper.KEY_TEXT_REPLY);
+            return remoteInput.getCharSequence(CustomPushNotification.KEY_TEXT_REPLY);
         }
         return null;
     }

android/app/src/main/java/com/mattermost/rnbeta/RNPasteableActionCallback.java

@@ -14,7 +14,7 @@ import com.facebook.react.bridge.WritableMap;
 
 public class RNPasteableActionCallback implements ActionMode.Callback {
 
-    private final RNPasteableEditText mEditText;
+    private RNPasteableEditText mEditText;
 
     RNPasteableActionCallback(RNPasteableEditText editText) {
         mEditText = editText;
@@ -26,7 +26,6 @@ public class RNPasteableActionCallback implements ActionMode.Callback {
         if (config != null) {
             WritableMap result = Arguments.fromBundle(config);
             String copyPasteProtection = result.getString("copyAndPasteProtection");
-            assert copyPasteProtection != null;
             if (copyPasteProtection.equals("true")) {
                 disableMenus(menu);
             }
@@ -83,12 +82,7 @@ public class RNPasteableActionCallback implements ActionMode.Callback {
             return null;
         }
 
-        CharSequence chars = item.getText();
-        if (chars == null) {
-            return null;
-        }
-
-        String text = chars.toString(); 
+        String text = item.getText().toString();
         if (text.length() > 0) {
             return null;
         }

android/app/src/main/java/com/mattermost/rnbeta/RNPasteableEditTextOnPasteListener.java

@@ -6,13 +6,10 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.net.Uri;
-import android.os.Build;
 import android.util.Patterns;
 import android.webkit.MimeTypeMap;
 import android.webkit.URLUtil;
 
-import androidx.annotation.RequiresApi;
-
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableArray;
@@ -30,7 +27,7 @@ import java.util.regex.Matcher;
 
 public class RNPasteableEditTextOnPasteListener implements RNEditTextOnPasteListener {
 
-    private final RNPasteableEditText mEditText;
+    private RNPasteableEditText mEditText;
 
     RNPasteableEditTextOnPasteListener(RNPasteableEditText editText) {
         mEditText = editText;
@@ -91,7 +88,7 @@ public class RNPasteableEditTextOnPasteListener implements RNEditTextOnPasteList
         // Get fileName
         String fileName = URLUtil.guessFileName(uri, null, mimeType);
 
-        if (uri.contains(ShareModule.CACHE_DIR_NAME) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (uri.contains(ShareModule.CACHE_DIR_NAME)) {
             uri = moveToImagesCache(uri, fileName);
         }
 
@@ -136,7 +133,6 @@ public class RNPasteableEditTextOnPasteListener implements RNEditTextOnPasteList
                 );
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.O)
     private String moveToImagesCache(String src, String fileName) {
         ReactContext ctx = (ReactContext)mEditText.getContext();
         String cacheFolder = ctx.getCacheDir().getAbsolutePath() + "/Images/";
@@ -145,10 +141,7 @@ public class RNPasteableEditTextOnPasteListener implements RNEditTextOnPasteList
 
         try {
             if (!folder.exists()) {
-                boolean created = folder.mkdirs();
-                if (!created) {
-                    return null;
-                }
+                folder.mkdirs();
             }
 
             Files.move(Paths.get(src), Paths.get(dest));

android/app/src/main/java/com/mattermost/rnbeta/RNPasteableImageFromUrl.java

@@ -13,9 +13,9 @@ import java.net.URLConnection;
 
 public class RNPasteableImageFromUrl implements Runnable {
 
-    private final ReactContext mContext;
-    private final String mUri;
-    private final ReactEditText mTarget;
+    private ReactContext mContext;
+    private String mUri;
+    private ReactEditText mTarget;
 
     RNPasteableImageFromUrl(ReactContext context, ReactEditText target, String uri) {
         mContext = context;

android/app/src/main/java/com/mattermost/rnbeta/RNPasteableTextInputManager.java

@@ -1,8 +1,8 @@
 package com.mattermost.rnbeta;
 
-import androidx.annotation.NonNull;
 import androidx.core.view.inputmethod.EditorInfoCompat;
 import androidx.core.view.inputmethod.InputConnectionCompat;
+import androidx.core.os.BuildCompat;
 import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
@@ -19,13 +19,11 @@ import javax.annotation.Nullable;
 public class RNPasteableTextInputManager extends ReactTextInputManager {
 
     @Override
-    @NonNull
     public String getName() {
         return "PasteableTextInputAndroid";
     }
 
     @Override
-    @NonNull
     public ReactEditText createViewInstance(ThemedReactContext context) {
         RNPasteableEditText editText = new RNPasteableEditText(context) {
             @Override
@@ -38,7 +36,7 @@ public class RNPasteableTextInputManager extends ReactTextInputManager {
                 final InputConnectionCompat.OnCommitContentListener callback =
                         (inputContentInfo, flags, opts) -> {
                             // read and display inputContentInfo asynchronously
-                            if ((flags &
+                            if (BuildCompat.isAtLeastNMR1() && (flags &
                                     InputConnectionCompat.INPUT_CONTENT_GRANT_READ_URI_PERMISSION) != 0) {
                                 try {
                                     inputContentInfo.requestPermission();
@@ -74,7 +72,6 @@ public class RNPasteableTextInputManager extends ReactTextInputManager {
     @Override
     public Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
         Map<String, Object> map = super.getExportedCustomBubblingEventTypeConstants();
-        assert map != null;
         map.put(
                 "onPaste",
                 MapBuilder.of(

android/app/src/main/java/com/mattermost/rnbeta/RNTextInputResetModule.java

@@ -4,19 +4,22 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.UIBlock;
+import com.facebook.react.uimanager.NativeViewHierarchyManager;
 import android.content.Context;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
-import androidx.annotation.NonNull;
-
 public class RNTextInputResetModule extends ReactContextBaseJavaModule {
+
+  private final ReactApplicationContext reactContext;
+
   public RNTextInputResetModule(ReactApplicationContext reactContext) {
     super(reactContext);
+    this.reactContext = reactContext;
   }
 
   @Override
-  @NonNull
   public String getName() {
     return "RNTextInputReset";
   }
@@ -25,13 +28,15 @@ public class RNTextInputResetModule extends ReactContextBaseJavaModule {
   @ReactMethod
   public void resetKeyboardInput(final int reactTagToReset) {
       UIManagerModule uiManager = getReactApplicationContext().getNativeModule(UIManagerModule.class);
-      assert uiManager != null;
-      uiManager.addUIBlock(nativeViewHierarchyManager -> {
-          InputMethodManager imm = (InputMethodManager) getReactApplicationContext().getBaseContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-          if (imm != null) {
-              View viewToReset = nativeViewHierarchyManager.resolveView(reactTagToReset);
-              imm.restartInput(viewToReset);
+      uiManager.addUIBlock(new UIBlock() {
+          @Override
+          public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
+              InputMethodManager imm = (InputMethodManager) getReactApplicationContext().getBaseContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+              if (imm != null) {
+                  View viewToReset = nativeViewHierarchyManager.resolveView(reactTagToReset);
+                  imm.restartInput(viewToReset);
+              }
           }
       });
   }
-}
+}

android/app/src/main/java/com/mattermost/rnbeta/ReceiptDelivery.java

@@ -1,10 +1,12 @@
 package com.mattermost.rnbeta;
 
 import android.content.Context;
+import androidx.annotation.Nullable;
 import android.os.Bundle;
 import android.util.Log;
 import java.lang.System;
 
+import okhttp3.Call;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -16,21 +18,43 @@ import org.json.JSONObject;
 import org.json.JSONException;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.Arguments;
 
 import com.mattermost.react_native_interface.ResolvePromise;
 
 public class ReceiptDelivery {
-    private static final int[] FIBONACCI_BACKOFF = new int[] { 0, 1, 2, 3, 5, 8 };
+    static final String CURRENT_SERVER_URL = "@currentServerUrl";
+
+    private static final int[] FIBONACCI_BACKOFFS = new int[] { 0, 1, 2, 3, 5, 8 };
 
     public static void send(Context context, final String ackId, final String postId, final String type, final boolean isIdLoaded, ResolvePromise promise) {
         final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
-        final ReadableMap credentials = MattermostCredentialsHelper.getCredentialsSync(reactApplicationContext);
-        final String serverUrl = credentials.getString("serverUrl");
-        final String token = credentials.getString("token");
 
-        Log.i("ReactNative", String.format("Send receipt delivery ACK=%s TYPE=%s to URL=%s with ID-LOADED=%s", ackId, type, serverUrl, isIdLoaded));
-        execute(serverUrl, postId, token, ackId, type, isIdLoaded, promise);
+        MattermostCredentialsHelper.getCredentialsForCurrentServer(reactApplicationContext, new ResolvePromise() {
+            @Override
+            public void resolve(@Nullable Object value) {
+                if (value instanceof Boolean && !(Boolean)value) {
+                    return;
+                }
+
+                WritableMap map = (WritableMap) value;
+                if (map != null) {
+                    String token = map.getString("password");
+                    String serverUrl = map.getString("service");
+                    if (serverUrl.isEmpty()) {
+                        String[] credentials = token.split(",[ ]*");
+                        if (credentials.length == 2) {
+                            token = credentials[0];
+                            serverUrl = credentials[1];
+                        }
+                    }
+
+                    Log.i("ReactNative", String.format("Send receipt delivery ACK=%s TYPE=%s to URL=%s with ID-LOADED=%s", ackId, type, serverUrl, isIdLoaded));
+                    execute(serverUrl, postId, token, ackId, type, isIdLoaded, promise);
+                }
+            }
+        });
     }
 
     protected static void execute(String serverUrl, String postId, String token, String ackId, String type, boolean isIdLoaded, ResolvePromise promise) {
@@ -60,7 +84,6 @@ public class ReceiptDelivery {
             return;
         }
 
-        assert serverUrl != null;
         final HttpUrl url = HttpUrl.parse(
             String.format("%s/api/v4/notifications/ack", serverUrl.replaceAll("/$", "")));
         if (url != null) {
@@ -81,7 +104,6 @@ public class ReceiptDelivery {
     private static void makeServerRequest(OkHttpClient client, Request request, Boolean isIdLoaded, int reRequestCount, ResolvePromise promise) {
         try {
             Response response = client.newCall(request).execute();
-            assert response.body() != null;
             String responseBody = response.body().string();
             if (response.code() != 200) {
                 switch (response.code()) {
@@ -107,8 +129,9 @@ public class ReceiptDelivery {
 
             JSONObject jsonResponse = new JSONObject(responseBody);
             Bundle bundle = new Bundle();
-            String[] keys = new String[]{"post_id", "root_id", "category", "message", "team_id", "channel_id", "channel_name", "type", "sender_id", "sender_name", "version"};
-            for (String key : keys) {
+            String keys[] = new String[]{"post_id", "category", "message", "team_id", "channel_id", "channel_name", "type", "sender_id", "sender_name", "version"};
+            for (int i = 0; i < keys.length; i++) {
+                String key = keys[i];
                 if (jsonResponse.has(key)) {
                     bundle.putString(key, jsonResponse.getString(key));
                 }
@@ -119,14 +142,12 @@ public class ReceiptDelivery {
             if (isIdLoaded) {
                 try {
                     reRequestCount++;
-                    if (reRequestCount < FIBONACCI_BACKOFF.length) {
-                        Log.i("ReactNative", "Retry attempt " + reRequestCount + " with backoff delay: " + FIBONACCI_BACKOFF[reRequestCount] + " seconds");
-                        Thread.sleep(FIBONACCI_BACKOFF[reRequestCount] * 1000);
-                        makeServerRequest(client, request, true, reRequestCount, promise);
+                    if (reRequestCount < FIBONACCI_BACKOFFS.length) {
+                        Log.i("ReactNative", "Retry attempt " + reRequestCount + " with backoff delay: " + FIBONACCI_BACKOFFS[reRequestCount] + " seconds");
+                        Thread.sleep(FIBONACCI_BACKOFFS[reRequestCount] * 1000);
+                        makeServerRequest(client, request, isIdLoaded, reRequestCount, promise);
                     }
-                } catch(InterruptedException ie) {
-                    // nothing to do
-                }
+                } catch(InterruptedException ie) {}    
             }
 
             promise.reject("Receipt delivery failure", e.toString());

android/app/src/main/java/com/mattermost/share/RealPathUtil.java

@@ -3,9 +3,11 @@ package com.mattermost.share;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
+import android.content.ContentUris;
 import android.content.ContentResolver;
 import android.os.Environment;
 import android.webkit.MimeTypeMap;
@@ -13,18 +15,18 @@ import android.util.Log;
 import android.text.TextUtils;
 
 import android.os.ParcelFileDescriptor;
-
 import java.io.*;
 import java.nio.channels.FileChannel;
-import java.util.Objects;
 
 // Class based on the steveevers DocumentHelper https://gist.github.com/steveevers/a5af24c226f44bb8fdc3
 
 public class RealPathUtil {
     public static String getRealPathFromURI(final Context context, final Uri uri) {
 
+        final boolean isKitKatOrNewer = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+
         // DocumentProvider
-        if (DocumentsContract.isDocumentUri(context, uri)) {
+        if (isKitKatOrNewer && DocumentsContract.isDocumentUri(context, uri)) {
             // ExternalStorageProvider
             if (isExternalStorageDocument(uri)) {
                 final String docId = DocumentsContract.getDocumentId(uri);
@@ -70,11 +72,7 @@ public class RealPathUtil {
                         split[1]
                 };
 
-                if (contentUri != null) {
-                    return getDataColumn(context, contentUri, selection, selectionArgs);
-                } else {
-                    return getPathFromSavingTempFile(context, uri);
-                }
+                return getDataColumn(context, contentUri, selection, selectionArgs);
             }
         }
 
@@ -98,26 +96,20 @@ public class RealPathUtil {
         File tmpFile;
         String fileName = null;
 
-        if (uri == null || uri.isRelative()) {
-            return null;
-        }
-
         // Try and get the filename from the Uri
         try {
             Cursor returnCursor =
                     context.getContentResolver().query(uri, null, null, null, null);
             int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
             returnCursor.moveToFirst();
-            fileName = sanitizeFilename(returnCursor.getString(nameIndex));
-            returnCursor.close();
-
+            fileName = returnCursor.getString(nameIndex);
         } catch (Exception e) {
             // just continue to get the filename with the last segment of the path
         }
 
         try {
-            if (TextUtils.isEmpty(fileName)) {
-                fileName = sanitizeFilename(uri.getLastPathSegment().trim());
+            if (fileName == null) {
+                fileName = uri.getLastPathSegment().toString().trim();
             }
 
 
@@ -126,6 +118,7 @@ public class RealPathUtil {
                 cacheDir.mkdirs();
             }
 
+            String mimeType = getMimeType(uri.getPath());
             tmpFile = new File(cacheDir, fileName);
             tmpFile.createNewFile();
 
@@ -232,18 +225,9 @@ public class RealPathUtil {
 
     private static void deleteRecursive(File fileOrDirectory) {
         if (fileOrDirectory.isDirectory())
-            for (File child : Objects.requireNonNull(fileOrDirectory.listFiles()))
+            for (File child : fileOrDirectory.listFiles())
                 deleteRecursive(child);
 
         fileOrDirectory.delete();
     }
-
-    private static String sanitizeFilename(String filename) {
-        if (filename == null) {
-            return null;
-        }
-
-        File f = new File(filename);
-        return f.getName();
-    }
 }

android/app/src/main/java/com/mattermost/share/ShareActivity.java

@@ -17,4 +17,9 @@ public class ShareActivity extends ReactActivity {
         MainApplication app = (MainApplication) this.getApplication();
         app.sharedExtensionIsOpened = true;
     }
+
+    @Override
+    public void onBackPressed() {
+        finish();
+    }
 }

android/app/src/main/java/com/mattermost/share/ShareModule.java

@@ -27,7 +27,6 @@ import org.json.JSONException;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -46,7 +45,6 @@ public class ShareModule extends ReactContextBaseJavaModule {
         super(reactContext);
         mApplication = application;
     }
-
     private File tempFolder;
 
     @Override
@@ -133,7 +131,6 @@ public class ShareModule extends ReactContextBaseJavaModule {
         String text = "";
         String type = "";
         String action = "";
-        String extra = "";
 
         Activity currentActivity = getCurrentActivity();
 
@@ -142,21 +139,20 @@ public class ShareModule extends ReactContextBaseJavaModule {
             Intent intent = currentActivity.getIntent();
             action = intent.getAction();
             type = intent.getType();
-            extra = intent.getStringExtra(Intent.EXTRA_TEXT);
-
             if (type == null) {
                 type = "";
             }
 
-            if (Intent.ACTION_SEND.equals(action) && "text/plain".equals(type) && extra != null) {
-                map.putString("value", extra);
+            if (Intent.ACTION_SEND.equals(action) && "text/plain".equals(type)) {
+                text = intent.getStringExtra(Intent.EXTRA_TEXT);
+                map.putString("value", text);
                 map.putString("type", type);
-                map.putBoolean("isString", true);
                 items.pushMap(map);
             } else if (Intent.ACTION_SEND.equals(action)) {
                 Uri uri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
                 if (uri != null) {
-                    map.putString("value", "file://" + RealPathUtil.getRealPathFromURI(currentActivity, uri));
+                    text = "file://" + RealPathUtil.getRealPathFromURI(currentActivity, uri);
+                    map.putString("value", text);
 
                     if (type.equals("image/*")) {
                         type = "image/jpeg";
@@ -165,16 +161,17 @@ public class ShareModule extends ReactContextBaseJavaModule {
                     }
 
                     map.putString("type", type);
-                    map.putBoolean("isString", false);
                     items.pushMap(map);
                 }
             } else if (Intent.ACTION_SEND_MULTIPLE.equals(action)) {
                 ArrayList<Uri> uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
-                for (Uri uri : Objects.requireNonNull(uris)) {
+                for (Uri uri : uris) {
+                    String filePath = RealPathUtil.getRealPathFromURI(currentActivity, uri);
                     map = Arguments.createMap();
-                    map.putString("value", "file://" + RealPathUtil.getRealPathFromURI(currentActivity, uri));
-                    type = RealPathUtil.getMimeTypeFromUri(currentActivity, uri);
+                    text = "file://" + filePath;
+                    map.putString("value", text);
 
+                    type = RealPathUtil.getMimeTypeFromUri(currentActivity, uri);
                     if (type != null) {
                         if (type.equals("image/*")) {
                             type = "image/jpeg";
@@ -185,7 +182,6 @@ public class ShareModule extends ReactContextBaseJavaModule {
                         type = "application/octet-stream";
                     }
                     map.putString("type", type);
-                    map.putBoolean("isString", false);
                     items.pushMap(map);
                 }
             }
@@ -225,7 +221,7 @@ public class ShareModule extends ReactContextBaseJavaModule {
             MultipartBody.Builder builder = new MultipartBody.Builder()
                     .setType(MultipartBody.FORM);
 
-            for (int i = 0; i < files.size(); i++) {
+            for(int i = 0 ; i < files.size() ; i++) {
                 ReadableMap file = files.getMap(i);
                 String filePath = file.getString("fullPath").replaceFirst("file://", "");
                 File fileInfo = new File(filePath);
@@ -249,7 +245,7 @@ public class ShareModule extends ReactContextBaseJavaModule {
                     JSONObject responseJson = new JSONObject(responseData);
                     JSONArray fileInfoArray = responseJson.getJSONArray("file_infos");
                     JSONArray file_ids = new JSONArray();
-                    for (int i = 0; i < fileInfoArray.length(); i++) {
+                    for(int i = 0 ; i < fileInfoArray.length() ; i++) {
                         JSONObject fileInfo = fileInfoArray.getJSONObject(i);
                         file_ids.put(fileInfo.getString("id"));
                     }

android/app/src/main/res/values/colors.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="white">#FFFFFF</color>
-    <color name="transparent">#00000000</color>
 </resources>

android/app/src/main/res/values/strings.xml

@@ -14,10 +14,6 @@
     <string name="allowOtherServers_description">Allow the user to change the above server URL.</string>
     <string name="username_title">Default Username</string>
     <string name="username_description">Set the username or email address to use to authenticate against the Mattermost Server.</string>
-    <string name="timeout_title">Default Request Timeout</string>
-    <string name="timeout_description">How long in milliseconds the mobile app should wait for the server to respond.</string>
     <string name="vendor_title">EMM Vendor or Company Name</string>
     <string name="vendor_description">Name of the EMM vendor or company deploying the app. Used in help text when prompting for passcodes so users are aware why the app is being protected.</string>
-    <string name="inAppSessionAuth_title">In-App Session Auth</string>
-    <string name="inAppSessionAuth_description">Instead of default flow from the mobile browser, enforce SSO with the WebView.</string>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -1,10 +1,8 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="android:windowBackground">@android:color/transparent</item>
-        
     </style>
 
 </resources>

android/app/src/main/res/xml/app_restrictions.xml

@@ -7,12 +7,6 @@
             android:description="@string/inAppPinCode_description"
             android:restrictionType="string"
             android:defaultValue="false" />
-    <restriction
-            android:key="inAppSessionAuth"
-            android:title="@string/inAppSessionAuth_title"
-            android:description="@string/inAppSessionAuth_description"
-            android:restrictionType="string"
-            android:defaultValue="false" />
     <restriction
             android:key="blurApplicationScreen"
             android:title="@string/blurApplicationScreen_title"
@@ -49,12 +43,6 @@
             android:description="@string/username_description"
             android:restrictionType="string"
             android:defaultValue="" />
-    <restriction
-            android:key="timeout"
-            android:title="@string/timeout_title"
-            android:description="@string/timeout_description"
-            android:restrictionType="string"
-            android:defaultValue="10000" />
     <restriction
             android:key="vendor"
             android:title="@string/vendor_title"

android/build.gradle

@@ -2,15 +2,13 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "29.0.3"
+        buildToolsVersion = "28.0.3"
         minSdkVersion = 24
-        compileSdkVersion = 29
-        targetSdkVersion = 29
+        compileSdkVersion = 28
+        targetSdkVersion = 28
         supportLibVersion = "28.0.0"
         kotlinVersion = "1.3.61"
-        firebaseVersion = "21.0.0"
         RNNKotlinVersion = kotlinVersion
-        ndkVersion = "21.1.6352462"
  
     }
     repositories {
@@ -20,15 +18,28 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath 'com.google.gms:google-services:4.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
+subprojects {
+    afterEvaluate {
+        android {
+            compileSdkVersion rootProject.ext.compileSdkVersion
+            buildToolsVersion rootProject.ext.buildToolsVersion
+            defaultConfig {
+                minSdkVersion rootProject.ext.minSdkVersion
+                targetSdkVersion rootProject.ext.targetSdkVersion
+            }
+        }
+    }
+}
+
 allprojects {
     repositories {
         google()
@@ -37,17 +48,17 @@ allprojects {
         jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url("$rootDir/../node_modules/react-native/android")
+            // url "$rootDir/../node_modules/react-native/android"
 
             // Replace AAR from original RN with AAR from react-native-v8
-            // url("$rootDir/../node_modules/react-native-v8/dist")
+            url("$rootDir/../node_modules/react-native-v8/dist")
         }
         maven {
             // Local Maven repo containing AARs with JSC library built for Android
-            url("$rootDir/../node_modules/jsc-android/dist")
+            // url "$rootDir/../node_modules/jsc-android/dist"
 
             // prebuilt libv8android.so
-            // url("$rootDir/../node_modules/v8-android/dist")
+            url("$rootDir/../node_modules/v8-android/dist")
         }
         maven {
             url "https://www.jitpack.io"
@@ -55,8 +66,5 @@ allprojects {
         maven { 
             url ("https://dl.bintray.com/rudderstack/rudderstack")
         }
-        maven {
-            url "$rootDir/../node_modules/detox/Detox-android"
-        }
     }
 }

android/gradle.properties

@@ -30,4 +30,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.75.1
+FLIPPER_VERSION=0.33.1

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip

android/gradlew

@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        i=$((i+1))
     done
     case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,9 +175,14 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"

android/gradlew.bat

@@ -13,77 +13,64 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
 @rem
 @rem ##########################################################################
-
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
-
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
+if "%ERRORLEVEL%" == "0" goto init
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
 echo location of your Java installation.
-
 goto fail
-
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
+if exist "%JAVA_EXE%" goto init
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
 echo location of your Java installation.
-
 goto fail
-
+:init
+@rem Get command-line arguments, handling Windows variants
+if not "%OS%" == "Windows_NT" goto win9xME_args
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+set CMD_LINE_ARGS=%*
 :execute
 @rem Setup the command line
-
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 :end
 @rem End local scope for the variables with windows NT shell
 if "%ERRORLEVEL%"=="0" goto mainEnd
-
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
 if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
 exit /b 1
-
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
-
 :omega

android/settings.gradle

@@ -1,5 +1,5 @@
 rootProject.name = 'Mattermost'
 include ':reactnativenotifications'
-project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/lib/android/app')
+project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android/app')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'

app/actions/apps.ts

@@ -1,157 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {sendEphemeralPost} from '@actions/views/post';
-import {Client4} from '@client/rest';
-import CompassIcon from '@components/compass_icon';
-import {handleGotoLocation} from '@mm-redux/actions/integrations';
-import {AppCallTypes, AppCallResponseTypes} from '@mm-redux/constants/apps';
-import {getTheme} from '@mm-redux/selectors/entities/preferences';
-import {ActionFunc, DispatchFunc} from '@mm-redux/types/actions';
-import {AppCallResponse, AppForm, AppCallRequest, AppCallType, AppContext} from '@mm-redux/types/apps';
-import {CommandArgs} from '@mm-redux/types/integrations';
-import {Post} from '@mm-redux/types/posts';
-import {Theme} from '@mm-redux/types/preferences';
-import EphemeralStore from '@store/ephemeral_store';
-import {makeCallErrorResponse} from '@utils/apps';
-
-import {showModal} from './navigation';
-
-export function doAppCall<Res=unknown>(call: AppCallRequest, type: AppCallType, intl: any): ActionFunc {
-    return async (dispatch, getState) => {
-        try {
-            const res = await Client4.executeAppCall(call, type) as AppCallResponse<Res>;
-            const responseType = res.type || AppCallResponseTypes.OK;
-
-            switch (responseType) {
-            case AppCallResponseTypes.OK:
-                return {data: res};
-            case AppCallResponseTypes.ERROR:
-                return {error: res};
-            case AppCallResponseTypes.FORM: {
-                if (!res.form) {
-                    const errMsg = intl.formatMessage({
-                        id: 'apps.error.responses.form.no_form',
-                        defaultMessage: 'Response type is `form`, but no form was included in response.',
-                    });
-                    return {error: makeCallErrorResponse(errMsg)};
-                }
-
-                const screen = EphemeralStore.getNavigationTopComponentId();
-                if (type === AppCallTypes.SUBMIT && screen !== 'AppForm') {
-                    showAppForm(res.form, call, getTheme(getState()));
-                }
-
-                return {data: res};
-            }
-            case AppCallResponseTypes.NAVIGATE:
-                if (!res.navigate_to_url) {
-                    const errMsg = intl.formatMessage({
-                        id: 'apps.error.responses.navigate.no_url',
-                        defaultMessage: 'Response type is `navigate`, but no url was included in response.',
-                    });
-                    return {error: makeCallErrorResponse(errMsg)};
-                }
-
-                if (type !== AppCallTypes.SUBMIT) {
-                    const errMsg = intl.formatMessage({
-                        id: 'apps.error.responses.navigate.no_submit',
-                        defaultMessage: 'Response type is `navigate`, but the call was not a submission.',
-                    });
-                    return {error: makeCallErrorResponse(errMsg)};
-                }
-
-                dispatch(handleGotoLocation(res.navigate_to_url, intl));
-
-                return {data: res};
-            default: {
-                const errMsg = intl.formatMessage({
-                    id: 'apps.error.responses.unknown_type',
-                    defaultMessage: 'App response type not supported. Response type: {type}.',
-                }, {
-                    type: responseType,
-                });
-                return {error: makeCallErrorResponse(errMsg)};
-            }
-            }
-        } catch (error) {
-            const errMsg = error.message || intl.formatMessage({
-                id: 'apps.error.responses.unexpected_error',
-                defaultMessage: 'Received an unexpected error.',
-            });
-            return {error: makeCallErrorResponse(errMsg)};
-        }
-    };
-}
-
-const showAppForm = async (form: AppForm, call: AppCallRequest, theme: Theme) => {
-    const closeButton = await CompassIcon.getImageSource('close', 24, theme.sidebarHeaderTextColor);
-
-    let submitButtons;
-    const customSubmitButtons = form.submit_buttons && form.fields.find((f) => f.name === form.submit_buttons)?.options;
-
-    if (!customSubmitButtons?.length) {
-        submitButtons = [{
-            id: 'submit-form',
-            showAsAction: 'always',
-            text: 'Submit',
-        }];
-    }
-
-    const options = {
-        topBar: {
-            leftButtons: [{
-                id: 'close-dialog',
-                icon: closeButton,
-            }],
-            rightButtons: submitButtons,
-        },
-    };
-
-    const passProps = {form, call};
-    showModal('AppForm', form.title, passProps, options);
-};
-
-export function postEphemeralCallResponseForPost(response: AppCallResponse, message: string, post: Post): ActionFunc {
-    return (dispatch: DispatchFunc) => {
-        return dispatch(sendEphemeralPost(
-            message,
-            post.channel_id,
-            post.root_id || post.id,
-            response.app_metadata?.bot_user_id,
-        ));
-    };
-}
-
-export function postEphemeralCallResponseForChannel(response: AppCallResponse, message: string, channelID: string): ActionFunc {
-    return (dispatch: DispatchFunc) => {
-        return dispatch(sendEphemeralPost(
-            message,
-            channelID,
-            '',
-            response.app_metadata?.bot_user_id,
-        ));
-    };
-}
-
-export function postEphemeralCallResponseForContext(response: AppCallResponse, message: string, context: AppContext): ActionFunc {
-    return (dispatch: DispatchFunc) => {
-        return dispatch(sendEphemeralPost(
-            message,
-            context.channel_id,
-            context.root_id || context.post_id,
-            response.app_metadata?.bot_user_id,
-        ));
-    };
-}
-
-export function postEphemeralCallResponseForCommandArgs(response: AppCallResponse, message: string, args: CommandArgs): ActionFunc {
-    return (dispatch: DispatchFunc) => {
-        return dispatch(sendEphemeralPost(
-            message,
-            args.channel_id,
-            args.root_id,
-            response.app_metadata?.bot_user_id,
-        ));
-    };
-}

app/actions/device/index.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {DeviceTypes} from '@constants';
+import {DeviceTypes} from 'app/constants';
 
 export function connection(isOnline) {
     return async (dispatch, getState) => {
@@ -15,6 +15,13 @@ export function connection(isOnline) {
     };
 }
 
+export function setStatusBarHeight(height = 20) {
+    return {
+        type: DeviceTypes.STATUSBAR_HEIGHT_CHANGED,
+        data: height,
+    };
+}
+
 export function setDeviceDimensions(height, width) {
     return {
         type: DeviceTypes.DEVICE_DIMENSIONS_CHANGED,
@@ -44,4 +51,5 @@ export default {
     setDeviceDimensions,
     setDeviceOrientation,
     setDeviceAsTablet,
+    setStatusBarHeight,
 };

app/actions/helpers/channels.test.js

@@ -3,9 +3,11 @@
 
 /* eslint-disable no-import-assign */
 
-import {Client4} from '@client/rest';
-import {PreferenceTypes} from '@mm-redux/action_types';
+import {Client4} from '@mm-redux/client';
+
 import {Preferences} from '@mm-redux/constants';
+import {PreferenceTypes} from '@mm-redux/action_types';
+
 import * as CommonSelectors from '@mm-redux/selectors/entities/common';
 import * as PreferenceSelectors from '@mm-redux/selectors/entities/preferences';
 import * as PreferenceUtils from '@mm-redux/utils/preference_utils';

app/actions/helpers/channels.ts

@@ -1,21 +1,23 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {Client4} from '@client/rest';
 import {ChannelTypes, PreferenceTypes, RoleTypes, UserTypes} from '@mm-redux/action_types';
+import {Client4} from '@mm-redux/client';
 import {General, Preferences} from '@mm-redux/constants';
 import {getCurrentChannelId, getRedirectChannelNameForTeam, getChannelsNameMapInTeam} from '@mm-redux/selectors/entities/channels';
 import {getConfig} from '@mm-redux/selectors/entities/general';
 import {getMyPreferences} from '@mm-redux/selectors/entities/preferences';
 import {getCurrentUserId, getUsers, getUserIdsInChannels} from '@mm-redux/selectors/entities/users';
+import {getChannelByName as selectChannelByName, getUserIdFromChannelName, isAutoClosed} from '@mm-redux/utils/channel_utils';
+import {getPreferenceKey} from '@mm-redux/utils/preference_utils';
+
 import {ActionResult, GenericAction} from '@mm-redux/types/actions';
 import {Channel, ChannelMembership} from '@mm-redux/types/channels';
 import {PreferenceType} from '@mm-redux/types/preferences';
 import {GlobalState} from '@mm-redux/types/store';
 import {UserProfile} from '@mm-redux/types/users';
 import {RelationOneToMany} from '@mm-redux/types/utilities';
-import {getChannelByName as selectChannelByName, getUserIdFromChannelName, isAutoClosed} from '@mm-redux/utils/channel_utils';
-import {getPreferenceKey} from '@mm-redux/utils/preference_utils';
+
 import {isDirectChannelVisible, isGroupChannelVisible} from '@utils/channels';
 import {buildPreference} from '@utils/preferences';
 
@@ -118,7 +120,7 @@ export async function fetchMyChannelMember(channelId: string) {
     }
 }
 
-export function markChannelAsUnread(state: GlobalState, teamId: string, channelId: string, mentions: Array<string>, isRoot = false): Array<GenericAction> {
+export function markChannelAsUnread(state: GlobalState, teamId: string, channelId: string, mentions: Array<string>): Array<GenericAction> {
     const {myMembers} = state.entities.channels;
     const {currentUserId} = state.entities.users;
 
@@ -127,7 +129,6 @@ export function markChannelAsUnread(state: GlobalState, teamId: string, channelI
         data: {
             channelId,
             amount: 1,
-            amountRoot: isRoot ? 1 : 0,
         },
     }, {
         type: ChannelTypes.INCREMENT_UNREAD_MSG_COUNT,
@@ -135,7 +136,6 @@ export function markChannelAsUnread(state: GlobalState, teamId: string, channelI
             teamId,
             channelId,
             amount: 1,
-            amountRoot: isRoot ? 1 : 0,
             onlyMentions: myMembers[channelId] && myMembers[channelId].notify_props &&
                 myMembers[channelId].notify_props.mark_unread === General.MENTION,
         },
@@ -148,7 +148,6 @@ export function markChannelAsUnread(state: GlobalState, teamId: string, channelI
                 teamId,
                 channelId,
                 amount: 1,
-                amountRoot: isRoot ? 1 : 0,
             },
         });
     }
@@ -420,4 +419,4 @@ async function getProfilesFromPromises(promises: Array<Promise<ActionResult>>):
     } catch {
         return null;
     }
-}
+}

app/actions/navigation/index.js

@@ -1,23 +1,19 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import merge from 'deepmerge';
 import {Keyboard, Platform} from 'react-native';
 import {Navigation} from 'react-native-navigation';
+import merge from 'deepmerge';
 
-import {DeviceTypes, NavigationTypes} from '@constants';
-import {CHANNEL} from '@constants/screen';
 import {Preferences} from '@mm-redux/constants';
 import {getTheme} from '@mm-redux/selectors/entities/preferences';
 import EventEmmiter from '@mm-redux/utils/event_emitter';
+
 import EphemeralStore from '@store/ephemeral_store';
 import Store from '@store/store';
+import {NavigationTypes} from '@constants';
 
-Navigation.setDefaultOptions({
-    layout: {
-        orientation: [DeviceTypes.IS_TABLET ? 'all' : 'portrait'],
-    },
-});
+const CHANNEL_SCREEN = 'Channel';
 
 function getThemeFromState() {
     const state = Store.redux?.getState() || {};
@@ -33,8 +29,8 @@ export function resetToChannel(passProps = {}) {
     const stack = {
         children: [{
             component: {
-                id: CHANNEL,
-                name: CHANNEL,
+                id: CHANNEL_SCREEN,
+                name: CHANNEL_SCREEN,
                 passProps,
                 options: {
                     layout: {
@@ -52,7 +48,6 @@ export function resetToChannel(passProps = {}) {
                         backButton: {
                             visible: false,
                             color: theme.sidebarHeaderTextColor,
-                            enableMenu: false,
                         },
                     },
                 },
@@ -93,8 +88,6 @@ export function resetToChannel(passProps = {}) {
 export function resetToSelectServer(allowOtherServers) {
     const theme = Preferences.THEMES.default;
 
-    EphemeralStore.clearNavigationComponents();
-
     Navigation.setRoot({
         root: {
             stack: {
@@ -116,7 +109,6 @@ export function resetToSelectServer(allowOtherServers) {
                             topBar: {
                                 backButton: {
                                     color: theme.sidebarHeaderTextColor,
-                                    enableMenu: false,
                                     title: '',
                                 },
                                 background: {
@@ -150,7 +142,6 @@ export function resetToTeams(name, title, passProps = {}, options = {}) {
             },
             backButton: {
                 color: theme.sidebarHeaderTextColor,
-                enableMenu: false,
                 title: '',
             },
             background: {
@@ -159,8 +150,6 @@ export function resetToTeams(name, title, passProps = {}, options = {}) {
         },
     };
 
-    EphemeralStore.clearNavigationComponents();
-
     Navigation.setRoot({
         root: {
             stack: {
@@ -194,9 +183,7 @@ export function goToScreen(name, title, passProps = {}, options = {}) {
             visible: true,
             backButton: {
                 color: theme.sidebarHeaderTextColor,
-                enableMenu: false,
                 title: '',
-                testID: 'screen.back.button',
             },
             background: {
                 color: theme.sidebarHeaderBg,
@@ -260,7 +247,6 @@ export function showModal(name, title, passProps = {}, options = {}) {
             visible: true,
             backButton: {
                 color: theme.sidebarHeaderTextColor,
-                enableMenu: false,
                 title: '',
             },
             background: {
@@ -292,50 +278,7 @@ export function showModal(name, title, passProps = {}, options = {}) {
 
 export function showModalOverCurrentContext(name, passProps = {}, options = {}) {
     const title = '';
-
-    let animations;
-    switch (Platform.OS) {
-    case 'android':
-        animations = {
-            showModal: {
-                waitForRender: true,
-                alpha: {
-                    from: 0,
-                    to: 1,
-                    duration: 250,
-                },
-            },
-            dismissModal: {
-                alpha: {
-                    from: 1,
-                    to: 0,
-                    duration: 250,
-                },
-            },
-        };
-        break;
-    default:
-        animations = {
-            showModal: {
-                enter: {
-                    enabled: false,
-                },
-                exit: {
-                    enabled: false,
-                },
-            },
-            dismissModal: {
-                enter: {
-                    enabled: false,
-                },
-                exit: {
-                    enabled: false,
-                },
-            },
-        };
-        break;
-    }
-
+    const animationsEnabled = (Platform.OS === 'android').toString();
     const defaultOptions = {
         modalPresentationStyle: 'overCurrentContext',
         layout: {
@@ -346,7 +289,25 @@ export function showModalOverCurrentContext(name, passProps = {}, options = {})
             visible: false,
             height: 0,
         },
-        animations,
+        animations: {
+            showModal: {
+                waitForRender: true,
+                enabled: animationsEnabled,
+                alpha: {
+                    from: 0,
+                    to: 1,
+                    duration: 250,
+                },
+            },
+            dismissModal: {
+                enabled: animationsEnabled,
+                alpha: {
+                    from: 1,
+                    to: 0,
+                    duration: 250,
+                },
+            },
+        },
     };
     const mergeOptions = merge(defaultOptions, options);
 
@@ -377,7 +338,7 @@ export async function dismissModal(options = {}) {
         return;
     }
 
-    const componentId = options.componentId || EphemeralStore.getNavigationTopComponentId();
+    const componentId = EphemeralStore.getNavigationTopComponentId();
 
     try {
         await Navigation.dismissModal(componentId, options);
@@ -388,20 +349,17 @@ export async function dismissModal(options = {}) {
     }
 }
 
-export async function dismissAllModals(options) {
+export async function dismissAllModals(options = {}) {
     if (!EphemeralStore.hasModalsOpened()) {
         return;
     }
 
-    if (Platform.OS === 'ios') {
-        const modals = [...EphemeralStore.navigationModalStack];
-        for await (const modal of modals) {
-            await Navigation.dismissModal(modal, options);
-            EphemeralStore.removeNavigationModal(modal);
-        }
-    } else {
+    try {
         await Navigation.dismissAllModals(options);
         EphemeralStore.clearNavigationModals();
+    } catch (error) {
+        // RNN returns a promise rejection if there are no modals to
+        // dismiss. We'll do nothing in this case.
     }
 }
 
@@ -469,7 +427,7 @@ export function closeMainSideMenu() {
     }
 
     Keyboard.dismiss();
-    Navigation.mergeOptions(CHANNEL, {
+    Navigation.mergeOptions(CHANNEL_SCREEN, {
         sideMenu: {
             left: {visible: false},
         },
@@ -481,7 +439,7 @@ export function enableMainSideMenu(enabled, visible = true) {
         return;
     }
 
-    Navigation.mergeOptions(CHANNEL, {
+    Navigation.mergeOptions(CHANNEL_SCREEN, {
         sideMenu: {
             left: {enabled, visible},
         },
@@ -494,7 +452,7 @@ export function openSettingsSideMenu() {
     }
 
     Keyboard.dismiss();
-    Navigation.mergeOptions(CHANNEL, {
+    Navigation.mergeOptions(CHANNEL_SCREEN, {
         sideMenu: {
             right: {visible: true},
         },
@@ -507,7 +465,7 @@ export function closeSettingsSideMenu() {
     }
 
     Keyboard.dismiss();
-    Navigation.mergeOptions(CHANNEL, {
+    Navigation.mergeOptions(CHANNEL_SCREEN, {
         sideMenu: {
             right: {visible: false},
         },

app/actions/navigation/index.test.js

@@ -1,38 +1,33 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import merge from 'deepmerge';
 import {Platform} from 'react-native';
 import {Navigation} from 'react-native-navigation';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
+import merge from 'deepmerge';
+
+import EventEmitter from '@mm-redux/utils/event_emitter';
 
 import * as NavigationActions from '@actions/navigation';
-import {NavigationTypes} from '@constants';
 import Preferences from '@mm-redux/constants/preferences';
-import EventEmitter from '@mm-redux/utils/event_emitter';
 import EphemeralStore from '@store/ephemeral_store';
 import intitialState from '@store/initial_state';
 import Store from '@store/store';
+import {NavigationTypes} from '@constants';
 
 jest.unmock('@actions/navigation');
+jest.mock('@store/ephemeral_store', () => ({
+    getNavigationTopComponentId: jest.fn(),
+    clearNavigationComponents: jest.fn(),
+    addNavigationModal: jest.fn(),
+    hasModalsOpened: jest.fn().mockReturnValue(true),
+}));
+
 const mockStore = configureMockStore([thunk]);
 const store = mockStore(intitialState);
 Store.redux = store;
 
-// Mock EphemeralStore add/remove modal
-const add = EphemeralStore.addNavigationModal;
-const remove = EphemeralStore.removeNavigationModal;
-EphemeralStore.removeNavigationModal = (componentId) => {
-    remove(componentId);
-    EphemeralStore.removeNavigationComponentId(componentId);
-};
-
-EphemeralStore.addNavigationModal = (componentId) => {
-    add(componentId);
-    EphemeralStore.addNavigationComponentId(componentId);
-};
-
 describe('@actions/navigation', () => {
     const topComponentId = 'top-component-id';
     const name = 'name';
@@ -44,16 +39,7 @@ describe('@actions/navigation', () => {
     const options = {
         testOption: 'test',
     };
-
-    beforeEach(() => {
-        EphemeralStore.clearNavigationComponents();
-        EphemeralStore.clearNavigationModals();
-
-        // mock that we have a root screen
-        EphemeralStore.addNavigationComponentId(topComponentId);
-    });
-
-    // EphemeralStore.getNavigationTopComponentId.mockReturnValue(topComponentId);
+    EphemeralStore.getNavigationTopComponentId.mockReturnValue(topComponentId);
 
     test('resetToChannel should call Navigation.setRoot', () => {
         const setRoot = jest.spyOn(Navigation, 'setRoot');
@@ -78,7 +64,6 @@ describe('@actions/navigation', () => {
                                     height: 0,
                                     backButton: {
                                         visible: false,
-                                        enableMenu: false,
                                         color: theme.sidebarHeaderTextColor,
                                     },
                                     background: {
@@ -121,7 +106,6 @@ describe('@actions/navigation', () => {
                                 topBar: {
                                     backButton: {
                                         color: theme.sidebarHeaderTextColor,
-                                        enableMenu: false,
                                         title: '',
                                     },
                                     background: {
@@ -159,7 +143,6 @@ describe('@actions/navigation', () => {
                 },
                 backButton: {
                     color: theme.sidebarHeaderTextColor,
-                    enableMenu: false,
                     title: '',
                 },
                 background: {
@@ -204,9 +187,7 @@ describe('@actions/navigation', () => {
                 visible: true,
                 backButton: {
                     color: theme.sidebarHeaderTextColor,
-                    enableMenu: false,
                     title: '',
-                    testID: 'screen.back.button',
                 },
                 background: {
                     color: theme.sidebarHeaderBg,
@@ -265,7 +246,6 @@ describe('@actions/navigation', () => {
                 visible: true,
                 backButton: {
                     color: theme.sidebarHeaderTextColor,
-                    enableMenu: false,
                     title: '',
                 },
                 background: {
@@ -300,6 +280,7 @@ describe('@actions/navigation', () => {
     test('showModalOverCurrentContext should call Navigation.showModal', () => {
         const showModal = jest.spyOn(Navigation, 'showModal');
 
+        const animationsEnabled = (Platform.OS === 'android').toString();
         const showModalOverCurrentContextTitle = '';
         const showModalOverCurrentContextOptions = {
             modalPresentationStyle: 'overCurrentContext',
@@ -313,19 +294,20 @@ describe('@actions/navigation', () => {
             },
             animations: {
                 showModal: {
-                    enter: {
-                        enabled: false,
-                    },
-                    exit: {
-                        enabled: false,
+                    waitForRender: true,
+                    enabled: animationsEnabled,
+                    alpha: {
+                        from: 0,
+                        to: 1,
+                        duration: 250,
                     },
                 },
                 dismissModal: {
-                    enter: {
-                        enabled: false,
-                    },
-                    exit: {
-                        enabled: false,
+                    enabled: animationsEnabled,
+                    alpha: {
+                        from: 1,
+                        to: 0,
+                        duration: 250,
                     },
                 },
             },
@@ -343,7 +325,6 @@ describe('@actions/navigation', () => {
                 visible: true,
                 backButton: {
                     color: theme.sidebarHeaderTextColor,
-                    enableMenu: false,
                     title: '',
                 },
                 background: {
@@ -402,7 +383,6 @@ describe('@actions/navigation', () => {
                 visible: true,
                 backButton: {
                     color: theme.sidebarHeaderTextColor,
-                    enableMenu: false,
                     title: '',
                 },
                 background: {
@@ -437,20 +417,15 @@ describe('@actions/navigation', () => {
     test('dismissModal should call Navigation.dismissModal', async () => {
         const dismissModal = jest.spyOn(Navigation, 'dismissModal');
 
-        NavigationActions.showModal('First', 'First Modal', passProps, options);
-
         await NavigationActions.dismissModal(options);
-        expect(dismissModal).toHaveBeenCalledWith('First', options);
+        expect(dismissModal).toHaveBeenCalledWith(topComponentId, options);
     });
 
     test('dismissAllModals should call Navigation.dismissAllModals', async () => {
-        const dismissModal = jest.spyOn(Navigation, 'dismissModal');
-
-        NavigationActions.showModal('First', 'First Modal', passProps, options);
-        NavigationActions.showModal('Second', 'Second Modal', passProps, options);
+        const dismissAllModals = jest.spyOn(Navigation, 'dismissAllModals');
 
         await NavigationActions.dismissAllModals(options);
-        expect(dismissModal).toHaveBeenCalledTimes(2);
+        expect(dismissAllModals).toHaveBeenCalledWith(options);
     });
 
     test('mergeNavigationOptions should call Navigation.mergeOptions', () => {
@@ -510,16 +485,13 @@ describe('@actions/navigation', () => {
     });
 
     test('dismissAllModalsAndPopToRoot should call Navigation.dismissAllModals, Navigation.popToRoot, and emit event', async () => {
-        const dismissModal = jest.spyOn(Navigation, 'dismissModal');
+        const dismissAllModals = jest.spyOn(Navigation, 'dismissAllModals');
         const popToRoot = jest.spyOn(Navigation, 'popToRoot');
         EventEmitter.emit = jest.fn();
 
-        NavigationActions.showModal('First', 'First Modal', passProps, options);
-        NavigationActions.showModal('Second', 'Second Modal', passProps, options);
-
         await NavigationActions.dismissAllModalsAndPopToRoot();
-        expect(dismissModal).toHaveBeenCalledTimes(2);
+        expect(dismissAllModals).toHaveBeenCalled();
         expect(popToRoot).toHaveBeenCalledWith(topComponentId);
         expect(EventEmitter.emit).toHaveBeenCalledWith(NavigationTypes.NAVIGATION_DISMISS_AND_POP_TO_ROOT);
     });
-});
+});

app/actions/views/announcement.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {ViewTypes} from '@constants';
+import {ViewTypes} from 'app/constants';
 
 export function dismissBanner(text) {
     return {

app/actions/views/channel.js

@@ -3,45 +3,40 @@
 
 import {batchActions} from 'redux-batched-actions';
 
-import {lastChannelIdForTeam, loadSidebarDirectMessagesProfiles} from '@actions/helpers/channels';
-import {getPosts, getPostsBefore, getPostsSince, loadUnreadChannelPosts} from '@actions/views/post';
-import {Client4} from '@client/rest';
-import {ViewTypes} from '@constants';
-import {INSERT_TO_COMMENT, INSERT_TO_DRAFT} from '@constants/post_draft';
+import {ViewTypes} from 'app/constants';
+
 import {ChannelTypes, RoleTypes, GroupTypes} from '@mm-redux/action_types';
-import {fetchAppBindings} from '@mm-redux/actions/apps';
 import {
     fetchMyChannelsAndMembers,
-    getChannelByName,
-    joinChannel,
+    getChannelByNameAndTeamName,
     leaveChannel as serviceLeaveChannel,
 } from '@mm-redux/actions/channels';
 import {savePreferences} from '@mm-redux/actions/preferences';
-import {addUserToTeam, getTeamByName, removeUserFromTeam, selectTeam} from '@mm-redux/actions/teams';
+import {getLicense} from '@mm-redux/selectors/entities/general';
+import {selectTeam} from '@mm-redux/actions/teams';
+import {Client4} from '@mm-redux/client';
 import {General, Preferences} from '@mm-redux/constants';
+import {getPostIdsInChannel} from '@mm-redux/selectors/entities/posts';
+import {isMinimumServerVersion} from '@mm-redux/utils/helpers';
 import {
     getCurrentChannelId,
     getRedirectChannelNameForTeam,
     getChannelsNameMapInTeam,
-    getMyChannelMemberships,
     isManuallyUnread,
 } from '@mm-redux/selectors/entities/channels';
-import {getLicense} from '@mm-redux/selectors/entities/general';
-import {getPostIdsInChannel} from '@mm-redux/selectors/entities/posts';
-import {isCollapsedThreadsEnabled} from '@mm-redux/selectors/entities/preferences';
-import {getTeamByName as selectTeamByName, getCurrentTeam, getTeamMemberships} from '@mm-redux/selectors/entities/teams';
 import {getCurrentUserId} from '@mm-redux/selectors/entities/users';
+import {getTeamByName, getCurrentTeam} from '@mm-redux/selectors/entities/teams';
+
 import {getChannelByName as selectChannelByName, getChannelsIdForTeam} from '@mm-redux/utils/channel_utils';
 import EventEmitter from '@mm-redux/utils/event_emitter';
-import {isMinimumServerVersion} from '@mm-redux/utils/helpers';
-import {getChannelReachable} from '@selectors/channel';
-import {getViewingGlobalThreads} from '@selectors/threads';
-import telemetry, {PERF_MARKERS} from '@telemetry';
-import {appsEnabled} from '@utils/apps';
-import {isDirectChannelVisible, isGroupChannelVisible, getChannelSinceValue, privateChannelJoinPrompt} from '@utils/channels';
-import {isPendingPost} from '@utils/general';
 
-import {handleNotViewingGlobalThreadsScreen} from './threads';
+import {lastChannelIdForTeam, loadSidebarDirectMessagesProfiles} from '@actions/helpers/channels';
+import {getPosts, getPostsBefore, getPostsSince, getPostThread, loadUnreadChannelPosts} from '@actions/views/post';
+import {INSERT_TO_COMMENT, INSERT_TO_DRAFT} from '@constants/post_draft';
+import {getChannelReachable} from '@selectors/channel';
+import telemetry from '@telemetry';
+import {isDirectChannelVisible, isGroupChannelVisible, getChannelSinceValue} from '@utils/channels';
+import {isPendingPost} from '@utils/general';
 
 const MAX_RETRIES = 3;
 
@@ -49,21 +44,15 @@ export function loadChannelsByTeamName(teamName, errorHandler) {
     return async (dispatch, getState) => {
         const state = getState();
         const {currentTeamId} = state.entities.teams;
+        const team = getTeamByName(state, teamName);
 
-        if (teamName) {
-            const team = selectTeamByName(state, teamName);
-
-            if (!team && errorHandler) {
-                errorHandler();
-                return {error: true};
-            }
-
-            if (team && team.id !== currentTeamId) {
-                await dispatch(fetchMyChannelsAndMembers(team.id));
-            }
+        if (!team && errorHandler) {
+            errorHandler();
         }
 
-        return {data: true};
+        if (team && team.id !== currentTeamId) {
+            await dispatch(fetchMyChannelsAndMembers(team.id));
+        }
     };
 }
 
@@ -122,14 +111,24 @@ export function fetchPostActionWithRetry(action, maxTries = MAX_RETRIES) {
     };
 }
 
+export function loadThreadIfNecessary(rootId) {
+    return (dispatch, getState) => {
+        const state = getState();
+        const {posts, postsInThread} = state.entities.posts;
+        const threadPosts = postsInThread[rootId];
+
+        if (!posts[rootId] || !threadPosts) {
+            dispatch(getPostThread(rootId));
+        }
+    };
+}
+
 export function selectInitialChannel(teamId) {
     return (dispatch, getState) => {
         const state = getState();
-        const collapsedThreadsEnabled = isCollapsedThreadsEnabled(state);
-        if (!collapsedThreadsEnabled || (collapsedThreadsEnabled && !getViewingGlobalThreads(state))) {
-            const channelId = lastChannelIdForTeam(state, teamId);
-            dispatch(handleSelectChannel(channelId));
-        }
+        const channelId = lastChannelIdForTeam(state, teamId);
+
+        dispatch(handleSelectChannel(channelId));
     };
 }
 
@@ -190,21 +189,12 @@ export function handleSelectChannel(channelId) {
     return async (dispatch, getState) => {
         const dt = Date.now();
         const state = getState();
-        const {currentUserId} = state.entities.users;
         const {channels, currentChannelId, myMembers} = state.entities.channels;
         const {currentTeamId} = state.entities.teams;
         const channel = channels[channelId];
         const member = myMembers[channelId];
 
         if (channel) {
-            let markerExtra;
-            if (channel.display_name) {
-                markerExtra = `Channel: ${channel.display_name}`;
-            } else {
-                markerExtra = `Channel: ${channel.type === General.DM_CHANNEL ? 'Direct Channel' : channel.name}`;
-            }
-
-            telemetry.start([PERF_MARKERS.CHANNEL_RENDER], Date.now(), [markerExtra]);
             dispatch(loadPostsIfNecessaryWithRetry(channelId));
 
             let previousChannelId = null;
@@ -222,53 +212,23 @@ export function handleSelectChannel(channelId) {
                     teamId: channel.team_id || currentTeamId,
                 },
             });
-            if (getViewingGlobalThreads(state)) {
-                actions.push(handleNotViewingGlobalThreadsScreen());
-            }
 
             dispatch(batchActions(actions, 'BATCH_SWITCH_CHANNEL'));
 
-            if (appsEnabled(state)) {
-                //TODO improve sync method
-                dispatch(fetchAppBindings(currentUserId, channelId));
-            }
             console.log('channel switch to', channel?.display_name, channelId, (Date.now() - dt), 'ms'); //eslint-disable-line
         }
-
-        return {data: true};
     };
 }
 
-export function handleSelectChannelByName(channelName, teamName, errorHandler, intl) {
+export function handleSelectChannelByName(channelName, teamName, errorHandler) {
     return async (dispatch, getState) => {
-        let state = getState();
+        const state = getState();
         const {teams: currentTeams, currentTeamId} = state.entities.teams;
         const currentTeam = currentTeams[currentTeamId];
         const currentTeamName = currentTeam?.name;
-        const currentUserId = getCurrentUserId(state);
+        const response = await dispatch(getChannelByNameAndTeamName(teamName || currentTeamName, channelName));
+        const {error, data: channel} = response;
         const currentChannelId = getCurrentChannelId(state);
-
-        const {error: teamError, data: team} = await dispatch(getTeamByName(teamName || currentTeamName));
-
-        // Fallback to API response error, if any.
-        if (teamError) {
-            if (errorHandler) {
-                errorHandler(intl);
-            }
-            return {error: teamError};
-        }
-
-        // Join team if not a member already
-        const myTeamMemberships = getTeamMemberships(state);
-        let joinedNewTeam = false;
-        if (!myTeamMemberships[team.id]) {
-            await dispatch(addUserToTeam(team.id, currentUserId));
-            joinedNewTeam = true;
-        }
-
-        const {error: channelError, data: channel} = await dispatch(getChannelByName(team.id, channelName));
-
-        state = getState();
         const reachable = getChannelReachable(state, channelName, teamName);
 
         if (!reachable && errorHandler) {
@@ -276,35 +236,12 @@ export function handleSelectChannelByName(channelName, teamName, errorHandler, i
         }
 
         // Fallback to API response error, if any.
-        if (channelError) {
-            return {error: channelError};
-        }
-
-        // Join Channel if not a member already
-        if (channel && currentChannelId !== channel.id) {
-            const myChannelMemberships = getMyChannelMemberships(state);
-            if (!myChannelMemberships[channel.id]) {
-                if (channel.type === General.PRIVATE_CHANNEL) {
-                    const {join} = await privateChannelJoinPrompt(channel, intl);
-                    if (!join) {
-                        if (joinedNewTeam) {
-                            await dispatch(removeUserFromTeam(team.id, currentUserId));
-                        }
-                        return {data: true};
-                    }
-                }
-                console.log('joining channel', channel?.display_name, channel.id); //eslint-disable-line
-                const result = await dispatch(joinChannel(currentUserId, '', channel.id));
-                if (result.error || !result.data || !result.data.channel) {
-                    if (joinedNewTeam) {
-                        await dispatch(removeUserFromTeam(team.id, currentUserId));
-                    }
-                    return result;
-                }
-            }
+        if (error) {
+            return {error};
         }
 
         if (teamName && teamName !== currentTeamName) {
+            const team = getTeamByName(state, teamName);
             dispatch(selectTeam(team));
         }
 
@@ -312,7 +249,7 @@ export function handleSelectChannelByName(channelName, teamName, errorHandler, i
             dispatch(handleSelectChannel(channel.id));
         }
 
-        return {data: true};
+        return null;
     };
 }
 
@@ -347,8 +284,6 @@ export function markChannelViewedAndRead(channelId, previousChannelId, markOnSer
         const actions = markAsViewedAndReadBatch(state, channelId, previousChannelId, markOnServer);
 
         dispatch(batchActions(actions, 'BATCH_MARK_CHANNEL_VIEWED_AND_READ'));
-
-        return {data: true};
     };
 }
 
@@ -382,7 +317,6 @@ export function markAsViewedAndReadBatch(state, channelId, prevChannelId = '', m
 
         if (channel) {
             const unreadMessageCount = channel.total_msg_count - member.msg_count;
-            const unreadMessageCountRoot = channel.total_msg_count_root - member.msg_count_root;
             actions.push({
                 type: ChannelTypes.SET_UNREAD_MSG_COUNT,
                 data: {
@@ -395,7 +329,6 @@ export function markAsViewedAndReadBatch(state, channelId, prevChannelId = '', m
                     teamId: channel.team_id,
                     channelId,
                     amount: unreadMessageCount,
-                    amountRoot: unreadMessageCountRoot,
                 },
             }, {
                 type: ChannelTypes.DECREMENT_UNREAD_MENTION_COUNT,
@@ -403,7 +336,6 @@ export function markAsViewedAndReadBatch(state, channelId, prevChannelId = '', m
                     teamId: channel.team_id,
                     channelId,
                     amount: member.mention_count,
-                    amountRoot: member.mention_count_root,
                 },
             });
         }
@@ -424,7 +356,6 @@ export function markAsViewedAndReadBatch(state, channelId, prevChannelId = '', m
                     teamId: prevChannel.team_id,
                     channelId: prevChannelId,
                     amount: prevChannel.total_msg_count - prevMember.msg_count,
-                    amountRoot: prevChannel.total_msg_count_root - prevMember.msg_count_root,
                 },
             }, {
                 type: ChannelTypes.DECREMENT_UNREAD_MENTION_COUNT,
@@ -432,7 +363,6 @@ export function markAsViewedAndReadBatch(state, channelId, prevChannelId = '', m
                     teamId: prevChannel.team_id,
                     channelId: prevChannelId,
                     amount: prevMember.mention_count,
-                    amountRoot: prevMember.mention_count_root,
                 },
             });
         }
@@ -514,7 +444,16 @@ export function closeGMChannel(channel) {
 
 export function refreshChannelWithRetry(channelId) {
     return async (dispatch) => {
-        return dispatch(fetchPostActionWithRetry(getPosts(channelId)));
+        dispatch(setChannelRefreshing(true));
+        const posts = await dispatch(fetchPostActionWithRetry(getPosts(channelId)));
+        const actions = [setChannelRefreshing(false)];
+
+        if (posts) {
+            actions.push(setChannelRetryFailed(false));
+        }
+
+        dispatch(batchActions(actions, 'BATCH_REEFRESH_CHANNEL'));
+        return posts;
     };
 }
 
@@ -541,6 +480,12 @@ export function leaveChannel(channel, reset = false) {
 }
 
 export function setChannelLoading(loading = true) {
+    if (loading) {
+        telemetry.start(['channel:loading']);
+    } else {
+        telemetry.end(['channel:loading']);
+    }
+
     return {
         type: ViewTypes.SET_CHANNEL_LOADER,
         loading,
@@ -589,6 +534,9 @@ export function increasePostVisibility(channelId, postId) {
             return true;
         }
 
+        telemetry.reset();
+        telemetry.start(['posts:loading']);
+
         dispatch({
             type: ViewTypes.LOADING_POSTS,
             data: true,
@@ -619,6 +567,8 @@ export function increasePostVisibility(channelId, postId) {
         }
 
         dispatch(batchActions(actions, 'BATCH_LOAD_MORE_POSTS'));
+        telemetry.end(['posts:loading']);
+        telemetry.save();
 
         return hasMorePost;
     };
@@ -631,7 +581,7 @@ function setLoadMorePostsVisible(visible) {
     };
 }
 
-function loadGroupData(isReconnect = false) {
+function loadGroupData() {
     return async (dispatch, getState) => {
         const state = getState();
         const actions = [];
@@ -664,10 +614,9 @@ function loadGroupData(isReconnect = false) {
                             });
                         }
                     } else {
-                        const getGroupsSince = isReconnect ? (state.websocket?.lastDisconnectAt || 0) : undefined;
                         const [getAllGroupsAssociatedToChannelsInTeam, getGroups] = await Promise.all([ //eslint-disable-line no-await-in-loop
                             Client4.getAllGroupsAssociatedToChannelsInTeam(team.id, true),
-                            Client4.getGroups(false, 0, 0, getGroupsSince),
+                            Client4.getGroups(true, 0, 0),
                         ]);
 
                         if (getAllGroupsAssociatedToChannelsInTeam.groups) {
@@ -713,11 +662,10 @@ function loadGroupData(isReconnect = false) {
     };
 }
 
-export function loadChannelsForTeam(teamId, skipDispatch = false, isReconnect = false) {
+export function loadChannelsForTeam(teamId, skipDispatch = false) {
     return async (dispatch, getState) => {
         const state = getState();
         const currentUserId = getCurrentUserId(state);
-        const lastConnectAt = state.websocket?.lastConnectAt || 0;
         const data = {
             sync: true,
             teamId,
@@ -725,12 +673,13 @@ export function loadChannelsForTeam(teamId, skipDispatch = false, isReconnect =
         };
 
         const actions = [];
+
         if (currentUserId) {
             for (let i = 0; i <= MAX_RETRIES; i++) {
                 try {
-                    console.log('Fetching channels attempt', (i + 1), teamId, 'include deleted since', lastConnectAt); //eslint-disable-line no-console
+                    console.log('Fetching channels attempt', teamId, (i + 1)); //eslint-disable-line no-console
                     const [channels, channelMembers] = await Promise.all([ //eslint-disable-line no-await-in-loop
-                        Client4.getMyChannels(teamId, true, lastConnectAt),
+                        Client4.getMyChannels(teamId, true),
                         Client4.getMyChannelMembers(teamId),
                     ]);
 
@@ -784,14 +733,14 @@ export function loadChannelsForTeam(teamId, skipDispatch = false, isReconnect =
                 dispatch(loadUnreadChannelPosts(data.channels, data.channelMembers));
             }
 
-            dispatch(loadGroupData(isReconnect));
+            dispatch(loadGroupData());
         }
 
         return {data};
     };
 }
 
-export function loadSidebar(data) {
+function loadSidebar(data) {
     return async (dispatch, getState) => {
         const state = getState();
         const {channels, channelMembers} = data;
@@ -800,8 +749,6 @@ export function loadSidebar(data) {
         if (sidebarActions.length) {
             dispatch(batchActions(sidebarActions, 'BATCH_LOAD_SIDEBAR'));
         }
-
-        return {data: true};
     };
 }
 

app/actions/views/channel.test.js

@@ -4,13 +4,13 @@
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
+import testHelper from 'test/test_helper';
+
 import * as ChannelActions from '@actions/views/channel';
 import {ViewTypes} from '@constants';
 import {ChannelTypes} from '@mm-redux/action_types';
-import {General} from '@mm-redux/constants';
 import postReducer from '@mm-redux/reducers/entities/posts';
 import initialState from '@store/initial_state';
-import testHelper from '@test/test_helper';
 
 const {
     handleSelectChannel,
@@ -30,33 +30,11 @@ jest.mock('@mm-redux/actions/channels', () => {
     };
 });
 
-jest.mock('@mm-redux/actions/teams', () => {
-    const teamActions = jest.requireActual('../../mm-redux/actions/teams');
-    return {
-        ...teamActions,
-        getTeamByName: jest.fn((teamName) => {
-            if (teamName) {
-                return {
-                    type: 'MOCK_RECEIVE_TEAM_TYPE',
-                    data: {
-                        id: 'current-team-id',
-                        name: 'received-team-id',
-                    },
-                };
-            }
-            return {
-                type: 'MOCK_ERROR',
-                error: 'error',
-            };
-        }),
-    };
-});
-
 jest.mock('@mm-redux/selectors/entities/teams', () => {
     const teamSelectors = jest.requireActual('../../mm-redux/selectors/entities/teams');
     return {
         ...teamSelectors,
-        selectTeamByName: jest.fn(() => ({name: 'current-team-name'})),
+        getTeamByName: jest.fn(() => ({name: 'current-team-name'})),
     };
 });
 
@@ -72,9 +50,8 @@ describe('Actions.Views.Channel', () => {
     const MOCK_RECEIVED_POSTS_SINCE = 'MOCK_RECEIVED_POSTS_SINCE';
 
     const actions = require('@mm-redux/actions/channels');
-
-    actions.getChannelByName = jest.fn((teamId, channelName) => {
-        if (teamId && channelName) {
+    actions.getChannelByNameAndTeamName = jest.fn((teamName) => {
+        if (teamName) {
             return {
                 type: MOCK_RECEIVE_CHANNEL_TYPE,
                 data: 'received-channel-id',
@@ -90,10 +67,6 @@ describe('Actions.Views.Channel', () => {
         type: MOCK_SELECT_CHANNEL_TYPE,
         data: 'selected-channel-id',
     });
-    actions.joinChannel = jest.fn((userId, teamId, channelId) => ({
-        type: 'MOCK_JOIN_CHANNEL',
-        data: {channel: {id: channelId}},
-    }));
     const postActions = require('./post');
     postActions.getPostsSince = jest.fn(() => {
         return {
@@ -162,9 +135,6 @@ describe('Actions.Views.Channel', () => {
                         name: currentTeamName,
                     },
                 },
-                myMembers: {
-                    [currentTeamId]: {},
-                },
             },
         },
     };
@@ -175,7 +145,6 @@ describe('Actions.Views.Channel', () => {
     channelSelectors.getMyChannelMember = jest.fn(() => ({data: {member: {}}}));
 
     const appChannelSelectors = require('app/selectors/channel');
-    const getChannelReachableOriginal = appChannelSelectors.getChannelReachable;
     appChannelSelectors.getChannelReachable = jest.fn(() => true);
 
     test('handleSelectChannelByName success', async () => {
@@ -208,7 +177,7 @@ describe('Actions.Views.Channel', () => {
 
     test('handleSelectChannelByName failure from no permission to channel', async () => {
         store = mockStore({...storeObj});
-        actions.getChannelByName = jest.fn(() => {
+        actions.getChannelByNameAndTeamName = jest.fn(() => {
             return {
                 type: 'MOCK_ERROR',
                 error: {
@@ -236,82 +205,6 @@ describe('Actions.Views.Channel', () => {
         expect(receivedChannel).toBe(false);
     });
 
-    test('handleSelectChannelByName select channel that user is not a member of', async () => {
-        actions.getChannelByName = jest.fn(() => {
-            return {
-                type: MOCK_RECEIVE_CHANNEL_TYPE,
-                data: {id: 'channel-id-3', name: 'channel-id-3', display_name: 'Test Channel', type: General.OPEN_CHANNEL},
-            };
-        });
-
-        store = mockStore(storeObj);
-
-        await store.dispatch(handleSelectChannelByName('channel-id-3', currentTeamName));
-
-        const storeActions = store.getActions();
-        const receivedChannel = storeActions.some((action) => action.type === MOCK_RECEIVE_CHANNEL_TYPE);
-        expect(receivedChannel).toBe(true);
-
-        expect(actions.joinChannel).toBeCalled();
-
-        const joinedChannel = storeActions.some((action) => action.type === 'MOCK_JOIN_CHANNEL' && action.data.channel.id === 'channel-id-3');
-        expect(joinedChannel).toBe(true);
-    });
-
-    test('handleSelectChannelByName select archived channel with ExperimentalViewArchivedChannels enabled', async () => {
-        const archivedChannelStoreObj = {...storeObj};
-        archivedChannelStoreObj.entities.general.config.ExperimentalViewArchivedChannels = 'true';
-        store = mockStore(archivedChannelStoreObj);
-
-        appChannelSelectors.getChannelReachable = getChannelReachableOriginal;
-        actions.getChannelByName = jest.fn(() => {
-            return {
-                type: MOCK_RECEIVE_CHANNEL_TYPE,
-                data: {id: 'channel-id-3', name: 'channel-id-3', display_name: 'Test Channel', type: General.OPEN_CHANNEL, delete_at: 100},
-            };
-        });
-        channelSelectors.getChannelByName = jest.fn(() => {
-            return {
-                data: {id: 'channel-id-3', name: 'channel-id-3', display_name: 'Test Channel', type: General.OPEN_CHANNEL, delete_at: 100},
-            };
-        });
-        const errorHandler = jest.fn();
-
-        await store.dispatch(handleSelectChannelByName('channel-id-3', currentTeamName, errorHandler));
-
-        const storeActions = store.getActions();
-        const receivedChannel = storeActions.some((action) => action.type === MOCK_RECEIVE_CHANNEL_TYPE);
-        expect(receivedChannel).toBe(true);
-        expect(errorHandler).not.toBeCalled();
-    });
-
-    test('handleSelectChannelByName select archived channel with ExperimentalViewArchivedChannels disabled', async () => {
-        const noArchivedChannelStoreObj = {...storeObj};
-        noArchivedChannelStoreObj.entities.general.config.ExperimentalViewArchivedChannels = 'false';
-        store = mockStore(noArchivedChannelStoreObj);
-
-        appChannelSelectors.getChannelReachable = getChannelReachableOriginal;
-        actions.getChannelByName = jest.fn(() => {
-            return {
-                type: MOCK_RECEIVE_CHANNEL_TYPE,
-                data: {id: 'channel-id-3', name: 'channel-id-3', display_name: 'Test Channel', type: General.OPEN_CHANNEL, delete_at: 100},
-            };
-        });
-        channelSelectors.getChannelByName = jest.fn(() => {
-            return {
-                data: {id: 'channel-id-3', name: 'channel-id-3', display_name: 'Test Channel', type: General.OPEN_CHANNEL, delete_at: 100},
-            };
-        });
-        const errorHandler = jest.fn();
-
-        await store.dispatch(handleSelectChannelByName('channel-id-3', currentTeamName, errorHandler));
-
-        const storeActions = store.getActions();
-        const receivedChannel = storeActions.some((action) => action.type === MOCK_RECEIVE_CHANNEL_TYPE);
-        expect(receivedChannel).toBe(true);
-        expect(errorHandler).toBeCalled();
-    });
-
     test('loadPostsIfNecessaryWithRetry for the first time', async () => {
         store = mockStore(storeObj);
 

app/actions/views/client_upgrade.js

@@ -0,0 +1,10 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {ViewTypes} from 'app/constants';
+
+export function setLastUpgradeCheck() {
+    return {
+        type: ViewTypes.SET_LAST_UPGRADE_CHECK,
+    };
+}

app/actions/views/command.js

@@ -0,0 +1,39 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {IntegrationTypes} from '@mm-redux/action_types';
+import {executeCommand as executeCommandService} from '@mm-redux/actions/integrations';
+import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams';
+
+export function executeCommand(message, channelId, rootId) {
+    return async (dispatch, getState) => {
+        const state = getState();
+
+        const teamId = getCurrentTeamId(state);
+
+        const args = {
+            channel_id: channelId,
+            team_id: teamId,
+            root_id: rootId,
+            parent_id: rootId,
+        };
+
+        let msg = message;
+
+        let cmdLength = msg.indexOf(' ');
+        if (cmdLength < 0) {
+            cmdLength = msg.length;
+        }
+
+        const cmd = msg.substring(0, cmdLength).toLowerCase();
+        msg = cmd + msg.substring(cmdLength, msg.length);
+
+        const {data, error} = await dispatch(executeCommandService(msg, args));
+
+        if (data?.trigger_id) { //eslint-disable-line camelcase
+            dispatch({type: IntegrationTypes.RECEIVED_DIALOG_TRIGGER_ID, data: data.trigger_id});
+        }
+
+        return {data, error};
+    };
+}

app/actions/views/command.ts

@@ -1,95 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {intlShape} from 'react-intl';
-
-import {doAppCall, postEphemeralCallResponseForCommandArgs} from '@actions/apps';
-import {AppCommandParser} from '@components/autocomplete/slash_suggestion/app_command_parser/app_command_parser';
-import {IntegrationTypes} from '@mm-redux/action_types';
-import {executeCommand as executeCommandService} from '@mm-redux/actions/integrations';
-import {AppCallResponseTypes, AppCallTypes} from '@mm-redux/constants/apps';
-import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams';
-import {DispatchFunc, GetStateFunc, ActionFunc} from '@mm-redux/types/actions';
-import {AppCallResponse} from '@mm-redux/types/apps';
-import {CommandArgs} from '@mm-redux/types/integrations';
-import {appsEnabled} from '@utils/apps';
-
-export function executeCommand(message: string, channelId: string, rootId: string, intl: typeof intlShape): ActionFunc {
-    return async (dispatch: DispatchFunc, getState: GetStateFunc) => {
-        const state = getState();
-
-        const teamId = getCurrentTeamId(state);
-
-        const args: CommandArgs = {
-            channel_id: channelId,
-            team_id: teamId,
-            root_id: rootId,
-            parent_id: rootId,
-        };
-
-        let msg = message;
-        msg = filterEmDashForCommand(msg);
-
-        let cmdLength = msg.indexOf(' ');
-        if (cmdLength < 0) {
-            cmdLength = msg.length;
-        }
-
-        const cmd = msg.substring(0, cmdLength).toLowerCase();
-        msg = cmd + msg.substring(cmdLength, msg.length);
-
-        const appsAreEnabled = appsEnabled(state);
-        if (appsAreEnabled) {
-            const parser = new AppCommandParser({dispatch, getState}, intl, args.channel_id, args.root_id);
-            if (parser.isAppCommand(msg)) {
-                const {call, errorMessage} = await parser.composeCallFromCommand(msg);
-                const createErrorMessage = (errMessage: string) => {
-                    return {error: {message: errMessage}};
-                };
-
-                if (!call) {
-                    return createErrorMessage(errorMessage!);
-                }
-
-                const res = await dispatch(doAppCall(call, AppCallTypes.SUBMIT, intl));
-                if (res.error) {
-                    const errorResponse = res.error as AppCallResponse;
-                    return createErrorMessage(errorResponse.error || intl.formatMessage({
-                        id: 'apps.error.unknown',
-                        defaultMessage: 'Unknown error.',
-                    }));
-                }
-                const callResp = res.data as AppCallResponse;
-                switch (callResp.type) {
-                case AppCallResponseTypes.OK:
-                    if (callResp.markdown) {
-                        dispatch(postEphemeralCallResponseForCommandArgs(callResp, callResp.markdown, args));
-                    }
-                    return {data: {}};
-                case AppCallResponseTypes.FORM:
-                case AppCallResponseTypes.NAVIGATE:
-                    return {data: {}};
-                default:
-                    return createErrorMessage(intl.formatMessage({
-                        id: 'apps.error.responses.unknown_type',
-                        defaultMessage: 'App response type not supported. Response type: {type}.',
-                    }, {
-                        type: callResp.type,
-                    }));
-                }
-            }
-        }
-
-        const {data, error} = await dispatch(executeCommandService(msg, args));
-
-        if (data?.trigger_id) { //eslint-disable-line camelcase
-            dispatch({type: IntegrationTypes.RECEIVED_DIALOG_TRIGGER_ID, data: data.trigger_id});
-        }
-
-        return {data, error};
-    };
-}
-
-const filterEmDashForCommand = (command: string): string => {
-    return command.replace(/\u2014/g, '--');
-};

app/actions/views/create_channel.js

@@ -1,14 +1,13 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import {handleSelectChannel, setChannelDisplayName} from './channel';
 import {createChannel} from '@mm-redux/actions/channels';
 import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams';
 import {getCurrentUserId} from '@mm-redux/selectors/entities/users';
 import {cleanUpUrlable} from '@mm-redux/utils/channel_utils';
 import {generateId} from '@mm-redux/utils/helpers';
 
-import {handleSelectChannel, setChannelDisplayName} from './channel';
-
 export function generateChannelNameFromDisplayName(displayName) {
     let name = cleanUpUrlable(displayName);
 

app/actions/views/create_channel.test.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {generateChannelNameFromDisplayName} from '@actions/views/create_channel';
+import {generateChannelNameFromDisplayName} from 'app/actions/views/create_channel';
 
 describe('Actions.Views.CreateChannel', () => {
     describe('generateChannelNameFromDisplayName', () => {

app/actions/views/crt.ts

@@ -1,31 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {PreferenceTypes} from '@mm-redux/action_types';
-import {General, Preferences} from '@mm-redux/constants';
-import {getConfig} from '@mm-redux/selectors/entities/general';
-import {getCollapsedThreadsPreference} from '@mm-redux/selectors/entities/preferences';
-import EventEmitter from '@mm-redux/utils/event_emitter';
-
-import type {ActionResult, DispatchFunc, GetStateFunc} from '@mm-redux/types/actions';
-import type {PreferenceType} from '@mm-redux/types/preferences';
-
-export function handleCRTPreferenceChange(preferences: PreferenceType[]) {
-    return async (dispatch: DispatchFunc, getState: GetStateFunc): Promise<ActionResult> => {
-        const state = getState();
-        const newCRTPreference = preferences.find((preference) => preference.name === Preferences.COLLAPSED_REPLY_THREADS);
-        if (newCRTPreference && getConfig(state).CollapsedThreads !== undefined) {
-            const newCRTValue = newCRTPreference.value;
-            const oldCRTValue = getCollapsedThreadsPreference(state);
-            if (newCRTValue !== oldCRTValue) {
-                dispatch({
-                    type: PreferenceTypes.RECEIVED_PREFERENCES,
-                    data: preferences,
-                });
-                EventEmitter.emit(General.CRT_PREFERENCE_CHANGED, newCRTValue);
-                return {data: true};
-            }
-        }
-        return {data: false};
-    };
-}

app/actions/views/custom_status.ts

@@ -1,66 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {Client4} from '@client/rest';
-import {UserTypes} from '@mm-redux/action_types';
-import {logError} from '@mm-redux/actions/errors';
-import {getCurrentUser} from '@mm-redux/selectors/entities/common';
-import {ActionFunc, DispatchFunc, batchActions, GetStateFunc} from '@mm-redux/types/actions';
-import {UserCustomStatus} from '@mm-redux/types/users';
-
-export function setCustomStatus(customStatus: UserCustomStatus): ActionFunc {
-    return async (dispatch: DispatchFunc, getState: GetStateFunc) => {
-        const user = getCurrentUser(getState());
-        if (!user.props) {
-            user.props = {};
-        }
-
-        const oldCustomStatus = user.props.customStatus;
-        user.props.customStatus = JSON.stringify(customStatus);
-        dispatch({type: UserTypes.RECEIVED_ME, data: user});
-
-        try {
-            await Client4.updateCustomStatus(customStatus);
-        } catch (error) {
-            user.props.customStatus = oldCustomStatus;
-            dispatch(batchActions([
-                {type: UserTypes.RECEIVED_ME, data: user},
-                logError(error),
-            ]));
-            return {error};
-        }
-
-        return {data: true};
-    };
-}
-
-export function unsetCustomStatus(): ActionFunc {
-    return async (dispatch: DispatchFunc) => {
-        try {
-            await Client4.unsetCustomStatus();
-        } catch (error) {
-            dispatch(logError(error));
-            return {error};
-        }
-        return {data: true};
-    };
-}
-
-export function removeRecentCustomStatus(customStatus: UserCustomStatus): ActionFunc {
-    return async (dispatch: DispatchFunc) => {
-        try {
-            await Client4.removeRecentCustomStatus(customStatus);
-        } catch (error) {
-            dispatch(logError(error));
-            return {error};
-        }
-
-        return {data: true};
-    };
-}
-
-export default {
-    setCustomStatus,
-    unsetCustomStatus,
-    removeRecentCustomStatus,
-};

app/actions/views/edit_profile.js

@@ -1,9 +1,10 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {ViewTypes} from '@constants';
 import {updateMe, setDefaultProfileImage} from '@mm-redux/actions/users';
 
+import {ViewTypes} from 'app/constants';
+
 export function updateUser(user, success, error) {
     return async (dispatch, getState) => {
         const result = await updateMe(user)(dispatch, getState);
@@ -27,7 +28,6 @@ export function setProfileImageUri(imageUri = '') {
 export function removeProfileImage(user) {
     return async (dispatch) => {
         const result = await dispatch(setDefaultProfileImage(user));
-        dispatch(setProfileImageUri());
         return result;
     };
 }

app/actions/views/emoji.js

@@ -1,15 +1,14 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import emojiRegex from 'emoji-regex';
 import {batchActions} from 'redux-batched-actions';
 
-import {Client4} from '@client/rest';
-import {ViewTypes} from '@constants';
 import {EmojiTypes} from '@mm-redux/action_types';
 import {addReaction as serviceAddReaction, getNeededCustomEmojis} from '@mm-redux/actions/posts';
+import {Client4} from '@mm-redux/client';
 import {getPostIdsInCurrentChannel, makeGetPostIdsForThread} from '@mm-redux/selectors/entities/posts';
-import {EmojiIndicesByAlias, EmojiIndicesByUnicode, Emojis} from '@utils/emojis';
+
+import {ViewTypes} from 'app/constants';
 
 const getPostIdsForThread = makeGetPostIdsForThread();
 
@@ -98,44 +97,4 @@ async function getCustomEmojiByName(name) {
     }
 
     return null;
-}
-
-export function addRecentUsedEmojisInMessage(message) {
-    return (dispatch) => {
-        const RE_UNICODE_EMOJI = emojiRegex();
-        const RE_NAMED_EMOJI = /(:([a-zA-Z0-9_-]+):)/g;
-        const emojis = message.match(RE_UNICODE_EMOJI);
-        const namedEmojis = message.match(RE_NAMED_EMOJI);
-        function emojiUnicode(input) {
-            const emoji = [];
-            for (const i of input) {
-                emoji.push(i.codePointAt(0).toString(16));
-            }
-            return emoji.join('-');
-        }
-        const emojisAvailableWithMattermost = [];
-        if (emojis) {
-            for (const emoji of emojis) {
-                const unicode = emojiUnicode(emoji);
-                const index = EmojiIndicesByUnicode.get(unicode || '');
-                if (index) {
-                    const name = 'short_name' in Emojis[index] ? Emojis[index].short_name : Emojis[index].name;
-                    emojisAvailableWithMattermost.push(name);
-                }
-            }
-        }
-        if (namedEmojis) {
-            for (const emoji of namedEmojis) {
-                const index = EmojiIndicesByAlias.get(emoji.slice(1, -1));
-                if (index) {
-                    const name = 'short_name' in Emojis[index] ? Emojis[index].short_name : Emojis[index].name;
-                    emojisAvailableWithMattermost.push(name);
-                }
-            }
-        }
-        dispatch({
-            type: ViewTypes.ADD_RECENT_EMOJI_ARRAY,
-            emojis: emojisAvailableWithMattermost,
-        });
-    };
-}
+}

app/actions/views/file_upload.js

@@ -1,9 +1,10 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {ViewTypes} from '@constants';
 import {FileTypes} from '@mm-redux/action_types';
-import {buildFileUploadData, generateId} from '@utils/file';
+
+import {ViewTypes} from 'app/constants';
+import {buildFileUploadData, generateId} from 'app/utils/file';
 
 export function initUploadFiles(files, rootId) {
     return (dispatch, getState) => {

app/actions/views/login.js

@@ -3,25 +3,27 @@
 
 import moment from 'moment-timezone';
 
-import {loadConfigAndLicense} from '@actions/views/root';
-import {Client4} from '@client/rest';
-import {setAppCredentials} from '@init/credentials';
-import PushNotifications from '@init/push_notifications';
-import {GeneralTypes} from '@mm-redux/action_types';
 import {getDataRetentionPolicy} from '@mm-redux/actions/general';
-import {autoUpdateTimezone} from '@mm-redux/actions/timezone';
+import {GeneralTypes} from '@mm-redux/action_types';
 import {getSessions} from '@mm-redux/actions/users';
+import {autoUpdateTimezone} from '@mm-redux/actions/timezone';
+import {Client4} from '@mm-redux/client';
 import {getConfig, getLicense} from '@mm-redux/selectors/entities/general';
 import {isTimezoneEnabled} from '@mm-redux/selectors/entities/timezone';
 import {getCurrentUserId} from '@mm-redux/selectors/entities/users';
-import {setCSRFFromCookie} from '@utils/security';
-import {getDeviceTimezone} from '@utils/timezone';
+
+import {setAppCredentials} from 'app/init/credentials';
+import PushNotifications from 'app/push_notifications';
+import {getDeviceTimezone} from 'app/utils/timezone';
+import {setCSRFFromCookie} from 'app/utils/security';
+import {loadConfigAndLicense} from 'app/actions/views/root';
 
 export function handleSuccessfulLogin() {
     return async (dispatch, getState) => {
         await dispatch(loadConfigAndLicense());
 
         const state = getState();
+        const config = getConfig(state);
         const license = getLicense(state);
         const token = Client4.getToken();
         const url = Client4.getUrl();
@@ -44,7 +46,8 @@ export function handleSuccessfulLogin() {
             },
         });
 
-        if (license?.IsLicensed === 'true' && license?.DataRetention === 'true') {
+        if (config.DataRetentionEnableMessageDeletion && config.DataRetentionEnableMessageDeletion === 'true' &&
+            license.IsLicensed === 'true' && license.DataRetention === 'true') {
             dispatch(getDataRetentionPolicy());
         } else {
             dispatch({type: GeneralTypes.RECEIVED_DATA_RETENTION_POLICY, data: {}});
@@ -91,11 +94,11 @@ export function scheduleExpiredNotification(intl) {
             });
 
             if (expiresAt) {
-                PushNotifications.scheduleNotification({
-                    fireDate: expiresAt,
-                    body: message,
+                PushNotifications.localNotificationSchedule({
+                    date: new Date(expiresAt),
+                    message,
                     userInfo: {
-                        local: true,
+                        localNotification: true,
                     },
                 });
             }

app/actions/views/login.test.js

@@ -4,8 +4,9 @@
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import {handleSuccessfulLogin} from '@actions/views/login';
-import {Client4} from '@client/rest';
+import {Client4} from '@mm-redux/client';
+
+import {handleSuccessfulLogin} from 'app/actions/views/login';
 
 jest.mock('app/init/credentials', () => ({
     setAppCredentials: () => jest.fn(),

app/actions/views/more_dms.js

@@ -1,10 +1,10 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {handleSelectChannel, toggleDMChannel, toggleGMChannel} from '@actions/views/channel';
+import {getDirectChannelName} from '@mm-redux/utils/channel_utils';
 import {createDirectChannel, createGroupChannel} from '@mm-redux/actions/channels';
 import {getProfilesByIds, getStatusesByIds} from '@mm-redux/actions/users';
-import {getDirectChannelName} from '@mm-redux/utils/channel_utils';
+import {handleSelectChannel, toggleDMChannel, toggleGMChannel} from 'app/actions/views/channel';
 
 export function makeDirectChannel(otherUserId, switchToChannel = true) {
     return async (dispatch, getState) => {

app/actions/views/permalink.ts

@@ -1,59 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {intlShape} from 'react-intl';
-import {Keyboard} from 'react-native';
-
-import {dismissAllModals, showModalOverCurrentContext} from '@actions/navigation';
-import {loadChannelsByTeamName} from '@actions/views/channel';
-import {selectFocusedPostId} from '@mm-redux/actions/posts';
-import {getCurrentTeam} from '@mm-redux/selectors/entities/teams';
-import {permalinkBadTeam} from '@utils/general';
-import {changeOpacity} from '@utils/theme';
-
-import type {DispatchFunc, GetStateFunc} from '@mm-redux/types/actions';
-
-let showingPermalink = false;
-
-export function showPermalink(intl: typeof intlShape, teamName: string, postId: string, openAsPermalink = true) {
-    return async (dispatch: DispatchFunc, getState: GetStateFunc) => {
-        let name = teamName;
-        if (!name) {
-            name = getCurrentTeam(getState()).name;
-        }
-
-        const loadTeam = await dispatch(loadChannelsByTeamName(name, permalinkBadTeam.bind(null, intl)));
-
-        if (!loadTeam.error) {
-            Keyboard.dismiss();
-            dispatch(selectFocusedPostId(postId));
-            if (showingPermalink) {
-                await dismissAllModals();
-            }
-
-            const screen = 'Permalink';
-            const passProps = {
-                isPermalink: openAsPermalink,
-                teamName,
-            };
-
-            const options = {
-                layout: {
-                    componentBackgroundColor: changeOpacity('#000', 0.2),
-                },
-            };
-
-            showingPermalink = true;
-            showModalOverCurrentContext(screen, passProps, options);
-        }
-
-        return {};
-    };
-}
-
-export function closePermalink() {
-    return async (dispatch: DispatchFunc) => {
-        showingPermalink = false;
-        return dispatch(selectFocusedPostId(''));
-    };
-}

app/actions/views/post.js

@@ -3,8 +3,6 @@
 
 import {batchActions} from 'redux-batched-actions';
 
-import {Client4} from '@client/rest';
-import {ViewTypes} from '@constants';
 import {UserTypes} from '@mm-redux/action_types';
 import {
     doPostAction,
@@ -17,41 +15,21 @@ import {
     receivedPostsSince,
     receivedPostsInThread,
 } from '@mm-redux/actions/posts';
+import {Client4} from '@mm-redux/client';
 import {Posts} from '@mm-redux/constants';
-import {getCurrentChannelId} from '@mm-redux/selectors/entities/channels';
 import {getPost as selectPost, getPostIdsInChannel} from '@mm-redux/selectors/entities/posts';
-import {isCollapsedThreadsEnabled} from '@mm-redux/selectors/entities/preferences';
-import {isUnreadChannel, isArchivedChannel} from '@mm-redux/utils/channel_utils';
+import {getCurrentChannelId} from '@mm-redux/selectors/entities/channels';
 import {removeUserFromList} from '@mm-redux/utils/user_utils';
-import {getChannelSinceValue} from '@utils/channels';
+import {isUnreadChannel, isArchivedChannel} from '@mm-redux/utils/channel_utils';
+
+import {ViewTypes} from '@constants';
 import {generateId} from '@utils/file';
+import {getChannelSinceValue} from '@utils/channels';
 
 import {getEmojisInPosts} from './emoji';
 
-export function sendEphemeralPost(message, channelId = '', parentId = '', userId = '0') {
-    return async (dispatch, getState) => {
-        const timestamp = Date.now();
-        const post = {
-            id: generateId(),
-            user_id: userId,
-            channel_id: channelId || getCurrentChannelId(getState()),
-            message,
-            type: Posts.POST_TYPES.EPHEMERAL,
-            create_at: timestamp,
-            update_at: timestamp,
-            root_id: parentId,
-            parent_id: parentId,
-            props: {},
-        };
-
-        dispatch(receivedNewPost(post));
-
-        return {};
-    };
-}
-
 export function sendAddToChannelEphemeralPost(user, addedUsername, message, channelId, postRootId = '') {
-    return async (dispatch, getState) => {
+    return async (dispatch) => {
         const timestamp = Date.now();
         const post = {
             id: generateId(),
@@ -69,19 +47,17 @@ export function sendAddToChannelEphemeralPost(user, addedUsername, message, chan
             },
         };
 
-        const collapsedThreadsEnabled = isCollapsedThreadsEnabled(getState());
-        dispatch(receivedNewPost(post, collapsedThreadsEnabled));
+        dispatch(receivedNewPost(post));
     };
 }
 
-export function setAutocompleteSelector(dataSource, onSelect, options, getDynamicOptions) {
+export function setAutocompleteSelector(dataSource, onSelect, options) {
     return {
         type: ViewTypes.SELECTED_ACTION_MENU,
         data: {
             dataSource,
             onSelect,
             options,
-            getDynamicOptions,
         },
     };
 }
@@ -103,14 +79,13 @@ export function selectAttachmentMenuAction(postId, actionId, text, value) {
     };
 }
 
-export function getPosts(channelId, page = 0, perPage = Posts.POST_CHUNK_SIZE, fetchThreads = true, collapsedThreadsExtended = false) {
+export function getPosts(channelId, page = 0, perPage = Posts.POST_CHUNK_SIZE) {
     return async (dispatch, getState) => {
         try {
             const state = getState();
             const {postsInChannel} = state.entities.posts;
             const postForChannel = postsInChannel[channelId];
-            const collapsedThreadsEnabled = isCollapsedThreadsEnabled(getState());
-            const data = await Client4.getPosts(channelId, page, perPage, fetchThreads, collapsedThreadsEnabled, collapsedThreadsExtended);
+            const data = await Client4.getPosts(channelId, page, perPage);
             const posts = Object.values(data.posts);
             const actions = [{
                 type: ViewTypes.SET_CHANNEL_RETRY_FAILED,
@@ -163,11 +138,10 @@ export function getPost(postId) {
     };
 }
 
-export function getPostsSince(channelId, since, fetchThreads = true, collapsedThreadsExtended = false) {
-    return async (dispatch, getState) => {
+export function getPostsSince(channelId, since) {
+    return async (dispatch) => {
         try {
-            const collapsedThreadsEnabled = isCollapsedThreadsEnabled(getState());
-            const data = await Client4.getPostsSince(channelId, since, fetchThreads, collapsedThreadsEnabled, collapsedThreadsExtended);
+            const data = await Client4.getPostsSince(channelId, since);
             const posts = Object.values(data.posts);
 
             if (posts?.length) {
@@ -191,11 +165,10 @@ export function getPostsSince(channelId, since, fetchThreads = true, collapsedTh
     };
 }
 
-export function getPostsBefore(channelId, postId, page = 0, perPage = Posts.POST_CHUNK_SIZE, fetchThreads = true, collapsedThreadsExtended = false) {
-    return async (dispatch, getState) => {
+export function getPostsBefore(channelId, postId, page = 0, perPage = Posts.POST_CHUNK_SIZE) {
+    return async (dispatch) => {
         try {
-            const collapsedThreadsEnabled = isCollapsedThreadsEnabled(getState());
-            const data = await Client4.getPostsBefore(channelId, postId, page, perPage, fetchThreads, collapsedThreadsEnabled, collapsedThreadsExtended);
+            const data = await Client4.getPostsBefore(channelId, postId, page, perPage);
             const posts = Object.values(data.posts);
 
             if (posts?.length) {
@@ -250,14 +223,13 @@ export function getPostThread(rootId, skipDispatch = false) {
     };
 }
 
-export function getPostsAround(channelId, postId, perPage = Posts.POST_CHUNK_SIZE / 2, fetchThreads = true, collapsedThreadsExtended = false) {
-    return async (dispatch, getState) => {
+export function getPostsAround(channelId, postId, perPage = Posts.POST_CHUNK_SIZE / 2) {
+    return async (dispatch) => {
         try {
-            const collapsedThreadsEnabled = isCollapsedThreadsEnabled(getState());
             const [before, thread, after] = await Promise.all([
-                Client4.getPostsBefore(channelId, postId, 0, perPage, fetchThreads, collapsedThreadsEnabled, collapsedThreadsExtended),
-                Client4.getPostThread(postId, fetchThreads, collapsedThreadsEnabled, collapsedThreadsExtended),
-                Client4.getPostsAfter(channelId, postId, 0, perPage, fetchThreads, collapsedThreadsEnabled, collapsedThreadsExtended),
+                Client4.getPostsBefore(channelId, postId, 0, perPage),
+                Client4.getPostThread(postId),
+                Client4.getPostsAfter(channelId, postId, 0, perPage),
             ]);
 
             const data = {
@@ -302,8 +274,7 @@ export function handleNewPostBatch(WebSocketMessage) {
     return async (dispatch, getState) => {
         const state = getState();
         const post = JSON.parse(WebSocketMessage.data.post);
-        const collapsedThreadsEnabled = isCollapsedThreadsEnabled(state);
-        const actions = [receivedNewPost(post, collapsedThreadsEnabled)];
+        const actions = [receivedNewPost(post)];
 
         // If we don't have the thread for this post, fetch it from the server
         // and include the actions in the batch
@@ -444,8 +415,8 @@ export function loadUnreadChannelPosts(channels, channelMembers) {
             if (channel.id === currentChannelId || isArchivedChannel(channel)) {
                 return;
             }
-            const collapsedThreadsEnabled = isCollapsedThreadsEnabled(state);
-            const isUnread = isUnreadChannel(channelMembersByChannel, channel, collapsedThreadsEnabled);
+
+            const isUnread = isUnreadChannel(channelMembersByChannel, channel);
             if (!isUnread) {
                 return;
             }
@@ -459,10 +430,10 @@ export function loadUnreadChannelPosts(channels, channelMembers) {
             };
             if (!postIds || !postIds.length) {
                 // Get the first page of posts if it appears we haven't gotten it yet, like the webapp
-                promise = Client4.getPosts(channel.id, undefined, undefined, true, collapsedThreadsEnabled);
+                promise = Client4.getPosts(channel.id);
             } else {
                 const since = getChannelSinceValue(state, channel.id, postIds);
-                promise = Client4.getPostsSince(channel.id, since, true, collapsedThreadsEnabled);
+                promise = Client4.getPostsSince(channel.id, since);
                 trace.since = since;
             }
 

app/actions/views/post.test.js

@@ -6,14 +6,17 @@
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import {loadUnreadChannelPosts} from '@actions/views/post';
-import {Client4} from '@client/rest';
-import {ViewTypes} from '@constants';
+import {Client4} from '@mm-redux/client';
 import {PostTypes, UserTypes} from '@mm-redux/action_types';
+
 import * as PostSelectors from '@mm-redux/selectors/entities/posts';
 import * as ChannelUtils from '@mm-redux/utils/channel_utils';
+
+import {ViewTypes} from '@constants';
 import initialState from '@store/initial_state';
 
+import {loadUnreadChannelPosts} from '@actions/views/post';
+
 describe('Actions.Views.Post', () => {
     const mockStore = configureStore([thunk]);
 
@@ -182,4 +185,4 @@ describe('Actions.Views.Post', () => {
         const receivedStatuses = actionTypes.filter((type) => type === UserTypes.RECEIVED_STATUSES);
         expect(receivedStatuses.length).toBe(1);
     });
-});
+});

app/actions/views/root.js

@@ -3,22 +3,20 @@
 
 import {batchActions} from 'redux-batched-actions';
 
-import {Client4} from '@client/rest';
 import {NavigationTypes, ViewTypes} from '@constants';
+import {analytics} from '@init/analytics.ts';
 import {ChannelTypes, GeneralTypes, TeamTypes} from '@mm-redux/action_types';
-import {getChannelAndMyMember} from '@mm-redux/actions/channels';
+import {fetchMyChannelsAndMembers, getChannelAndMyMember} from '@mm-redux/actions/channels';
 import {getDataRetentionPolicy} from '@mm-redux/actions/general';
 import {receivedNewPost} from '@mm-redux/actions/posts';
-import {getMyTeams, getMyTeamMembers, getMyTeamUnreads} from '@mm-redux/actions/teams';
+import {getMyTeams, getMyTeamMembers} from '@mm-redux/actions/teams';
+import {Client4} from '@mm-redux/client';
 import {General} from '@mm-redux/constants';
-import {isCollapsedThreadsEnabled} from '@mm-redux/selectors/entities/preferences';
 import EventEmitter from '@mm-redux/utils/event_emitter';
-import {getViewingGlobalThreads} from '@selectors/threads';
 import initialState from '@store/initial_state';
 import {getStateForReset} from '@store/utils';
 
-import {loadChannelsForTeam, markAsViewedAndReadBatch} from './channel';
-import {handleNotViewingGlobalThreadsScreen} from './threads';
+import {markAsViewedAndReadBatch} from './channel';
 
 export function startDataCleanup() {
     return async (dispatch, getState) => {
@@ -48,7 +46,8 @@ export function loadConfigAndLicense() {
             }];
 
             if (currentUserId) {
-                if (license?.IsLicensed === 'true' && license?.DataRetention === 'true') {
+                if (config.DataRetentionEnableMessageDeletion && config.DataRetentionEnableMessageDeletion === 'true' &&
+                    license.IsLicensed === 'true' && license.DataRetention === 'true') {
                     dispatch(getDataRetentionPolicy());
                 } else {
                     actions.push({type: GeneralTypes.RECEIVED_DATA_RETENTION_POLICY, data: {}});
@@ -64,19 +63,20 @@ export function loadConfigAndLicense() {
     };
 }
 
-export function loadFromPushNotification(notification, isInitialNotification) {
+export function loadFromPushNotification(notification) {
     return async (dispatch, getState) => {
         const state = getState();
-        const {payload} = notification;
+        const {data} = notification;
         const {currentTeamId, teams, myMembers: myTeamMembers} = state.entities.teams;
+        const {channels} = state.entities.channels;
 
         let channelId = '';
         let teamId = currentTeamId;
-        if (payload) {
-            channelId = payload.channel_id;
+        if (data) {
+            channelId = data.channel_id;
 
             // when the notification does not have a team id is because its from a DM or GM
-            teamId = payload.team_id || currentTeamId;
+            teamId = data.team_id || currentTeamId;
         }
 
         // load any missing data
@@ -87,9 +87,8 @@ export function loadFromPushNotification(notification, isInitialNotification) {
             loading.push(dispatch(getMyTeamMembers()));
         }
 
-        if (isInitialNotification) {
-            loading.push(dispatch(getMyTeamUnreads()));
-            loading.push(dispatch(loadChannelsForTeam(teamId)));
+        if (channelId && !channels[channelId]) {
+            loading.push(dispatch(fetchMyChannelsAndMembers(teamId)));
         }
 
         if (loading.length > 0) {
@@ -97,35 +96,21 @@ export function loadFromPushNotification(notification, isInitialNotification) {
         }
 
         dispatch(handleSelectTeamAndChannel(teamId, channelId));
-
-        return {data: true};
     };
 }
 
 export function handleSelectTeamAndChannel(teamId, channelId) {
     return async (dispatch, getState) => {
         const dt = Date.now();
-        let state = getState();
-        let {channels, myMembers} = state.entities.channels;
+        await dispatch(getChannelAndMyMember(channelId));
 
-        if (channelId && (!channels[channelId] || !myMembers[channelId])) {
-            await dispatch(getChannelAndMyMember(channelId));
-            state = getState();
-        }
-
-        channels = state.entities.channels.channels;
-        myMembers = state.entities.channels.myMembers;
-
-        const {currentChannelId} = state.entities.channels;
+        const state = getState();
+        const {channels, currentChannelId, myMembers} = state.entities.channels;
         const {currentTeamId} = state.entities.teams;
         const channel = channels[channelId];
         const member = myMembers[channelId];
         const actions = markAsViewedAndReadBatch(state, channelId);
 
-        if (getViewingGlobalThreads(state)) {
-            actions.push(handleNotViewingGlobalThreadsScreen());
-        }
-
         // when the notification is from a team other than the current team
         if (teamId !== currentTeamId) {
             actions.push({type: TeamTypes.SELECT_TEAM, data: teamId});
@@ -162,7 +147,6 @@ export function purgeOfflineStore() {
         });
 
         EventEmitter.emit(NavigationTypes.RESTART_APP);
-        return {data: true};
     };
 }
 
@@ -185,8 +169,7 @@ export function createPostForNotificationReply(post) {
 
         try {
             const data = await Client4.createPost({...newPost, create_at: 0});
-            const collapsedThreadsEnabled = isCollapsedThreadsEnabled(state);
-            dispatch(receivedNewPost(data, collapsedThreadsEnabled));
+            dispatch(receivedNewPost(data));
 
             return {data};
         } catch (error) {
@@ -195,6 +178,14 @@ export function createPostForNotificationReply(post) {
     };
 }
 
+export function recordLoadTime(screenName, category) {
+    return async (dispatch, getState) => {
+        const {currentUserId} = getState().entities.users;
+
+        analytics.recordTime(screenName, category, currentUserId);
+    };
+}
+
 export function setDeepLinkURL(url) {
     return {
         type: ViewTypes.SET_DEEP_LINK_URL,

app/actions/views/search.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {ViewTypes} from '@constants';
+import {ViewTypes} from 'app/constants';
 
 export function handleSearchDraftChanged(text) {
     return {

app/actions/views/select_server.js

@@ -2,10 +2,10 @@
 // See LICENSE.txt for license information.
 
 import {batchActions} from 'redux-batched-actions';
-
-import {ViewTypes} from '@constants';
 import {GeneralTypes} from '@mm-redux/action_types';
 
+import {ViewTypes} from 'app/constants';
+
 export function handleServerUrlChanged(serverUrl) {
     return batchActions([
         {type: GeneralTypes.CLIENT_CONFIG_RESET},

app/actions/views/select_server.test.js

@@ -5,10 +5,12 @@ import {batchActions} from 'redux-batched-actions';
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import {handleServerUrlChanged} from '@actions/views/select_server';
-import {ViewTypes} from '@constants';
 import {GeneralTypes} from '@mm-redux/action_types';
 
+import {ViewTypes} from 'app/constants';
+
+import {handleServerUrlChanged} from 'app/actions/views/select_server';
+
 const mockStore = configureStore([thunk]);
 
 describe('Actions.Views.SelectServer', () => {