Automated cherry pick of #3927 (#3928)

* Bump app build number to 268

* Update server version in Android description

Co-authored-by: Miguel Alatzar <migbot@users.noreply.github.com>

.circleci/config.yml

@@ -1,7 +1,4 @@
 version: 2.1
-orbs:
-  owasp: entur/owasp@0.0.10
-  node: circleci/node@4.5.1
 
 executors:
   android:
@@ -14,7 +11,7 @@ executors:
       NODE_ENV: production
       BABEL_ENV: production
     docker:
-      - image: circleci/android:api-30-node
+      - image: circleci/android:api-27-node
     working_directory: ~/mattermost-mobile
     resource_class: <<parameters.resource_class>>
 
@@ -24,7 +21,7 @@ executors:
       NODE_ENV: production
       BABEL_ENV: production
     macos:
-      xcode: "13.0.0"
+      xcode: "11.0.0"
     working_directory: ~/mattermost-mobile
     shell: /bin/bash --login -o pipefail
 
@@ -45,6 +42,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 +80,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 +90,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 +111,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 +141,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 +163,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 +196,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,59 +223,7 @@ jobs:
           command: npm test
       - run:
           name: Check i18n
-          command: ./scripts/precommit/i18n.sh
-
-  check-deps:
-    parameters:
-      cve_data_directory:
-        type: string
-        default: "~/.owasp/dependency-check-data"
-    working_directory: ~/mattermost-mobile
-    executor: owasp/default
-    environment:
-      version_url: "https://jeremylong.github.io/DependencyCheck/current.txt"
-      executable_url: "https://dl.bintray.com/jeremy-long/owasp/dependency-check-VERSION-release.zip"
-    steps:
-      - checkout
-      - restore_cache:
-          name: Restore npm cache
-          key: v2-npm-{{ checksum "package.json" }}-{{ arch }}
-      - run:
-          name: Checkout config
-          command: cd .. && git clone https://github.com/mattermost/security-automation-config
-      - run:
-          name: Install Go
-          command: sudo apt-get update && sudo apt-get install golang
-      - owasp/with_commandline:
-          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
-            - 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
-            - owasp/store_owasp_cache:
-                cve_data_directory: <<parameters.cve_data_directory>>
-            - run:
-                name: Run OWASP Dependency-Check Analyzer
-                command: |
-                  ~/.owasp/dependency-check/bin/dependency-check.sh \
-                    --data << parameters.cve_data_directory >> --format ALL --noupdate --enableExperimental \
-                    --propertyfile ../security-automation-config/dependency-check/dependencycheck.properties \
-                    --suppression ../security-automation-config/dependency-check/suppression.xml \
-                    --suppression ../security-automation-config/dependency-check/suppression.$CIRCLE_PROJECT_REPONAME.xml \
-                    --scan './**/*' || true
-            - owasp/collect_reports:
-                persist_to_workspace: false
-      - run:
-          name: Post results to Mattermost
-          command: go run ../security-automation-config/dependency-check/post_results.go
+          command: make i18n-extract-ci
 
   build-android-beta:
     executor: android
@@ -292,7 +231,7 @@ jobs:
       - build-android
       - persist
       - save:
-          filename: "*.apk"
+          filename: "Mattermost_Beta.apk"
 
   build-android-release:
     executor: android
@@ -300,7 +239,7 @@ jobs:
       - build-android
       - persist
       - save:
-          filename: "*.apk"
+          filename: "Mattermost.apk"
 
   build-android-pr:
     executor: android
@@ -309,7 +248,7 @@ jobs:
     steps:
       - build-android
       - save:
-          filename: "*.apk"
+          filename: "Mattermost_Beta.apk"
 
   build-android-unsigned:
     executor: android
@@ -321,9 +260,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 +267,7 @@ jobs:
           command: bundle exec fastlane android unsigned
       - persist
       - save:
-          filename: "*.apk"
+          filename: "Mattermost-unsigned.apk"
 
   build-ios-beta:
     executor: ios
@@ -339,7 +275,7 @@ jobs:
       - build-ios
       - persist
       - save:
-          filename: "*.ipa"
+          filename: "Mattermost_Beta.ipa"
 
   build-ios-release:
     executor: ios
@@ -347,7 +283,7 @@ jobs:
       - build-ios
       - persist
       - save:
-          filename: "*.ipa"
+          filename: "Mattermost.ipa"
 
   build-ios-pr:
     executor: ios
@@ -356,13 +292,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,75 +315,56 @@ jobs:
       - persist_to_workspace:
           root: ~/
           paths:
-            - mattermost-mobile/*.ipa
+            - mattermost-mobile/Mattermost-unsigned.ipa
       - save:
-          filename: "*.ipa"
-
-  build-ios-simulator:
-    executor: ios
-    steps:
-      - checkout:
-          path: ~/mattermost-mobile
-      - npm-dependencies
-      - pods-dependencies
-      - assets
-      - fastlane-dependencies:
-          for: ios
-      - run:
-          working_directory: fastlane
-          name: Run fastlane to build unsigned x86_64 iOS app for iPhone simulator
-          no_output_timeout: 30m
-          command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install watchman
-            bundle exec fastlane ios simulator
-      - persist_to_workspace:
-          root: ~/
-          paths:
-            - mattermost-mobile/Mattermost-simulator-x86_64.app.zip
-      - save:
-          filename: "Mattermost-simulator-x86_64.app.zip"
+          filename: "Mattermost-unsigned.ipa"
 
   deploy-android-release:
     executor:
       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 +377,6 @@ workflows:
   build:
     jobs:
       - test
-      # - check-deps:
-      #     context: sast-webhook
-      #     requires:
-      #       - test
 
       - build-android-release:
           context: mattermost-mobile-android-release
@@ -554,14 +468,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
@@ -581,18 +495,6 @@ workflows:
               only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
             branches:
               only: unsigned
-      - build-ios-simulator:
-          context: mattermost-mobile-unsigned
-          requires:
-            - test
-          filters:
-            branches:
-              only:
-                - /^build-\d+$/
-                - /^build-ios-\d+$/
-                - /^build-ios-beta-\d+$/
-                - /^build-ios-sim-\d+$/
-                
       - github-release:
           context: mattermost-mobile-unsigned
           requires:
@@ -602,4 +504,4 @@ workflows:
             tags:
               only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
             branches:
-              only: unsigned
+              only: unsigned

.env

@@ -1,3 +0,0 @@
-STORYBOOK_PORT=
-STORYBOOK_HOST=
-RUNNING_E2E=

.eslintrc.json

@@ -1,14 +1,7 @@
 {
   "extends": [
-    "plugin:mattermost/react",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "@typescript-eslint",
-    "mattermost",
-    "import"
+    "./node_modules/eslint-config-mattermost/.eslintrc.json",
+    "./node_modules/eslint-config-mattermost/.eslintrc-react.json"
   ],
   "settings": {
     "react": {
@@ -23,64 +16,9 @@
     "__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,
-      {
-        "properties": "never"
-      }
-    ],
-    "@typescript-eslint/ban-types": 0,
-    "@typescript-eslint/no-non-null-assertion": 0,
-    "@typescript-eslint/no-unused-vars": [
-      2,
-      {
-        "vars": "all",
-        "args": "after-used"
-      }
-    ],
-    "@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-async-storage|@react-native-community|@react-native-cookies|@react-navigation|@rudderstack|@sentry|@testing-library)/**",
-            "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"
+    "react/jsx-filename-extension": [2, {"extensions": [".js"]}]
   },
   "overrides": [
     {
@@ -88,23 +26,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
 
@@ -17,15 +21,14 @@ node_modules/react-native/Libraries/polyfills/.*
 [include]
 
 [libs]
-node_modules/react-native/interface.js
+node_modules/react-native/Libraries/react-native/react-native-interface.js
 node_modules/react-native/flow/
 
 [options]
 emoji=true
 
-exact_by_default=true
-
-format.bracket_spacing=false
+esproposal.optional_chaining=enable
+esproposal.nullish_coalescing=enable
 
 module.file_ext=.js
 module.file_ext=.json
@@ -33,14 +36,19 @@ module.file_ext=.ios.js
 
 munge_underscores=true
 
+module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
 module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
-module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
+module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
 
 suppress_type=$FlowIssue
 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
@@ -52,6 +60,7 @@ unsafe-getters-setters=warn
 inexact-spread=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
+deprecated-utility=error
 
 [strict]
 deprecated-type
@@ -63,4 +72,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.162.0
+^0.105.0

.gitattributes

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

.github/ISSUE_TEMPLATE.md

@@ -1,32 +0,0 @@
-Per Mattermost guidelines, GitHub issues are for bug reports: <https://handbook.mattermost.com/contributors/contributors/ways-to-contribute>.
-
-For troubleshooting see: https://forum.mattermost.com/.
-For feature proposals see: https://www.mattermost.com/feature-ideas/
-
-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://mattermost.com/security-vulnerability-report/).
-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,62 +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
-- [ ] Have tested against the 5 core themes to ensure consistency between them.
-
-#### 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

.github/workflows/scorecards-analysis.yml

@@ -1,55 +0,0 @@
-name: Scorecards supply-chain security
-on:
-  # Only the default branch is supported.
-  branch_protection_rule:
-  schedule:
-    - cron: '22 14 * * 1'
-  push:
-    branches: [ master ]
-
-# Declare default permissions as read only.
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecards analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      actions: read
-      contents: read
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@c8416b0b2bf627c349ca92fc8e3de51a64b005cf # v1.0.2
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # Read-only PAT token. To create it,
-          # follow the steps in https://github.com/ossf/scorecard-action#pat-token-creation.
-          repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
-          # Publish the results to enable scorecard badges. For more details, see
-          # https://github.com/ossf/scorecard-action#publishing-results.
-          # For private repositories, `publish_results` will automatically be set to `false`,
-          # regardless of the value entered here.
-          publish_results: true
-
-      # Upload the results as artifacts (optional).
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # v1.0.26
-        with:
-          sarif_file: results.sarif

.gitignore

@@ -5,8 +5,6 @@ build-ios
 server.PID
 mattermost.keystore
 tmp/
-.env
-env.d.ts
 
 # OSX
 #
@@ -30,7 +28,6 @@ DerivedData
 *.hmap
 *.ipa
 *.apk
-*.aab
 *.xcuserstate
 project.xcworkspace
 ios/Pods
@@ -90,13 +87,6 @@ ios/sentry.properties
 # Testing
 .nyc_output
 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].*" },
-}
-

ISSUE_TEMPLATE.md

@@ -1,4 +1,4 @@
-Submit feature requests to https://www.mattermost.com/feature-ideas/. File non-security related bugs here in the following format: 
+Submit feature requests to http://www.mattermost.org/feature-requests/. File non-security related bugs here in the following format: 
 
 #### Summary
 Issue in one concise sentence.

Jenkinsfile

@@ -0,0 +1,14 @@
+pipeline {
+    agent any
+
+    stages {
+        stage('Test') {
+            steps {
+                echo 'assets/base/config.json'
+                sh 'cat assets/base/config.json'
+                sh 'touch .podinstall'
+                sh 'make test || exit 1'
+            }
+        }
+    }
+}

Makefile

@@ -0,0 +1,254 @@
+.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
+
+POD := $(shell which pod 2> /dev/null)
+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)
+ifdef POD
+	@echo Getting Cocoapods dependencies;
+	@cd ios && pod install;
+else
+	@echo "Cocoapods is not installed https://cocoapods.org/"
+	@exit 1
+endif
+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 unsigned
+	@mkdir -p build-ios
+	@cd ios/ && xcodebuild -workspace Mattermost.xcworkspace/ -scheme Mattermost -arch x86_64 -sdk iphonesimulator -configuration Release -parallelizeTargets -resultBundlePath ../build-ios/result -derivedDataPath ../build-ios/ ENABLE_BITCODE=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ENABLE_BITCODE=NO
+	@cd build-ios/Build/Products/Release-iphonesimulator/ && zip -r Mattermost-simulator-x86_64.app.zip Mattermost.app/
+	@mv build-ios/Build/Products/Release-iphonesimulator/Mattermost-simulator-x86_64.app.zip .
+	@rm -rf build-ios/
+	@cd fastlane && bundle exec fastlane upload_file_to_s3 file:Mattermost-simulator-x86_64.app.zip os_type:iOS
+	$(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

PULL_REQUEST_TEMPLATE.md

@@ -24,6 +24,7 @@ Otherwise, link the JIRA ticket.
 Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.
 -->
 - [ ] Added or updated unit tests (required for all new features)
+- [ ] All new/modified APIs include changes to [mattermost-redux](https://github.com/mattermost/mattermost-redux) (please link)
 - [ ] Has UI changes
 - [ ] Includes text changes and localization file updates
 

README.md

@@ -1,14 +1,14 @@
-# Mattermost Mobile App
-[![Mattermost](https://user-images.githubusercontent.com/7205829/136108314-75cd2e1f-4147-4cfa-a16c-9b3b0313ea25.png)](https://mattermost.com)
+# Mattermost Mobile
 
-- **Minimum Server versions:** Current ESR version (6.3.0)
-- **Supported iOS versions:** 12.1+
+- **Minimum Server versions:** Current ESR version (5.19)
+- **Supported iOS versions:** 10.3+
 - **Supported Android versions:** 7.0+
 
+Mattermost is an open source Slack-alternative used by thousands of companies around the world in 14 languages. Learn more at [https://about.mattermost.com](https://about.mattermost.com).
 
-[Mattermost](https://mattermost.com) is an open source platform for secure collaboration across the entire software development lifecycle. This repo is for the mobile app that runs on Android and iOS. You can download our apps from the [App Store](https://about.mattermost.com/mattermost-ios-app/) or [Google Play Store](https://about.mattermost.com/mattermost-android-app/), or [build them yourself](https://developers.mattermost.com/contribute/mobile/build-your-own/). 
+You can download our apps from the [App Store](https://about.mattermost.com/mattermost-ios-app/) or [Google Play Store](https://about.mattermost.com/mattermost-android-app/), or [build them yourself](https://developers.mattermost.com/contribute/mobile/build-your-own/). 
 
-New features are released monthly - check the [changelog](https://github.com/mattermost/mattermost-mobile/blob/master/CHANGELOG.md) for currently-supported features! 
+We plan on releasing monthly updates with new features - check the [changelog](https://github.com/mattermost/mattermost-mobile/blob/master/CHANGELOG.md) for what features are currently supported! 
 
 **Important:** If you self-compile the Mattermost Mobile apps you also need to deploy your own [Mattermost Push Notification Service](https://github.com/mattermost/mattermost-push-proxy/releases). 
 
@@ -20,7 +20,7 @@ To help with testing app updates before they're released, you can:
 
 1. Sign up to be a beta tester
    - [Android](https://play.google.com/apps/testing/com.mattermost.rnbeta)
-   - [iOS](https://testflight.apple.com/join/Q7Rx7K9P) - Open this link from your iOS device
+   - [iOS](https://testflight.apple.com/join/Q7Rx7K9P)
 2. Install the `Mattermost Beta` app. New updates in the Beta app are released periodically. You will receive a notification when the new updates are available.
 3. File any bugs you find by filing a [GitHub issue](https://github.com/mattermost/mattermost-mobile/issues) with:
    - Device information
@@ -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.
 

SECURITY.md

@@ -17,7 +17,7 @@ Security updates
 
 Mattermost has a mandatory upgrade policy, and updates are only provided for the latest release. Critical updates are delivered as dot releases. Details on security updates are announced 30 days after the availability of the update.
 
-For more details about the security content of past releases, see the [Security Updates](https://mattermost.com/security-updates/) page on the Mattermost website. For timely notifications about new security updates, subscribe to the [Security Bulletins Mailing List](https://mattermost.com/security-updates/#sign-up).
+For more details about the security content of past releases, see the [Security Updates](https://mattermost.com/security-updates/) page on the Mattermost website. For timely notifications about new security updates, subscribe to the [Security Bulletins Mailing List](https://about.mattermost.com/security-bulletin).
 
 Contributing to this policy
 ---------------------------

android/app/build.gradle

@@ -15,9 +15,7 @@ import com.android.build.OutputFile
  *   // the name of the generated asset file containing your JS bundle
  *   bundleAssetName: "index.android.bundle",
  *
- *   // the entry file for bundle generation. If none specified and
- *   // "index.android.js" exists, it will be used. Otherwise "index.js" is
- *   // default. Can be overridden with ENTRY_FILE environment variable.
+ *   // the entry file for bundle generation
  *   entryFile: "index.android.js",
  *
  *   // whether to bundle JS and assets in debug mode
@@ -101,41 +99,45 @@ 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.
  *
- * This should be set on project.ext.react and that value will be read here. If it is not set
+ * This should be set on project.ext.react and mirrored here.  If it is not set
  * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
  * and the benefits of using Hermes will therefore be sharply reduced.
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
-/**
- * Architectures to build native code for in debug.
- */
-def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 398
-        versionName "1.52.0"
+        missingDimensionStrategy "RNN.reactNativeVersion", "reactNative60"
+        versionCode 268
+        versionName "1.28.0"
         multiDexEnabled = true
-        testBuildType System.getProperty('testBuildType', 'debug')
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        ndk {
+            abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
+        }
+
     }
     signingConfigs {
         release {
@@ -151,7 +153,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"
         }
     }
@@ -164,11 +166,6 @@ android {
         debug {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            if (nativeArchitectures) {
-                ndk {
-                    abiFilters nativeArchitectures.split(',')
-                }
-            }
         }
         unsigned.initWith(buildTypes.release)
         unsigned {
@@ -185,7 +182,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
             }
         }
     }
@@ -196,14 +193,9 @@ android {
     }
 
     packagingOptions {
-        pickFirst '**/*.so'
+        // Make sure libjsc.so does not packed in APK
+        exclude "**/libjsc.so"
     }
-
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
-
 }
 
 repositories {
@@ -232,23 +224,6 @@ configurations.all {
 }
 
 dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar"])
-
-    //noinspection GradleDynamicVersio
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.fbjni'
-    }
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-    }
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-    }
-
-
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";
         debugImplementation files(hermesPath + "hermes-debug.aar")
@@ -258,29 +233,53 @@ dependencies {
         implementation jscFlavor
     }
 
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.facebook.react:react-native:+"  // From node_modules
+
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-
+    implementation 'com.google.firebase:firebase-messaging:17.3.4'
+    implementation project(':react-native-document-picker')
+    implementation project(':react-native-keychain')
+    implementation project(':react-native-doc-viewer')
+    implementation project(':react-native-video')
+    implementation project(':react-native-navigation')
+    implementation project(':react-native-image-picker')
+    implementation project(':react-native-device-info')
     implementation project(':reactnativenotifications')
-    implementation "com.google.firebase:firebase-messaging:$firebaseVersion"
+    implementation project(':react-native-cookies')
+    implementation project(':react-native-linear-gradient')
+    implementation project(':react-native-vector-icons')
+    implementation project(':react-native-svg')
+    implementation project(':react-native-local-auth')
+    implementation project(':jail-monkey')
+    implementation project(':react-native-youtube')
+    implementation project(':react-native-exception-handler')
+    implementation project(':rn-fetch-blob')
+    implementation project(':react-native-webview')
+    implementation project(':react-native-gesture-handler')
+    implementation project(':@react-native-community_async-storage')
+    implementation project(':@react-native-community_netinfo')
+    implementation project(':@sentry_react-native')
+    implementation project(':react-native-android-open-settings')
+    implementation project(':react-native-haptic-feedback')
+    implementation project(':react-native-permissions')
 
+    implementation project(':react-native-fast-image')
     // For animated GIF support
     implementation 'com.facebook.fresco:fresco:2.0.0'
     implementation 'com.facebook.fresco:animated-gif:2.0.0'
     // 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
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.implementation
+    from configurations.compile
     into 'libs'
 }
 
 apply plugin: 'com.google.gms.google-services'
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

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/debug/java/com/rn/ReactNativeFlipper.java

@@ -1,68 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
- * directory of this source tree.
- */
-package com.rn;
-
-import android.content.Context;
-import com.facebook.flipper.android.AndroidFlipperClient;
-import com.facebook.flipper.android.utils.FlipperUtils;
-import com.facebook.flipper.core.FlipperClient;
-import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
-import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
-import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
-import com.facebook.flipper.plugins.inspector.DescriptorMapping;
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
-import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
-import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
-import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
-import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.network.NetworkingModule;
-import okhttp3.OkHttpClient;
-public class ReactNativeFlipper {
-  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
-    if (FlipperUtils.shouldEnableFlipper(context)) {
-      final FlipperClient client = AndroidFlipperClient.getInstance(context);
-      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
-      client.addPlugin(new ReactFlipperPlugin());
-      client.addPlugin(new DatabasesFlipperPlugin(context));
-      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
-      client.addPlugin(CrashReporterPlugin.getInstance());
-      NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
-      NetworkingModule.setCustomClientBuilder(
-          new NetworkingModule.CustomClientBuilder() {
-            @Override
-            public void apply(OkHttpClient.Builder builder) {
-              builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
-            }
-          });
-      client.addPlugin(networkFlipperPlugin);
-      client.start();
-      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
-      // Hence we run if after all native modules have been initialized
-      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-      if (reactContext == null) {
-        reactInstanceManager.addReactInstanceEventListener(
-            new ReactInstanceManager.ReactInstanceEventListener() {
-              @Override
-              public void onReactContextInitialized(ReactContext reactContext) {
-                reactInstanceManager.removeReactInstanceEventListener(this);
-                reactContext.runOnNativeModulesQueueThread(
-                    new Runnable() {
-                      @Override
-                      public void run() {
-                        client.addPlugin(new FrescoFlipperPlugin());
-                      }
-                    });
-              }
-            });
-      } else {
-        client.addPlugin(new FrescoFlipperPlugin());
-      }
-    }
-  }
-}

android/app/src/main/AndroidManifest.xml

@@ -9,10 +9,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
       android:name=".MainApplication"
@@ -23,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:configChanges="keyboard|keyboardHidden|orientation|screenSize"
         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" />
@@ -48,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" />
@@ -82,13 +71,5 @@
             </intent-filter>
         </activity>
     </application>
-    <queries>
-      <intent>
-        <action android:name="com.google.android.youtube.api.service.START" />
-      </intent>
-      <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:mimeType="*/*" />
-        </intent>
-    </queries>
+
 </manifest>

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

@@ -1,19 +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;
-
-public class CustomMMKVJSIModulePackage extends ReanimatedJSIModulePackage {
-    @Override
-    public List<JSIModuleSpec> getJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext) {
-        super.getJSIModules(reactApplicationContext, jsContext);
-
-        return Collections.emptyList();
-    }
-}

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

@@ -1,159 +1,113 @@
 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.PackageInfo;
-import android.content.pm.PackageManager;
+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.service.notification.StatusBarNotification;
-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.JSONObject;
+import com.facebook.react.bridge.WritableMap;
 
 public class CustomPushNotification extends PushNotification {
-    private static final String PUSH_NOTIFICATIONS = "PUSH_NOTIFICATIONS";
-    private static final String VERSION_PREFERENCE = "VERSION_PREFERENCE";
+    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();
+    }
 
-        try {
-            PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
-            String version = String.valueOf(pInfo.versionCode);
-            String storedVersion = null;
-            SharedPreferences pSharedPref = context.getSharedPreferences(VERSION_PREFERENCE, Context.MODE_PRIVATE);
-            if (pSharedPref != null) {
-                storedVersion = pSharedPref.getString("Version", "");
+    public static void clearNotification(Context mContext, int notificationId, String channelId) {
+        if (notificationId != -1) {
+            Integer count = channelIdToNotificationCount.get(channelId);
+            if (count == null) {
+                count = -1;
             }
 
-            if (!version.equals(storedVersion)) {
-                if (pSharedPref != null) {
-                    SharedPreferences.Editor editor = pSharedPref.edit();
-                    editor.putString("Version", version);
-                    editor.apply();
+            channelIdToNotificationCount.remove(channelId);
+            channelIdToNotification.remove(channelId);
+
+            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;
                 }
-
-                Map<String, Map<String, JSONObject>> inputMap = new HashMap<>();
-                saveNotificationsMap(context, inputMap);
             }
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
         }
     }
 
-    public static void cancelNotification(Context context, String channelId, String rootId, Integer notificationId, Boolean isCRTEnabled) {
-        if (!android.text.TextUtils.isEmpty(channelId)) {
-            final String notificationIdStr = notificationId.toString();
-            final Boolean isThreadNotification = isCRTEnabled && !android.text.TextUtils.isEmpty(rootId);
-            final String groupId = isThreadNotification ? rootId : channelId;
-            Map<String, Map<String, JSONObject>> notificationsInChannel = loadNotificationsMap(context);
-            Map<String, JSONObject> notifications = notificationsInChannel.get(groupId);
-            if (notifications == null) {
-                return;
-            }
-            final NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
-            notificationManager.cancel(notificationId);
-            notifications.remove(notificationIdStr);
-            final StatusBarNotification[] statusNotifications = notificationManager.getActiveNotifications();
-            boolean hasMore = false;
-            for (final StatusBarNotification status : statusNotifications) {
-                Bundle bundle = status.getNotification().extras;
-                if (isThreadNotification) {
-                    hasMore = bundle.getString("root_id").equals(rootId);
-                } else if (isCRTEnabled) {
-                    hasMore = !bundle.getString("root_id").equals(rootId);
-                } else {
-                    hasMore = bundle.getString("channel_id").equals(channelId);
-                }
-                if (hasMore) {
-                    break;
-                }
-            }
-
-            if (!hasMore) {
-                notificationsInChannel.remove(groupId);
-            } else {
-                notificationsInChannel.put(groupId, notifications);
-            }
-            saveNotificationsMap(context, notificationsInChannel);
-        }
-    }
-
-    public static void clearChannelNotifications(Context context, String channelId, String rootId, Boolean isCRTEnabled) {
-        if (!android.text.TextUtils.isEmpty(channelId)) {
-            final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
-
-            // rootId is available only when CRT is enabled & clearing the thread
-            final boolean isClearThread = isCRTEnabled && !android.text.TextUtils.isEmpty(rootId);
-            
-            Map<String, Map<String, JSONObject>> notificationsInChannel = loadNotificationsMap(context);
-            String groupId = isClearThread ? rootId : channelId;
-            Map<String, JSONObject> notifications = notificationsInChannel.get(groupId);
-
-            if (notifications == null) {
-                return;
-            }
-
-            notificationsInChannel.remove(groupId);
-            saveNotificationsMap(context, notificationsInChannel);
-            notifications.forEach(
-                    (notificationIdStr, post) -> notificationManager.cancel(Integer.valueOf(notificationIdStr))
-            );
-        }
-    }
-
-    public static void clearAllNotifications(Context context) {
-        if (context != null) {
-            Map<String, Map<String, JSONObject>> 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 String rootId = initialData.getString("root_id");
-        final boolean isCRTEnabled = initialData.getString("is_crt_enabled") != null && initialData.getString("is_crt_enabled").equals("true");
-        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() {
@@ -172,162 +126,426 @@ 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) {
-                            try {
+        if (channelId != null) {
+            notificationId = channelId.hashCode();
 
-                                JSONObject post = new JSONObject();
-                                if (!android.text.TextUtils.isEmpty(rootId)) {
-                                    post.put("root_id", rootId);
-                                }
-                                if (!android.text.TextUtils.isEmpty(postId)) {
-                                    post.put("post_id", postId);
-                                }
-
-                                final Boolean isThreadNotification = isCRTEnabled && post.has("root_id");
-                                final String groupId = isThreadNotification ? rootId : channelId;
-                                
-                                Map<String, Map<String, JSONObject>> notificationsInChannel = loadNotificationsMap(mContext);
-                                Map<String, JSONObject> notifications = notificationsInChannel.get(groupId);
-                                if (notifications == null) {
-                                    notifications = Collections.synchronizedMap(new HashMap<String, JSONObject>());
-                                }
-
-                                if (notifications.size() > 0) {
-                                    createSummary = false;
-                                }
-    
-                                notifications.put(String.valueOf(notificationId),  post);
-        
-                                if (createSummary) {
-                                    // Add the summary notification id as well
-                                    notifications.put(String.valueOf(notificationId + 1), new JSONObject());
-                                }
-    
-                                notificationsInChannel.put(groupId, notifications);
-                                saveNotificationsMap(mContext, notificationsInChannel);
-                            } catch(Exception e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    }
-
-                    buildNotification(notificationId, createSummary);
+            synchronized (channelIdToNotificationCount) {
+                Integer count = channelIdToNotificationCount.get(channelId);
+                if (count == null) {
+                    count = 0;
                 }
-                break;
-            case PUSH_TYPE_CLEAR:
-                clearChannelNotifications(mContext, channelId, rootId, isCRTEnabled);
-                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:
+            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 rootId = data.getString("root_id");
-        final Boolean isCRTEnabled = data.getBoolean("is_crt_enabled");
-
-        if (channelId != null) {
-            clearChannelNotifications(mContext, channelId, rootId, isCRTEnabled);
-        }
-    }
-
-    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);
+        channelIdToNotificationCount.remove(channelId);
+        channelIdToNotification.remove(channelId);
+        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");
+        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 (postId == null || 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, Map<String, JSONObject>> 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);
     }
 
-    /**
-     * Map Structure
-     * 
-     * {
-     *     channel_id1 | thread_id1: {
-     *         notification_id1: {
-     *             post_id: 'p1',
-     *             root_id: 'r1',
-     *         }
-     *     }
-     * }
-     *
-     */
-    private static Map<String, Map<String, JSONObject>> loadNotificationsMap(Context context) {
-        Map<String, Map<String, JSONObject>> 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);
+    private String getSenderName(Bundle bundle) {
+        String senderName = bundle.getString("sender_name");
+        if (senderName != null) {
+            return senderName;
+        }
 
-                    // Can be a channel_id or thread_id
-                    Iterator<String> groupIdsItr = json.keys();
-                    while (groupIdsItr.hasNext()) {
-                        String groupId = groupIdsItr.next();
-                        JSONObject notificationsJSONObj = json.getJSONObject(groupId);
-                        Map<String, JSONObject> notifications = new HashMap<>();
-                        Iterator<String> notificationIdKeys = notificationsJSONObj.keys();
-                        while(notificationIdKeys.hasNext()) {
-                            String notificationId = notificationIdKeys.next();
-                            JSONObject post = notificationsJSONObj.getJSONObject(notificationId);
-                            notifications.put(notificationId, post);
-                        }
-                        outputMap.put(groupId, notifications);
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
+        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) {
+        return message.replaceFirst(senderName, "").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,471 +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 postId = bundle.getString("post_id");
-        if (postId != null) {
-            userInfoBundle.putString("post_id", postId);
-        }
-
-        String rootId = bundle.getString("root_id");
-        if (rootId != null) {
-            userInfoBundle.putString("root_id", rootId);
-        }
-
-        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");
-        String rootId = bundle.getString("root_id");
-        int notificationId = postId != null ? postId.hashCode() : MESSAGE_NOTIFICATION_ID;
-        NotificationPreferences notificationPreferences = NotificationPreferences.getInstance(context);
-        
-        Boolean is_crt_enabled = bundle.getString("is_crt_enabled") != null && bundle.getString("is_crt_enabled").equals("true");
-        String groupId = is_crt_enabled && !android.text.TextUtils.isEmpty(rootId) ? rootId : channelId;
-
-        addNotificationExtras(notification, bundle);
-        setNotificationIcons(context, notification, bundle);
-        setNotificationMessagingStyle(context, notification, bundle);
-        setNotificationGroup(notification, groupId, 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,52 +1,14 @@
 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;
 
 import com.reactnativenavigation.NavigationActivity;
-import com.github.emilioicai.hwkeyboardevent.HWKeyboardEventModule;
 
 public class MainActivity extends NavigationActivity {
-    private boolean HWKeyboardConnected = false;
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.launch_screen);
-        setHWKeyboardConnected();
-    }
-
-    @Override
-    public void onConfigurationChanged(@NonNull Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-
-        if (newConfig.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO) {
-            HWKeyboardConnected = true;
-        } else if (newConfig.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_YES) {
-            HWKeyboardConnected = false;
-        }
-    }
-
-    /*
-    https://mattermost.atlassian.net/browse/MM-10601
-    Required by react-native-hw-keyboard-event
-    (https://github.com/emilioicai/react-native-hw-keyboard-event)
-    */
-    @Override
-    public boolean dispatchKeyEvent(KeyEvent event) {
-        if (HWKeyboardConnected && event.getKeyCode() == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
-            String keyPressed = event.isShiftPressed() ? "shift-enter" : "enter";
-            HWKeyboardEventModule.getInstance().keyPressed(keyPressed);
-            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,19 +1,49 @@
 package com.mattermost.rnbeta;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.content.Context;
 import android.content.RestrictionsManager;
 import android.os.Bundle;
 import android.util.Log;
 import java.io.File;
 import java.util.HashMap;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import com.mattermost.share.RealPathUtil;
 import com.mattermost.share.ShareModule;
-import com.wix.reactnativenotifications.RNNotificationsPackage;
+import com.learnium.RNDeviceInfo.RNDeviceModule;
+import com.imagepicker.ImagePickerModule;
+import com.psykar.cookiemanager.CookieManagerModule;
+import com.oblador.vectoricons.VectorIconsModule;
+import com.wix.reactnativenotifications.RNNotificationsModule;
+import io.tradle.react.LocalAuthModule;
+import com.gantix.JailMonkey.JailMonkeyModule;
+import com.RNFetchBlob.RNFetchBlob;
+import com.masteratul.exceptionhandler.ReactNativeExceptionHandlerModule;
+import com.inprogress.reactnativeyoutube.YouTubeStandaloneModule;
+import com.philipphecht.RNDocViewerModule;
+import io.github.elyx0.reactnativedocumentpicker.DocumentPickerModule;
+import com.oblador.keychain.KeychainModule;
+import com.reactnativecommunity.asyncstorage.AsyncStorageModule;
+import com.reactnativecommunity.netinfo.NetInfoModule;
+import com.reactnativecommunity.webview.RNCWebViewPackage;
+import io.sentry.RNSentryModule;
+import com.dylanvann.fastimage.FastImageViewPackage;
+import com.levelasquez.androidopensettings.AndroidOpenSettings;
+import com.mkuczera.RNReactNativeHapticFeedbackModule;
+import com.reactnativecommunity.rnpermissions.RNPermissionsModule;
+
+import com.reactnativecommunity.webview.RNCWebViewPackage;
+import com.brentvatne.react.ReactVideoPackage;
+import com.BV.LinearGradient.LinearGradientPackage;
+import com.horcrux.svg.SvgPackage;
+import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.react.NavigationReactNativeHost;
+import com.reactnativenavigation.react.ReactGateway;
 import com.wix.reactnativenotifications.core.notification.INotificationsApplication;
 import com.wix.reactnativenotifications.core.notification.IPushNotification;
 import com.wix.reactnativenotifications.core.notificationdrawer.IPushNotificationsDrawer;
@@ -22,54 +52,110 @@ import com.wix.reactnativenotifications.core.AppLaunchHelper;
 import com.wix.reactnativenotifications.core.AppLifecycleFacade;
 import com.wix.reactnativenotifications.core.JsIOHelper;
 
-import com.facebook.react.PackageList;
-import com.facebook.react.ReactInstanceManager;
 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;
-
+import com.mattermost.share.RealPathUtil;
 
 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 =
-  new ReactNativeHost(this) {
-    @Override
-    public boolean getUseDeveloperSupport() {
-      return BuildConfig.DEBUG;
-    }
+  @Override
+  protected ReactGateway createReactGateway() {
+    ReactNativeHost host = new NavigationReactNativeHost(this, isDebug(), createAdditionalReactPackages()) {
+      @Override
+      protected String getJSMainModuleName() {
+        return "index";
+      }
+    };
+    return new ReactGateway(this, isDebug(), host);
+  }
 
-    @Override
-    protected List<ReactPackage> getPackages() {
-      List<ReactPackage> packages = new PackageList(this).getPackages();
-      // Packages that cannot be auto linked yet can be added manually here, for example:
-      // packages.add(new MyReactNativePackage());
-      packages.add(new RNNotificationsPackage(MainApplication.this));
-      packages.add(
-        new TurboReactPackage() {
+  @Override
+  public boolean isDebug() {
+    return BuildConfig.DEBUG;
+  }
+
+  @NonNull
+  @Override
+  public List<ReactPackage> createAdditionalReactPackages() {
+    // Add the packages you require here.
+    // No need to add RnnPackage and MainReactPackage
+    return Arrays.<ReactPackage>asList(
+            new TurboReactPackage() {
               @Override
               public NativeModule getModule(String name, ReactApplicationContext reactContext) {
                 switch (name) {
-                  case "MattermostManaged":
-                    return MattermostManagedModule.getInstance(reactContext);
                   case "MattermostShare":
                     return new ShareModule(instance, reactContext);
+                  case "RNDeviceInfo":
+                    return new RNDeviceModule(reactContext, false);
+                  case "ImagePickerManager":
+                    return new ImagePickerModule(reactContext, R.style.DefaultExplainingPermissionsTheme);
+                  case "RNCookieManagerAndroid":
+                    return new CookieManagerModule(reactContext);
+                  case "RNVectorIconsModule":
+                    return new VectorIconsModule(reactContext);
+                  case "WixRNNotifications":
+                    return new RNNotificationsModule(instance, reactContext);
+                  case "RNLocalAuth":
+                    return new LocalAuthModule(reactContext);
+                  case "JailMonkey":
+                    return new JailMonkeyModule(reactContext, false);
+                  case "RNFetchBlob":
+                    return new RNFetchBlob(reactContext);
+                  case "MattermostManaged":
+                    return MattermostManagedModule.getInstance(reactContext);
                   case "NotificationPreferences":
                     return NotificationPreferencesModule.getInstance(instance, reactContext);
                   case "RNTextInputReset":
                     return new RNTextInputResetModule(reactContext);
+                  case "ReactNativeExceptionHandler":
+                    return new ReactNativeExceptionHandlerModule(reactContext);
+                  case "YouTubeStandaloneModule":
+                    return new YouTubeStandaloneModule(reactContext);
+                  case "RNDocViewer":
+                    return new RNDocViewerModule(reactContext);
+                  case "RNDocumentPicker":
+                    return new DocumentPickerModule(reactContext);
+                  case "RNKeychainManager":
+                    return new KeychainModule(reactContext);
+                  case "RNSentry":
+                    return new RNSentryModule(reactContext);
+                  case AsyncStorageModule.NAME:
+                    return new AsyncStorageModule(reactContext);
+                  case NetInfoModule.NAME:
+                    return new NetInfoModule(reactContext);
+                  case "RNAndroidOpenSettings":
+                    return new AndroidOpenSettings(reactContext);
+                  case "RNReactNativeHapticFeedbackModule":
+                    return new RNReactNativeHapticFeedbackModule(reactContext);
+                  case "RNPermissions":
+                    return new RNPermissionsModule(reactContext);
                   default:
                     throw new IllegalArgumentException("Could not find module " + name);
                 }
@@ -77,35 +163,47 @@ 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("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));
+
+                    map.put("MattermostShare", new ReactModuleInfo("MattermostShare", "com.mattermost.share.ShareModule", false, false, true, false, false));
+                    map.put("RNDeviceInfo", new ReactModuleInfo("RNDeviceInfo", "com.learnium.RNDeviceInfo.RNDeviceModule", false, false, true, false, false));
+                    map.put("ImagePickerManager", new ReactModuleInfo("ImagePickerManager", "com.imagepicker.ImagePickerModule", false, false, false, false, false));
+                    map.put("RNCookieManagerAndroid", new ReactModuleInfo("RNCookieManagerAndroid", "com.psykar.cookiemanager.CookieManagerModule", false, false, false, false, false));
+                    map.put("RNVectorIconsModule", new ReactModuleInfo("RNVectorIconsModule", "com.oblador.vectoricons.VectorIconsModule", false, false, false, false, false));
+                    map.put("WixRNNotifications", new ReactModuleInfo("WixRNNotifications", "com.wix.reactnativenotifications.RNNotificationsModule", false, false, false, false, false));
+                    map.put("RNLocalAuth", new ReactModuleInfo("RNLocalAuth", "io.tradle.react.LocalAuthModule", false, false, false, false, false));
+                    map.put("JailMonkey", new ReactModuleInfo("JailMonkey", "com.gantix.JailMonkey.JailMonkeyModule", false, false, true, false, false));
+                    map.put("RNFetchBlob", new ReactModuleInfo("RNFetchBlob", "com.RNFetchBlob.RNFetchBlob", false, false, true, false, false));
+                    map.put("ReactNativeExceptionHandler", new ReactModuleInfo("ReactNativeExceptionHandler", "com.masteratul.exceptionhandler.ReactNativeExceptionHandlerModule", false, false, false, false, false));
+                    map.put("YouTubeStandaloneModule", new ReactModuleInfo("YouTubeStandaloneModule", "com.inprogress.reactnativeyoutube.YouTubeStandaloneModule", false, false, false, false, false));
+                    map.put("RNDocViewer", new ReactModuleInfo("RNDocViewer", "com.philipphecht.RNDocViewerModule", false, false, false, false, false));
+                    map.put("RNDocumentPicker", new ReactModuleInfo("RNDocumentPicker", "io.github.elyx0.reactnativedocumentpicker.DocumentPickerModule", false, false, false, false, false));
+                    map.put("RNKeychainManager", new ReactModuleInfo("RNKeychainManager", "com.oblador.keychain.KeychainModule", false, false, true, false, false));
+                    map.put("RNSentry", new ReactModuleInfo("RNSentry", "com.sentry.RNSentryModule", false, false, true, false, false));
+                    map.put(AsyncStorageModule.NAME, new ReactModuleInfo(AsyncStorageModule.NAME, "com.reactnativecommunity.asyncstorage.AsyncStorageModule", false, false, false, false, false));
+                    map.put(NetInfoModule.NAME, new ReactModuleInfo(NetInfoModule.NAME, "com.reactnativecommunity.netinfo.NetInfoModule", false, false, false, false, false));
+                    map.put("RNAndroidOpenSettings", new ReactModuleInfo("RNAndroidOpenSettings", "com.levelasquez.androidopensettings.AndroidOpenSettings", false, false, false, false, false));
+                    map.put("RNReactNativeHapticFeedbackModule", new ReactModuleInfo("RNReactNativeHapticFeedback", "com.mkuczera.RNReactNativeHapticFeedbackModule", false, false, false, false, false));
+                    map.put("RNPermissions", new ReactModuleInfo("RNPermissions", "com.reactnativecommunity.rnpermissions.RNPermissionsModule", false, false, false, false, false));
+                    return map;
+                  }
                 };
               }
-            }
-      );
-
-      return packages;
-    }
-
-    @Override
-    protected String getJSMainModuleName() {
-      return "index";
-    }
-
-    @Override
-    protected JSIModulePackage getJSIModulePackage() {
-      return (JSIModulePackage) new CustomMMKVJSIModulePackage();
-    }
-  };
-
-  @Override
-  public ReactNativeHost getReactNativeHost() {
-    return mReactNativeHost;
+            },
+            new FastImageViewPackage(),
+            new RNCWebViewPackage(),
+            new SvgPackage(),
+            new LinearGradientPackage(),
+            new ReactVideoPackage(),
+            new RNGestureHandlerPackage(),
+            new RNPasteableTextInputPackage()
+    );
   }
 
   @Override
@@ -119,7 +217,9 @@ private final ReactNativeHost mReactNativeHost =
     Log.i("ReactNative", "Cleaning temp cache " + tempFolder.getAbsolutePath());
 
     SoLoader.init(this, /* native exopackage */ false);
-    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+
+    // Uncomment to listen to react markers for build that has telemetry enabled
+    // addReactMarkerListener();
   }
 
   @Override
@@ -139,11 +239,14 @@ private final ReactNativeHost mReactNativeHost =
   }
 
   public ReactContext getRunningReactContext() {
-    if (mReactNativeHost == null) {
+    final ReactGateway reactGateway = getReactGateway();
+
+    if (reactGateway == null) {
         return null;
     }
 
-    return mReactNativeHost
+    return reactGateway
+        .getReactNativeHost()
         .getReactInstanceManager()
         .getCurrentReactContext();
   }
@@ -154,6 +257,7 @@ private final ReactNativeHost mReactNativeHost =
               (RestrictionsManager) ctx.getSystemService(Context.RESTRICTIONS_SERVICE);
 
       mManagedConfig = myRestrictionsMgr.getApplicationRestrictions();
+      myRestrictionsMgr = null;
 
       if (mManagedConfig!= null && mManagedConfig.size() > 0) {
         return mManagedConfig;
@@ -179,28 +283,35 @@ private final ReactNativeHost mReactNativeHost =
     return null;
   }
 
-  /**
-   * 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
-   */
-  private static void initializeFlipper(
-      Context context, ReactInstanceManager reactInstanceManager) {
-    if (BuildConfig.DEBUG) {
-      try {
-        /*
-         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");
-        aClass
-            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
-            .invoke(null, context, reactInstanceManager);
-      } catch (Exception e) {
-        e.printStackTrace();
+  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);
+          }
+        }
       }
-    }
+    });
   }
 }

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

@@ -1,15 +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;
 
 import com.mattermost.react_native_interface.ResolvePromise;
@@ -18,17 +15,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 +28,6 @@ public class MattermostCredentialsHelper {
             }
 
             @Override
-            @NonNull
             public String getString(int index) {
                 return keys.get(index);
             }
@@ -44,42 +35,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,27 +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");
-        final String rootId = bundle.getString("root_id");
-        final Boolean isCRTEnabled = bundle.getString("is_crt_enabled") != null && bundle.getString("is_crt_enabled").equals("true");
-
-        int notificationId = CustomPushNotificationHelper.MESSAGE_NOTIFICATION_ID;
-        if (postId != null) {
-            notificationId = postId.hashCode();
-        } else if (channelId != null) {
-            notificationId = channelId.hashCode();
-        }
-
-        CustomPushNotification.cancelNotification(context, channelId, rootId, notificationId, isCRTEnabled);
+        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,11 +119,9 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
             WritableMap map = Arguments.createMap();
             Notification n = sbn.getNotification();
             Bundle bundle = n.extras;
-            String postId = bundle.getString("post_id");
-            map.putString("post_id", postId);
-            String rootId = bundle.getString("root_id");
-            map.putString("root_id", rootId);
+            int identifier = sbn.getId();
             String channelId = bundle.getString("channel_id");
+            map.putInt("identifier", identifier);
             map.putString("channel_id", channelId);
             result.pushMap(map);
         }
@@ -130,9 +129,8 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void removeDeliveredNotifications(String channelId, String rootId, Boolean isCRTEnabled) {
-        final Context context = mApplication.getApplicationContext();
-        CustomPushNotification.clearChannelNotifications(context, channelId, rootId, isCRTEnabled);
+    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,29 @@ 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");
+
+                        Log.i("ReactNative", String.format("URL=%s", serverUrl));
+                        replyToMessage(serverUrl, token, notificationId, message);
+                    }
+                }
+            });
         }
     }
 
@@ -68,7 +80,7 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
         }
 
         if (token == null || serverUrl == null) {
-            onReplyFailed(notificationId);
+            onReplyFailed(notificationManager, notificationId, channelId);
             return;
         }
 
@@ -76,33 +88,28 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
         final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
         String json = buildReplyPost(channelId, rootId, message.toString());
         RequestBody body = RequestBody.create(JSON, json);
-
-        String postsEndpoint = "/api/v4/posts?set_online=false";
-        String url = String.format("%s%s", serverUrl.replaceAll("/$", ""), postsEndpoint);
-        Log.i("ReactNative", String.format("Reply URL=%s", url));
         Request request = new Request.Builder()
-            .header("Authorization", String.format("Bearer %s", token))
-            .header("Content-Type", "application/json")
-            .url(url)
-            .post(body)
-            .build();
+                .header("Authorization", String.format("Bearer %s", token))
+                .header("Content-Type", "application/json")
+                .url(String.format("%s/api/v4/posts", serverUrl.replaceAll("/$", "")))
+                .post(body)
+                .build();
 
         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 +127,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/RNEditTextOnPasteListener.java

@@ -0,0 +1,7 @@
+package com.mattermost.rnbeta;
+
+import android.net.Uri;
+
+public interface RNEditTextOnPasteListener {
+    void onPaste(Uri itemUri);
+}

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

@@ -0,0 +1,92 @@
+package com.mattermost.rnbeta;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.ActionMode;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
+
+public class RNPasteableActionCallback implements ActionMode.Callback {
+
+    private RNPasteableEditText mEditText;
+
+    RNPasteableActionCallback(RNPasteableEditText editText) {
+        mEditText = editText;
+    }
+
+    @Override
+    public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+        Bundle config = MainApplication.instance.getManagedConfig();
+        if (config != null) {
+            WritableMap result = Arguments.fromBundle(config);
+            String copyPasteProtection = result.getString("copyAndPasteProtection");
+            if (copyPasteProtection.equals("true")) {
+                disableMenus(menu);
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+        return false;
+    }
+
+    @Override
+    public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+        Uri uri = this.getUriInClipboard();
+        if (item.getItemId() == android.R.id.paste && uri != null) {
+            mEditText.getOnPasteListener().onPaste(uri);
+            mode.finish();
+        } else {
+            mEditText.onTextContextMenuItem(item.getItemId());
+        }
+
+        return true;
+    }
+
+    @Override
+    public void onDestroyActionMode(ActionMode mode) {
+
+    }
+
+    private void disableMenus(Menu menu) {
+        for (int i = 0; i < menu.size(); i++) {
+            MenuItem item = menu.getItem(i);
+            int id = item.getItemId();
+            boolean shouldDisableMenu = (
+                id == android.R.id.paste
+                || id == android.R.id.copy
+                || id == android.R.id.cut
+            );
+            item.setEnabled(!shouldDisableMenu);
+        }
+    }
+
+    private Uri getUriInClipboard() {
+        ClipboardManager clipboardManager = (ClipboardManager) mEditText.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+        ClipData clipData = clipboardManager.getPrimaryClip();
+        if (clipData == null) {
+            return null;
+        }
+
+        ClipData.Item item = clipData.getItemAt(0);
+        if (item == null) {
+            return null;
+        }
+
+        String text = item.getText().toString();
+        if (text.length() > 0) {
+            return null;
+        }
+
+        return item.getUri();
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.mattermost.rnbeta;
+
+import android.content.Context;
+
+import com.facebook.react.views.textinput.ReactEditText;
+
+public class RNPasteableEditText extends ReactEditText {
+
+    private RNEditTextOnPasteListener mOnPasteListener;
+
+    public RNPasteableEditText(Context context) {
+        super(context);
+    }
+
+    public void setOnPasteListener(RNEditTextOnPasteListener listener) {
+        mOnPasteListener = listener;
+    }
+
+    public RNEditTextOnPasteListener getOnPasteListener() {
+        return mOnPasteListener;
+    }
+}

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

@@ -0,0 +1,146 @@
+package com.mattermost.rnbeta;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.AssetFileDescriptor;
+import android.net.Uri;
+import android.util.Patterns;
+import android.webkit.MimeTypeMap;
+import android.webkit.URLUtil;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
+import com.mattermost.share.RealPathUtil;
+import com.mattermost.share.ShareModule;
+
+import java.io.FileNotFoundException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.regex.Matcher;
+
+public class RNPasteableEditTextOnPasteListener implements RNEditTextOnPasteListener {
+
+    private RNPasteableEditText mEditText;
+
+    RNPasteableEditTextOnPasteListener(RNPasteableEditText editText) {
+        mEditText = editText;
+    }
+
+    @Override
+    public void onPaste(Uri itemUri) {
+        ReactContext reactContext = (ReactContext)mEditText.getContext();
+        String uri = itemUri.toString();
+
+        WritableArray images = null;
+        WritableMap error = null;
+
+        String uriMimeType = reactContext.getContentResolver().getType(itemUri);
+        if (uriMimeType == null) {
+            return;
+        }
+
+        // Special handle for Google docs
+        if (uri.equals("content://com.google.android.apps.docs.editors.kix.editors.clipboard")) {
+            ClipboardManager clipboardManager = (ClipboardManager) reactContext.getSystemService(Context.CLIPBOARD_SERVICE);
+            ClipData clipData = clipboardManager.getPrimaryClip();
+            if (clipData == null) {
+                return;
+            }
+
+            ClipData.Item item = clipData.getItemAt(0);
+            String htmlText = item.getHtmlText();
+            // Find uri from html
+            Matcher matcher = Patterns.WEB_URL.matcher(htmlText);
+            if (matcher.find()) {
+                uri = htmlText.substring(matcher.start(1), matcher.end());
+            }
+        }
+
+        if (uri.startsWith("http")) {
+            Thread pastImageFromUrlThread = new Thread(new RNPasteableImageFromUrl(reactContext, mEditText, uri));
+            pastImageFromUrlThread.start();
+            return;
+        }
+
+        uri = RealPathUtil.getRealPathFromURI(reactContext, itemUri);
+        if (uri == null) {
+            return;
+        }
+
+        // Get type
+        String extension = MimeTypeMap.getFileExtensionFromUrl(uri);
+        if (extension == null) {
+            return;
+        }
+
+        String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
+        if (mimeType == null) {
+            return;
+        }
+
+        // Get fileName
+        String fileName = URLUtil.guessFileName(uri, null, mimeType);
+
+        if (uri.contains(ShareModule.CACHE_DIR_NAME)) {
+            uri = moveToImagesCache(uri, fileName);
+        }
+
+        if (uri == null) {
+            return;
+        }
+
+        // Get fileSize
+        long fileSize;
+        try {
+            ContentResolver contentResolver = reactContext.getContentResolver();
+            AssetFileDescriptor assetFileDescriptor = contentResolver.openAssetFileDescriptor(itemUri, "r");
+            if (assetFileDescriptor == null) {
+                return;
+            }
+
+            fileSize = assetFileDescriptor.getLength();
+
+            WritableMap image = Arguments.createMap();
+            image.putString("type", mimeType);
+            image.putDouble("fileSize", fileSize);
+            image.putString("fileName", fileName);
+            image.putString("uri", "file://" + uri);
+
+            images = Arguments.createArray();
+            images.pushMap(image);
+        } catch (FileNotFoundException e) {
+            error = Arguments.createMap();
+            error.putString("message", e.getMessage());
+        }
+
+        WritableMap event = Arguments.createMap();
+        event.putArray("data", images);
+        event.putMap("error", error);
+
+        reactContext
+                .getJSModule(RCTEventEmitter.class)
+                .receiveEvent(
+                        mEditText.getId(),
+                        "onPaste",
+                        event
+                );
+    }
+
+    private String moveToImagesCache(String src, String fileName) {
+        ReactContext ctx = (ReactContext)mEditText.getContext();
+        String dest = ctx.getCacheDir().getAbsolutePath() + "/Images/" + fileName;
+
+        try {
+            Files.move(Paths.get(src), Paths.get(dest));
+        } catch (Exception err) {
+            return null;
+        }
+
+        return dest;
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.mattermost.rnbeta;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
+import com.facebook.react.views.textinput.ReactEditText;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
+
+public class RNPasteableImageFromUrl implements Runnable {
+
+    private ReactContext mContext;
+    private String mUri;
+    private ReactEditText mTarget;
+
+    RNPasteableImageFromUrl(ReactContext context, ReactEditText target, String uri) {
+        mContext = context;
+        mUri = uri;
+        mTarget = target;
+    }
+
+    @Override
+    public void run() {
+        WritableArray images = null;
+        WritableMap error = null;
+
+        try {
+            URL url = new URL(mUri);
+            URLConnection u = url.openConnection();
+
+            // Get type
+            String mimeType = u.getHeaderField("Content-Type");
+            if (!mimeType.startsWith("image")) {
+                return;
+            }
+
+            // Get fileSize
+            long fileSize = Long.parseLong(u.getHeaderField("Content-Length"));
+
+            // Get fileName
+            String contentDisposition = u.getHeaderField("Content-Disposition");
+            int startIndex = contentDisposition.indexOf("filename=\"") + 10;
+            int endIndex = contentDisposition.length() - 1;
+            String fileName = contentDisposition.substring(startIndex, endIndex);
+
+            WritableMap image = Arguments.createMap();
+            image.putString("type", mimeType);
+            image.putDouble("fileSize", fileSize);
+            image.putString("fileName", fileName);
+            image.putString("uri", mUri);
+
+            images = Arguments.createArray();
+            images.pushMap(image);
+
+        } catch (IOException e) {
+            error = Arguments.createMap();
+            error.putString("message", e.getMessage());
+        }
+
+        WritableMap event = Arguments.createMap();
+        event.putArray("data", images);
+        event.putMap("error", error);
+
+        mContext
+                .getJSModule(RCTEventEmitter.class)
+                .receiveEvent(
+                        mTarget.getId(),
+                        "onPaste",
+                        event
+                );
+    }
+}

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

@@ -0,0 +1,78 @@
+package com.mattermost.rnbeta;
+
+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;
+
+import com.facebook.react.common.MapBuilder;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.views.textinput.ReactEditText;
+import com.facebook.react.views.textinput.ReactTextInputManager;
+
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+public class RNPasteableTextInputManager extends ReactTextInputManager {
+
+    @Override
+    public String getName() {
+        return "PasteableTextInputAndroid";
+    }
+
+    @Override
+    public ReactEditText createViewInstance(ThemedReactContext context) {
+        RNPasteableEditText editText = new RNPasteableEditText(context) {
+            @Override
+            public InputConnection onCreateInputConnection(EditorInfo editorInfo) {
+                final InputConnection ic = super.onCreateInputConnection(editorInfo);
+                EditorInfoCompat.setContentMimeTypes(editorInfo,
+                        new String [] {"image/*"});
+
+
+                final InputConnectionCompat.OnCommitContentListener callback =
+                        (inputContentInfo, flags, opts) -> {
+                            // read and display inputContentInfo asynchronously
+                            if (BuildCompat.isAtLeastNMR1() && (flags &
+                                    InputConnectionCompat.INPUT_CONTENT_GRANT_READ_URI_PERMISSION) != 0) {
+                                try {
+                                    inputContentInfo.requestPermission();
+                                }
+                                catch (Exception e) {
+                                    return false;
+                                }
+                            }
+
+                            this.getOnPasteListener().onPaste(inputContentInfo.getContentUri());
+                            return true;
+                        };
+                return InputConnectionCompat.createWrapper(ic, editorInfo, callback);
+            }
+        };
+        int inputType = editText.getInputType();
+        editText.setInputType(inputType & (~InputType.TYPE_TEXT_FLAG_MULTI_LINE));
+        editText.setReturnKeyType("done");
+        editText.setCustomInsertionActionModeCallback(new RNPasteableActionCallback(editText));
+        editText.setCustomSelectionActionModeCallback(new RNPasteableActionCallback(editText));
+        return editText;
+    }
+
+    @Override
+    protected void addEventEmitters(ThemedReactContext reactContext, ReactEditText editText) {
+        super.addEventEmitters(reactContext, editText);
+
+        RNPasteableEditText pasteableEditText = (RNPasteableEditText)editText;
+        pasteableEditText.setOnPasteListener(new RNPasteableEditTextOnPasteListener(pasteableEditText));
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+        Map map = super.getExportedViewConstants();
+        map.put("onPaste", MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onPaste")));
+        return map;
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.mattermost.rnbeta;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
+public class RNPasteableTextInputPackage implements ReactPackage {
+    @Nonnull
+    @Override
+    public List<NativeModule> createNativeModules(@Nonnull ReactApplicationContext reactContext) {
+        return Collections.emptyList();
+    }
+
+    @Nonnull
+    @Override
+    public List<ViewManager> createViewManagers(@Nonnull ReactApplicationContext reactContext) {
+        return Arrays.asList(
+                new RNPasteableTextInputManager()
+        );
+    }
+}

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,41 @@ 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";
 
     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 +82,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) {
@@ -74,62 +95,26 @@ public class ReceiptDelivery {
                     .post(body)
                     .build();
 
-            makeServerRequest(client, request, isIdLoaded, 0, promise);
-        }
-    }
-
-    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()) {
-                    case 302:
-                    promise.reject("Receipt delivery failure", "StatusFound");
-                    return;
-                    case 400:
-                    promise.reject("Receipt delivery failure", "StatusBadRequest");
-                    return;
-                    case 401:
-                    promise.reject("Receipt delivery failure", "Unauthorized");
-                    return;
-                    case 500:
-                    promise.reject("Receipt delivery failure", "StatusInternalServerError");
-                    return;
-                    case 501:
-                    promise.reject("Receipt delivery failure", "StatusNotImplemented");
-                    return;
+            try {
+                Response response = client.newCall(request).execute();
+                String responseBody = response.body().string();
+                if (response.code() != 200 || !isIdLoaded) {
+                    throw new Exception(responseBody);
                 }
-
-                throw new Exception(responseBody);
-            }
-
-            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) {
-                if (jsonResponse.has(key)) {
-                    bundle.putString(key, jsonResponse.getString(key));
-                }
-            }
-            promise.resolve(bundle);
-        } catch (Exception e) {
-            Log.e("ReactNative", "Receipt delivery failed to send");
-            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);
+                JSONObject jsonResponse = new JSONObject(responseBody);
+                Bundle bundle = new Bundle();
+                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));
                     }
-                } catch(InterruptedException ie) {
-                    // nothing to do
                 }
+                promise.resolve(bundle);
+            } catch (Exception e) {
+                Log.e("ReactNative", "Receipt delivery failed to send");
+                promise.reject("Receipt delivery failure", e.toString());
             }
-
-            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/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);
                 }
             }
@@ -198,12 +194,8 @@ public class ShareModule extends ReactContextBaseJavaModule {
         JSONObject json = new JSONObject();
         try {
             json.put("user_id", data.getString("currentUserId"));
-            if (data.hasKey("channelId")) {
-                json.put("channel_id", data.getString("channelId"));
-            }
-            if (data.hasKey("value")) {
-                json.put("message", data.getString("value"));
-            }
+            json.put("channel_id", data.getString("channelId"));
+            json.put("message", data.getString("value"));
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -225,7 +217,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 +241,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/drawable/rn_edit_text_material.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-       android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
-       android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
-       android:insetTop="@dimen/abc_edit_text_inset_top_material"
-       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
-
-    <selector>
-        <!-- 
-          This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
-          The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
-          NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
-
-          <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
-
-          For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
-        -->
-        <item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
-        <item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
-    </selector>
-
-</inset>

android/app/src/main/res/layout/launch_screen.xml

@@ -1,32 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/splashscreen_bg"
-    android:orientation="vertical">
+    android:background="#ffffff"
+    android:gravity="center_horizontal"
+    tools:context=".SplashScreenActivity">
 
     <ImageView
-        android:id="@+id/splashBackgroundImage"
+        android:id="@+id/imgLogo"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:src="@drawable/splash_background"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/splashIcon"
-        android:layout_width="96dp"
-        android:layout_height="96dp"
-        android:contentDescription="@string/app_name"
-        android:src="@drawable/splash"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:adjustViewBounds="true"
+        android:src="@drawable/splash" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>