MM_30482 : Fail safe for id

Corrections made after having SonarQube analyzed the code

.circleci/config.yml

@@ -1,37 +1,31 @@
 version: 2.1
 orbs:
   owasp: entur/owasp@0.0.10
-  node: circleci/node@5.0.3
 
 executors:
   android:
     parameters:
       resource_class:
-        default: xlarge
+        default: large
         type: string
     environment:
       NODE_OPTIONS: --max_old_space_size=12000
       NODE_ENV: production
       BABEL_ENV: production
     docker:
-      - image: cimg/android:2022.09.2-node
+      - image: circleci/android:api-29-node
     working_directory: ~/mattermost-mobile
     resource_class: <<parameters.resource_class>>
 
   ios:
-    parameters:
-      resource_class:
-        default: medium
-        type: string
     environment:
       NODE_OPTIONS: --max_old_space_size=12000
       NODE_ENV: production
       BABEL_ENV: production
     macos:
-      xcode: "14.0.0"
+      xcode: "12.0.0"
     working_directory: ~/mattermost-mobile
     shell: /bin/bash --login -o pipefail
-    resource_class: <<parameters.resource_class>>
 
 commands:
   checkout-private:
@@ -39,7 +33,7 @@ commands:
     steps:
       - add_ssh_keys:
           fingerprints:
-            - "03:1c:a7:07:35:bc:57:e4:1d:6c:e1:2c:4b:be:09:6d"
+            - "59:4d:99:5e:1c:6d:30:36:6d:60:76:88:ff:a7:ab:63"
       - run:
           name: Clone the mobile private repo
           command: git clone git@github.com:mattermost/mattermost-mobile-private.git ~/mattermost-mobile-private
@@ -88,13 +82,6 @@ commands:
       - run:
           name: Generate assets
           command: node ./scripts/generate-assets.js
-      - run:
-          name: Compass Icons
-          environment:
-            COMPASS_ICONS: "node_modules/@mattermost/compass-icons/font/compass-icons.ttf"
-          command: |
-            cp "$COMPASS_ICONS" "assets/fonts/"
-            cp "$COMPASS_ICONS" "android/app/src/main/assets/fonts"
       - save_cache:
           name: Save assets cache
           key: v1-assets-{{ checksum "assets/base/config.json" }}-{{ arch }}
@@ -104,17 +91,12 @@ commands:
   npm-dependencies:
     description: "Get JavaScript dependencies"
     steps:
-      - node/install:
-          node-version: '18.7.0'
       - 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
-            node node_modules/\@sentry/cli/scripts/install.js
-            node node_modules/react-native-webrtc/tools/downloadWebRTC.js
+          command: NODE_ENV=development npm install --ignore-scripts
       - save_cache:
           name: Save npm cache
           key: v2-npm-{{ checksum "package.json" }}-{{ arch }}
@@ -198,15 +180,13 @@ commands:
         type: string
       file:
         type: string
-      env:
-        type: string
     steps:
       - attach_workspace:
           at: ~/
       - run:
           name: <<parameters.task>>
           working_directory: fastlane
-          command: <<parameters.env>> bundle exec fastlane <<parameters.target>> deploy file:$HOME/mattermost-mobile/<<parameters.file>>
+          command: bundle exec fastlane <<parameters.target>> deploy file:$HOME/mattermost-mobile/<<parameters.file>>
 
   persist:
     description: "Persist mattermost-mobile directory"
@@ -234,7 +214,7 @@ jobs:
   test:
     working_directory: ~/mattermost-mobile
     docker:
-      - image: cimg/node:16.14.2
+      - image: circleci/node:10
     steps:
       - checkout:
           path: ~/mattermost-mobile
@@ -250,58 +230,6 @@ jobs:
           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
-
   build-android-beta:
     executor: android
     steps:
@@ -350,9 +278,7 @@ jobs:
           filename: "*.apk"
 
   build-ios-beta:
-    executor:
-      name: ios
-      resource_class: large
+    executor: ios
     steps:
       - build-ios
       - persist
@@ -433,7 +359,6 @@ jobs:
           task: "Deploy to Google Play"
           target: android
           file: "*.apk"
-          env: "SUPPLY_TRACK=beta"
 
   deploy-android-beta:
     executor:
@@ -444,7 +369,6 @@ jobs:
           task: "Deploy to Google Play"
           target: android
           file: "*.apk"
-          env: "SUPPLY_TRACK=alpha"
 
   deploy-ios-release:
     executor: ios
@@ -453,7 +377,6 @@ jobs:
           task: "Deploy to TestFlight"
           target: ios
           file: "*.ipa"
-          env: ""
 
   deploy-ios-beta:
     executor: ios
@@ -462,7 +385,6 @@ jobs:
           task: "Deploy to TestFlight"
           target: ios
           file: "*.ipa"
-          env: ""
 
   github-release:
     executor:
@@ -481,10 +403,6 @@ workflows:
   build:
     jobs:
       - test
-      # - check-deps:
-      #     context: sast-webhook
-      #     requires:
-      #       - test
 
       - build-android-release:
           context: mattermost-mobile-android-release
@@ -493,7 +411,8 @@ workflows:
           filters:
             branches:
               only:
-                - /^build-release-\d+$/
+                - /^build-\d+$/
+                - /^build-android-\d+$/
                 - /^build-android-release-\d+$/
       - deploy-android-release:
           context: mattermost-mobile-android-release
@@ -502,11 +421,14 @@ workflows:
           filters:
             branches:
               only:
-                - /^build-release-\d+$/
+                - /^build-\d+$/
+                - /^build-android-\d+$/
                 - /^build-android-release-\d+$/
 
       - build-android-beta:
           context: mattermost-mobile-android-beta
+          requires:
+            - test
           filters:
             branches:
               only:
@@ -531,7 +453,8 @@ workflows:
           filters:
             branches:
               only:
-                - /^build-release-\d+$/
+                - /^build-\d+$/
+                - /^build-ios-\d+$/
                 - /^build-ios-release-\d+$/
       - deploy-ios-release:
           context: mattermost-mobile-ios-release
@@ -540,11 +463,14 @@ workflows:
           filters:
             branches:
               only:
-                - /^build-release-\d+$/
+                - /^build-\d+$/
+                - /^build-ios-\d+$/
                 - /^build-ios-release-\d+$/
 
       - build-ios-beta:
           context: mattermost-mobile-ios-beta
+          requires:
+            - test
           filters:
             branches:
               only:
@@ -568,14 +494,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
@@ -603,8 +529,9 @@ workflows:
             branches:
               only:
                 - /^build-\d+$/
-                - /^build-ios-sim-\d+$/
-
+                - /^build-ios-\d+$/
+                - /^build-ios-beta-\d+$/
+                
       - github-release:
           context: mattermost-mobile-unsigned
           requires:

.drone.yml

@@ -1,31 +0,0 @@
-kind: pipeline
-name: default
-
-steps:
-  - name: permissions
-    image: alpine/git
-    commands:
-    - chmod -R 777 .
-
-  #- name: build
-  #  image: cimg/android:2022.09.2-node
-  #  environment:
-  #    CIRCLECI: true
-  #    NODE_OPTIONS: --max_old_space_size=12000
-  #    NODE_ENV: production
-  #    BABEL_ENV: production
-  #    MATTERMOST_RELEASE_STORE_FILE: /root/mattermost.keystore
-  #    MATTERMOST_RELEASE_KEY_ALIAS: mattermost-google-key
-  #    MATTERMOST_RELEASE_PASSWORD: 123456
-  #  commands:
-  #    - 'npm run build:android'
-
-  - name: gitea_release
-    image: plugins/gitea-release
-    settings:
-      api_key:
-        from_secret: drone_release
-      base_url: https://git.ivasoft.cz
-      files: package.json
-    when:
-      event: tag

.editorconfig

@@ -7,7 +7,7 @@ end_of_line = lf
 insert_final_newline = true
 charset = utf-8
 
-[*.{js,jsx,json,html,ts,tsx}]
+[*.{js,jsx,json,html}]
 indent_style = space
 indent_size = 4
 

.env

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

.eslintrc.json

@@ -1,20 +1,18 @@
 {
   "extends": [
-    "./eslint/eslint-mattermost",
-    "./eslint/eslint-react",
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended",
-    "plugin:react-hooks/recommended"
+    "plugin:mattermost/react"
   ],
   "parser": "@typescript-eslint/parser",
   "plugins": [
     "@typescript-eslint",
-    "import"
+    "mattermost"
   ],
   "settings": {
     "react": {
       "pragma": "React",
-      "version": "17.0"
+      "version": "16.5"
     }
   },
   "env": {
@@ -24,13 +22,10 @@
     "__DEV__": true
   },
   "rules": {
-    "eol-last": ["error", "always"],
     "global-require": 0,
     "no-undefined": 0,
-    "no-shadow": "off",
     "react/display-name": [2, { "ignoreTranspilerName": false }],
     "react/jsx-filename-extension": 0,
-    "react-hooks/exhaustive-deps": 0,
     "camelcase": [
       0,
       {
@@ -46,9 +41,7 @@
         "args": "after-used"
       }
     ],
-    "@typescript-eslint/no-shadow": ["error"],
     "@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,
@@ -59,32 +52,7 @@
       "singleLine": {
         "beforeColon": false,
         "afterColon": true
-      }}],
-    "@typescript-eslint/member-delimiter-style": 2,
-    "import/order": [
-      2,
-      {
-        "groups": ["builtin", "external", "parent", "sibling", "index", "type"],
-        "newlines-between": "always",
-        "pathGroups": [
-          {
-            "pattern": "{@(@actions|@app|@assets|@calls|@client|@components|@constants|@context|@database|@helpers|@hooks|@init|@managers|@queries|@screens|@selectors|@share|@store|@telemetry|@typings|@test|@utils)/**,@(@constants|@i18n|@notifications|@store|@websocket)}",
-            "group": "external",
-            "position": "after"
-          },
-          {
-            "pattern": "app/**",
-            "group": "parent",
-            "position": "before"
-          }
-        ],
-        "alphabetize": {
-          "order": "asc",
-          "caseInsensitive": true
-        },
-        "pathGroupsExcludedImportTypes": ["type"]
-      }
-    ]
+      }}]
   },
   "overrides": [
     {

.flowconfig

@@ -8,11 +8,13 @@
 ; 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
 
-.*/node_modules/resolve/test/resolver/malformed_package_json/package\.json$
-
 [untyped]
 .*/node_modules/@react-native-community/cli/.*/.*
 
@@ -28,10 +30,6 @@ emoji=true
 esproposal.optional_chaining=enable
 esproposal.nullish_coalescing=enable
 
-exact_by_default=true
-
-format.bracket_spacing=false
-
 module.file_ext=.js
 module.file_ext=.json
 module.file_ext=.ios.js
@@ -46,6 +44,10 @@ suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
+
 [lints]
 sketchy-null-number=warn
 sketchy-null-mixed=warn
@@ -56,6 +58,8 @@ deprecated-type=warn
 unsafe-getters-setters=warn
 inexact-spread=warn
 unnecessary-invariant=warn
+signature-verification-failure=warn
+deprecated-utility=error
 
 [strict]
 deprecated-type
@@ -67,4 +71,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.182.0
+^0.122.0

.gitattributes

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

.github/ISSUE_TEMPLATE.md

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

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,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/codeql/codeql-config.yml

@@ -1,13 +0,0 @@
-name: "CodeQL config"
-
-query-filters:
-  - exclude:
-      problem.severity:
-        - warning
-        - recommendation
-  - exclude:
-      id: js/insecure-randomness
-
-paths-ignore:
-  - test
-  - '**/*.test.*'

.github/workflows/codeql-analysis.yml

@@ -1,42 +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'
-
-permissions:
-  contents: read
-
-jobs:
-  analyze:
-    permissions:
-      security-events: write
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        config-file: ./.github/codeql/codeql-config.yml
-
-    # Autobuild attempts to build any compiled languages
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2

.gitignore

@@ -7,11 +7,6 @@ mattermost.keystore
 tmp/
 .env
 env.d.ts
-*.apk
-*.aab
-*.ipa
-
-*/**/compass-icons.ttf
 
 # OSX
 #
@@ -19,7 +14,7 @@ env.d.ts
 
 # Xcode
 #
-ios/build/*
+build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -33,11 +28,12 @@ xcuserdata
 *.moved-aside
 DerivedData
 *.hmap
+*.ipa
+*.apk
 *.xcuserstate
 project.xcworkspace
 ios/Pods
 .podinstall
-ios/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -45,13 +41,7 @@ ios/.xcode.env.local
 .gradle
 local.properties
 *.iml
-*.hprof
-.cxx/
-*.keystore
-!debug.keystore
 android/app/bin
-android/app/build
-android/build
 .settings
 .project
 .classpath
@@ -64,6 +54,12 @@ npm-debug.log
 yarn-error.log
 .yarninstall
 
+# BUCK
+buck-out/
+\.buckd/
+android/app/libs
+*.keystore
+
 # Vim
 [._]*.s[a-w][a-z]
 [._]s[a-w][a-z]
@@ -80,11 +76,11 @@ tags
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/
 
-**/fastlane/report.xml
-**/fastlane/Preview.html
-**/fastlane/screenshots
-**/fastlane/test_output
-**/fastlane/.env
+*/fastlane/report.xml
+*/fastlane/Preview.html
+*/fastlane/screenshots
+fastlane/.env
+fastlane/report.xml
 
 # Sentry
 android/sentry.properties
@@ -99,18 +95,9 @@ coverage
 mattermost-license.txt
 *.mattermost-license
 detox/artifacts
-detox/detox_pixel_*
 
 # Bundle artifact
 *.jsbundle
 
 #editor-settings
 .vscode
-.scannerwork
-launch.json
-
-# Notice.txt generation
-!build/notice-file
-
-# Temporary files created by Metro to check the health of the file watcher
-.metro-health-check*

.husky/.gitignore

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

.husky/pre-commit

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

.solidarity

@@ -1,72 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/solidaritySchema",
-  "config" : {
-    "output" : "moderate"
-  },
-  "requirements": {
-    "Node": [
-      {
-        "rule": "cli",
-        "binary": "node",
-        "semver": ">=16.0.0",
-        "error": "install node using nvm https://github.com/nvm-sh/nvm#installing-and-updating"
-      },
-      {
-        "rule": "cli",
-        "binary": "npm",
-        "semver": ">=8.5.5 <9.0.0",
-        "error": "install npm 8.5.5 `npm i -g npm@8.5.5"
-      }
-    ],
-    "Android": [
-      {
-        "rule": "cli",
-        "binary": "emulator"
-      },
-      {
-        "rule": "cli",
-        "binary": "android"
-      },
-      {
-        "rule": "env",
-        "variable": "ANDROID_HOME",
-        "error": "The ANDROID_HOME environment variable must be set to your local SDK.  Refer to getting started docs for help."
-      }
-    ],
-    "iOS": [
-      {
-        "rule": "cli",
-        "binary": "watchman",
-        "error": "install watchman `brew install watchman`",
-        "platform": "darwin"
-      },
-      {
-        "rule": "cli",
-        "binary": "xcodebuild",
-        "semver": ">=13.0",
-        "error": "install xcode",
-        "platform": "darwin"
-      },
-      {
-        "rule": "cli",
-        "binary": "ruby",
-        "semver": ">=2.7.1 <3.0.0",
-        "error": "visit rvm install https://rvm.io/rvm/install",
-        "platform": "darwin"
-      },
-      {
-        "rule": "cli",
-        "binary": "pod",
-        "semver": "1.11.3",
-        "platform": "darwin"
-      }
-    ],
-    "Git email": [
-      {
-        "rule": "shell",
-        "command": "git config user.email",
-        "match": ".+@.+"
-      }
-    ]
-  }
-}

.storybook/main.js

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

.storybook/preview.js

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

ISSUE_TEMPLATE.md

@@ -1,4 +1,4 @@
-Submit feature requests to https://mattermost.com/suggestions/. 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.

README.md

@@ -1,10 +1,12 @@
 # Mattermost Mobile v2
 
-- **Minimum Server versions:** Current ESR version (7.1.0+)
-- **Supported iOS versions:** 12.1+
+This is a work in progress branch for the next major version of the Mattermost mobile app. Once the work is completed and ready to share,  this brach will be set as the default branch in this repository.
+
+- **Minimum Server versions:** Current ESR version (5.25)
+- **Supported iOS versions:** 11+
 - **Supported Android versions:** 7.0+
 
-Mattermost is an open source Slack-alternative used by thousands of companies around the world in 21 languages. Learn more at [https://about.mattermost.com](https://about.mattermost.com).
+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).
 
 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/). 
 
@@ -49,9 +51,15 @@ You can leave the Beta testing program at any time:
 
 App data is wiped from the device when a user logs out of the app. If the user is logged in when the account is deactivated, then within one minute the system logs the user out, and as a result all app data is wiped from the device.
 
-### I need the code for the v1 version
+### Can I connect to multiple Mattermost servers using the mobile apps?
 
-You can still access it! We have moved the code from master to the [v1 branch](https://github.com/mattermost/mattermost-mobile/tree/v1). Be aware that we will not be providing any more v1 versions or updates in the public stores.
+At the moment, we only support connecting to one server at a time. If you need to connect to multiple servers, please [upvote the feature request](https://mattermost.uservoice.com/forums/306457/suggestions/10975938) so we can track demand for it. 
+
+As a work around, you can install both the released "Mattermost" app and sign up to be a [tester](#testing) for the "Mattermost Beta" app so you can connect to two servers at once.
+
+### Will there be second generation apps available for tablets?
+
+We plan to add support for tablets in the future, but the timeline depends on how many people have a need for it. If you're looking for a tablet version, please help us out by [upvoting the feature request](https://mattermost.uservoice.com/forums/306457/suggestions/20082079)!
 
 # Troubleshooting
 

android/app/BUCK

@@ -0,0 +1,65 @@
+# To learn about Buck see [Docs](https://buckbuild.com/).
+# To run your application with Buck:
+# - install Buck
+# - `npm start` - to start the packager
+# - `cd android`
+# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
+# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
+# - `buck install -r android/app` - compile, install and run application
+#
+
+lib_deps = []
+
+for jarfile in glob(['libs/*.jar']):
+  name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
+  lib_deps.append(':' + name)
+  prebuilt_jar(
+    name = name,
+    binary_jar = jarfile,
+  )
+
+for aarfile in glob(['libs/*.aar']):
+  name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
+  lib_deps.append(':' + name)
+  android_prebuilt_aar(
+    name = name,
+    aar = aarfile,
+  )
+
+android_library(
+    name = "all-libs",
+    exported_deps = lib_deps,
+)
+
+android_library(
+    name = "app-code",
+    srcs = glob([
+        "src/main/java/**/*.java",
+    ]),
+    deps = [
+        ":all-libs",
+        ":build_config",
+        ":res",
+    ],
+)
+
+android_build_config(
+    name = "build_config",
+    package = "com.mattermost.rnbeta",
+)
+
+android_resource(
+    name = "res",
+    package = "com.mattermost.rnbeta",
+    res = "src/main/res",
+)
+
+android_binary(
+    name = "app",
+    keystore = "//android/keystores:debug",
+    manifest = "src/main/AndroidManifest.xml",
+    package_type = "debug",
+    deps = [
+        ":app-code",
+    ],
+)

android/app/build.gradle

@@ -1,54 +1,88 @@
 apply plugin: "com.android.application"
-apply plugin: "com.facebook.react"
+apply from: '../../node_modules/react-native-unimodules/gradle.groovy'
 apply plugin: 'kotlin-android'
+import com.android.build.OutputFile
 
 /**
- * This is the configuration block to customize your React Native Android app.
- * By default you don't need to apply any configuration, just uncomment the lines you need.
+ * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
+ * and bundleReleaseJsAndAssets).
+ * These basically call `react-native bundle` with the correct arguments during the Android build
+ * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
+ * bundle directly from the development server. Below you can see all the possible configurations
+ * and their defaults. If you decide to add a configuration block, make sure to add it before the
+ * `apply from: "../../node_modules/react-native/react.gradle"` line.
+ *
+ * project.ext.react = [
+ *   // 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.
+ *   entryFile: "index.android.js",
+ *
+ *   // whether to bundle JS and assets in debug mode
+ *   bundleInDebug: false,
+ *
+ *   // whether to bundle JS and assets in release mode
+ *   bundleInRelease: true,
+ *
+ *   // whether to bundle JS and assets in another build variant (if configured).
+ *   // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
+ *   // The configuration property can be in the following formats
+ *   //         'bundleIn${productFlavor}${buildType}'
+ *   //         'bundleIn${buildType}'
+ *   // bundleInFreeDebug: true,
+ *   // bundleInPaidRelease: true,
+ *   // bundleInBeta: true,
+ *
+ *   // whether to disable dev mode in custom build variants (by default only disabled in release)
+ *   // for example: to disable dev mode in the staging build type (if configured)
+ *   devDisabledInStaging: true,
+ *   // The configuration property can be in the following formats
+ *   //         'devDisabledIn${productFlavor}${buildType}'
+ *   //         'devDisabledIn${buildType}'
+ *
+ *   // the root of your project, i.e. where "package.json" lives
+ *   root: "../../",
+ *
+ *   // where to put the JS bundle asset in debug mode
+ *   jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
+ *
+ *   // where to put the JS bundle asset in release mode
+ *   jsBundleDirRelease: "$buildDir/intermediates/assets/release",
+ *
+ *   // where to put drawable resources / React Native assets, e.g. the ones you use via
+ *   // require('./image.png')), in debug mode
+ *   resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
+ *
+ *   // where to put drawable resources / React Native assets, e.g. the ones you use via
+ *   // require('./image.png')), in release mode
+ *   resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
+ *
+ *   // by default the gradle tasks are skipped if none of the JS files or assets change; this means
+ *   // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
+ *   // date; if you have any other folders that you want to ignore for performance reasons (gradle
+ *   // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
+ *   // for example, you might want to remove it from here.
+ *   inputExcludes: ["android/**", "ios/**"],
+ *
+ *   // override which node gets called and with what additional arguments
+ *   nodeExecutableAndArgs: ["node"],
+ *
+ *   // supply additional arguments to the packager
+ *   extraPackagerArgs: []
+ * ]
  */
 
- react {
-    /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    // root = file("../")
-    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen
-    // codegenDir = file("../node_modules/react-native-codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    // cliFile = file("../node_modules/react-native/cli.js")
-    /* Variants */
-    //   The list of variants to that are debuggable. For those we're going to
-    //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
-    //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
-    // debuggableVariants = ["liteDebug", "prodDebug"]
-    /* Bundling */
-    //   A list containing the node command and its flags. Default is just 'node'.
-    // nodeExecutableAndArgs = ["node"]
-    //
-    //   The command to run when bundling. By default is 'bundle'
-    // bundleCommand = "ram-bundle"
-    //
-    //   The path to the CLI configuration file. Default is empty.
-    // bundleConfig = file(../rn-cli.config.js)
-    //
-    //   The name of the generated asset file containing your JS bundle
-    // bundleAssetName = "MyApplication.android.bundle"
-    //
-    //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
-    entryFile = file("../../index.ts")
-    //
-    //   A list of extra flags to pass to the 'bundle' commands.
-    //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
-    // extraPackagerArgs = []
-    /* Hermes Commands */
-    //   The hermes compiler command to run. By default it is 'hermesc'
-    // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
-    //
-    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
-    // hermesFlags = ["-O", "-output-source-map"]
-}
+project.ext.react = [
+    entryFile: "index.ts",
+    bundleConfig: "metro.config.js",
+    bundleCommand: "bundle",
+    enableHermes: true,
+]
 
+apply from: "../../node_modules/react-native/react.gradle"
 apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
 
 if (System.getenv("SENTRY_ENABLED") == "true") {
@@ -61,61 +95,50 @@ if (System.getenv("SENTRY_ENABLED") == "true") {
 }
 
 /**
- * Set this to true to create four separate APKs instead of one,
- * one for each native architecture. This is useful if you don't
- * use App Bundles (https://developer.android.com/guide/app-bundle/)
- * and want to have separate APKs to upload to the Play Store
+ * Set this to true to create two separate APKs instead of one:
+ *   - An APK that only works on ARM devices
+ *   - An APK that only works on x86 devices
+ * The advantage is the size of the APK is reduced by about 4MB.
+ * 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
 
 /**
- * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
+ * Run Proguard to shrink the Java bytecode in release builds.
  */
 def enableProguardInReleaseBuilds = false
 
-/**
- * The preferred build flavor of JavaScriptCore (JSC)
- *
- * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
- *
- * The international variant includes ICU i18n library and necessary data
- * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
- * give correct results when using with locales other than en-US. Note that
- * this variant is about 6MiB larger per architecture than default.
- */
 def jscFlavor = 'org.webkit:android-jsc-intl:+'
 
 /**
- * Private function to get the list of Native Architectures you want to build.
- * This reads the value from reactNativeArchitectures in your gradle.properties
- * file and works together with the --active-arch-only flag of react-native run-android.
+ * Whether to enable the Hermes VM.
+ *
+ * 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 reactNativeArchitectures() {
-    def value = project.getProperties().get("reactNativeArchitectures")
-    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
+def enableHermes = project.ext.react.get("enableHermes", false);
 
 android {
-    ndkVersion rootProject.ext.ndkVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
-    namespace "com.mattermost.rnbeta"
 
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
+    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 461
-        versionName "2.1.0"
+        missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
+        versionCode 333
+        versionName "2.0.0"
+        multiDexEnabled = true
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
-
     signingConfigs {
         release {
             if (project.hasProperty('MATTERMOST_RELEASE_STORE_FILE')) {
@@ -125,39 +148,24 @@ android {
                 keyPassword MATTERMOST_RELEASE_PASSWORD
             }
         }
-        debug {
-            storeFile file('debug.keystore')
-            storePassword 'android'
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-        }
     }
     splits {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk enableSeparateBuildPerCPUArchitecture  // If true, also generate a universal APK
-            include (*reactNativeArchitectures())
+            include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
     buildTypes {
-        def useReleaseKey = project.hasProperty('MATTERMOST_RELEASE_STORE_FILE')
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
-            if (useReleaseKey) {
-                signingConfig signingConfigs.release
-            } else {
-                signingConfig signingConfigs.debug
-            }
+            signingConfig signingConfigs.release
         }
         debug {
-            if (useReleaseKey) {
-                signingConfig signingConfigs.release
-            } else {
-                signingConfig signingConfigs.debug
-            }
+            minifyEnabled enableProguardInReleaseBuilds
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
         unsigned.initWith(buildTypes.release)
         unsigned {
@@ -171,13 +179,19 @@ android {
             // For each separate APK per architecture, set a unique version code as described here:
             // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
             def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3, "x86_64": 4]
-            def abi = output.filters[0]
+            def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
-                        versionCodes.get(abi.identifier) * 2000000 + defaultConfig.versionCode
+                        versionCodes.get(abi) * 2000000 + defaultConfig.versionCode
             }
         }
     }
+
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
 }
 
 repositories {
@@ -186,72 +200,83 @@ repositories {
     }
 }
 
-dependencies {
-    // The version of react-native is set by the React Native Gradle Plugin
-    implementation("com.facebook.react:react-android")
-
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
-    if (hermesEnabled.toBoolean()) {
-        implementation("com.facebook.react:hermes-android")
-    } else {
-        implementation jscFlavor
-    }
-
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
-    implementation 'io.reactivex.rxjava3:rxjava:3.1.6'
-    implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
-    implementation 'androidx.window:window-rxjava3:1.0.0'
-    implementation 'androidx.window:window:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.8.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "com.google.firebase:firebase-messaging:$firebaseVersion"
-
-    androidTestImplementation('com.wix:detox:+')
-    implementation project(':reactnativenotifications')
-    implementation project(':watermelondb')
-    implementation project(':watermelondb-jsi')
-}
-
 configurations.all {
     resolutionStrategy {
         eachDependency { DependencyResolveDetails details ->
             if (details.requested.name == 'play-services-base') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '18.1.0'
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
             }
             if (details.requested.name == 'play-services-tasks') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '18.0.2'
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
             }
             if (details.requested.name == 'play-services-stats') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '17.0.3'
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
             }
             if (details.requested.name == 'play-services-basement') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '18.1.0'
-            }
-            if (details.requested.name == 'okhttp') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.10.0'
-            }
-            if (details.requested.name == 'okhttp-tls') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.10.0'
-            }
-            if (details.requested.name == 'okhttp-urlconnection') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.10.0'
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
             }
         }
     }
 }
 
+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"
+
+    addUnimodulesDependencies([exclude:  [
+        'expo-image-loader',
+        'expo-permissions',
+        'expo-application',
+        'expo-face-detector',
+    ]])
+
+    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")
+        releaseImplementation files(hermesPath + "hermes-release.aar")
+        unsignedImplementation files(hermesPath + "hermes-release.aar")
+    } else {
+        implementation jscFlavor
+    }
+
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+
+    implementation project(':reactnativenotifications')
+    implementation "com.google.firebase:firebase-messaging:$firebaseVersion"
+
+    // 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:+')
+
+    implementation project(':watermelondb')
+}
+
 // 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'
 }
 

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

@@ -1,7 +1,6 @@
 package com.mattermost.rnbeta;
 
 import com.wix.detox.Detox;
-import com.wix.detox.config.DetoxConfig;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -20,11 +19,10 @@ public class DetoxTest {
 
     @Test
     public void runDetoxTests() {
-        DetoxConfig detoxConfig = new DetoxConfig();
-        detoxConfig.idlePolicyConfig.masterTimeoutSec = 90;
-        detoxConfig.idlePolicyConfig.idleResourceTimeoutSec = 60;
-        detoxConfig.rnContextLoadTimeoutSec = (BuildConfig.DEBUG ? 180 : 60);
+        Detox.DetoxIdlePolicyConfig idlePolicyConfig = new Detox.DetoxIdlePolicyConfig();
+        idlePolicyConfig.masterTimeoutSec = 60;
+        idlePolicyConfig.idleResourceTimeoutSec = 30;
 
-        Detox.runTests(mActivityRule, detoxConfig);
+        Detox.runTests(mActivityRule, idlePolicyConfig);
     }
 }

android/app/src/debug/AndroidManifest.xml

@@ -4,13 +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"
-            android:exported="false"
-        />
-    </application>
+    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
 </manifest>

android/app/src/debug/java/com/rn/ReactNativeFlipper.java

@@ -1,10 +1,10 @@
 /**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.mattermost.flipper;
+package com.rn;
 
 import android.content.Context;
 import com.facebook.flipper.android.AndroidFlipperClient;
@@ -17,29 +17,29 @@ 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.ReactInstanceEventListener;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.network.NetworkingModule;
-import com.mattermost.networkclient.RCTOkHttpClientFactory;
-
-/**
- * Class responsible of loading Flipper inside your React Native application. This is the debug
- * flavor of it. Here you can add your own plugins and customize the Flipper setup.
- */
+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();
-      RCTOkHttpClientFactory.Companion.setFlipperPlugin(networkFlipperPlugin);
       NetworkingModule.setCustomClientBuilder(
-              builder -> builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin)));
+          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
@@ -47,12 +47,17 @@ public class ReactNativeFlipper {
       ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
       if (reactContext == null) {
         reactInstanceManager.addReactInstanceEventListener(
-            new ReactInstanceEventListener() {
+            new ReactInstanceManager.ReactInstanceEventListener() {
               @Override
               public void onReactContextInitialized(ReactContext reactContext) {
                 reactInstanceManager.removeReactInstanceEventListener(this);
                 reactContext.runOnNativeModulesQueueThread(
-                        () -> client.addPlugin(new FrescoFlipperPlugin()));
+                    new Runnable() {
+                      @Override
+                      public void run() {
+                        client.addPlugin(new FrescoFlipperPlugin());
+                      }
+                    });
               }
             });
       } else {

android/app/src/main/AndroidManifest.xml

@@ -1,33 +1,14 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mattermost.rnbeta">
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission-sdk-23 android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
     <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.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-
-    <!-- Request legacy Bluetooth permissions on older devices. -->
-    <uses-permission android:name="android.permission.BLUETOOTH"
-        android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
-        android:maxSdkVersion="30" />
-
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:mimeType="*/*" />
-        </intent>
-    </queries>
 
     <application
       android:name=".MainApplication"
@@ -48,12 +29,9 @@
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:windowSoftInputMode="adjustResize"
-        android:launchMode="singleTask"
-        android:exported="true"
-        android:taskAffinity=""
-      >
+        android:launchMode="singleTask">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
@@ -65,42 +43,34 @@
           <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" />
       <receiver android:name=".NotificationReplyBroadcastReceiver"
                android:enabled="true"
                android:exported="false" />
-      <activity
-        android:name="com.reactnativenavigation.controllers.NavigationActivity"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-        android:resizeableActivity="true"
-        android:exported="true"
-      />
-      <activity
-        android:name="com.mattermost.share.ShareActivity"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-        android:windowSoftInputMode="adjustResize"
-        android:label="@string/app_name"
-        android:screenOrientation="portrait"
-        android:theme="@style/AppTheme"
-        android:taskAffinity="com.mattermost.share"
-        android:exported="true"
-      >
-          <intent-filter>
-              <action android:name="android.intent.action.SEND" />
-              <action android:name="android.intent.action.SEND_MULTIPLE" />
-              <category android:name="android.intent.category.DEFAULT" />
-              <!-- for sharing-->
-              <data android:mimeType="*/*" />
-          </intent-filter>
-      </activity>
-  </application>
+        <activity
+                android:name="com.reactnativenavigation.controllers.NavigationActivity"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+                android:resizeableActivity="true"/>
+        <activity
+                android:name="com.mattermost.share.ShareActivity"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+                android:label="@string/app_name"
+                android:screenOrientation="portrait"
+                android:theme="@style/AppTheme"
+                android:taskAffinity="com.mattermost.share"
+                android:launchMode="singleInstance">
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <!-- for sharing-->
+                <data android:mimeType="*/*" />
+            </intent-filter>
+        </activity>
+    </application>
+
 </manifest>

android/app/src/main/java/com/mattermost/helpers/AsyncStorage.java

@@ -0,0 +1,93 @@
+package com.mattermost.helpers;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.text.TextUtils;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.modules.storage.ReactDatabaseSupplier;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+
+/**
+ * AsyncStorage: Class that accesses React Native AsyncStorage Database synchronously
+ */
+public class AsyncStorage {
+
+    // Static variables from: com.facebook.react.modules.storage.ReactDatabaseSupplier
+    static final String TABLE_CATALYST = "catalystLocalStorage";
+    static final String KEY_COLUMN = "key";
+    static final String VALUE_COLUMN = "value";
+
+
+    private static final int MAX_SQL_KEYS = 999;
+
+    Context mReactContext = null;
+
+    public AsyncStorage(Context mReactContext) {
+        this.mReactContext = mReactContext;
+    }
+
+    public HashMap<String, String> multiGet(ReadableArray keys) {
+        HashMap<String, String> results = new HashMap<>(keys.size());
+
+        HashSet<String> keysRemaining = new HashSet<>();
+        String[] columns = {KEY_COLUMN, VALUE_COLUMN};
+        ReactDatabaseSupplier reactDatabaseSupplier = ReactDatabaseSupplier.getInstance(this.mReactContext);
+        for (int keyStart = 0; keyStart < keys.size(); keyStart += MAX_SQL_KEYS) {
+            int keyCount = Math.min(keys.size() - keyStart, MAX_SQL_KEYS);
+            Cursor cursor = reactDatabaseSupplier.get().query(
+                    TABLE_CATALYST,
+                    columns,
+                    buildKeySelection(keyCount),
+                    buildKeySelectionArgs(keys, keyStart, keyCount),
+                    null,
+                    null,
+                    null);
+            keysRemaining.clear();
+
+            try {
+                if (cursor.getCount() != keys.size()) {
+                    // some keys have not been found - insert them with null into the final array
+                    for (int keyIndex = keyStart; keyIndex < keyStart + keyCount; keyIndex++) {
+                        keysRemaining.add(keys.getString(keyIndex));
+                    }
+                }
+
+                if (cursor.moveToFirst()) {
+                    do {
+                        results.put(cursor.getString(0), cursor.getString(1));
+                        keysRemaining.remove(cursor.getString(0));
+                    } while (cursor.moveToNext());
+                }
+            } catch (Exception e) {
+                return new HashMap<>(1);
+            } finally {
+                cursor.close();
+            }
+
+            for (String key : keysRemaining) {
+                results.put(key, null);
+            }
+            keysRemaining.clear();
+        }
+
+        return results;
+    }
+
+    private static String buildKeySelection(int selectionCount) {
+        String[] list = new String[selectionCount];
+        Arrays.fill(list, "?");
+        return KEY_COLUMN + " IN (" + TextUtils.join(", ", list) + ")";
+    }
+
+    private static String[] buildKeySelectionArgs(ReadableArray keys, int start, int count) {
+        String[] selectionArgs = new String[count];
+        for (int keyIndex = 0; keyIndex < count; keyIndex++) {
+            selectionArgs[keyIndex] = keys.getString(start + keyIndex);
+        }
+        return selectionArgs;
+    }
+}

android/app/src/main/java/com/mattermost/helpers/BitmapCache.kt

@@ -1,49 +0,0 @@
-package com.mattermost.helpers
-
-import android.graphics.Bitmap
-import android.util.LruCache
-
-class BitmapCache {
-    private var memoryCache: LruCache<String, Bitmap>
-    private var keysCache: LruCache<String, String>
-
-    init {
-        val maxMemory = (Runtime.getRuntime().maxMemory() / 1024).toInt()
-        val cacheSize = maxMemory / 8
-        memoryCache = object : LruCache<String, Bitmap>(cacheSize) {
-            override fun sizeOf(key: String, bitmap: Bitmap): Int {
-                return bitmap.byteCount / 1024
-            }
-        }
-        keysCache = LruCache<String, String>(50)
-    }
-
-    fun bitmap(userId: String, updatedAt: Double, serverUrl: String): Bitmap? {
-        val key = "$serverUrl-$userId-$updatedAt"
-        return memoryCache.get(key)
-    }
-
-    fun insertBitmap(bitmap: Bitmap?, userId: String, updatedAt: Double, serverUrl: String) {
-        if (bitmap == null) {
-            removeBitmap(userId, serverUrl)
-        }
-        val key = "$serverUrl-$userId-$updatedAt"
-        val cachedKey = "$serverUrl-$userId"
-        keysCache.put(cachedKey, key)
-        memoryCache.put(key, bitmap)
-    }
-
-    fun removeBitmap(userId: String, serverUrl: String) {
-        val cachedKey = "$serverUrl-$userId"
-        val key = keysCache.get(cachedKey)
-        if (key != null) {
-            memoryCache.remove(key)
-            keysCache.remove(cachedKey)
-        }
-    }
-
-    fun removeAllBitmaps() {
-        memoryCache.evictAll()
-        keysCache.evictAll()
-    }
-}

android/app/src/main/java/com/mattermost/helpers/Credentials.java

@@ -1,48 +1,35 @@
 package com.mattermost.helpers;
 
-import androidx.annotation.Nullable;
+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.WritableMap;
 import com.oblador.keychain.KeychainModule;
 
 
 public class Credentials {
-    public static void getCredentialsForServer(ReactApplicationContext context, String serverUrl, ResolvePromise promise) {
+    static final String CURRENT_SERVER_URL = "@currentServerUrl";
+
+    public static void getCredentialsForCurrentServer(ReactApplicationContext context, ResolvePromise promise) {
         final KeychainModule keychainModule = new KeychainModule(context);
-
-        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 String getCredentialsForServerSync(ReactApplicationContext context, String serverUrl) {
-        final String[] token = new String[1];
-        Credentials.getCredentialsForServer(context, serverUrl, new ResolvePromise() {
+        final AsyncStorage asyncStorage = new AsyncStorage(context);
+        final ArrayList<String> keys = new ArrayList<String>(1);
+        keys.add(CURRENT_SERVER_URL);
+        KeysReadableArray asyncStorageKeys = new KeysReadableArray() {
             @Override
-            public void resolve(@Nullable Object value) {
-                WritableMap map = (WritableMap) value;
-                if (map != null) {
-                    token[0] = map.getString("password");
-                    String service = map.getString("service");
-                    assert service != null;
-                    if (service.isEmpty()) {
-                        String[] credentials = token[0].split(", *");
-                        if (credentials.length == 2) {
-                            token[0] = credentials[0];
-                        }
-                    }
-                }
+            public int size() {
+                return keys.size();
             }
-        });
 
-        return token[0];
+            @Override
+            public String getString(int index) {
+                return keys.get(index);
+            }
+        };
+
+        HashMap<String, String> asyncStorageResults = asyncStorage.multiGet(asyncStorageKeys);
+        String serverUrl = asyncStorageResults.get(CURRENT_SERVER_URL);
+
+        keychainModule.getGenericPasswordForOptions(serverUrl, promise);
     }
 }

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

@@ -1,456 +0,0 @@
-package com.mattermost.helpers;
-
-import android.annotation.SuppressLint;
-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.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.os.Build;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-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.mattermost.rnbeta.*;
-import com.nozbe.watermelondb.Database;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.Objects;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-import static com.mattermost.helpers.database_extension.GeneralKt.getDatabaseForServer;
-import static com.mattermost.helpers.database_extension.UserKt.getLastPictureUpdate;
-
-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";
-    public static final String NOTIFICATION = "notification";
-    public static final String PUSH_TYPE_MESSAGE = "message";
-    public static final String PUSH_TYPE_CLEAR = "clear";
-    public static final String PUSH_TYPE_SESSION = "session";
-
-    private static NotificationChannel mHighImportanceChannel;
-    private static NotificationChannel mMinImportanceChannel;
-
-    private static final OkHttpClient client = new OkHttpClient();
-
-    private static final BitmapCache bitmapCache = new BitmapCache();
-
-    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");
-        String serverUrl = bundle.getString("server_url");
-        String type = bundle.getString("type");
-        String urlOverride = bundle.getString("override_icon_url");
-        if (senderId == null) {
-            senderId = "sender_id";
-        }
-        String senderName = getSenderName(bundle);
-
-        if (conversationTitle == null || !android.text.TextUtils.isEmpty(senderName.trim())) {
-            message = removeSenderNameFromMessage(message, senderName);
-        }
-
-        long timestamp = new Date().getTime();
-        Person.Builder sender = new Person.Builder()
-                .setKey(senderId)
-                .setName(senderName);
-
-        if (serverUrl != null && !type.equals(CustomPushNotificationHelper.PUSH_TYPE_SESSION)) {
-            try {
-                Bitmap avatar = userAvatar(context, serverUrl, senderId, urlOverride);
-                if (avatar != null) {
-                    sender.setIcon(IconCompat.createWithBitmap(avatar));
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        messagingStyle.addMessage(message, timestamp, sender.build());
-    }
-
-    private static void addNotificationExtras(NotificationCompat.Builder notification, Bundle bundle) {
-        Bundle userInfoBundle = bundle.getBundle("userInfo");
-        if (userInfoBundle == null) {
-            userInfoBundle = new Bundle();
-        }
-
-        String channelId = bundle.getString("channel_id");
-        if (channelId != null) {
-            userInfoBundle.putString("channel_id", channelId);
-        }
-
-        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 crtEnabled = bundle.getString("is_crt_enabled");
-        if (crtEnabled != null) {
-            userInfoBundle.putString("is_crt_enabled", crtEnabled);
-        }
-
-        String serverUrl = bundle.getString("server_url");
-        if (serverUrl != null) {
-            userInfoBundle.putString("server_url", serverUrl);
-        }
-
-        notification.addExtras(userInfoBundle);
-    }
-
-    @SuppressLint("UnspecifiedImmutableFlag")
-    private static void addNotificationReplyAction(Context context, NotificationCompat.Builder notification, Bundle bundle, int notificationId) {
-        String postId = bundle.getString("post_id");
-        String serverUrl = bundle.getString("server_url");
-
-        if (android.text.TextUtils.isEmpty(postId) || serverUrl == null) {
-            return;
-        }
-
-        Intent replyIntent = new Intent(context, NotificationReplyBroadcastReceiver.class);
-        replyIntent.setAction(KEY_TEXT_REPLY);
-        replyIntent.putExtra(NOTIFICATION_ID, notificationId);
-        replyIntent.putExtra(NOTIFICATION, bundle);
-
-        PendingIntent replyPendingIntent;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            replyPendingIntent = PendingIntent.getBroadcast(
-                    context,
-                    notificationId,
-                    replyIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
-        } else {
-            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;
-
-        boolean is_crt_enabled = bundle.containsKey("is_crt_enabled") && 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);
-
-        setNotificationChannel(context, notification);
-        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");
-        }
-
-        if (android.text.TextUtils.isEmpty(title)) {
-            title = bundle.getString("title", "");
-        }
-
-        return title;
-    }
-
-    private static NotificationCompat.MessagingStyle getMessagingStyle(Context context, Bundle bundle) {
-        NotificationCompat.MessagingStyle messagingStyle;
-        final String senderId = "me";
-        final String serverUrl = bundle.getString("server_url");
-        final String type = bundle.getString("type");
-        String urlOverride = bundle.getString("override_icon_url");
-
-        Person.Builder sender = new Person.Builder()
-                .setKey(senderId)
-                .setName("Me");
-
-        if (serverUrl != null && !type.equals(CustomPushNotificationHelper.PUSH_TYPE_SESSION)) {
-            try {
-                Bitmap avatar = userAvatar(context, serverUrl, "me", urlOverride);
-                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);
-    }
-
-    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 setNotificationChannel(Context context, NotificationCompat.Builder notification) {
-        // If Android Oreo or above we need to register a channel
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
-        }
-
-        if (mHighImportanceChannel == null) {
-            createNotificationChannels(context);
-        }
-        NotificationChannel notificationChannel = mHighImportanceChannel;
-        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
-        final String PUSH_NOTIFICATION_EXTRA_NAME = "pushNotification";
-        Intent delIntent = new Intent(context, NotificationDismissService.class);
-        delIntent.putExtra(NOTIFICATION_ID, notificationId);
-        delIntent.putExtra(PUSH_NOTIFICATION_EXTRA_NAME, bundle);
-        @SuppressLint("UnspecifiedImmutableFlag")
-        PendingIntent deleteIntent = PendingIntent.getService(context, (int) System.currentTimeMillis(), delIntent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
-        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 channelName = getConversationTitle(bundle);
-        String senderName = bundle.getString("sender_name");
-        String serverUrl = bundle.getString("server_url");
-        String urlOverride = bundle.getString("override_icon_url");
-
-        notification.setSmallIcon(R.mipmap.ic_notification);
-
-        if (serverUrl != null && channelName.equals(senderName)) {
-            try {
-                String senderId = bundle.getString("sender_id");
-                Bitmap avatar = userAvatar(context, serverUrl, senderId, urlOverride);
-                if (avatar != null) {
-                    notification.setLargeIcon(avatar);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static Bitmap userAvatar(final Context context, @NonNull final String serverUrl, final String userId, final String urlOverride) throws IOException {
-        try {
-            Response response;
-            Double lastUpdateAt = 0.0;
-            if (!TextUtils.isEmpty(urlOverride)) {
-                Request request = new Request.Builder().url(urlOverride).build();
-                Log.i("ReactNative", String.format("Fetch override profile image %s", urlOverride));
-                response = client.newCall(request).execute();
-            } else {
-                DatabaseHelper dbHelper = DatabaseHelper.Companion.getInstance();
-                if (dbHelper != null) {
-                    Database db = getDatabaseForServer(dbHelper, context, serverUrl);
-                    if (db != null) {
-                        lastUpdateAt = getLastPictureUpdate(db, userId);
-                        if (lastUpdateAt == null) {
-                            lastUpdateAt = 0.0;
-                        }
-                        db.close();
-                    }
-                }
-                Bitmap cached = bitmapCache.bitmap(userId, lastUpdateAt, serverUrl);
-                if (cached != null) {
-                    Bitmap bitmap = cached.copy(cached.getConfig(), false);
-                    return getCircleBitmap(bitmap);
-                }
-
-                bitmapCache.removeBitmap(userId, serverUrl);
-                String url = String.format("api/v4/users/%s/image", userId);
-                Log.i("ReactNative", String.format("Fetch profile image %s", url));
-                response = Network.getSync(serverUrl, url, null);
-            }
-
-            if (response.code() == 200) {
-                assert response.body() != null;
-                byte[] bytes = Objects.requireNonNull(response.body()).bytes();
-                Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
-                if (TextUtils.isEmpty(urlOverride) && !TextUtils.isEmpty(userId)) {
-                    bitmapCache.insertBitmap(bitmap.copy(bitmap.getConfig(), false), userId, lastUpdateAt, serverUrl);
-                }
-                return getCircleBitmap(bitmap);
-            }
-
-            return null;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-}

android/app/src/main/java/com/mattermost/helpers/DatabaseHelper.kt

@@ -1,75 +0,0 @@
-package com.mattermost.helpers
-
-import android.content.Context
-import android.net.Uri
-
-import com.nozbe.watermelondb.Database
-
-import java.lang.Exception
-
-import org.json.JSONArray
-import org.json.JSONObject
-
-class DatabaseHelper {
-    var defaultDatabase: Database? = null
-
-    val onlyServerUrl: String?
-        get() {
-            try {
-                val query = "SELECT url FROM Servers WHERE last_active_at != 0 AND identifier != ''"
-                defaultDatabase!!.rawQuery(query).use { cursor ->
-                    if (cursor.count == 1) {
-                        cursor.moveToFirst()
-                        return cursor.getString(0)
-                    }
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                // let it fall to return null
-            }
-            return null
-        }
-
-    fun init(context: Context) {
-        if (defaultDatabase == null) {
-            setDefaultDatabase(context)
-        }
-    }
-
-    private fun setDefaultDatabase(context: Context) {
-        val databaseName = "app.db"
-        val databasePath = Uri.fromFile(context.filesDir).toString() + "/" + databaseName
-        defaultDatabase = Database(databasePath, context)
-    }
-
-    internal fun JSONObject.toMap(): Map<String, Any?> = keys().asSequence().associateWith { it ->
-        when (val value = this[it])
-        {
-            is JSONArray ->
-            {
-                val map = (0 until value.length()).associate { Pair(it.toString(), value[it]) }
-                JSONObject(map).toMap().values.toList()
-            }
-            is JSONObject -> {
-                value.toMap()
-            }
-            JSONObject.NULL -> {
-                null
-            }
-            else            -> {
-                value
-            }
-        }
-    }
-
-    companion object {
-        var instance: DatabaseHelper? = null
-            get() {
-                if (field == null) {
-                    field = DatabaseHelper()
-                }
-                return field
-            }
-            private set
-    }
-}

android/app/src/main/java/com/mattermost/helpers/KeysReadableArray.java

@@ -0,0 +1,68 @@
+package com.mattermost.helpers;
+
+import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableType;
+
+import java.util.ArrayList;
+
+/**
+ * KeysReadableArray: Helper class that abstracts boilerplate
+ */
+public class KeysReadableArray implements ReadableArray {
+    @Override
+    public int size() {
+        return 0;
+    }
+
+    @Override
+    public boolean isNull(int index) {
+        return false;
+    }
+
+    @Override
+    public boolean getBoolean(int index) {
+        return false;
+    }
+
+    @Override
+    public double getDouble(int index) {
+        return 0;
+    }
+
+    @Override
+    public int getInt(int index) {
+        return 0;
+    }
+
+    @Override
+    public String getString(int index) {
+        return null;
+    }
+
+    @Override
+    public ReadableArray getArray(int index) {
+        return null;
+    }
+
+    @Override
+    public ReadableMap getMap(int index) {
+        return null;
+    }
+
+    @Override
+    public Dynamic getDynamic(int index) {
+        return null;
+    }
+
+    @Override
+    public ReadableType getType(int index) {
+        return null;
+    }
+
+    @Override
+    public ArrayList<Object> toArrayList() {
+        return null;
+    }
+}

android/app/src/main/java/com/mattermost/helpers/Network.java

@@ -1,78 +0,0 @@
-package com.mattermost.helpers;
-
-import android.content.Context;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.ReadableMap;
-
-import com.mattermost.networkclient.APIClientModule;
-import com.mattermost.networkclient.enums.RetryTypes;
-
-import okhttp3.HttpUrl;
-import okhttp3.Response;
-
-
-public class Network {
-    private static APIClientModule clientModule;
-    private static final WritableMap clientOptions = Arguments.createMap();
-    private static final Promise emptyPromise = new ResolvePromise();
-
-    public static void init(Context context) {
-        final ReactApplicationContext reactContext = new ReactApplicationContext(context);
-        clientModule = new APIClientModule(reactContext);
-        createClientOptions();
-    }
-
-    public static void get(String baseUrl, String endpoint, ReadableMap options, Promise promise) {
-        createClientIfNeeded(baseUrl);
-        clientModule.get(baseUrl, endpoint, options, promise);
-    }
-
-    public static void post(String baseUrl, String endpoint, ReadableMap options, Promise promise) {
-        createClientIfNeeded(baseUrl);
-        clientModule.post(baseUrl, endpoint, options, promise);
-    }
-
-    public static Response getSync(String baseUrl, String endpoint, ReadableMap options) {
-        createClientIfNeeded(baseUrl);
-        return clientModule.getSync(baseUrl, endpoint, options);
-    }
-
-    public static Response postSync(String baseUrl, String endpoint, ReadableMap options) {
-        createClientIfNeeded(baseUrl);
-        return clientModule.postSync(baseUrl, endpoint, options);
-    }
-
-    private static void createClientOptions() {
-        WritableMap headers = Arguments.createMap();
-        headers.putString("X-Requested-With", "XMLHttpRequest");
-        clientOptions.putMap("headers", headers);
-
-        WritableMap retryPolicyConfiguration = Arguments.createMap();
-        retryPolicyConfiguration.putString("type", RetryTypes.EXPONENTIAL_RETRY.getType());
-        retryPolicyConfiguration.putDouble("retryLimit", 2);
-        retryPolicyConfiguration.putDouble("exponentialBackoffBase", 2);
-        retryPolicyConfiguration.putDouble("exponentialBackoffScale", 0.5);
-        clientOptions.putMap("retryPolicyConfiguration", retryPolicyConfiguration);
-
-        WritableMap requestAdapterConfiguration = Arguments.createMap();
-        requestAdapterConfiguration.putString("bearerAuthTokenResponseHeader", "token");
-        clientOptions.putMap("requestAdapterConfiguration", requestAdapterConfiguration);
-
-        WritableMap sessionConfiguration = Arguments.createMap();
-        sessionConfiguration.putInt("httpMaximumConnectionsPerHost", 10);
-        sessionConfiguration.putDouble("timeoutIntervalForRequest", 30000);
-        sessionConfiguration.putDouble("timeoutIntervalForResource", 30000);
-        clientOptions.putMap("sessionConfiguration", sessionConfiguration);
-    }
-
-    private static void createClientIfNeeded(String baseUrl) {
-        HttpUrl url = HttpUrl.parse(baseUrl);
-        if (url != null && !clientModule.hasClientFor(url)) {
-            clientModule.createClientFor(baseUrl, clientOptions, emptyPromise);
-        }
-    }
-}

android/app/src/main/java/com/mattermost/helpers/NotificationHelper.java

@@ -1,312 +0,0 @@
-package com.mattermost.helpers;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.os.Bundle;
-import android.service.notification.StatusBarNotification;
-
-
-import androidx.core.app.NotificationManagerCompat;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Objects;
-
-public class NotificationHelper {
-    public static final String PUSH_NOTIFICATIONS = "PUSH_NOTIFICATIONS";
-    public static final String NOTIFICATIONS_IN_GROUP = "notificationsInGroup";
-    private static final String VERSION_PREFERENCE = "VERSION_PREFERENCE";
-
-    public static void cleanNotificationPreferencesIfNeeded(Context context) {
-        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", "");
-            }
-
-            if (!version.equals(storedVersion)) {
-                if (pSharedPref != null) {
-                    SharedPreferences.Editor editor = pSharedPref.edit();
-                    editor.putString("Version", version);
-                    editor.apply();
-                }
-
-                Map<String, JSONObject> inputMap = new HashMap<>();
-                saveMap(context, inputMap);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static int getNotificationId(Bundle notification) {
-        final String postId = notification.getString("post_id");
-        final String channelId = notification.getString("channel_id");
-
-        int notificationId = CustomPushNotificationHelper.MESSAGE_NOTIFICATION_ID;
-        if (postId != null) {
-            notificationId = postId.hashCode();
-        } else if (channelId != null) {
-            notificationId = channelId.hashCode();
-        }
-
-        return notificationId;
-    }
-
-    public static StatusBarNotification[] getDeliveredNotifications(Context context) {
-        final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        return notificationManager.getActiveNotifications();
-    }
-
-    public static boolean addNotificationToPreferences(Context context, int notificationId, Bundle notification) {
-        try {
-            boolean createSummary = true;
-            final String serverUrl = notification.getString("server_url");
-            final String channelId = notification.getString("channel_id");
-            final String rootId = notification.getString("root_id");
-            final boolean isCRTEnabled = notification.containsKey("is_crt_enabled") && notification.getString("is_crt_enabled").equals("true");
-
-            final boolean isThreadNotification = isCRTEnabled && !android.text.TextUtils.isEmpty(rootId);
-            final String groupId = isThreadNotification ? rootId : channelId;
-
-            Map<String, JSONObject> notificationsPerServer = loadMap(context);
-            JSONObject notificationsInServer = notificationsPerServer.get(serverUrl);
-            if (notificationsInServer == null) {
-                notificationsInServer = new JSONObject();
-            }
-
-            JSONObject notificationsInGroup = notificationsInServer.optJSONObject(groupId);
-            if (notificationsInGroup == null) {
-                notificationsInGroup = new JSONObject();
-            }
-
-            if (notificationsInGroup.length() > 0) {
-                createSummary = false;
-            }
-
-            notificationsInGroup.put(String.valueOf(notificationId), false);
-
-            if (createSummary) {
-                // Add the summary notification id as well
-                notificationsInGroup.put(String.valueOf(notificationId + 1), true);
-            }
-            notificationsInServer.put(groupId, notificationsInGroup);
-            notificationsPerServer.put(serverUrl, notificationsInServer);
-            saveMap(context, notificationsPerServer);
-
-            return createSummary;
-        } catch(Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    public static void dismissNotification(Context context, Bundle notification) {
-        final boolean isCRTEnabled = notification.containsKey("is_crt_enabled") && notification.getString("is_crt_enabled").equals("true");
-        final String serverUrl = notification.getString("server_url");
-        final String channelId = notification.getString("channel_id");
-        final String rootId = notification.getString("root_id");
-
-        int notificationId = getNotificationId(notification);
-
-        if (!android.text.TextUtils.isEmpty(serverUrl) && !android.text.TextUtils.isEmpty(channelId)) {
-            boolean isThreadNotification = isCRTEnabled && !android.text.TextUtils.isEmpty(rootId);
-            String notificationIdStr = String.valueOf(notificationId);
-            String groupId = isThreadNotification ? rootId : channelId;
-
-            Map<String, JSONObject> notificationsPerServer = loadMap(context);
-            JSONObject notificationsInServer = notificationsPerServer.get(serverUrl);
-            if (notificationsInServer == null) {
-                return;
-            }
-
-            JSONObject notificationsInGroup = notificationsInServer.optJSONObject(groupId);
-            if (notificationsInGroup == null) {
-                return;
-            }
-            boolean isSummary = notificationsInGroup.optBoolean(notificationIdStr);
-            notificationsInGroup.remove(notificationIdStr);
-
-            NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
-            notificationManager.cancel(notificationId);
-            StatusBarNotification[] statusNotifications = getDeliveredNotifications(context);
-            boolean hasMore = false;
-
-            for (final StatusBarNotification status : statusNotifications) {
-                Bundle bundle = status.getNotification().extras;
-                if (isThreadNotification) {
-                    hasMore = bundle.containsKey("root_id") && bundle.getString("root_id").equals(rootId);
-                } else {
-                    hasMore = bundle.containsKey("channel_id") && bundle.getString("channel_id").equals(channelId);
-                }
-                if (hasMore) break;
-            }
-
-            if (!hasMore || isSummary) {
-                notificationsInServer.remove(groupId);
-            } else {
-                try {
-                    notificationsInServer.put(groupId, notificationsInGroup);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            notificationsPerServer.put(serverUrl, notificationsInServer);
-            saveMap(context, notificationsPerServer);
-        }
-    }
-
-    public static void removeChannelNotifications(Context context, String serverUrl, String channelId) {
-        NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
-        Map<String, JSONObject> notificationsPerServer = loadMap(context);
-        JSONObject notificationsInServer = notificationsPerServer.get(serverUrl);
-
-        if (notificationsInServer != null) {
-            notificationsInServer.remove(channelId);
-            notificationsPerServer.put(serverUrl, notificationsInServer);
-            saveMap(context, notificationsPerServer);
-        }
-
-        StatusBarNotification[] notifications = getDeliveredNotifications(context);
-        for (StatusBarNotification sbn:notifications) {
-            Notification n = sbn.getNotification();
-            Bundle bundle = n.extras;
-            String cId = bundle.getString("channel_id");
-            String rootId = bundle.getString("root_id");
-            boolean isCRTEnabled = bundle.containsKey("is_crt_enabled") && bundle.getString("is_crt_enabled").equals("true");
-            boolean skipThreadNotification = isCRTEnabled && !android.text.TextUtils.isEmpty(rootId);
-            if (Objects.equals(cId, channelId) && !skipThreadNotification) {
-                notificationManager.cancel(sbn.getId());
-            }
-        }
-    }
-
-    public static void removeThreadNotifications(Context context, String serverUrl, String threadId) {
-        NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
-        Map<String, JSONObject> notificationsPerServer = loadMap(context);
-        JSONObject notificationsInServer = notificationsPerServer.get(serverUrl);
-
-        StatusBarNotification[] notifications = getDeliveredNotifications(context);
-        for (StatusBarNotification sbn:notifications) {
-            Notification n = sbn.getNotification();
-            Bundle bundle = n.extras;
-            String rootId = bundle.getString("root_id");
-            String postId = bundle.getString("post_id");
-            if (Objects.equals(rootId, threadId)) {
-                notificationManager.cancel(sbn.getId());
-            }
-
-            if (Objects.equals(postId, threadId)) {
-                String channelId = bundle.getString("channel_id");
-                int id = sbn.getId();
-                if (notificationsInServer != null && channelId != null) {
-                    JSONObject notificationsInChannel = notificationsInServer.optJSONObject(channelId);
-                    if (notificationsInChannel != null) {
-                        notificationsInChannel.remove(String.valueOf(id));
-                        try {
-                            notificationsInServer.put(channelId, notificationsInChannel);
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-                notificationManager.cancel(id);
-            }
-        }
-
-        if (notificationsInServer != null) {
-            notificationsInServer.remove(threadId);
-            notificationsPerServer.put(serverUrl, notificationsInServer);
-            saveMap(context, notificationsPerServer);
-        }
-    }
-
-    public static void removeServerNotifications(Context context, String serverUrl) {
-        NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
-        Map<String, JSONObject> notificationsPerServer = loadMap(context);
-        notificationsPerServer.remove(serverUrl);
-        saveMap(context, notificationsPerServer);
-        StatusBarNotification[] notifications = getDeliveredNotifications(context);
-        for (StatusBarNotification sbn:notifications) {
-            Notification n = sbn.getNotification();
-            Bundle bundle = n.extras;
-            String url = bundle.getString("server_url");
-            if (Objects.equals(url, serverUrl)) {
-                notificationManager.cancel(sbn.getId());
-            }
-        }
-    }
-
-    public static void clearChannelOrThreadNotifications(Context context, Bundle notification) {
-        final String serverUrl = notification.getString("server_url");
-        final String channelId = notification.getString("channel_id");
-        final String rootId = notification.getString("root_id");
-        if (channelId != null) {
-            final boolean isCRTEnabled = notification.containsKey("is_crt_enabled") && notification.getString("is_crt_enabled").equals("true");
-            // rootId is available only when CRT is enabled & clearing the thread
-            final boolean isClearThread = isCRTEnabled && !android.text.TextUtils.isEmpty(rootId);
-
-            if (isClearThread) {
-                removeThreadNotifications(context, serverUrl, rootId);
-            } else {
-                removeChannelNotifications(context, serverUrl, channelId);
-            }
-        }
-    }
-
-
-    /**
-     * Map Structure
-     *
-     * { serverUrl: { groupId: { notification1: true, notification2: false } } }
-     * summary notification has a value of true
-     *
-     */
-
-    private static void saveMap(Context context, Map<String, JSONObject> inputMap) {
-        SharedPreferences pSharedPref = context.getSharedPreferences(PUSH_NOTIFICATIONS, Context.MODE_PRIVATE);
-        if (pSharedPref != null) {
-            JSONObject json = new JSONObject(inputMap);
-            String jsonString = json.toString();
-            SharedPreferences.Editor editor = pSharedPref.edit();
-            editor.remove(NOTIFICATIONS_IN_GROUP).apply();
-            editor.putString(NOTIFICATIONS_IN_GROUP, jsonString);
-            editor.apply();
-        }
-    }
-
-    private static Map<String, JSONObject> loadMap(Context context) {
-        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_GROUP, (new JSONObject()).toString());
-                    JSONObject json = new JSONObject(jsonString);
-                    Iterator<String> servers = json.keys();
-
-                    while (servers.hasNext()) {
-                        String serverUrl = servers.next();
-                        JSONObject notificationGroup = json.getJSONObject(serverUrl);
-                        outputMap.put(serverUrl, notificationGroup);
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        return outputMap;
-    }
-}

android/app/src/main/java/com/mattermost/helpers/PushNotificationDataHelper.kt

@@ -1,154 +0,0 @@
-package com.mattermost.helpers
-
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import com.facebook.react.bridge.Arguments
-
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
-
-import com.mattermost.helpers.database_extension.*
-import com.mattermost.helpers.push_notification.*
-
-import kotlinx.coroutines.*
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-
-class PushNotificationDataHelper(private val context: Context) {
-    private var coroutineScope = CoroutineScope(Dispatchers.Default)
-    fun fetchAndStoreDataForPushNotification(initialData: Bundle, isReactInit: Boolean): Bundle? {
-        var result: Bundle? = null
-        val job = coroutineScope.launch(Dispatchers.Default) {
-            result = PushNotificationDataRunnable.start(context, initialData, isReactInit)
-        }
-        runBlocking {
-            job.join()
-        }
-
-        return result
-    }
-}
-
-class PushNotificationDataRunnable {
-    companion object {
-        internal val specialMentions = listOf("all", "here", "channel")
-        private val dbHelper = DatabaseHelper.instance!!
-        private val mutex = Mutex()
-
-        suspend fun start(context: Context, initialData: Bundle, isReactInit: Boolean): Bundle? {
-            // for more info see: https://blog.danlew.net/2020/01/28/coroutines-and-java-synchronization-dont-mix/
-            mutex.withLock {
-                val serverUrl: String = initialData.getString("server_url") ?: return null
-                val db = dbHelper.getDatabaseForServer(context, serverUrl)
-                var result: Bundle? = null
-
-                try {
-                    if (db != null) {
-                        val teamId = initialData.getString("team_id")
-                        val channelId = initialData.getString("channel_id")
-                        val postId = initialData.getString("post_id")
-                        val rootId = initialData.getString("root_id")
-                        val isCRTEnabled = initialData.getString("is_crt_enabled") == "true"
-
-                        Log.i("ReactNative", "Start fetching notification data in server=$serverUrl for channel=$channelId")
-
-                        val receivingThreads = isCRTEnabled && !rootId.isNullOrEmpty()
-                        val notificationData = Arguments.createMap()
-
-                        if (!teamId.isNullOrEmpty()) {
-                            val res = fetchTeamIfNeeded(db, serverUrl, teamId)
-                            res.first?.let { notificationData.putMap("team", it) }
-                            res.second?.let { notificationData.putMap("myTeam", it) }
-                        }
-
-                        if (channelId != null && postId != null) {
-                            val channelRes = fetchMyChannel(db, serverUrl, channelId, isCRTEnabled)
-                            channelRes.first?.let { notificationData.putMap("channel", it) }
-                            channelRes.second?.let { notificationData.putMap("myChannel", it) }
-                            val loadedProfiles = channelRes.third
-
-                            // Fetch categories if needed
-                            if (!teamId.isNullOrEmpty() && notificationData.getMap("myTeam") != null) {
-                                // should load all categories
-                                val res = fetchMyTeamCategories(db, serverUrl, teamId)
-                                res?.let { notificationData.putMap("categories", it) }
-                            } else if (notificationData.getMap("channel") != null) {
-                                // check if the channel is in the category for the team
-                                val res = addToDefaultCategoryIfNeeded(db, notificationData.getMap("channel")!!)
-                                res?.let { notificationData.putArray("categoryChannels", it) }
-                            }
-
-                            val postData = fetchPosts(db, serverUrl, channelId, isCRTEnabled, rootId, loadedProfiles)
-                            postData?.getMap("posts")?.let { notificationData.putMap("posts", it) }
-
-                            var notificationThread: ReadableMap? = null
-                            if (isCRTEnabled && !rootId.isNullOrEmpty()) {
-                                notificationThread = fetchThread(db, serverUrl, rootId, teamId)
-                            }
-
-                            getThreadList(notificationThread, postData?.getArray("threads"))?.let {
-                                val threadsArray = Arguments.createArray()
-                                for(item in it) {
-                                    threadsArray.pushMap(item)
-                                }
-                                notificationData.putArray("threads", threadsArray)
-                            }
-
-                            val userList = fetchNeededUsers(serverUrl, loadedProfiles, postData)
-                            notificationData.putArray("users", ReadableArrayUtils.toWritableArray(userList.toArray()))
-                        }
-
-                        result = Arguments.toBundle(notificationData)
-
-                        if (!isReactInit) {
-                            dbHelper.saveToDatabase(db, notificationData, teamId, channelId, receivingThreads)
-                        }
-
-                        Log.i("ReactNative", "Done processing push notification=$serverUrl for channel=$channelId")
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                } finally {
-                    db?.close()
-                    Log.i("ReactNative", "DONE fetching notification data")
-                }
-
-                return result
-            }
-        }
-
-        private fun getThreadList(notificationThread: ReadableMap?, threads: ReadableArray?): ArrayList<ReadableMap>? {
-            threads?.let {
-                val threadsArray = ArrayList<ReadableMap>()
-                val threadIds = ArrayList<String>()
-                notificationThread?.let { thread ->
-                    thread.getString("id")?.let { it1 -> threadIds.add(it1) }
-                    threadsArray.add(thread)
-                }
-                for(i in 0 until it.size()) {
-                    val thread = it.getMap(i)
-                    val threadId = thread.getString("id")
-                    if (threadId != null) {
-                        if (threadIds.contains(threadId)) {
-                         // replace the values for participants and is_following
-                            val index = threadsArray.indexOfFirst { el -> el.getString("id") == threadId }
-                            val prev = threadsArray[index]
-                            val merge = Arguments.createMap()
-                            merge.merge(prev)
-                            merge.putBoolean("is_following", thread.getBoolean("is_following"))
-                            merge.putArray("participants", thread.getArray("participants"))
-                            threadsArray[index] = merge
-                        } else {
-                            threadsArray.add(thread)
-                            threadIds.add(threadId)
-                        }
-                    }
-                }
-                return threadsArray
-            }
-
-            return null
-        }
-    }
-}

android/app/src/main/java/com/mattermost/helpers/RandomId.kt

@@ -1,22 +0,0 @@
-package com.mattermost.helpers
-
-import kotlin.math.floor
-
-class RandomId {
-    companion object {
-        private const val alphabet = "0123456789abcdefghijklmnopqrstuvwxyz"
-        private const val alphabetLength = alphabet.length
-        private const val idLength = 16
-
-        fun generate(): String {
-            var id = ""
-            for (i in 1.rangeTo((idLength / 2))) {
-                val random = floor(Math.random() * alphabetLength * alphabetLength)
-                id += alphabet[floor(random / alphabetLength).toInt()]
-                id += alphabet[(random % alphabetLength).toInt()]
-            }
-
-            return id
-        }
-    }
-}

android/app/src/main/java/com/mattermost/helpers/ReadableArrayUtils.java

@@ -1,122 +0,0 @@
-package com.mattermost.helpers;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableType;
-import com.facebook.react.bridge.WritableArray;
-
-import java.util.Map;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONException;
-
-public class ReadableArrayUtils {
-    public static JSONArray toJSONArray(ReadableArray readableArray) throws JSONException {
-        JSONArray jsonArray = new JSONArray();
-
-        for (int i = 0; i < readableArray.size(); i++) {
-            ReadableType type = readableArray.getType(i);
-
-            switch (type) {
-                case Null:
-                    jsonArray.put(i, null);
-                    break;
-                case Boolean:
-                    jsonArray.put(i, readableArray.getBoolean(i));
-                    break;
-                case Number:
-                    jsonArray.put(i, readableArray.getDouble(i));
-                    break;
-                case String:
-                    jsonArray.put(i, readableArray.getString(i));
-                    break;
-                case Map:
-                    jsonArray.put(i, ReadableMapUtils.toJSONObject(readableArray.getMap(i)));
-                    break;
-                case Array:
-                    jsonArray.put(i, ReadableArrayUtils.toJSONArray(readableArray.getArray(i)));
-                    break;
-            }
-        }
-
-        return jsonArray;
-    }
-
-    public static Object[] toArray(JSONArray jsonArray) throws JSONException {
-        Object[] array = new Object[jsonArray.length()];
-
-        for (int i = 0; i < jsonArray.length(); i++) {
-            Object value = jsonArray.get(i);
-
-            if (value instanceof JSONObject) {
-                value = ReadableMapUtils.toMap((JSONObject) value);
-            }
-            if (value instanceof JSONArray) {
-                value = ReadableArrayUtils.toArray((JSONArray) value);
-            }
-
-            array[i] = value;
-        }
-
-        return array;
-    }
-
-    public static Object[] toArray(ReadableArray readableArray) {
-        Object[] array = new Object[readableArray.size()];
-
-        for (int i = 0; i < readableArray.size(); i++) {
-            ReadableType type = readableArray.getType(i);
-
-            switch (type) {
-                case Null:
-                    array[i] = null;
-                    break;
-                case Boolean:
-                    array[i] = readableArray.getBoolean(i);
-                    break;
-                case Number:
-                    array[i] = readableArray.getDouble(i);
-                    break;
-                case String:
-                    array[i] = readableArray.getString(i);
-                    break;
-                case Map:
-                    array[i] = ReadableMapUtils.toMap(readableArray.getMap(i));
-                    break;
-                case Array:
-                    array[i] = ReadableArrayUtils.toArray(readableArray.getArray(i));
-                    break;
-            }
-        }
-
-        return array;
-    }
-
-    public static WritableArray toWritableArray(Object[] array) {
-        WritableArray writableArray = Arguments.createArray();
-
-        for (Object value : array) {
-            if (value == null) {
-                writableArray.pushNull();
-            } else if (value instanceof Boolean) {
-                writableArray.pushBoolean((Boolean) value);
-            } else if (value instanceof Double) {
-                writableArray.pushDouble((Double) value);
-            } else if (value instanceof Integer) {
-                writableArray.pushInt((Integer) value);
-            } else if (value instanceof String) {
-                writableArray.pushString((String) value);
-            } else if (value instanceof Map) {
-                writableArray.pushMap(ReadableMapUtils.toWritableMap((Map<String, Object>) value));
-            } else if (value instanceof ReadableMap) {
-                writableArray.pushMap((ReadableMap) value);
-            }else if (value.getClass().isArray()) {
-                writableArray.pushArray(ReadableArrayUtils.toWritableArray((Object[]) value));
-            }
-        }
-
-        return writableArray;
-    }
-}

android/app/src/main/java/com/mattermost/helpers/ReadableMapUtils.java

@@ -1,148 +0,0 @@
-package com.mattermost.helpers;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.bridge.ReadableType;
-import com.facebook.react.bridge.WritableMap;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-public class ReadableMapUtils {
-    public static JSONObject toJSONObject(ReadableMap readableMap) throws JSONException {
-        JSONObject jsonObject = new JSONObject();
-
-        ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
-
-        while (iterator.hasNextKey()) {
-            String key = iterator.nextKey();
-            ReadableType type = readableMap.getType(key);
-
-            switch (type) {
-                case Null:
-                    jsonObject.put(key, null);
-                    break;
-                case Boolean:
-                    jsonObject.put(key, readableMap.getBoolean(key));
-                    break;
-                case Number:
-                    jsonObject.put(key, readableMap.getDouble(key));
-                    break;
-                case String:
-                    jsonObject.put(key, readableMap.getString(key));
-                    break;
-                case Map:
-                    ReadableMap map = readableMap.getMap(key);
-                    if (map != null) {
-                        jsonObject.put(key, ReadableMapUtils.toJSONObject(map));
-                    }
-                    break;
-                case Array:
-                    ReadableArray array = readableMap.getArray(key);
-                    if (array != null) {
-                        jsonObject.put(key, ReadableArrayUtils.toJSONArray(array));
-                    }
-                    break;
-            }
-        }
-
-        return jsonObject;
-    }
-
-    public static Map<String, Object> toMap(JSONObject jsonObject) throws JSONException {
-        Map<String, Object> map = new HashMap<>();
-        Iterator<String> iterator = jsonObject.keys();
-
-        while (iterator.hasNext()) {
-            String key = iterator.next();
-            Object value = jsonObject.get(key);
-
-            if (value instanceof JSONObject) {
-                value = ReadableMapUtils.toMap((JSONObject) value);
-            }
-            if (value instanceof JSONArray) {
-                value = ReadableArrayUtils.toArray((JSONArray) value);
-            }
-
-            map.put(key, value);
-        }
-
-        return map;
-    }
-
-    public static Map<String, Object> toMap(ReadableMap readableMap) {
-        Map<String, Object> map = new HashMap<>();
-        ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
-
-        while (iterator.hasNextKey()) {
-            String key = iterator.nextKey();
-            ReadableType type = readableMap.getType(key);
-
-            switch (type) {
-                case Null:
-                    map.put(key, null);
-                    break;
-                case Boolean:
-                    map.put(key, readableMap.getBoolean(key));
-                    break;
-                case Number:
-                    map.put(key, readableMap.getDouble(key));
-                    break;
-                case String:
-                    map.put(key, readableMap.getString(key));
-                    break;
-                case Map:
-                    ReadableMap obj = readableMap.getMap(key);
-                    if (obj != null) {
-                        map.put(key, ReadableMapUtils.toMap(obj));
-                    }
-                    break;
-                case Array:
-                    ReadableArray array = readableMap.getArray(key);
-                    if (array != null) {
-                        map.put(key, ReadableArrayUtils.toArray(array));
-                    }
-                    break;
-            }
-        }
-
-        return map;
-    }
-
-    public static WritableMap toWritableMap(Map<String, Object> map) {
-        WritableMap writableMap = Arguments.createMap();
-        Iterator<Map.Entry<String, Object>> iterator = map.entrySet().iterator();
-
-        while (iterator.hasNext()) {
-            Map.Entry<String, Object> pair = iterator.next();
-            Object value = pair.getValue();
-
-            if (value == null) {
-                writableMap.putNull(pair.getKey());
-            } else if (value instanceof Boolean) {
-                writableMap.putBoolean(pair.getKey(), (Boolean) value);
-            } else if (value instanceof Double) {
-                writableMap.putDouble(pair.getKey(), (Double) value);
-            } else if (value instanceof Integer) {
-                writableMap.putInt(pair.getKey(), (Integer) value);
-            } else if (value instanceof String) {
-                writableMap.putString(pair.getKey(), (String) value);
-            } else if (value instanceof Map)
-                writableMap.putMap(pair.getKey(), ReadableMapUtils.toWritableMap((Map<String, Object>) value));
-            else if (value.getClass().isArray()) {
-                writableMap.putArray(pair.getKey(), ReadableArrayUtils.toWritableArray((Object[]) value));
-            }
-
-            iterator.remove();
-        }
-
-        return writableMap;
-    }
-}

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

@@ -3,6 +3,7 @@ package com.mattermost.helpers;
 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;
@@ -17,14 +18,16 @@ import android.os.ParcelFileDescriptor;
 import java.io.*;
 import java.nio.channels.FileChannel;
 
-// Class based on DocumentHelper https://gist.github.com/steveevers/a5af24c226f44bb8fdc3
+// Class based on the steveevers DocumentHelper https://gist.github.com/steveevers/a5af24c226f44bb8fdc3
 
 public class RealPathUtil {
     public static final String CACHE_DIR_NAME = "mmShare";
     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);
@@ -45,7 +48,7 @@ public class RealPathUtil {
                     try {
                         return getPathFromSavingTempFile(context, uri);
                     } catch (NumberFormatException e) {
-                        Log.e("ReactNative", "DownloadsProvider unexpected uri " + uri);
+                        Log.e("ReactNative", "DownloadsProvider unexpected uri " + uri.toString());
                         return null;
                     }
                 }
@@ -70,12 +73,7 @@ public class RealPathUtil {
                         split[1]
                 };
 
-                String name = getDataColumn(context, contentUri, selection, selectionArgs);
-                if (!TextUtils.isEmpty(name)) {
-                    return name;
-                }
-
-                return getPathFromSavingTempFile(context, uri);
+                return getDataColumn(context, contentUri, selection, selectionArgs);
             }
         }
 
@@ -97,7 +95,7 @@ public class RealPathUtil {
 
     public static String getPathFromSavingTempFile(Context context, final Uri uri) {
         File tmpFile;
-        String fileName = "";
+        String fileName = null;
 
         if (uri == null || uri.isRelative()) {
             return null;
@@ -110,49 +108,36 @@ public class RealPathUtil {
             int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
             returnCursor.moveToFirst();
             fileName = sanitizeFilename(returnCursor.getString(nameIndex));
-            returnCursor.close();
         } 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());
+                fileName = sanitizeFilename(uri.getLastPathSegment().toString().trim());
             }
 
 
             File cacheDir = new File(context.getCacheDir(), CACHE_DIR_NAME);
-            boolean cacheDirExists = cacheDir.exists();
-            if (!cacheDirExists) {
-                cacheDirExists = cacheDir.mkdirs();
+            if (!cacheDir.exists()) {
+                cacheDir.mkdirs();
             }
 
-            if (cacheDirExists) {
-                tmpFile = new File(cacheDir, fileName);
-                boolean fileCreated = tmpFile.createNewFile();
+            String mimeType = getMimeType(uri.getPath());
+            tmpFile = new File(cacheDir, fileName);
+            tmpFile.createNewFile();
 
-                if (fileCreated) {
-                    ParcelFileDescriptor pfd = context.getContentResolver().openFileDescriptor(uri, "r");
+            ParcelFileDescriptor pfd = context.getContentResolver().openFileDescriptor(uri, "r");
 
-                    try (FileInputStream inputSrc = new FileInputStream(pfd.getFileDescriptor())) {
-                        FileChannel src = inputSrc.getChannel();
-                        try (FileOutputStream outputDst = new FileOutputStream(tmpFile)) {
-                            FileChannel dst = outputDst.getChannel();
-                            dst.transferFrom(src, 0, src.size());
-                            src.close();
-                            dst.close();
-                        }
-                    }
-
-                    pfd.close();
-                }
-                return tmpFile.getAbsolutePath();
-            }
+            FileChannel src = new FileInputStream(pfd.getFileDescriptor()).getChannel();
+            FileChannel dst = new FileOutputStream(tmpFile).getChannel();
+            dst.transferFrom(src, 0, src.size());
+            src.close();
+            dst.close();
         } catch (IOException ex) {
-            ex.printStackTrace();
+            return null;
         }
-
-        return null;
+        return tmpFile.getAbsolutePath();
     }
 
     public static String getDataColumn(Context context, Uri uri, String selection,
@@ -196,14 +181,8 @@ public class RealPathUtil {
     }
 
     public static String getExtension(String uri) {
-        String extension = "";
         if (uri == null) {
-            return extension;
-        }
-
-        extension = MimeTypeMap.getFileExtensionFromUrl(uri);
-        if (!extension.equals("")) {
-            return extension;
+            return null;
         }
 
         int dot = uri.lastIndexOf(".");
@@ -230,7 +209,7 @@ public class RealPathUtil {
         return getMimeType(file);
     }
 
-     public static String getMimeTypeFromUri(final Context context, final Uri uri) {
+    public static String getMimeTypeFromUri(final Context context, final Uri uri) {
         try {
             ContentResolver cR = context.getContentResolver();
             return cR.getType(uri);
@@ -250,17 +229,11 @@ public class RealPathUtil {
     }
 
     private static void deleteRecursive(File fileOrDirectory) {
-        if (fileOrDirectory.isDirectory()) {
-                File[] files = fileOrDirectory.listFiles();
-                if (files != null) {
-                    for (File child : files)
-                        deleteRecursive(child);
-                }
-        }
+        if (fileOrDirectory.isDirectory())
+            for (File child : fileOrDirectory.listFiles())
+                deleteRecursive(child);
 
-        if (!fileOrDirectory.delete()) {
-            Log.i("ReactNative", "Couldn't delete file " + fileOrDirectory.getName());
-        }
+        fileOrDirectory.delete();
     }
 
     private static String sanitizeFilename(String filename) {
@@ -271,4 +244,5 @@ public class RealPathUtil {
         File f = new File(filename);
         return f.getName();
     }
+
 }

android/app/src/main/java/com/mattermost/helpers/ResolvePromise.java

@@ -1,7 +1,5 @@
 package com.mattermost.helpers;
 
-import androidx.annotation.NonNull;
-
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.WritableMap;
 
@@ -20,7 +18,7 @@ public class ResolvePromise implements Promise {
     }
 
     @Override
-    public void reject(String code, @NonNull WritableMap map) {
+    public void reject(String code, WritableMap map) {
 
     }
 
@@ -50,7 +48,7 @@ public class ResolvePromise implements Promise {
     }
 
     @Override
-    public void reject(String code, String message, @NonNull WritableMap map) {
+    public void reject(String code, String message, WritableMap map) {
 
     }
 

android/app/src/main/java/com/mattermost/helpers/database_extension/Category.kt

@@ -1,87 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
-import com.nozbe.watermelondb.Database
-
-fun insertCategory(db: Database, category: ReadableMap) {
-    try {
-        val id = category.getString("id") ?: return
-        val collapsed = false
-        val displayName = category.getString("display_name")
-        val muted = category.getBoolean("muted")
-        val sortOrder = category.getInt("sort_order")
-        val sorting = category.getString("sorting") ?: "recent"
-        val teamId = category.getString("team_id")
-        val type = category.getString("type")
-
-        db.execute(
-                """
-                INSERT INTO Category
-                (id, collapsed, display_name, muted, sort_order, sorting, team_id, type, _changed, _status)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, '', 'created')
-                """.trimIndent(),
-                arrayOf(
-                        id, collapsed, displayName, muted,
-                        sortOrder / 10, sorting, teamId, type
-                )
-        )
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-fun insertCategoryChannels(db: Database, categoryId: String, teamId: String, channelIds: ReadableArray) {
-    try {
-        for (i in 0 until channelIds.size()) {
-            val channelId = channelIds.getString(i)
-            val id = "${teamId}_$channelId"
-            db.execute(
-                    """
-                    INSERT INTO CategoryChannel
-                    (id, category_id, channel_id, sort_order, _changed, _status)
-                    VALUES (?, ?, ?, ?, '', 'created')
-                    """.trimIndent(),
-                    arrayOf(id, categoryId, channelId, i)
-            )
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-fun insertCategoriesWithChannels(db: Database, orderCategories: ReadableMap) {
-    val categories = orderCategories.getArray("categories") ?: return
-    for (i in 0 until categories.size()) {
-        val category = categories.getMap(i)
-        val id = category.getString("id")
-        val teamId = category.getString("team_id")
-        val channelIds = category.getArray("channel_ids")
-        insertCategory(db, category)
-        if (id != null && teamId != null) {
-            channelIds?.let { insertCategoryChannels(db, id, teamId, it) }
-        }
-    }
-}
-
-fun insertChannelToDefaultCategory(db: Database, categoryChannels: ReadableArray) {
-    try {
-        for (i in 0 until categoryChannels.size()) {
-            val cc = categoryChannels.getMap(i)
-            val id = cc.getString("id")
-            val categoryId = cc.getString("category_id")
-            val channelId = cc.getString("channel_id")
-            val count = countByColumn(db, "CategoryChannel", "category_id", categoryId)
-            db.execute(
-                    """
-                        INSERT INTO CategoryChannel
-                        (id, category_id, channel_id, sort_order, _changed, _status)
-                        VALUES (?, ?, ?, ?, '', 'created')
-                    """.trimIndent(),
-                    arrayOf(id, categoryId, channelId, if (count > 0) count + 1 else count)
-            )
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}

android/app/src/main/java/com/mattermost/helpers/database_extension/Channel.kt

@@ -1,220 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import com.facebook.react.bridge.ReadableMap
-import com.mattermost.helpers.DatabaseHelper
-import com.mattermost.helpers.ReadableMapUtils
-import com.nozbe.watermelondb.Database
-import org.json.JSONException
-import org.json.JSONObject
-
-fun findChannel(db: Database?, channelId: String): Boolean {
-    if (db != null) {
-        val team = find(db, "Channel", channelId)
-        return team != null
-    }
-    return false
-}
-
-fun findMyChannel(db: Database?, channelId: String): Boolean {
-    if (db != null) {
-        val team = find(db, "MyChannel", channelId)
-        return team != null
-    }
-    return false
-}
-
-internal fun handleChannel(db: Database, channel: ReadableMap) {
-    try {
-        val exists = channel.getString("id")?.let { findChannel(db, it) } ?: false
-        if (!exists) {
-            val json = ReadableMapUtils.toJSONObject(channel)
-            if (insertChannel(db, json)) {
-                insertChannelInfo(db, json)
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-internal fun DatabaseHelper.handleMyChannel(db: Database, myChannel: ReadableMap, postsData: ReadableMap?, receivingThreads: Boolean) {
-    try {
-        val json = ReadableMapUtils.toJSONObject(myChannel)
-        val exists = myChannel.getString("id")?.let { findMyChannel(db, it) } ?: false
-
-        if (postsData != null && !receivingThreads) {
-            val posts = ReadableMapUtils.toJSONObject(postsData.getMap("posts")).toMap()
-            val postList = posts.toList()
-            val lastFetchedAt = postList.fold(0.0) { acc, next ->
-                val post = next.second as Map<*, *>
-                val createAt = post["create_at"] as Double
-                val updateAt = post["update_at"] as Double
-                val deleteAt = post["delete_at"] as Double
-                val value = maxOf(createAt, updateAt, deleteAt)
-
-                maxOf(value, acc)
-            }
-            json.put("last_fetched_at", lastFetchedAt)
-        }
-
-        if (exists) {
-            updateMyChannel(db, json)
-            return
-        }
-
-        if (insertMyChannel(db, json)) {
-            insertMyChannelSettings(db, json)
-            insertChannelMember(db, json)
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-fun insertChannel(db: Database, channel: JSONObject): Boolean {
-    val id = try { channel.getString("id") } catch (e: JSONException) { return false }
-    val createAt = try { channel.getDouble("create_at") } catch (e: JSONException) { 0 }
-    val deleteAt = try { channel.getDouble("delete_at") } catch (e: JSONException) { 0 }
-    val updateAt = try { channel.getDouble("update_at") } catch (e: JSONException) { 0 }
-    val creatorId = try { channel.getString("creator_id") } catch (e: JSONException) { "" }
-    val displayName = try { channel.getString("display_name") } catch (e: JSONException) { "" }
-    val name = try { channel.getString("name") } catch (e: JSONException) { "" }
-    val teamId = try { channel.getString("team_id") } catch (e: JSONException) { "" }
-    val type = try { channel.getString("type") } catch (e: JSONException) { "O" }
-    val isGroupConstrained = try { channel.getBoolean("group_constrained") } catch (e: JSONException) { false }
-    val shared = try { channel.getBoolean("shared") } catch (e: JSONException) { false }
-
-    return try {
-        db.execute(
-                """
-                INSERT INTO Channel 
-                (id, create_at, delete_at, update_at, creator_id, display_name, name, team_id, type, is_group_constrained, shared, _changed, _status)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '', 'created')
-                """.trimIndent(),
-                arrayOf(
-                        id, createAt, deleteAt, updateAt,
-                        creatorId, displayName, name, teamId, type,
-                        isGroupConstrained, shared
-                )
-        )
-        true
-    } catch (e: Exception) {
-        e.printStackTrace()
-        false
-    }
-}
-
-fun insertChannelInfo(db: Database, channel: JSONObject) {
-    val id = try { channel.getString("id") } catch (e: JSONException) { return }
-    val header = try { channel.getString("header") } catch (e: JSONException) { "" }
-    val purpose = try { channel.getString("purpose") } catch (e: JSONException) { "" }
-
-    try {
-        db.execute(
-                """
-                INSERT INTO ChannelInfo
-                (id, header, purpose, guest_count, member_count, pinned_post_count, _changed, _status)
-                VALUES (?, ?, ?, 0, 0, 0, '', 'created')
-                """.trimIndent(),
-                arrayOf(id, header, purpose)
-        )
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-fun insertMyChannel(db: Database, myChanel: JSONObject): Boolean {
-    return try {
-        val id = try { myChanel.getString("id") } catch (e: JSONException) { return false }
-        val roles = try { myChanel.getString("roles") } catch (e: JSONException) { "" }
-        val msgCount = try { myChanel.getInt("message_count") } catch (e: JSONException) { 0 }
-        val mentionsCount = try { myChanel.getInt("mentions_count") } catch (e: JSONException) { 0 }
-        val isUnread = try { myChanel.getBoolean("is_unread") } catch (e: JSONException) { false }
-        val lastPostAt = try { myChanel.getDouble("last_post_at") } catch (e: JSONException) { 0 }
-        val lastViewedAt = try { myChanel.getDouble("last_viewed_at") } catch (e: JSONException) { 0 }
-        val viewedAt = 0
-        val lastFetchedAt = try { myChanel.getDouble("last_fetched_at") } catch (e: JSONException) { 0 }
-        val manuallyUnread = false
-
-        db.execute(
-                """
-                    INSERT INTO MyChannel
-                    (id, roles, message_count, mentions_count, is_unread, manually_unread,
-                    last_post_at, last_viewed_at, viewed_at, last_fetched_at, _changed, _status)
-                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '', 'created') 
-                    """,
-                arrayOf(
-                        id, roles, msgCount, mentionsCount, isUnread, manuallyUnread,
-                        lastPostAt, lastViewedAt, viewedAt, lastFetchedAt
-                )
-        )
-
-        true
-    } catch (e: Exception) {
-        e.printStackTrace()
-        false
-    }
-}
-
-fun insertMyChannelSettings(db: Database, myChanel: JSONObject) {
-    try {
-        val id = try { myChanel.getString("id") } catch (e: JSONException) { return }
-        val notifyProps = try { myChanel.getString("notify_props") } catch (e: JSONException) { return }
-
-        db.execute(
-                """
-                    INSERT INTO MyChannelSettings (id, notify_props, _changed, _status)
-                    VALUES (?, ?, '', 'created')
-                    """,
-                arrayOf(id, notifyProps)
-        )
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-fun insertChannelMember(db: Database, myChanel: JSONObject) {
-    try {
-        val userId = queryCurrentUserId(db) ?: return
-        val channelId = try { myChanel.getString("id") } catch (e: JSONException) { return }
-        val schemeAdmin = try { myChanel.getBoolean("scheme_admin") } catch (e: JSONException) { false }
-        val id = "$channelId-$userId"
-        db.execute(
-                """
-                    INSERT INTO ChannelMembership 
-                    (id, channel_id, user_id, scheme_admin, _changed, _status)
-                    VALUES (?, ?, ?, ?, '', 'created')
-                    """,
-                arrayOf(id, channelId, userId, schemeAdmin)
-        )
-
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-fun updateMyChannel(db: Database, myChanel: JSONObject) {
-    try {
-        val id = try { myChanel.getString("id") } catch (e: JSONException) { return }
-        val msgCount = try { myChanel.getInt("message_count") } catch (e: JSONException) { 0 }
-        val mentionsCount = try { myChanel.getInt("mentions_count") } catch (e: JSONException) { 0 }
-        val isUnread = try { myChanel.getBoolean("is_unread") } catch (e: JSONException) { false }
-        val lastPostAt = try { myChanel.getDouble("last_post_at") } catch (e: JSONException) { 0 }
-        val lastViewedAt = try { myChanel.getDouble("last_viewed_at") } catch (e: JSONException) { 0 }
-        val lastFetchedAt = try { myChanel.getDouble("last_fetched_at") } catch (e: JSONException) { 0 }
-
-        db.execute(
-                """
-                    UPDATE MyChannel SET message_count=?, mentions_count=?, is_unread=?, 
-                    last_post_at=?, last_viewed_at=?, last_fetched_at=?, _status = 'updated' 
-                    WHERE id=?
-                    """,
-                arrayOf(
-                        msgCount, mentionsCount, isUnread,
-                        lastPostAt, lastViewedAt, lastFetchedAt, id
-                )
-        )
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}

android/app/src/main/java/com/mattermost/helpers/database_extension/CustomEmoji.kt

@@ -1,23 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import com.nozbe.watermelondb.Database
-import org.json.JSONArray
-
-internal fun insertCustomEmojis(db: Database, customEmojis: JSONArray) {
-    for (i in 0 until customEmojis.length()) {
-        try {
-            val emoji = customEmojis.getJSONObject(i)
-            if (find(db, "CustomEmoji", emoji.getString("id")) == null) {
-                db.execute(
-                        "INSERT INTO CustomEmoji (id, name, _changed, _status) VALUES (?, ?, '', 'created')",
-                        arrayOf(
-                                emoji.getString("id"),
-                                emoji.getString("name"),
-                        )
-                )
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-}

android/app/src/main/java/com/mattermost/helpers/database_extension/File.kt

@@ -1,35 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import com.nozbe.watermelondb.Database
-import org.json.JSONArray
-import org.json.JSONException
-
-internal fun insertFiles(db: Database, files: JSONArray) {
-    try {
-        for (i in 0 until files.length()) {
-            val file = files.getJSONObject(i)
-            val id = file.getString("id")
-            val extension = file.getString("extension")
-            val miniPreview = try { file.getString("mini_preview") } catch (e: JSONException) { "" }
-            val height = try { file.getInt("height") } catch (e: JSONException) { 0 }
-            val mime = file.getString("mime_type")
-            val name = file.getString("name")
-            val postId = file.getString("post_id")
-            val size = try { file.getDouble("size") } catch (e: JSONException) { 0 }
-            val width = try { file.getInt("width") } catch (e: JSONException) { 0 }
-            db.execute(
-                    """
-                    INSERT INTO File 
-                    (id, extension, height, image_thumbnail, local_path, mime_type, name, post_id, size, width, _changed, _status) 
-                    VALUES (?, ?, ?, ?, '', ?, ?, ?, ?, ?, '', 'created')
-                    """.trimIndent(),
-                    arrayOf(
-                            id, extension, height, miniPreview,
-                            mime, name, postId, size, width
-                    )
-            )
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}

android/app/src/main/java/com/mattermost/helpers/database_extension/General.kt

@@ -1,168 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import android.content.Context
-import android.text.TextUtils
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReadableMap
-import com.mattermost.helpers.DatabaseHelper
-import com.nozbe.watermelondb.Database
-import com.nozbe.watermelondb.QueryArgs
-import com.nozbe.watermelondb.mapCursor
-import java.util.*
-import kotlin.Exception
-
-internal fun DatabaseHelper.saveToDatabase(db: Database, data: ReadableMap, teamId: String?, channelId: String?, receivingThreads: Boolean) {
-    db.transaction {
-        val posts = data.getMap("posts")
-        data.getMap("team")?.let { insertTeam(db, it) }
-        data.getMap("myTeam")?.let { insertMyTeam(db, it) }
-        data.getMap("channel")?.let { handleChannel(db, it) }
-        data.getMap("myChannel")?.let { handleMyChannel(db, it, posts, receivingThreads) }
-        data.getMap("categories")?.let { insertCategoriesWithChannels(db, it) }
-        data.getArray("categoryChannels")?.let { insertChannelToDefaultCategory(db, it) }
-        if (channelId != null) {
-            handlePosts(db, posts, channelId, receivingThreads)
-        }
-        data.getArray("threads")?.let {
-            val threadsArray = ArrayList<ReadableMap>()
-            for (i in 0 until it.size()) {
-                threadsArray.add(it.getMap(i))
-            }
-            handleThreads(db, threadsArray, teamId)
-        }
-        data.getArray("users")?.let { handleUsers(db, it) }
-    }
-}
-
-fun DatabaseHelper.getServerUrlForIdentifier(identifier: String): String? {
-    try {
-        val query = "SELECT url FROM Servers WHERE identifier=?"
-        defaultDatabase!!.rawQuery(query, arrayOf(identifier)).use { cursor ->
-            if (cursor.count == 1) {
-                cursor.moveToFirst()
-                return cursor.getString(0)
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-        // let it fall to return null
-    }
-    return null
-}
-
-fun DatabaseHelper.getDatabaseForServer(context: Context?, serverUrl: String): Database? {
-    try {
-        val query = "SELECT db_path FROM Servers WHERE url=?"
-        defaultDatabase!!.rawQuery(query, arrayOf(serverUrl)).use { cursor ->
-            if (cursor.count == 1) {
-                cursor.moveToFirst()
-                val databasePath = cursor.getString(0)
-                return Database(databasePath, context!!)
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-        // let it fall to return null
-    }
-    return null
-}
-
-fun find(db: Database, tableName: String, id: String?): ReadableMap? {
-    try {
-        db.rawQuery(
-                "SELECT * FROM $tableName WHERE id == ? LIMIT 1",
-                arrayOf(id)
-        ).use { cursor ->
-            if (cursor.count <= 0) {
-                return null
-            }
-            val resultMap = Arguments.createMap()
-            cursor.moveToFirst()
-            resultMap.mapCursor(cursor)
-            return resultMap
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-        return null
-    }
-}
-
-fun findByColumns(db: Database, tableName: String, columnNames: Array<String>, values: QueryArgs): ReadableMap? {
-    try {
-        val whereString = columnNames.joinToString(" AND ") { "$it = ?" }
-        db.rawQuery(
-                "SELECT * FROM $tableName WHERE $whereString LIMIT 1",
-                values
-        ).use { cursor ->
-            if (cursor.count <= 0) {
-                return null
-            }
-            val resultMap = Arguments.createMap()
-            cursor.moveToFirst()
-            resultMap.mapCursor(cursor)
-            return resultMap
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-        return null
-    }
-}
-
-fun queryIds(db: Database, tableName: String, ids: Array<String>): List<String> {
-    val list: MutableList<String> = ArrayList()
-    val args = TextUtils.join(",", Arrays.stream(ids).map { "?" }.toArray())
-    try {
-        @Suppress("UNCHECKED_CAST")
-        db.rawQuery("SELECT DISTINCT id FROM $tableName WHERE id IN ($args)", ids as Array<Any?>).use { cursor ->
-            if (cursor.count > 0) {
-                while (cursor.moveToNext()) {
-                    val index = cursor.getColumnIndex("id")
-                    if (index >= 0) {
-                        list.add(cursor.getString(index))
-                    }
-                }
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-    return list
-}
-
-fun queryByColumn(db: Database, tableName: String, columnName: String, values: Array<Any?>): List<String> {
-    val list: MutableList<String> = ArrayList()
-    val args = TextUtils.join(",", Arrays.stream(values).map { "?" }.toArray())
-    try {
-        db.rawQuery("SELECT DISTINCT $columnName FROM $tableName WHERE $columnName IN ($args)", values).use { cursor ->
-            if (cursor.count > 0) {
-                while (cursor.moveToNext()) {
-                    val index = cursor.getColumnIndex(columnName)
-                    if (index >= 0) {
-                        list.add(cursor.getString(index))
-                    }
-                }
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-    return list
-}
-
-fun countByColumn(db: Database, tableName: String, columnName: String, value: Any?): Int {
-    try {
-        db.rawQuery(
-                "SELECT COUNT(*) FROM $tableName WHERE $columnName == ? LIMIT 1",
-                arrayOf(value)
-        ).use { cursor ->
-            if (cursor.count <= 0) {
-                return 0
-            }
-            cursor.moveToFirst()
-            return cursor.getInt(0)
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-        return 0
-    }
-}

android/app/src/main/java/com/mattermost/helpers/database_extension/Post.kt

@@ -1,256 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import com.facebook.react.bridge.ReadableMap
-import com.mattermost.helpers.DatabaseHelper
-import com.mattermost.helpers.ReadableMapUtils
-import com.nozbe.watermelondb.Database
-import org.json.JSONArray
-import org.json.JSONException
-import org.json.JSONObject
-import kotlin.Exception
-
-internal fun queryLastPostCreateAt(db: Database?, channelId: String): Double? {
-    try {
-        if (db != null) {
-            val postsInChannelQuery = "SELECT earliest, latest FROM PostsInChannel WHERE channel_id=? ORDER BY latest DESC LIMIT 1"
-            db.rawQuery(postsInChannelQuery, arrayOf(channelId)).use { cursor1 ->
-                if (cursor1.count == 1) {
-                    cursor1.moveToFirst()
-                    val earliest = cursor1.getDouble(0)
-                    val latest = cursor1.getDouble(1)
-                    val postQuery = "SELECT create_at FROM POST WHERE channel_id= ? AND delete_at=0 AND create_at BETWEEN ? AND ? ORDER BY create_at DESC"
-
-                    db.rawQuery(postQuery, arrayOf(channelId, earliest, latest)).use { cursor2 ->
-                        if (cursor2.count >= 60) {
-                            cursor2.moveToFirst()
-                            return cursor2.getDouble(0)
-                        }
-                    }
-                }
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-    return null
-}
-
-fun queryPostSinceForChannel(db: Database?, channelId: String): Double? {
-    try {
-        if (db != null) {
-            val postsInChannelQuery = "SELECT last_fetched_at FROM MyChannel WHERE id=? LIMIT 1"
-            db.rawQuery(postsInChannelQuery, arrayOf(channelId)).use { cursor ->
-                if (cursor.count == 1) {
-                    cursor.moveToFirst()
-                    val lastFetchedAt = cursor.getDouble(0)
-                    if (lastFetchedAt == 0.0) {
-                        return queryLastPostCreateAt(db, channelId)
-                    }
-                    return lastFetchedAt
-                }
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-        // let it fall to return null
-    }
-    return null
-}
-
-fun queryLastPostInThread(db: Database?, rootId: String): Double? {
-    try {
-        if (db != null) {
-            val query = "SELECT create_at FROM Post WHERE root_id=? AND delete_at=0 ORDER BY create_at DESC LIMIT 1"
-            db.rawQuery(query, arrayOf(rootId)).use { cursor ->
-                if (cursor.count == 1) {
-                    cursor.moveToFirst()
-                    return cursor.getDouble(0)
-                }
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-
-    return null
-}
-
-internal fun insertPost(db: Database, post: JSONObject) {
-    try {
-        val id = try { post.getString("id") } catch (e: JSONException) { return }
-        val channelId = try { post.getString("channel_id") } catch (e: JSONException) { return }
-        val userId = try { post.getString("user_id") } catch (e: JSONException) { return }
-        val createAt = try { post.getDouble("create_at") } catch (e: JSONException) { return }
-        val deleteAt = try { post.getDouble("delete_at") } catch (e: JSONException) { 0 }
-        val updateAt = try { post.getDouble("update_at") } catch (e: JSONException) { 0 }
-        val editAt = try { post.getDouble("edit_at") } catch (e: JSONException) { 0 }
-        val isPinned = try { post.getBoolean("is_pinned") } catch (e: JSONException) { false }
-        val message = try { post.getString("message") } catch (e: JSONException) { "" }
-        val metadata = try { post.getJSONObject("metadata") } catch (e: JSONException) { JSONObject() }
-        val originalId = try { post.getString("original_id") } catch (e: JSONException) { "" }
-        val pendingId = try { post.getString("pending_post_id") } catch (e: JSONException) { "" }
-        val prevId = try { post.getString("prev_post_id") } catch (e: JSONException) { "" }
-        val rootId = try { post.getString("root_id") } catch (e: JSONException) { "" }
-        val type = try { post.getString("type") } catch (e: JSONException) { "" }
-        val props = try { post.getJSONObject("props").toString() } catch (e: JSONException) { "" }
-        val reactions = metadata.remove("reactions") as JSONArray?
-        val customEmojis = metadata.remove("emojis") as JSONArray?
-        val files = metadata.remove("files") as JSONArray?
-
-        db.execute(
-                """
-                INSERT INTO Post 
-                (id, channel_id, create_at, delete_at, update_at, edit_at, is_pinned, message, metadata, original_id, pending_post_id, 
-                previous_post_id, root_id, type, user_id, props, _changed, _status) 
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '', 'created')
-                """.trimIndent(),
-                arrayOf(
-                        id, channelId, createAt, deleteAt, updateAt, editAt,
-                        isPinned, message, metadata.toString(),
-                        originalId, pendingId, prevId, rootId,
-                        type, userId, props
-                )
-        )
-
-        if (reactions != null && reactions.length() > 0) {
-            insertReactions(db, reactions)
-        }
-
-        if (customEmojis != null && customEmojis.length() > 0) {
-            insertCustomEmojis(db, customEmojis)
-        }
-
-        if (files != null && files.length() > 0) {
-            insertFiles(db, files)
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-internal fun updatePost(db: Database, post: JSONObject) {
-    try {
-        val id = try { post.getString("id") } catch (e: JSONException) { return }
-        val channelId = try { post.getString("channel_id") } catch (e: JSONException) { return }
-        val userId = try { post.getString("user_id") } catch (e: JSONException) { return }
-        val createAt = try { post.getDouble("create_at") } catch (e: JSONException) { return }
-        val deleteAt = try { post.getDouble("delete_at") } catch (e: JSONException) { 0 }
-        val updateAt = try { post.getDouble("update_at") } catch (e: JSONException) { 0 }
-        val editAt = try { post.getDouble("edit_at") } catch (e: JSONException) { 0 }
-        val isPinned = try { post.getBoolean("is_pinned") } catch (e: JSONException) { false }
-        val message = try { post.getString("message") } catch (e: JSONException) { "" }
-        val metadata = try { post.getJSONObject("metadata") } catch (e: JSONException) { JSONObject() }
-        val originalId = try { post.getString("original_id") } catch (e: JSONException) { "" }
-        val pendingId = try { post.getString("pending_post_id") } catch (e: JSONException) { "" }
-        val prevId = try { post.getString("prev_post_id") } catch (e: JSONException) { "" }
-        val rootId = try { post.getString("root_id") } catch (e: JSONException) { "" }
-        val type = try { post.getString("type") } catch (e: JSONException) { "" }
-        val props = try { post.getJSONObject("props").toString() } catch (e: JSONException) { "" }
-        val reactions = metadata.remove("reactions") as JSONArray?
-        val customEmojis = metadata.remove("emojis") as JSONArray?
-
-        metadata.remove("files")
-
-        db.execute(
-                """
-                UPDATE Post SET channel_id = ?, create_at = ?, delete_at = ?, update_at =?, edit_at =?, 
-                is_pinned = ?, message = ?, metadata = ?, original_id = ?, pending_post_id = ?, previous_post_id = ?, 
-                root_id = ?, type = ?, user_id = ?, props = ?, _status = 'updated' 
-                WHERE id = ?
-                """.trimIndent(),
-                arrayOf(
-                        channelId, createAt, deleteAt, updateAt, editAt,
-                        isPinned, message, metadata.toString(),
-                        originalId, pendingId, prevId, rootId,
-                        type, userId, props,
-                        id,
-                )
-        )
-
-        if (reactions != null && reactions.length() > 0) {
-            db.execute("DELETE FROM Reaction WHERE post_id = ?", arrayOf(post.getString("id")))
-            insertReactions(db, reactions)
-        }
-
-        if (customEmojis != null && customEmojis.length() > 0) {
-            insertCustomEmojis(db, customEmojis)
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-fun DatabaseHelper.handlePosts(db: Database, postsData: ReadableMap?, channelId: String, receivingThreads: Boolean) {
-    // Posts, PostInChannel, PostInThread, Reactions, Files, CustomEmojis, Users
-    try {
-        if (postsData != null) {
-            val ordered = postsData.getArray("order")?.toArrayList()
-            val posts = ReadableMapUtils.toJSONObject(postsData.getMap("posts")).toMap()
-            val previousPostId = postsData.getString("prev_post_id")
-            val postsInThread = hashMapOf<String, List<JSONObject>>()
-            val postList = posts.toList()
-            var earliest = 0.0
-            var latest = 0.0
-
-            if (ordered != null && posts.isNotEmpty()) {
-                val firstId = ordered.first()
-                val lastId = ordered.last()
-                var prevPostId = ""
-
-                val sortedPosts = postList.sortedBy { (_, value) ->
-                    ((value as Map<*, *>)["create_at"] as Double)
-                }
-
-                sortedPosts.forEachIndexed { index, it ->
-                    val key = it.first
-                    if (it.second != null) {
-                        @Suppress("UNCHECKED_CAST", "UNCHECKED_CAST")
-                        val post: MutableMap<String, Any?> = it.second as MutableMap<String, Any?>
-
-                        if (index == 0) {
-                            post.putIfAbsent("prev_post_id", previousPostId)
-                        } else if (prevPostId.isNotEmpty()) {
-                            post.putIfAbsent("prev_post_id", prevPostId)
-                        }
-
-                        if (lastId == key) {
-                            earliest = post["create_at"] as Double
-                        }
-                        if (firstId == key) {
-                            latest = post["create_at"] as Double
-                        }
-
-                        val jsonPost = JSONObject(post)
-                        val postId = post["id"] as? String ?: ""
-                        val rootId = post["root_id"] as? String ?: ""
-                        val postInThread = rootId.ifEmpty { postId }
-                        var thread = postsInThread[postInThread]?.toMutableList()
-                        if (thread == null) {
-                            thread = mutableListOf()
-                        }
-
-                        thread.add(jsonPost)
-                        postsInThread[postInThread] = thread.toList()
-
-                        if (find(db, "Post", key) == null) {
-                            insertPost(db, jsonPost)
-                        } else {
-                            updatePost(db, jsonPost)
-                        }
-
-                        if (ordered.contains(key)) {
-                            prevPostId = key
-                        }
-                    }
-                }
-            }
-
-            if (!receivingThreads) {
-                handlePostsInChannel(db, channelId, earliest, latest)
-            }
-            handlePostsInThread(db, postsInThread)
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}

android/app/src/main/java/com/mattermost/helpers/database_extension/PostsInChannel.kt

@@ -1,97 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
-import com.mattermost.helpers.RandomId
-import com.nozbe.watermelondb.Database
-import com.nozbe.watermelondb.mapCursor
-
-internal fun findPostInChannel(chunks: ReadableArray, earliest: Double, latest: Double): ReadableMap? {
-    for (i in 0 until chunks.size()) {
-        val chunk = chunks.getMap(i)
-        if (earliest >= chunk.getDouble("earliest") || latest <= chunk.getDouble("latest")) {
-            return chunk
-        }
-    }
-
-    return null
-}
-
-internal fun insertPostInChannel(db: Database, channelId: String, earliest: Double, latest: Double): ReadableMap? {
-    return try {
-        val id = RandomId.generate()
-        db.execute(
-                """
-                INSERT INTO PostsInChannel 
-                (id, channel_id, earliest, latest, _changed, _status) 
-                VALUES (?, ?, ?, ?, '', 'created')
-                """.trimIndent(),
-                arrayOf(id, channelId, earliest, latest))
-
-        val map = Arguments.createMap()
-        map.putString("id", id)
-        map.putString("channel_id", channelId)
-        map.putDouble("earliest", earliest)
-        map.putDouble("latest", latest)
-        map
-    } catch (e: Exception) {
-        e.printStackTrace()
-        null
-    }
-}
-
-internal fun mergePostsInChannel(db: Database, existingChunks: ReadableArray, newChunk: ReadableMap) {
-    for (i in 0 until existingChunks.size()) {
-        try {
-            val chunk = existingChunks.getMap(i)
-            if (newChunk.getDouble("earliest") <= chunk.getDouble("earliest") &&
-                    newChunk.getDouble("latest") >= chunk.getDouble("latest")) {
-                db.execute("DELETE FROM PostsInChannel WHERE id = ?", arrayOf(chunk.getString("id")))
-                break
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-}
-
-internal fun handlePostsInChannel(db: Database, channelId: String, earliest: Double, latest: Double) {
-    try {
-        db.rawQuery(
-                "SELECT id, channel_id, earliest, latest FROM PostsInChannel WHERE channel_id = ?",
-                arrayOf(channelId)
-        ).use { cursor ->
-            if (cursor.count == 0) {
-                // create new post in channel
-                insertPostInChannel(db, channelId, earliest, latest)
-                return
-            }
-
-            val resultArray = Arguments.createArray()
-            while (cursor.moveToNext()) {
-                val cursorMap = Arguments.createMap()
-                cursorMap.mapCursor(cursor)
-                resultArray.pushMap(cursorMap)
-            }
-
-            val chunk = findPostInChannel(resultArray, earliest, latest)
-            if (chunk != null) {
-                db.execute(
-                        "UPDATE PostsInChannel SET earliest = ?, latest = ?, _status = 'updated' WHERE id = ?",
-                        arrayOf(
-                                minOf(earliest, chunk.getDouble("earliest")),
-                                maxOf(latest, chunk.getDouble("latest")),
-                                chunk.getString("id")
-                        )
-                )
-                return
-            }
-
-            val newChunk = insertPostInChannel(db, channelId, earliest, latest)
-            newChunk?.let { mergePostsInChannel(db, resultArray, it) }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}

android/app/src/main/java/com/mattermost/helpers/database_extension/Preference.kt

@@ -1,29 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import com.facebook.react.bridge.Arguments
-import com.nozbe.watermelondb.Database
-import com.nozbe.watermelondb.mapCursor
-
-fun getTeammateDisplayNameSetting(db: Database): String {
-    val configSetting = queryConfigDisplayNameSetting(db)
-    if (configSetting != null) {
-        return configSetting
-    }
-
-    try {
-        db.rawQuery(
-                "SELECT value FROM Preference where category = ? AND name = ? limit 1",
-                arrayOf("display_settings", "name_format")
-        ).use { cursor ->
-            if (cursor.count <= 0) {
-                return "username"
-            }
-            val resultMap = Arguments.createMap()
-            cursor.moveToFirst()
-            resultMap.mapCursor(cursor)
-            return resultMap?.getString("value") ?: "username"
-        }
-    } catch (e: Exception) {
-        return "username"
-    }
-}

android/app/src/main/java/com/mattermost/helpers/database_extension/Reaction.kt

@@ -1,28 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import com.mattermost.helpers.RandomId
-import com.nozbe.watermelondb.Database
-import org.json.JSONArray
-
-internal fun insertReactions(db: Database, reactions: JSONArray) {
-    for (i in 0 until reactions.length()) {
-        try {
-            val reaction = reactions.getJSONObject(i)
-            val id = RandomId.generate()
-            db.execute(
-                    """
-                    INSERT INTO Reaction 
-                    (id, create_at, emoji_name, post_id, user_id, _changed, _status) 
-                    VALUES (?, ?, ?, ?, ?, '', 'created')
-                    """.trimIndent(),
-                    arrayOf(
-                            id,
-                            reaction.getDouble("create_at"), reaction.getString("emoji_name"),
-                            reaction.getString("post_id"), reaction.getString("user_id")
-                    )
-            )
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-}

android/app/src/main/java/com/mattermost/helpers/database_extension/System.kt

@@ -1,32 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import com.nozbe.watermelondb.Database
-import org.json.JSONObject
-
-fun queryCurrentUserId(db: Database): String? {
-    val result = find(db, "System", "currentUserId")
-    return result?.getString("value")?.removeSurrounding("\"")
-}
-
-fun queryCurrentTeamId(db: Database): String? {
-    val result = find(db, "System", "currentTeamId")
-    return result?.getString("value")?.removeSurrounding("\"")
-}
-
-fun queryConfigDisplayNameSetting(db: Database): String? {
-    val license = find(db, "System", "license")
-    val lockDisplayName = find(db, "Config", "LockTeammateNameDisplay")
-    val displayName = find(db, "Config", "TeammateNameDisplay")
-
-    val licenseValue = license?.getString("value") ?: ""
-    val lockDisplayNameValue = lockDisplayName?.getString("value") ?: "false"
-    val displayNameValue = displayName?.getString("value") ?: "full_name"
-    val licenseJson = JSONObject(licenseValue)
-    val licenseLock = try { licenseJson.getString("LockTeammateNameDisplay") } catch (e: Exception) { "false"}
-
-    if (licenseLock == "true" && lockDisplayNameValue == "true") {
-        return displayNameValue
-    }
-
-    return null
-}

android/app/src/main/java/com/mattermost/helpers/database_extension/Team.kt

@@ -1,106 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.NoSuchKeyException
-import com.facebook.react.bridge.ReadableMap
-import com.nozbe.watermelondb.Database
-import com.nozbe.watermelondb.mapCursor
-
-fun findTeam(db: Database?, teamId: String): Boolean {
-    if (db != null) {
-        val team = find(db, "Team", teamId)
-        return team != null
-    }
-    return false
-}
-
-fun findMyTeam(db: Database?, teamId: String): Boolean {
-    if (db != null) {
-        val team = find(db, "MyTeam", teamId)
-        return team != null
-    }
-    return false
-}
-
-fun queryMyTeams(db: Database?): ArrayList<ReadableMap>? {
-    db?.rawQuery("SELECT * FROM MyTeam")?.use { cursor ->
-        val results = ArrayList<ReadableMap>()
-        if (cursor.count > 0) {
-            while(cursor.moveToNext()) {
-                val map = Arguments.createMap()
-                map.mapCursor(cursor)
-                results.add(map)
-            }
-        }
-
-        return results
-    }
-    return null
-}
-
-fun insertTeam(db: Database, team: ReadableMap): Boolean {
-    val id = try { team.getString("id") } catch (e: Exception) { return false }
-    val deleteAt = try {team.getDouble("delete_at") } catch (e: Exception) { 0 }
-    if (deleteAt.toInt() > 0) {
-        return false
-    }
-
-    val isAllowOpenInvite = try { team.getBoolean("allow_open_invite") } catch (e: NoSuchKeyException) { false }
-    val description = try { team.getString("description") } catch (e: NoSuchKeyException) { "" }
-    val displayName = try { team.getString("display_name") } catch (e: NoSuchKeyException) { "" }
-    val name = try { team.getString("name") } catch (e: NoSuchKeyException) { "" }
-    val updateAt = try { team.getDouble("update_at") } catch (e: NoSuchKeyException) { 0 }
-    val type = try { team.getString("type") } catch (e: NoSuchKeyException) { "O" }
-    val allowedDomains = try { team.getString("allowed_domains") } catch (e: NoSuchKeyException) { "" }
-    val isGroupConstrained = try { team.getBoolean("group_constrained") } catch (e: NoSuchKeyException) { false }
-    val lastTeamIconUpdatedAt = try { team.getDouble("last_team_icon_update") } catch (e: NoSuchKeyException) { 0 }
-    val inviteId = try { team.getString("invite_id") } catch (e: NoSuchKeyException) { "" }
-    val status = "created"
-
-    return try {
-        db.execute(
-                """
-                INSERT INTO Team (
-                  id, allow_open_invite, description, display_name, name, update_at, type, allowed_domains,
-                  group_constrained, last_team_icon_update, invite_id, _changed, _status
-                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '', ?)
-                """.trimIndent(),
-                arrayOf(
-                        id, isAllowOpenInvite, description, displayName, name, updateAt,
-                        type, allowedDomains, isGroupConstrained, lastTeamIconUpdatedAt, inviteId, status
-                )
-        )
-
-        true
-    } catch (e: Exception) {
-        e.printStackTrace()
-        false
-    }
-}
-
-fun insertMyTeam(db: Database, myTeam: ReadableMap): Boolean {
-    val currentUserId = queryCurrentUserId(db) ?: return false
-    val id = try { myTeam.getString("id") } catch (e: NoSuchKeyException) { return false }
-    val roles = try { myTeam.getString("roles") } catch (e: NoSuchKeyException) { "" }
-    val schemeAdmin = try { myTeam.getBoolean("scheme_admin") } catch (e: NoSuchKeyException) { false }
-    val status = "created"
-    val membershipId = "$id-$currentUserId"
-
-    return try {
-        db.execute(
-                "INSERT INTO MyTeam (id, roles, _changed, _status) VALUES (?, ?, '', ?)",
-                arrayOf(id, roles, status)
-        )
-        db.execute(
-                """
-                    INSERT INTO TeamMembership (id, team_id, user_id, scheme_admin, _changed, _status)
-                    VALUES (?, ?, ?, ?, '', ?)
-                    """.trimIndent(),
-                arrayOf(membershipId, id, currentUserId, schemeAdmin, status)
-        )
-        true
-    } catch (e: Exception) {
-        e.printStackTrace()
-        false
-    }
-}

android/app/src/main/java/com/mattermost/helpers/database_extension/Thread.kt

@@ -1,247 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.NoSuchKeyException
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
-import com.mattermost.helpers.RandomId
-import com.nozbe.watermelondb.Database
-import com.nozbe.watermelondb.mapCursor
-import org.json.JSONObject
-
-internal fun insertThread(db: Database, thread: ReadableMap) {
-    // These fields are not present when we extract threads from posts
-    try {
-        val id = try { thread.getString("id") } catch (e: NoSuchKeyException) { return }
-        val isFollowing = try { thread.getBoolean("is_following") } catch (e: NoSuchKeyException) { false }
-        val lastViewedAt = try { thread.getDouble("last_viewed_at") } catch (e: NoSuchKeyException) { 0 }
-        val unreadReplies = try { thread.getInt("unread_replies") } catch (e: NoSuchKeyException) { 0 }
-        val unreadMentions = try { thread.getInt("unread_mentions") } catch (e: NoSuchKeyException) { 0 }
-        val lastReplyAt = try { thread.getDouble("last_reply_at") } catch (e: NoSuchKeyException) { 0 }
-        val replyCount = try { thread.getInt("reply_count") } catch (e: NoSuchKeyException) { 0 }
-
-        db.execute(
-                """
-                INSERT INTO Thread 
-                (id, last_reply_at, last_fetched_at, last_viewed_at, reply_count, is_following, unread_replies, unread_mentions, viewed_at, _changed, _status) 
-                VALUES (?, ?, 0, ?, ?, ?, ?, ?, 0, '', 'created')
-                """.trimIndent(),
-                arrayOf(
-                        id, lastReplyAt, lastViewedAt,
-                        replyCount, isFollowing, unreadReplies, unreadMentions
-                )
-        )
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-internal fun updateThread(db: Database, thread: ReadableMap, existingRecord: ReadableMap) {
-    try {
-        // These fields are not present when we extract threads from posts
-        val id = try { thread.getString("id") } catch (e: NoSuchKeyException) { return }
-        val isFollowing = try { thread.getBoolean("is_following") } catch (e: NoSuchKeyException) { existingRecord.getInt("is_following") == 1 }
-        val lastViewedAt = try { thread.getDouble("last_viewed_at") } catch (e: NoSuchKeyException) { existingRecord.getDouble("last_viewed_at") }
-        val unreadReplies = try { thread.getInt("unread_replies") } catch (e: NoSuchKeyException) { existingRecord.getInt("unread_replies") }
-        val unreadMentions = try { thread.getInt("unread_mentions") } catch (e: NoSuchKeyException) { existingRecord.getInt("unread_mentions") }
-        val lastReplyAt = try { thread.getDouble("last_reply_at") } catch (e: NoSuchKeyException) { 0 }
-        val replyCount = try { thread.getInt("reply_count") } catch (e: NoSuchKeyException) { 0 }
-
-        db.execute(
-                """
-                UPDATE Thread SET 
-                last_reply_at = ?, last_viewed_at = ?, reply_count = ?, is_following = ?, unread_replies = ?, 
-                unread_mentions = ?, _status = 'updated' where id = ?
-                """.trimIndent(),
-                arrayOf(
-                        lastReplyAt, lastViewedAt, replyCount,
-                        isFollowing, unreadReplies, unreadMentions, id
-                )
-        )
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-internal fun insertThreadParticipants(db: Database, threadId: String, participants: ReadableArray) {
-    for (i in 0 until participants.size()) {
-        try {
-            val participant = participants.getMap(i)
-            val id = RandomId.generate()
-            db.execute(
-                    """
-                    INSERT INTO ThreadParticipant 
-                    (id, thread_id, user_id, _changed, _status) 
-                    VALUES (?, ?, ?, '', 'created')
-                    """.trimIndent(),
-                    arrayOf(id, threadId, participant.getString("id"))
-            )
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-}
-
-fun insertTeamThreadsSync(db: Database, teamId: String, earliest: Double, latest: Double) {
-    try {
-        val query = """
-            INSERT INTO TeamThreadsSync (id, _changed, _status, earliest, latest)
-            VALUES (?, '', 'created', ?, ?)
-            """
-        db.execute(query, arrayOf(teamId, earliest, latest))
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-fun updateTeamThreadsSync(db: Database, teamId: String, earliest: Double, latest: Double, existingRecord: ReadableMap) {
-    try {
-        val storeEarliest = minOf(earliest, existingRecord.getDouble("earliest"))
-        val storeLatest = maxOf(latest, existingRecord.getDouble("latest"))
-        val query = "UPDATE TeamThreadsSync SET earliest=?, latest=? WHERE id=?"
-        db.execute(query, arrayOf(storeEarliest, storeLatest, teamId))
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-fun syncParticipants(db: Database, thread: ReadableMap) {
-    try {
-        val threadId = thread.getString("id")
-        val participants = thread.getArray("participants")
-        if (participants != null) {
-            db.execute("DELETE FROM ThreadParticipant WHERE thread_id = ?", arrayOf(threadId))
-
-            if (participants.size() > 0) {
-                insertThreadParticipants(db, threadId!!, participants)
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
-internal fun handlePostsInThread(db: Database, postsInThread: Map<String, List<JSONObject>>) {
-    postsInThread.forEach { (key, list) ->
-        try {
-            val sorted = list.sortedBy { it.getDouble("create_at") }
-            val earliest = sorted.first().getDouble("create_at")
-            val latest = sorted.last().getDouble("create_at")
-            db.rawQuery("SELECT * FROM PostsInThread WHERE root_id = ? ORDER BY latest DESC", arrayOf(key)).use { cursor ->
-                if (cursor.count > 0) {
-                    cursor.moveToFirst()
-                    val cursorMap = Arguments.createMap()
-                    cursorMap.mapCursor(cursor)
-                    val storeEarliest = minOf(earliest, cursorMap.getDouble("earliest"))
-                    val storeLatest = maxOf(latest, cursorMap.getDouble("latest"))
-                    db.execute(
-                            "UPDATE PostsInThread SET earliest = ?, latest = ?, _status = 'updated' WHERE root_id = ?",
-                            arrayOf(
-                                    storeEarliest,
-                                    storeLatest,
-                                    key
-                            )
-                    )
-                    return
-                }
-
-                val id = RandomId.generate()
-                db.execute(
-                        """
-                            INSERT INTO PostsInThread 
-                            (id, root_id, earliest, latest, _changed, _status) 
-                            VALUES (?, ?, ?, ?, '', 'created')
-                            """.trimIndent(),
-                        arrayOf(id, key, earliest, latest)
-                )
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-}
-
-fun handleThreads(db: Database, threads: ArrayList<ReadableMap>, teamId: String?) {
-    val teamIds = ArrayList<String>()
-    if (teamId.isNullOrEmpty()) {
-        val myTeams = queryMyTeams(db)
-        if (myTeams != null) {
-            for (myTeam in myTeams) {
-                myTeam.getString("id")?.let { teamIds.add(it) }
-            }
-        }
-    } else {
-        teamIds.add(teamId)
-    }
-
-    for (i in 0 until threads.size) {
-        try {
-            val thread = threads[i]
-            handleThread(db, thread, teamIds)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    handleTeamThreadsSync(db, threads, teamIds)
-}
-
-fun handleThread(db: Database, thread: ReadableMap, teamIds: ArrayList<String>) {
-    // Insert/Update the thread
-    val threadId = thread.getString("id")
-    val isFollowing = thread.getBoolean("is_following")
-    val existingRecord = find(db, "Thread", threadId)
-    if (existingRecord == null) {
-        insertThread(db, thread)
-    } else {
-        updateThread(db, thread, existingRecord)
-    }
-
-    syncParticipants(db, thread)
-
-    // this is per team
-    if (isFollowing) {
-        for (teamId in teamIds) {
-            handleThreadInTeam(db, thread, teamId)
-        }
-    }
-}
-
-fun handleThreadInTeam(db: Database, thread: ReadableMap, teamId: String) {
-    val threadId = thread.getString("id") ?: return
-    val existingRecord = findByColumns(
-            db,
-            "ThreadsInTeam",
-            arrayOf("thread_id", "team_id"),
-            arrayOf(threadId, teamId)
-    )
-    if (existingRecord == null) {
-        try {
-            val id = RandomId.generate()
-            val query = """
-            INSERT INTO ThreadsInTeam (id, team_id, thread_id, _changed, _status)
-            VALUES (?, ?, ?, '', 'created')
-            """
-            db.execute(query, arrayOf(id, teamId, threadId))
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-}
-
-fun handleTeamThreadsSync(db: Database, threadList: ArrayList<ReadableMap>, teamIds: ArrayList<String>) {
-    val sortedList = threadList.filter{ it.getBoolean("is_following") }
-            .sortedBy { it.getDouble("last_reply_at") }
-            .map { it.getDouble("last_reply_at") }
-    val earliest = sortedList.first()
-    val latest = sortedList.last()
-
-    for (teamId in teamIds) {
-        val existingTeamThreadsSync = find(db, "TeamThreadsSync", teamId)
-        if (existingTeamThreadsSync == null) {
-            insertTeamThreadsSync(db, teamId, earliest, latest)
-        } else {
-            updateTeamThreadsSync(db, teamId, earliest, latest, existingTeamThreadsSync)
-        }
-    }
-}

android/app/src/main/java/com/mattermost/helpers/database_extension/User.kt

@@ -1,85 +0,0 @@
-package com.mattermost.helpers.database_extension
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.NoSuchKeyException
-import com.facebook.react.bridge.ReadableArray
-import com.mattermost.helpers.ReadableMapUtils
-import com.nozbe.watermelondb.Database
-
-fun getLastPictureUpdate(db: Database?, userId: String): Double? {
-    try {
-        if (db != null) {
-            var id = userId
-            if (userId == "me") {
-                (queryCurrentUserId(db) ?: userId).also { id = it }
-            }
-            val userQuery = "SELECT last_picture_update FROM User WHERE id=?"
-            db.rawQuery(userQuery, arrayOf(id)).use { cursor ->
-                if (cursor.count == 1) {
-                    cursor.moveToFirst()
-                    return cursor.getDouble(0)
-                }
-            }
-
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-    return null
-}
-
-fun getCurrentUserLocale(db: Database): String {
-    try {
-        val currentUserId = queryCurrentUserId(db) ?: return "en"
-        val userQuery = "SELECT locale FROM User WHERE id=?"
-        db.rawQuery(userQuery, arrayOf(currentUserId)).use { cursor ->
-            if (cursor.count == 1) {
-                cursor.moveToFirst()
-                return cursor.getString(0)
-            }
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-
-    return "en"
-}
-
-fun handleUsers(db: Database, users: ReadableArray) {
-    for (i in 0 until users.size()) {
-        val user = users.getMap(i)
-        val roles =  user.getString("roles") ?: ""
-        val isBot = try {
-            user.getBoolean("is_bot")
-        } catch (e: NoSuchKeyException) {
-            false
-        }
-
-        val lastPictureUpdate = try { user.getDouble("last_picture_update") } catch (e: NoSuchKeyException) { 0 }
-
-        try {
-            db.execute(
-                    """
-                    INSERT INTO User (id, auth_service, update_at, delete_at, email, first_name, is_bot, is_guest,
-                    last_name, last_picture_update, locale, nickname, position, roles, status, username, notify_props, 
-                    props, timezone, _changed, _status) 
-                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '', 'created')
-                    """.trimIndent(),
-                    arrayOf(
-                            user.getString("id"),
-                            user.getString("auth_service"), user.getDouble("update_at"), user.getDouble("delete_at"),
-                            user.getString("email"), user.getString("first_name"), isBot,
-                            roles.contains("system_guest"), user.getString("last_name"), lastPictureUpdate,
-                            user.getString("locale"), user.getString("nickname"), user.getString("position"),
-                            roles, "", user.getString("username"), "{}",
-                            ReadableMapUtils.toJSONObject(user.getMap("props")
-                                    ?: Arguments.createMap()).toString(),
-                            ReadableMapUtils.toJSONObject(user.getMap("timezone")
-                                    ?: Arguments.createMap()).toString(),
-                    )
-            )
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-}

android/app/src/main/java/com/mattermost/helpers/push_notification/Category.kt

@@ -1,70 +0,0 @@
-package com.mattermost.helpers.push_notification
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
-import com.mattermost.helpers.PushNotificationDataRunnable
-import com.mattermost.helpers.database_extension.findByColumns
-import com.mattermost.helpers.database_extension.queryCurrentUserId
-import com.mattermost.helpers.database_extension.queryMyTeams
-import com.nozbe.watermelondb.Database
-
-suspend fun PushNotificationDataRunnable.Companion.fetchMyTeamCategories(db: Database, serverUrl: String, teamId: String): ReadableMap? {
-    return try {
-        val userId = queryCurrentUserId(db)
-        val categories = fetch(serverUrl, "/api/v4/users/$userId/teams/$teamId/channels/categories")
-        categories?.getMap("data")
-    } catch (e: Exception) {
-        e.printStackTrace()
-        null
-    }
-}
-
-fun PushNotificationDataRunnable.Companion.addToDefaultCategoryIfNeeded(db: Database, channel: ReadableMap): ReadableArray? {
-    val channelId = channel.getString("id") ?: return null
-    val channelType = channel.getString("type")
-    val categoryChannels = Arguments.createArray()
-    if (channelType == "D" || channelType == "G") {
-        val myTeams = queryMyTeams(db)
-        myTeams?.let {
-            for (myTeam in it) {
-                val map = categoryChannelForTeam(db, channelId, myTeam.getString("id"), "direct_messages")
-                if (map != null) {
-                    categoryChannels.pushMap(map)
-                }
-            }
-        }
-    } else {
-        val map = categoryChannelForTeam(db, channelId, channel.getString("team_id"), "channels")
-        if (map != null) {
-            categoryChannels.pushMap(map)
-        }
-    }
-
-    return categoryChannels
-}
-
-private fun categoryChannelForTeam(db: Database, channelId: String, teamId: String?, type: String): ReadableMap? {
-    teamId?.let { id ->
-        val category = findByColumns(db, "Category", arrayOf("type", "team_id"), arrayOf(type, id))
-        val categoryId = category?.getString("id")
-        categoryId?.let { cId ->
-            val cc = findByColumns(
-                    db,
-                    "CategoryChannel",
-                    arrayOf("category_id", "channel_id"),
-                    arrayOf(cId, channelId)
-            )
-            if (cc == null) {
-                val map = Arguments.createMap()
-                map.putString("channel_id", channelId)
-                map.putString("category_id", cId)
-                map.putString("id", "${id}_$channelId")
-                return map
-            }
-        }
-    }
-
-    return null
-}
-

android/app/src/main/java/com/mattermost/helpers/push_notification/Channel.kt

@@ -1,162 +0,0 @@
-package com.mattermost.helpers.push_notification
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
-import com.mattermost.helpers.PushNotificationDataRunnable
-import com.mattermost.helpers.database_extension.findChannel
-import com.mattermost.helpers.database_extension.getCurrentUserLocale
-import com.mattermost.helpers.database_extension.getTeammateDisplayNameSetting
-import com.mattermost.helpers.database_extension.queryCurrentUserId
-import com.nozbe.watermelondb.Database
-import java.text.Collator
-import java.util.Locale
-import kotlin.math.max
-
-suspend fun PushNotificationDataRunnable.Companion.fetchMyChannel(db: Database, serverUrl: String, channelId: String, isCRTEnabled: Boolean): Triple<ReadableMap?, ReadableMap?, ReadableArray?> {
-    val channel = fetch(serverUrl, "/api/v4/channels/$channelId")
-    var channelData = channel?.getMap("data")
-    val myChannelData = channelData?.let { fetchMyChannelData(serverUrl, channelId, isCRTEnabled, it) }
-    val channelType = channelData?.getString("type")
-    var profilesArray: ReadableArray? = null
-
-    if (channelData != null && channelType != null && !findChannel(db, channelId)) {
-        val displayNameSetting = getTeammateDisplayNameSetting(db)
-
-        when (channelType) {
-            "D" -> {
-                profilesArray = fetchProfileInChannel(db, serverUrl, channelId)
-                if ((profilesArray?.size() ?: 0) > 0) {
-                    val displayName = displayUsername(profilesArray!!.getMap(0), displayNameSetting)
-                    val data = Arguments.createMap()
-                    data.merge(channelData)
-                    data.putString("display_name", displayName)
-                    channelData = data
-                }
-            }
-            "G" -> {
-                profilesArray = fetchProfileInChannel(db, serverUrl, channelId)
-                if ((profilesArray?.size() ?: 0) > 0) {
-                    val localeString = getCurrentUserLocale(db)
-                    val localeArray = localeString.split("-")
-                    val locale = if (localeArray.size == 1) {
-                        Locale(localeString)
-                    } else {
-                        Locale(localeArray[0], localeArray[1])
-                    }
-                    val displayName = displayGroupMessageName(profilesArray!!, locale, displayNameSetting)
-                    val data = Arguments.createMap()
-                    data.merge(channelData)
-                    data.putString("display_name", displayName)
-                    channelData = data
-                }
-            }
-            else -> {}
-        }
-    }
-
-    return Triple(channelData, myChannelData, profilesArray)
-}
-
-private suspend fun PushNotificationDataRunnable.Companion.fetchMyChannelData(serverUrl: String, channelId: String, isCRTEnabled: Boolean, channelData: ReadableMap): ReadableMap? {
-    try {
-        val myChannel = fetch(serverUrl, "/api/v4/channels/$channelId/members/me")
-        val myChannelData = myChannel?.getMap("data")
-        if (myChannelData != null) {
-            val data = Arguments.createMap()
-            data.merge(myChannelData)
-            data.putString("id", channelId)
-
-            val totalMsg = if (isCRTEnabled) {
-                channelData.getInt("total_msg_count_root")
-            } else {
-                channelData.getInt("total_msg_count")
-            }
-
-            val myMsgCount = if (isCRTEnabled) {
-                myChannelData.getInt("msg_count_root")
-            } else {
-                myChannelData.getInt("msg_count")
-            }
-
-            val mentionCount = if (isCRTEnabled) {
-                myChannelData.getInt("mention_count_root")
-            } else {
-                myChannelData.getInt("mention_count")
-            }
-
-            val lastPostAt = if (isCRTEnabled) {
-                try {
-                    channelData.getDouble("last_root_post_at")
-                } catch (e: Exception) {
-                    channelData.getDouble("last_post_at")
-                }
-            } else {
-                channelData.getDouble("last_post_at")
-            }
-
-            val messageCount = 0.coerceAtLeast(totalMsg - myMsgCount)
-            data.putInt("message_count", messageCount)
-            data.putInt("mentions_count", mentionCount)
-            data.putBoolean("is_unread", messageCount > 0)
-            data.putDouble("last_post_at", lastPostAt)
-            return data
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-
-    return null
-}
-
-private suspend fun PushNotificationDataRunnable.Companion.fetchProfileInChannel(db: Database, serverUrl: String, channelId: String): ReadableArray? {
-    return try {
-        val currentUserId = queryCurrentUserId(db)
-        val profilesInChannel = fetch(serverUrl, "/api/v4/users?in_channel=${channelId}&page=0&per_page=8&sort=")
-        val profilesArray = profilesInChannel?.getArray("data")
-        val result = Arguments.createArray()
-        if (profilesArray != null) {
-            for (i in 0 until profilesArray.size()) {
-                val profile = profilesArray.getMap(i)
-                if (profile.getString("id") != currentUserId) {
-                    result.pushMap(profile)
-                }
-            }
-        }
-
-        result
-    } catch (e: Exception) {
-        e.printStackTrace()
-        null
-    }
-}
-
-private fun PushNotificationDataRunnable.Companion.displayUsername(user: ReadableMap, displayNameSetting: String): String {
-    val name = user.getString("username") ?: ""
-    val nickname = user.getString("nickname")
-    val firstName = user.getString("first_name") ?: ""
-    val lastName = user.getString("last_name") ?: ""
-    return when (displayNameSetting) {
-        "nickname_full_name" -> {
-            (nickname ?: "$firstName $lastName").trim()
-        }
-        "full_name" -> {
-            "$firstName $lastName".trim()
-        }
-        else -> {
-            name.trim()
-        }
-    }
-}
-
-private fun PushNotificationDataRunnable.Companion.displayGroupMessageName(profilesArray: ReadableArray, locale: Locale, displayNameSetting: String): String {
-    val names = ArrayList<String>()
-    for (i in 0 until profilesArray.size()) {
-        val profile = profilesArray.getMap(i)
-        names.add(displayUsername(profile, displayNameSetting))
-    }
-
-    return names.sortedWith { s1, s2 ->
-        Collator.getInstance(locale).compare(s1, s2)
-    }.joinToString(", ").trim()
-}

android/app/src/main/java/com/mattermost/helpers/push_notification/General.kt

@@ -1,53 +0,0 @@
-package com.mattermost.helpers.push_notification
-
-import com.facebook.react.bridge.ReadableMap
-import com.mattermost.helpers.Network
-import com.mattermost.helpers.PushNotificationDataRunnable
-import com.mattermost.helpers.ResolvePromise
-
-import java.io.IOException
-
-import kotlin.coroutines.suspendCoroutine
-
-internal suspend fun PushNotificationDataRunnable.Companion.fetch(serverUrl: String, endpoint: String): ReadableMap? {
-    return suspendCoroutine { cont ->
-        Network.get(serverUrl, endpoint, null, object : ResolvePromise() {
-            override fun resolve(value: Any?) {
-                val response = value as ReadableMap?
-                if (response != null && !response.getBoolean("ok")) {
-                    val error = response.getMap("data")
-                    cont.resumeWith(Result.failure((IOException("Unexpected code ${error?.getInt("status_code")} ${error?.getString("message")}"))))
-                } else {
-                    cont.resumeWith(Result.success(response))
-                }
-            }
-
-            override fun reject(code: String, message: String) {
-                cont.resumeWith(Result.failure(IOException("Unexpected code $code $message")))
-            }
-
-            override fun reject(reason: Throwable?) {
-                cont.resumeWith(Result.failure(IOException("Unexpected code $reason")))
-            }
-        })
-    }
-}
-
-internal suspend fun PushNotificationDataRunnable.Companion.fetchWithPost(serverUrl: String, endpoint: String, options: ReadableMap?) : ReadableMap? {
-    return suspendCoroutine { cont ->
-        Network.post(serverUrl, endpoint, options, object : ResolvePromise() {
-            override fun resolve(value: Any?) {
-                val response = value as ReadableMap?
-                cont.resumeWith(Result.success(response))
-            }
-
-            override fun reject(code: String, message: String) {
-                cont.resumeWith(Result.failure(IOException("Unexpected code $code $message")))
-            }
-
-            override fun reject(reason: Throwable?) {
-                cont.resumeWith(Result.failure(IOException("Unexpected code $reason")))
-            }
-        })
-    }
-}

android/app/src/main/java/com/mattermost/helpers/push_notification/Post.kt

@@ -1,182 +0,0 @@
-package com.mattermost.helpers.push_notification
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.NoSuchKeyException
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableNativeArray
-import com.mattermost.helpers.PushNotificationDataRunnable
-import com.mattermost.helpers.ReadableArrayUtils
-import com.mattermost.helpers.ReadableMapUtils
-import com.mattermost.helpers.database_extension.*
-import com.nozbe.watermelondb.Database
-
-internal suspend fun PushNotificationDataRunnable.Companion.fetchPosts(
-        db: Database, serverUrl: String, channelId: String, isCRTEnabled: Boolean,
-        rootId: String?, loadedProfiles: ReadableArray?
-): ReadableMap? {
-    return try {
-        val regex = Regex("""\B@(([a-z\d-._]*[a-z\d_])[.-]*)""", setOf(RegexOption.IGNORE_CASE))
-        val currentUserId = queryCurrentUserId(db)
-        val currentUser = find(db, "User", currentUserId)
-        val currentUsername = currentUser?.getString("username")
-
-        var additionalParams = ""
-        if (isCRTEnabled) {
-            additionalParams = "&collapsedThreads=true&collapsedThreadsExtended=true"
-        }
-
-        val receivingThreads = isCRTEnabled && !rootId.isNullOrEmpty()
-        val endpoint = if (receivingThreads) {
-            val since = rootId?.let { queryLastPostInThread(db, it) }
-            val queryParams = if (since == null) "?perPage=60&fromCreatedAt=0&direction=up" else
-                "?fromCreateAt=${since.toLong()}&direction=down"
-
-            "/api/v4/posts/$rootId/thread$queryParams$additionalParams"
-        } else {
-            val since = queryPostSinceForChannel(db, channelId)
-            val queryParams = if (since == null) "?page=0&per_page=60" else "?since=${since.toLong()}"
-            "/api/v4/channels/$channelId/posts$queryParams$additionalParams"
-        }
-
-        val postsResponse = fetch(serverUrl, endpoint)
-        val postData = postsResponse?.getMap("data")
-        val results = Arguments.createMap()
-
-        if (postData != null) {
-            val data = ReadableMapUtils.toMap(postData)
-            results.putMap("posts", postData)
-            if (data != null) {
-                val postsMap = data["posts"]
-                if (postsMap != null) {
-                    @Suppress("UNCHECKED_CAST")
-                    val posts = ReadableMapUtils.toWritableMap(postsMap as? Map<String, Any>)
-                    val iterator = posts.keySetIterator()
-                    val userIds = mutableListOf<String>()
-                    val usernames = mutableListOf<String>()
-
-                    val threads = WritableNativeArray()
-                    val threadParticipantUserIds = mutableListOf<String>() // Used to exclude the "userIds" present in the thread participants
-                    val threadParticipantUsernames = mutableListOf<String>() // Used to exclude the "usernames" present in the thread participants
-                    val threadParticipantUsers = HashMap<String, ReadableMap>() // All unique users from thread participants are stored here
-                    val userIdsAlreadyLoaded = mutableListOf<String>()
-                    if (loadedProfiles != null) {
-                        for (i in 0 until loadedProfiles.size()) {
-                            loadedProfiles.getMap(i).getString("id")?.let { userIdsAlreadyLoaded.add(it) }
-                        }
-                    }
-
-                    while (iterator.hasNextKey()) {
-                        val key = iterator.nextKey()
-                        val post = posts.getMap(key)
-                        val userId = post?.getString("user_id")
-                        if (userId != null && userId != currentUserId && !userIdsAlreadyLoaded.contains(userId) && !userIds.contains(userId)) {
-                            userIds.add(userId)
-                        }
-                        val message = post?.getString("message")
-                        if (message != null) {
-                            val matchResults = regex.findAll(message)
-                            matchResults.iterator().forEach {
-                                val username = it.value.removePrefix("@")
-                                if (!usernames.contains(username) && currentUsername != username && !specialMentions.contains(username)) {
-                                    usernames.add(username)
-                                }
-                            }
-                        }
-
-                        if (isCRTEnabled) {
-                            // Add root post as a thread
-                            val threadId = post?.getString("root_id")
-                            if (threadId.isNullOrEmpty()) {
-                                post?.let {
-                                    val thread = Arguments.createMap()
-                                    thread.putString("id", it.getString("id"))
-                                    thread.putInt("reply_count", it.getInt("reply_count"))
-                                    thread.putDouble("last_reply_at", 0.0)
-                                    thread.putDouble("last_viewed_at", 0.0)
-                                    thread.putArray("participants", it.getArray("participants"))
-                                    thread.putMap("post", it)
-                                    thread.putBoolean("is_following", try {
-                                        it.getBoolean("is_following")
-                                    } catch (e: NoSuchKeyException) {
-                                        false
-                                    })
-                                    thread.putInt("unread_replies", 0)
-                                    thread.putInt("unread_mentions", 0)
-                                    thread.putDouble("delete_at", it.getDouble("delete_at"))
-                                    threads.pushMap(thread)
-                                }
-                            }
-
-                            // Add participant userIds and usernames to exclude them from getting fetched again
-                            val participants = post?.getArray("participants")
-                            participants?.let {
-                                for (i in 0 until it.size()) {
-                                    val participant = it.getMap(i)
-
-                                    val participantId = participant.getString("id")
-                                    if (participantId != currentUserId && participantId != null) {
-                                        if (!threadParticipantUserIds.contains(participantId) && !userIdsAlreadyLoaded.contains(participantId)) {
-                                            threadParticipantUserIds.add(participantId)
-                                        }
-
-                                        if (!threadParticipantUsers.containsKey(participantId)) {
-                                            threadParticipantUsers[participantId] = participant
-                                        }
-                                    }
-
-                                    val username = participant.getString("username")
-                                    if (username != null && username != currentUsername && !threadParticipantUsernames.contains(username)) {
-                                        threadParticipantUsernames.add(username)
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    val existingUserIds = queryIds(db, "User", userIds.toTypedArray())
-                    val existingUsernames = queryByColumn(db, "User", "username", usernames.toTypedArray())
-                    userIds.removeAll { it in existingUserIds }
-                    usernames.removeAll { it in existingUsernames }
-
-                    if (threadParticipantUserIds.size > 0) {
-                        // Do not fetch users found in thread participants as we get the user's data in the posts response already
-                        userIds.removeAll { it in threadParticipantUserIds }
-                        usernames.removeAll { it in threadParticipantUsernames }
-
-                        // Get users from thread participants
-                        val existingThreadParticipantUserIds = queryIds(db, "User", threadParticipantUserIds.toTypedArray())
-
-                        // Exclude the thread participants already present in the DB from getting inserted again
-                        val usersFromThreads = WritableNativeArray()
-                        threadParticipantUsers.forEach { (userId, user) ->
-                            if (!existingThreadParticipantUserIds.contains(userId)) {
-                                usersFromThreads.pushMap(user)
-                            }
-                        }
-
-                        if (usersFromThreads.size() > 0) {
-                            results.putArray("usersFromThreads", usersFromThreads)
-                        }
-                    }
-
-                    if (userIds.size > 0) {
-                        results.putArray("userIdsToLoad", ReadableArrayUtils.toWritableArray(userIds.toTypedArray()))
-                    }
-
-                    if (usernames.size > 0) {
-                        results.putArray("usernamesToLoad", ReadableArrayUtils.toWritableArray(usernames.toTypedArray()))
-                    }
-
-                    if (threads.size() > 0) {
-                        results.putArray("threads", threads)
-                    }
-                }
-            }
-        }
-        results
-    } catch (e: Exception) {
-        e.printStackTrace()
-        null
-    }
-}

android/app/src/main/java/com/mattermost/helpers/push_notification/Team.kt

@@ -1,28 +0,0 @@
-package com.mattermost.helpers.push_notification
-
-import com.facebook.react.bridge.ReadableMap
-import com.mattermost.helpers.PushNotificationDataRunnable
-import com.mattermost.helpers.database_extension.findMyTeam
-import com.mattermost.helpers.database_extension.findTeam
-import com.nozbe.watermelondb.Database
-
-suspend fun PushNotificationDataRunnable.Companion.fetchTeamIfNeeded(db: Database, serverUrl: String, teamId: String): Pair<ReadableMap?, ReadableMap?> {
-    return try {
-        var team: ReadableMap? = null
-        var myTeam: ReadableMap? = null
-        val teamExists = findTeam(db, teamId)
-        val myTeamExists = findMyTeam(db, teamId)
-        if (!teamExists) {
-            team = fetch(serverUrl, "/api/v4/teams/$teamId")
-        }
-
-        if (!myTeamExists) {
-            myTeam = fetch(serverUrl, "/api/v4/teams/$teamId/members/me")
-        }
-
-        Pair(team, myTeam)
-    } catch (e: Exception) {
-        e.printStackTrace()
-        Pair(null, null)
-    }
-}

android/app/src/main/java/com/mattermost/helpers/push_notification/Thread.kt

@@ -1,19 +0,0 @@
-package com.mattermost.helpers.push_notification
-
-import com.facebook.react.bridge.ReadableMap
-import com.mattermost.helpers.PushNotificationDataRunnable
-import com.mattermost.helpers.database_extension.*
-import com.nozbe.watermelondb.Database
-
-internal suspend fun PushNotificationDataRunnable.Companion.fetchThread(db: Database, serverUrl: String, threadId: String, teamId: String?): ReadableMap? {
-    val currentUserId = queryCurrentUserId(db) ?: return null
-    val threadTeamId = (if (teamId.isNullOrEmpty()) queryCurrentTeamId(db) else teamId) ?: return null
-
-    return try {
-        val thread = fetch(serverUrl, "/api/v4/users/$currentUserId/teams/${threadTeamId}/threads/$threadId")
-        thread?.getMap("data")
-    } catch (e: Exception) {
-        e.printStackTrace()
-        null
-    }
-}

android/app/src/main/java/com/mattermost/helpers/push_notification/User.kt

@@ -1,61 +0,0 @@
-package com.mattermost.helpers.push_notification
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
-import com.mattermost.helpers.PushNotificationDataRunnable
-import com.mattermost.helpers.ReadableArrayUtils
-
-internal suspend fun PushNotificationDataRunnable.Companion.fetchUsersById(serverUrl: String, userIds: ReadableArray): ReadableArray? {
-    return try {
-        val endpoint = "api/v4/users/ids"
-        val options = Arguments.createMap()
-        options.putArray("body", ReadableArrayUtils.toWritableArray(ReadableArrayUtils.toArray(userIds)))
-        val result = fetchWithPost(serverUrl, endpoint, options)
-        result?.getArray("data")
-    } catch (e: Exception) {
-        e.printStackTrace()
-        null
-    }
-}
-
-internal suspend fun PushNotificationDataRunnable.Companion.fetchUsersByUsernames(serverUrl: String, usernames: ReadableArray): ReadableArray? {
-    return try {
-        val endpoint = "api/v4/users/usernames"
-        val options = Arguments.createMap()
-        options.putArray("body", ReadableArrayUtils.toWritableArray(ReadableArrayUtils.toArray(usernames)))
-        val result = fetchWithPost(serverUrl, endpoint, options)
-        result?.getArray("data")
-    } catch (e: Exception) {
-        e.printStackTrace()
-        null
-    }
-}
-
-internal suspend fun PushNotificationDataRunnable.Companion.fetchNeededUsers(serverUrl: String, loadedUsers: ReadableArray?, data: ReadableMap?): ArrayList<Any> {
-    val userList = ArrayList<Any>()
-    loadedUsers?.let { PushNotificationDataRunnable.addUsersToList(it, userList) }
-    data?.getArray("userIdsToLoad")?.let { ids ->
-        if (ids.size() > 0) {
-            val result = fetchUsersById(serverUrl, ids)
-            result?.let { PushNotificationDataRunnable.addUsersToList(it, userList) }
-        }
-    }
-
-    data?.getArray("usernamesToLoad")?.let { ids ->
-        if (ids.size() > 0) {
-            val result = fetchUsersByUsernames(serverUrl, ids)
-            result?.let { PushNotificationDataRunnable.addUsersToList(it, userList) }
-        }
-    }
-
-    data?.getArray("usersFromThreads")?.let { PushNotificationDataRunnable.addUsersToList(it, userList) }
-
-    return userList
-}
-
-internal fun PushNotificationDataRunnable.Companion.addUsersToList(users: ReadableArray, list: ArrayList<Any>) {
-    for (i in 0 until users.size()) {
-        list.add(users.getMap(i))
-    }
-}

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

@@ -1,177 +1,563 @@
 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.RemoteInput;
+import android.content.Intent;
 import android.content.Context;
+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.net.Uri;
 import android.os.Bundle;
-import android.text.TextUtils;
+import android.os.Build;
+import android.provider.Settings.System;
+import androidx.annotation.Nullable;
 import android.util.Log;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-import androidx.annotation.NonNull;
-import androidx.core.app.NotificationCompat;
-
-import java.util.Objects;
-
-import com.facebook.react.bridge.ReadableMap;
-import com.mattermost.helpers.CustomPushNotificationHelper;
-import com.mattermost.helpers.DatabaseHelper;
-import com.mattermost.helpers.Network;
-import com.mattermost.helpers.NotificationHelper;
-import com.mattermost.helpers.PushNotificationDataHelper;
-import com.mattermost.helpers.ReadableMapUtils;
-import com.mattermost.share.ShareModule;
-import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
 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.mattermost.helpers.database_extension.GeneralKt.*;
 import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_NAME;
 
+import com.mattermost.helpers.ResolvePromise;
 
 public class CustomPushNotification extends PushNotification {
-    private final PushNotificationDataHelper dataHelper;
+    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 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);
-        dataHelper = new PushNotificationDataHelper(context);
+        this.context = context;
+        createNotificationChannels();
+    }
 
-        try {
-            Objects.requireNonNull(DatabaseHelper.Companion.getInstance()).init(context);
-            Network.init(context);
-            NotificationHelper.cleanNotificationPreferencesIfNeeded(context);
-        } catch (Exception e) {
-            e.printStackTrace();
+    public static void clearNotification(Context mContext, int notificationId, String channelId) {
+        if (notificationId != -1) {
+            Integer count = channelIdToNotificationCount.get(channelId);
+            if (count == null) {
+                count = -1;
+            }
+
+            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;
+                }
+            }
+        }
+    }
+
+    public static void clearAllNotifications(Context mContext) {
+        channelIdToNotificationCount.clear();
+        channelIdToNotification.clear();
+        if (mContext != null) {
+            final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+            notificationManager.cancelAll();
         }
     }
 
     @Override
-    public void onReceived() {
+    public void onReceived() throws InvalidNotificationException {
         final Bundle initialData = mNotificationProps.asBundle();
         final String type = initialData.getString("type");
         final String ackId = initialData.getString("ack_id");
         final String postId = initialData.getString("post_id");
         final String channelId = initialData.getString("channel_id");
-        final boolean isIdLoaded = initialData.getString("id_loaded") != null && initialData.getString("id_loaded").equals("true");
-        int notificationId = NotificationHelper.getNotificationId(initialData);
+        final boolean isIdLoaded = initialData.getString("id_loaded") != null ? initialData.getString("id_loaded").equals("true") : false;
+        int notificationId = MESSAGE_NOTIFICATION_ID;
 
-        String serverUrl = addServerUrlToBundle(initialData);
-
-        if (ackId != null && serverUrl != null) {
-            Bundle response = ReceiptDelivery.send(ackId, serverUrl, postId, type, isIdLoaded);
-            if (isIdLoaded && response != null) {
-                Bundle current = mNotificationProps.asBundle();
-                if (!current.containsKey("server_url")) {
-                    response.putString("server_url", serverUrl);
+        if (ackId != null) {
+            notificationReceiptDelivery(ackId, postId, type, isIdLoaded, new ResolvePromise() {
+                @Override
+                public void resolve(@Nullable Object value) {
+                    if (isIdLoaded) {
+                        Bundle response = (Bundle) value;
+                        mNotificationProps = createProps(response);
+                    }
                 }
-                current.putAll(response);
-                mNotificationProps = createProps(current);
+
+                @Override
+                public void reject(String code, String message) {
+                    Log.e("ReactNative", code + ": " + message);
+                }
+            });
+        }
+
+        // notificationReceiptDelivery can override mNotificationProps
+        // so we fetch the bundle again
+        final Bundle data = mNotificationProps.asBundle();
+
+        if (channelId != null) {
+            notificationId = channelId.hashCode();
+
+            synchronized (channelIdToNotificationCount) {
+                Integer count = channelIdToNotificationCount.get(channelId);
+                if (count == null) {
+                    count = 0;
+                }
+
+                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);
             }
         }
 
-        finishProcessingNotification(serverUrl, type, channelId, notificationId);
-    }
-
-    @Override
-    public void onOpened() {
-        if (mNotificationProps != null) {
-            digestNotification();
-
-            Bundle data = mNotificationProps.asBundle();
-            NotificationHelper.clearChannelOrThreadNotifications(mContext, data);
-        }
-    }
-
-    private void finishProcessingNotification(final String serverUrl, @NonNull final String type, final String channelId, final int notificationId) {
-        final boolean isReactInit = mAppLifecycleFacade.isReactInitialized();
-
-        switch (type) {
-            case CustomPushNotificationHelper.PUSH_TYPE_MESSAGE:
-            case CustomPushNotificationHelper.PUSH_TYPE_SESSION:
-                ShareModule shareModule = ShareModule.getInstance();
-                String currentActivityName = shareModule != null ? shareModule.getCurrentActivityName() : "";
-                Log.i("ReactNative", currentActivityName);
-                if (!mAppLifecycleFacade.isAppVisible() || !currentActivityName.equals("MainActivity")) {
-                    boolean createSummary = type.equals(CustomPushNotificationHelper.PUSH_TYPE_MESSAGE);
-                    if (type.equals(CustomPushNotificationHelper.PUSH_TYPE_MESSAGE)) {
-                        if (channelId != null) {
-                            Bundle notificationBundle = mNotificationProps.asBundle();
-                            if (serverUrl != null) {
-                                // We will only fetch the data related to the notification on the native side
-                                // as updating the data directly to the db removes the wal & shm files needed
-                                // by watermelonDB, if the DB is updated while WDB is running it causes WDB to
-                                // detect the database as malformed, thus the app stop working and a restart is required.
-                                // Data will be fetch from within the JS context instead.
-                                Bundle notificationResult = dataHelper.fetchAndStoreDataForPushNotification(notificationBundle, isReactInit);
-                                if (notificationResult != null) {
-                                    notificationBundle.putBundle("data", notificationResult);
-                                    mNotificationProps = createProps(notificationBundle);
-                                }
-                            }
-                            createSummary = NotificationHelper.addNotificationToPreferences(
-                                    mContext,
-                                    notificationId,
-                                    notificationBundle
-                            );
-                        }
-                    }
-
-                    buildNotification(notificationId, createSummary);
-                }
-                break;
-            case CustomPushNotificationHelper.PUSH_TYPE_CLEAR:
-                NotificationHelper.clearChannelOrThreadNotifications(mContext, mNotificationProps.asBundle());
-                break;
+        switch(type) {
+        case PUSH_TYPE_MESSAGE:
+        case PUSH_TYPE_SESSION:
+            super.postNotification(notificationId);
+            break;
+        case PUSH_TYPE_CLEAR:
+            cancelNotification(data, notificationId);
+            break;
         }
 
-        if (isReactInit) {
+        if (mAppLifecycleFacade.isReactInitialized()) {
             notifyReceivedToJS();
         }
     }
 
-    private void buildNotification(Integer notificationId, boolean createSummary) {
-        final PendingIntent pendingIntent = NotificationIntentAdapter.createPendingNotificationIntent(mContext, mNotificationProps);
-        final Notification notification = buildNotification(pendingIntent);
-        if (createSummary) {
-            final Notification summary = getNotificationSummaryBuilder(pendingIntent).build();
-            super.postNotification(summary, notificationId + 1);
+    @Override
+    public void onOpened() {
+        Bundle data = mNotificationProps.asBundle();
+        final String channelId = data.getString("channel_id");
+        if (channelId != null) {
+            channelIdToNotificationCount.remove(channelId);
+            channelIdToNotification.remove(channelId);
         }
-        super.postNotification(notification, notificationId);
+        digestNotification();
     }
 
     @Override
-    protected NotificationCompat.Builder getNotificationBuilder(PendingIntent intent) {
+    protected Notification.Builder getNotificationBuilder(PendingIntent intent) {
+        // First, get a builder initialized with defaults from the core class.
+        final Notification.Builder notification = new Notification.Builder(mContext);
+
         Bundle bundle = mNotificationProps.asBundle();
-        return CustomPushNotificationHelper.createNotificationBuilder(mContext, intent, bundle, false);
+
+        addNotificationExtras(notification, bundle);
+        setNotificationIcons(notification, bundle);
+        setNotificationMessagingStyle(notification, bundle);
+        setNotificationChannel(notification, bundle);
+        setNotificationBadgeIconType(notification);
+
+        NotificationPreferences notificationPreferences = NotificationPreferences.getInstance(mContext);
+        setNotificationSound(notification, notificationPreferences);
+        setNotificationVibrate(notification, notificationPreferences);
+        setNotificationBlink(notification, notificationPreferences);
+
+        String channelId = bundle.getString("channel_id");
+        int notificationId = channelId != null ? channelId.hashCode() : MESSAGE_NOTIFICATION_ID;
+        setNotificationNumber(notification, channelId);
+        setNotificationDeleteIntent(notification, notificationId);
+        addNotificationReplyAction(notification, notificationId, bundle);
+
+        notification
+            .setContentIntent(intent)
+            .setVisibility(Notification.VISIBILITY_PRIVATE)
+            .setPriority(Notification.PRIORITY_HIGH)
+            .setAutoCancel(true);
+
+        return notification;
     }
 
-    protected NotificationCompat.Builder getNotificationSummaryBuilder(PendingIntent intent) {
-        Bundle bundle = mNotificationProps.asBundle();
-        return CustomPushNotificationHelper.createNotificationBuilder(mContext, intent, bundle, true);
+    private void addNotificationExtras(Notification.Builder notification, Bundle bundle) {
+        Bundle userInfoBundle = bundle.getBundle("userInfo");
+        if (userInfoBundle == null) {
+            userInfoBundle = new Bundle();
+        }
+
+        String channelId = bundle.getString("channel_id");
+        if (channelId != null) {
+            userInfoBundle.putString("channel_id", channelId);
+        }
+
+        notification.addExtras(userInfoBundle);
+    }
+
+    private void 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;
+        String senderId = bundle.getString("sender_id");
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P || senderId == null) {
+            messagingStyle = new Notification.MessagingStyle("");
+        } else {
+            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", data.getString("body"));
+            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("test");
+                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 testNotification = false;
+        boolean localNotification = false;
+        Bundle userInfoBundle = bundle.getBundle("userInfo");
+        if (userInfoBundle != null) {
+            testNotification = userInfoBundle.getBoolean("test");
+            localNotification = userInfoBundle.getBoolean("local");
+        }
+
+        if (mAppLifecycleFacade.isAppVisible() && !testNotification && !localNotification) {
+            notificationChannel = mMinImportanceChannel;
+        }
+
+        notification.setChannelId(notificationChannel.getId());
+    }
+
+    private void setNotificationBadgeIconType(Notification.Builder notification) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            notification.setBadgeIconType(Notification.BADGE_ICON_SMALL);
+        }
+    }
+
+    private void setNotificationGroup(Notification.Builder notification) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            notification
+                .setGroup(GROUP_KEY_MESSAGES)
+                .setGroupSummary(true);
+        }
+    }
+
+    private void setNotificationSound(Notification.Builder notification, NotificationPreferences notificationPreferences) {
+        String soundUri = notificationPreferences.getNotificationSound();
+        if (soundUri != null) {
+            if (soundUri != "none") {
+                notification.setSound(Uri.parse(soundUri), AudioManager.STREAM_NOTIFICATION);
+            }
+        } else {
+            Uri defaultUri = System.DEFAULT_NOTIFICATION_URI;
+            notification.setSound(defaultUri, AudioManager.STREAM_NOTIFICATION);
+        }
+    }
+
+    private void setNotificationVibrate(Notification.Builder notification, NotificationPreferences notificationPreferences) {
+        boolean vibrate = notificationPreferences.getShouldVibrate();
+        if (vibrate) {
+            // Use the system default for vibration
+            notification.setDefaults(Notification.DEFAULT_VIBRATE);
+        }
+    }
+
+    private void setNotificationBlink(Notification.Builder notification, NotificationPreferences notificationPreferences) {
+        boolean blink = notificationPreferences.getShouldBlink();
+        if (blink) {
+            notification.setLights(Color.CYAN, 500, 500);
+        }
+    }
+
+    private void setNotificationDeleteIntent(Notification.Builder notification, int notificationId) {
+        // Let's add a delete intent when the notification is dismissed
+        Intent delIntent = new Intent(mContext, NotificationDismissService.class);
+        delIntent.putExtra(NOTIFICATION_ID, notificationId);
+        PendingIntent deleteIntent = NotificationIntentAdapter.createPendingNotificationIntent(mContext, delIntent, mNotificationProps);
+        notification.setDeleteIntent(deleteIntent);
+    }
+
+    private void addNotificationReplyAction(Notification.Builder notification, int notificationId, Bundle bundle) {
+        String postId = bundle.getString("post_id");
+
+        if (android.text.TextUtils.isEmpty(postId) || Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            return;
+        }
+
+        Intent replyIntent = new Intent(mContext, NotificationReplyBroadcastReceiver.class);
+        replyIntent.setAction(KEY_TEXT_REPLY);
+        replyIntent.putExtra(NOTIFICATION_ID, notificationId);
+        replyIntent.putExtra("pushNotification", bundle);
+
+        PendingIntent replyPendingIntent = PendingIntent.getBroadcast(
+            mContext,
+            notificationId,
+            replyIntent,
+            PendingIntent.FLAG_UPDATE_CURRENT);
+
+        RemoteInput remoteInput = new RemoteInput.Builder(KEY_TEXT_REPLY)
+            .setLabel("Reply")
+            .build();
+
+        int icon = R.drawable.ic_notif_action_reply;
+        CharSequence title = "Reply";
+        Notification.Action replyAction = new Notification.Action.Builder(icon, title, replyPendingIntent)
+            .addRemoteInput(remoteInput)
+            .setAllowGeneratedReplies(true)
+            .build();
+
+        notification
+            .setShowWhen(true)
+            .addAction(replyAction);
     }
 
     private void notifyReceivedToJS() {
         mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_EVENT_NAME, mNotificationProps.asBundle(), mAppLifecycleFacade.getRunningReactContext());
     }
 
-    private String addServerUrlToBundle(Bundle bundle) {
-        DatabaseHelper dbHelper = DatabaseHelper.Companion.getInstance();
-        String serverId = bundle.getString("server_id");
-        String serverUrl = null;
-        if (dbHelper != null) {
-            if (serverId == null) {
-                serverUrl = dbHelper.getOnlyServerUrl();
-            } else {
-                serverUrl = getServerUrlForIdentifier(dbHelper, serverId);
-            }
+    private void cancelNotification(Bundle data, int notificationId) {
+        final String channelId = data.getString("channel_id");
+        final String badge = data.getString("badge");
 
-            if (!TextUtils.isEmpty(serverUrl)) {
-                bundle.putString("server_url", serverUrl);
-                mNotificationProps = createProps(bundle);
+        CustomPushNotification.badgeCount = Integer.parseInt(badge);
+        CustomPushNotification.clearNotification(mContext.getApplicationContext(), notificationId, channelId);
+    }
+
+    private String getSenderName(Bundle bundle) {
+        String senderName = bundle.getString("sender_name");
+        if (senderName != null) {
+            return senderName;
+        }
+
+        String channelName = bundle.getString("channel_name");
+        if (channelName != null && channelName.startsWith("@")) {
+            return channelName;
+        }
+
+        String message = bundle.getString("message");
+        if (message != null) {
+            String name = message.split(":")[0];
+            if (name != message) {
+                return name;
             }
         }
 
-        return serverUrl;
+        return getConversationTitle(bundle);
+    }
+
+    private String removeSenderNameFromMessage(String message, String senderName) {
+        Integer index = message.indexOf(senderName);
+        if (index == 0) {
+            message = message.substring(senderName.length());
+        }
+
+        return message.replaceFirst(": ", "").trim();
+    }
+
+    private void notificationReceiptDelivery(String ackId, String postId, String type, boolean isIdLoaded, ResolvePromise promise) {
+        ReceiptDelivery.send(context, ackId, postId, type, isIdLoaded, promise);
+    }
+
+    private void createNotificationChannels() {
+        // Notification channels are not supported in Android Nougat and below
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return;
+        }
+
+        final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+
+        mHighImportanceChannel = new NotificationChannel("channel_01", "High Importance", NotificationManager.IMPORTANCE_HIGH);
+        mHighImportanceChannel.setShowBadge(true);
+        notificationManager.createNotificationChannel(mHighImportanceChannel);
+
+        mMinImportanceChannel = new NotificationChannel("channel_02", "Min Importance", NotificationManager.IMPORTANCE_MIN);
+        mMinImportanceChannel.setShowBadge(true);
+        notificationManager.createNotificationChannel(mMinImportanceChannel);
     }
 }

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

@@ -0,0 +1,35 @@
+package com.mattermost.rnbeta;
+
+import android.content.Context;
+
+import com.wix.reactnativenotifications.core.AppLaunchHelper;
+import com.wix.reactnativenotifications.core.notificationdrawer.PushNotificationsDrawer;
+
+public class CustomPushNotificationDrawer extends PushNotificationsDrawer {
+    final protected Context mContext;
+    final protected AppLaunchHelper mAppLaunchHelper;
+
+   protected CustomPushNotificationDrawer(Context context, AppLaunchHelper appLaunchHelper) {
+        super(context, appLaunchHelper);
+        mContext = context;
+        mAppLaunchHelper = appLaunchHelper;
+    }
+
+    @Override
+    public void onAppInit() {
+    }
+
+    @Override
+    public void onAppVisible() {
+    }
+
+    @Override
+    public void onNotificationOpened() {
+    }
+
+    @Override
+    public void onCancelAllLocalNotifications() {
+        CustomPushNotification.clearAllNotifications(mContext);
+        cancelAllScheduledNotifications();
+    }
+}

android/app/src/main/java/com/mattermost/rnbeta/FoldableObserver.kt

@@ -1,58 +0,0 @@
-package com.mattermost.rnbeta
-
-import android.app.Activity
-import androidx.window.layout.FoldingFeature
-import androidx.window.layout.WindowInfoTracker
-import androidx.window.layout.WindowLayoutInfo
-import androidx.window.rxjava3.layout.windowLayoutInfoObservable
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.disposables.Disposable
-
-class FoldableObserver(private val activity: Activity) {
-    private var disposable: Disposable? = null
-    private lateinit var observable: Observable<WindowLayoutInfo>
-
-    fun onCreate() {
-        observable = WindowInfoTracker.getOrCreate(activity)
-                .windowLayoutInfoObservable(activity)
-    }
-
-    fun onStart() {
-        if (disposable?.isDisposed == true) {
-            onCreate()
-        }
-        disposable = observable.observeOn(AndroidSchedulers.mainThread())
-                .subscribe { layoutInfo ->
-                    val splitViewModule = SplitViewModule.getInstance()
-                    val foldingFeature = layoutInfo.displayFeatures
-                            .filterIsInstance<FoldingFeature>()
-                            .firstOrNull()
-                    when {
-                        foldingFeature?.state === FoldingFeature.State.FLAT ->
-                            splitViewModule?.setDeviceFolded(false)
-                        isTableTopPosture(foldingFeature) ->
-                            splitViewModule?.setDeviceFolded(false)
-                        isBookPosture(foldingFeature) ->
-                            splitViewModule?.setDeviceFolded(false)
-                        else -> {
-                            splitViewModule?.setDeviceFolded(true)
-                        }
-                    }
-                }
-    }
-
-    fun onStop() {
-        disposable?.dispose()
-    }
-
-    private fun isTableTopPosture(foldFeature : FoldingFeature?) : Boolean {
-        return foldFeature?.state == FoldingFeature.State.HALF_OPENED &&
-                foldFeature.orientation == FoldingFeature.Orientation.HORIZONTAL
-    }
-
-    private fun isBookPosture(foldFeature : FoldingFeature?) : Boolean {
-        return foldFeature?.state == FoldingFeature.State.HALF_OPENED &&
-                foldFeature.orientation == FoldingFeature.Orientation.VERTICAL
-    }
-}

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

@@ -1,69 +1,25 @@
 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.facebook.react.ReactActivityDelegate;
 import com.reactnativenavigation.NavigationActivity;
 import com.github.emilioicai.hwkeyboardevent.HWKeyboardEventModule;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactActivityDelegate;
-
-import java.util.Objects;
 
 public class MainActivity extends NavigationActivity {
     private boolean HWKeyboardConnected = false;
-    private final FoldableObserver foldableObserver = new FoldableObserver(this);
-
-    @Override
-    protected String getMainComponentName() {
-        return "Mattermost";
-    }
-
-    /**
-     * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link
-     * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React
-     * (aka React 18) with two boolean flags.
-     */
-    @Override
-    protected ReactActivityDelegate createReactActivityDelegate() {
-        return new DefaultReactActivityDelegate(
-                this,
-                Objects.requireNonNull(getMainComponentName()),
-                // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-                DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled
-                // If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18).
-                DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled
-        );
-    }
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(null);
+        super.onCreate(savedInstanceState);
         setContentView(R.layout.launch_screen);
         setHWKeyboardConnected();
-        foldableObserver.onCreate();
     }
 
     @Override
-    protected void onStart() {
-        super.onStart();
-        foldableObserver.onStart();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        foldableObserver.onStop();
-    }
-
-    @Override
-    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+    public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
         if (newConfig.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO) {
@@ -73,12 +29,6 @@ public class MainActivity extends NavigationActivity {
         }
     }
 
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        super.onWindowFocusChanged(hasFocus);
-        getReactGateway().onWindowFocusChanged(hasFocus);
-    }
-
     /*
     https://mattermost.atlassian.net/browse/MM-10601
     Required by react-native-hw-keyboard-event
@@ -86,22 +36,13 @@ public class MainActivity extends NavigationActivity {
     */
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
-        if (HWKeyboardConnected) {
-            int keyCode = event.getKeyCode();
-            int keyAction = event.getAction();
-            if (keyAction == KeyEvent.ACTION_UP) {
-                if (keyCode == KeyEvent.KEYCODE_ENTER) {
-                    String keyPressed = event.isShiftPressed() ? "shift-enter" : "enter";
-                    HWKeyboardEventModule.getInstance().keyPressed(keyPressed);
-                    return true;
-                } else if (keyCode == KeyEvent.KEYCODE_K && event.isCtrlPressed()) {
-                    HWKeyboardEventModule.getInstance().keyPressed("find-channels");
-                    return true;
-                }
-            }
+        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,11 +1,14 @@
 package com.mattermost.rnbeta;
 
+import com.mattermost.rnbeta.generated.BasePackageList;
+
+import androidx.annotation.Nullable;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
-
+import java.lang.reflect.InvocationTargetException;
 import java.io.File;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,35 +20,54 @@ import com.wix.reactnativenotifications.RNNotificationsPackage;
 import com.reactnativenavigation.NavigationApplication;
 import com.wix.reactnativenotifications.core.notification.INotificationsApplication;
 import com.wix.reactnativenotifications.core.notification.IPushNotification;
+import com.wix.reactnativenotifications.core.notificationdrawer.IPushNotificationsDrawer;
+import com.wix.reactnativenotifications.core.notificationdrawer.INotificationsDrawerApplication;
 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.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactNativeHost;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.TurboReactPackage;
-import com.facebook.react.bridge.JSIModuleSpec;
 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.JSIModulePackage;
+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.network.OkHttpClientProvider;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.soloader.SoLoader;
 
-import com.mattermost.flipper.ReactNativeFlipper;
-import com.mattermost.networkclient.RCTOkHttpClientFactory;
-import com.nozbe.watermelondb.jsi.WatermelonDBJSIPackage;
+import org.unimodules.adapters.react.ModuleRegistryAdapter;
+import org.unimodules.adapters.react.ReactModuleRegistryProvider;
+import org.unimodules.core.interfaces.SingletonModule;
 
-public class MainApplication extends NavigationApplication implements INotificationsApplication {
+import com.nozbe.watermelondb.WatermelonDBPackage;
+
+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 ReactModuleRegistryProvider mModuleRegistryProvider = new ReactModuleRegistryProvider(new BasePackageList().getPackageList(), null);
+
   private final ReactNativeHost mReactNativeHost =
-    new DefaultReactNativeHost(this) {
+    new ReactNativeHost(this) {
       @Override
       public boolean getUseDeveloperSupport() {
         return BuildConfig.DEBUG;
@@ -53,39 +75,46 @@ public class MainApplication extends NavigationApplication implements INotificat
 
       @Override
       protected List<ReactPackage> getPackages() {
+        @SuppressWarnings("UnnecessaryLocalVariable")
         List<ReactPackage> packages = new PackageList(this).getPackages();
         // Packages that cannot be autolinked yet can be added manually here, for example:
         // packages.add(new MyReactNativePackage());
         packages.add(new RNNotificationsPackage(MainApplication.this));
+        packages.add(new WatermelonDBPackage());
 
+        // Add unimodules
+        List<ReactPackage> unimodules = Arrays.<ReactPackage>asList(
+          new ModuleRegistryAdapter(mModuleRegistryProvider)
+        );
+        packages.addAll(unimodules);
 
         packages.add(
           new TurboReactPackage() {
                 @Override
                 public NativeModule getModule(String name, ReactApplicationContext reactContext) {
                   switch (name) {
-                  case "MattermostManaged":
-                      return MattermostManagedModule.getInstance(reactContext);
-                  case "MattermostShare":
-                    return ShareModule.getInstance(reactContext);
-                  case "Notifications":
-                    return NotificationsModule.getInstance(instance, reactContext);
-                  case "SplitView":
-                      return SplitViewModule.Companion.getInstance(reactContext);
-                  default:
-                    throw new IllegalArgumentException("Could not find module " + name);
+                    case "MattermostShare":
+                      return new ShareModule(instance, reactContext);
+                    case "NotificationPreferences":
+                      return NotificationPreferencesModule.getInstance(instance, reactContext);
+                    case "RNTextInputReset":
+                      return new RNTextInputResetModule(reactContext);
+                    default:
+                      throw new IllegalArgumentException("Could not find module " + name);
                   }
                 }
 
                 @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("Notifications", new ReactModuleInfo("Notifications", "com.mattermost.rnbeta.NotificationsModule", false, false, false, false, false));
-                    map.put("SplitView", new ReactModuleInfo("SplitView", "com.mattermost.rnbeta.SplitViewModule", false, false, false, false, false));
-                    return map;
+                  return new ReactModuleInfoProvider() {
+                    @Override
+                    public Map<String, ReactModuleInfo> getReactModuleInfos() {
+                      Map<String, ReactModuleInfo> map = new HashMap<>();
+                      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;
+                    }
                   };
                 }
               }
@@ -94,29 +123,10 @@ public class MainApplication extends NavigationApplication implements INotificat
         return packages;
       }
 
-      @Override
-      protected JSIModulePackage getJSIModulePackage() {
-        return (reactApplicationContext, jsContext) -> {
-          List<JSIModuleSpec> modules = Collections.emptyList();
-          modules.addAll(new WatermelonDBJSIPackage().getJSIModules(reactApplicationContext, jsContext));
-
-          return modules;
-        };
-      }
-
       @Override
       protected String getJSMainModuleName() {
         return "index";
       }
-
-        @Override
-        protected boolean isNewArchEnabled() {
-            return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-        }
-        @Override
-        protected Boolean isHermesEnabled() {
-            return BuildConfig.IS_HERMES_ENABLED;
-        }
     };
 
   @Override
@@ -128,24 +138,17 @@ public class MainApplication extends NavigationApplication implements INotificat
   public void onCreate() {
     super.onCreate();
     instance = this;
-    Context context = getApplicationContext();
 
     // Delete any previous temp files created by the app
-    File tempFolder = new File(context.getCacheDir(), RealPathUtil.CACHE_DIR_NAME);
+    File tempFolder = new File(getApplicationContext().getCacheDir(), RealPathUtil.CACHE_DIR_NAME);
     RealPathUtil.deleteTempFiles(tempFolder);
     Log.i("ReactNative", "Cleaning temp cache " + tempFolder.getAbsolutePath());
 
-    // Tells React Native to use our RCTOkHttpClientFactory which builds an OKHttpClient
-    // with a cookie jar defined in APIClientModule and an interceptor to intercept all
-    // requests that originate from React Native's OKHttpClient
-    OkHttpClientProvider.setOkHttpClientFactory(new RCTOkHttpClientFactory());
+    SoLoader.init(this, /* native exopackage */ false);
+    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
 
-      SoLoader.init(this, /* native exopackage */ false);
-      if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-          // If you opted-in for the New Architecture, we load the native entry point for this app.
-          DefaultNewArchitectureEntryPoint.load();
-      }
-      ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+    // Uncomment to listen to react markers for build that has telemetry enabled
+    // addReactMarkerListener();
   }
 
   @Override
@@ -158,4 +161,82 @@ public class MainApplication extends NavigationApplication implements INotificat
             new JsIOHelper()
     );
   }
+
+  @Override
+  public IPushNotificationsDrawer getPushNotificationsDrawer(Context context, AppLaunchHelper defaultAppLaunchHelper) {
+    return new CustomPushNotificationDrawer(context, defaultAppLaunchHelper);
+  }
+
+  public ReactContext getRunningReactContext() {
+    if (mReactNativeHost == null) {
+        return null;
+    }
+
+    return mReactNativeHost
+        .getReactInstanceManager()
+        .getCurrentReactContext();
+  }
+
+  private void addReactMarkerListener() {
+    ReactMarker.addListener(new ReactMarker.MarkerListener() {
+      @Override
+      public void logMarker(ReactMarkerConstants name, @Nullable String tag, int instanceKey) {
+        if (name.toString() == ReactMarkerConstants.RELOAD.toString()) {
+          APP_START_TIME = System.currentTimeMillis();
+          RELOAD = System.currentTimeMillis();
+        } else if (name.toString() == ReactMarkerConstants.PROCESS_PACKAGES_START.toString()) {
+          PROCESS_PACKAGES_START = System.currentTimeMillis();
+        } else if (name.toString() == ReactMarkerConstants.PROCESS_PACKAGES_END.toString()) {
+          PROCESS_PACKAGES_END = System.currentTimeMillis();
+        } else if (name.toString() == ReactMarkerConstants.CONTENT_APPEARED.toString()) {
+          CONTENT_APPEARED = System.currentTimeMillis();
+          ReactContext ctx = getRunningReactContext();
+
+          if (ctx != null) {
+            WritableMap map = Arguments.createMap();
+
+            map.putDouble("appReload", RELOAD);
+            map.putDouble("appContentAppeared", CONTENT_APPEARED);
+
+            map.putDouble("processPackagesStart", PROCESS_PACKAGES_START);
+            map.putDouble("processPackagesEnd", PROCESS_PACKAGES_END);
+
+            ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).
+                    emit("nativeMetrics", map);
+          }
+        }
+      }
+    });
+  }
+
+  /**
+   * Loads Flipper in React Native templates. Call this in the onCreate method with something like
+   * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+   *
+   * @param context
+   * @param reactInstanceManager
+   */
+  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.rndiffapp.ReactNativeFlipper");
+        aClass
+            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
+            .invoke(null, context, reactInstanceManager);
+      } catch (ClassNotFoundException e) {
+        e.printStackTrace();
+      } catch (NoSuchMethodException e) {
+        e.printStackTrace();
+      } catch (IllegalAccessException e) {
+        e.printStackTrace();
+      } catch (InvocationTargetException e) {
+        e.printStackTrace();
+      }
+    }
+  }
 }

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

@@ -1,263 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.ParcelFileDescriptor;
-import android.text.TextUtils;
-import android.webkit.MimeTypeMap;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.FileProvider;
-
-import com.facebook.react.bridge.ActivityEventListener;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.BaseActivityEventListener;
-import com.facebook.react.bridge.GuardedResultAsyncTask;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-
-import com.mattermost.helpers.Credentials;
-import com.reactlibrary.createthumbnail.CreateThumbnailModule;
-import com.mattermost.helpers.RealPathUtil;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.lang.ref.WeakReference;
-import java.net.URL;
-import java.nio.channels.FileChannel;
-import java.util.Objects;
-
-public class MattermostManagedModule extends ReactContextBaseJavaModule {
-    private static final String SAVE_EVENT = "MattermostManagedSaveFile";
-    private static final Integer SAVE_REQUEST = 38641;
-    private static MattermostManagedModule instance;
-    private ReactApplicationContext reactContext;
-
-    private Promise mPickerPromise;
-    private String fileContent;
-
-    private MattermostManagedModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.reactContext = reactContext;
-        // Let the document provider know you're done by closing the stream.
-        ActivityEventListener mActivityEventListener = new BaseActivityEventListener() {
-            @Override
-            public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent intent) {
-                if (requestCode == SAVE_REQUEST) {
-                    if (mPickerPromise != null) {
-                        if (resultCode == Activity.RESULT_CANCELED) {
-                            mPickerPromise.reject(SAVE_EVENT, "Save operation cancelled");
-                        } else if (resultCode == Activity.RESULT_OK) {
-                            Uri uri = intent.getData();
-                            if (uri == null) {
-                                mPickerPromise.reject(SAVE_EVENT, "No data found");
-                            } else {
-                                try {
-                                    new SaveDataTask(reactContext, fileContent, uri).execute();
-                                    mPickerPromise.resolve(uri.toString());
-                                } catch (Exception e) {
-                                    mPickerPromise.reject(SAVE_EVENT, e.getMessage());
-                                }
-                            }
-                        }
-
-                        mPickerPromise = null;
-                    } else if (resultCode == Activity.RESULT_OK) {
-                        try {
-                            Uri uri = intent.getData();
-                            if (uri != null)
-                                new SaveDataTask(reactContext, fileContent, uri).execute();
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            }
-        };
-        reactContext.addActivityEventListener(mActivityEventListener);
-    }
-
-    public static MattermostManagedModule getInstance(ReactApplicationContext reactContext) {
-        if (instance == null) {
-            instance = new MattermostManagedModule(reactContext);
-        } else {
-            instance.reactContext = reactContext;
-        }
-
-        return instance;
-    }
-
-    public static MattermostManagedModule getInstance() {
-        return instance;
-    }
-
-    public void sendEvent(String eventName,
-                           @Nullable WritableMap params) {
-        this.reactContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit(eventName, params);
-    }
-
-    @Override
-    @NonNull
-    public String getName() {
-        return "MattermostManaged";
-    }
-
-    @ReactMethod
-    public void getFilePath(String filePath, Promise promise) {
-        Activity currentActivity = getCurrentActivity();
-        WritableMap map = Arguments.createMap();
-
-        if (currentActivity != null) {
-            Uri uri = Uri.parse(filePath);
-            String path = RealPathUtil.getRealPathFromURI(currentActivity, uri);
-            if (path != null) {
-                String text = "file://" + path;
-                map.putString("filePath", text);
-            }
-        }
-
-        promise.resolve(map);
-    }
-
-    @ReactMethod
-    public void saveFile(String path, final Promise promise) {
-        Uri contentUri;
-        String filename = "";
-        if(path.startsWith("content://")) {
-            contentUri = Uri.parse(path);
-        } else {
-            File newFile = new File(path);
-            filename = newFile.getName();
-            Activity currentActivity = getCurrentActivity();
-            if(currentActivity == null) {
-                promise.reject(SAVE_EVENT, "Activity doesn't exist");
-                return;
-            }
-            try {
-                final String packageName = currentActivity.getPackageName();
-                final String authority = packageName + ".provider";
-                contentUri = FileProvider.getUriForFile(currentActivity, authority, newFile);
-            }
-            catch(IllegalArgumentException e) {
-                promise.reject(SAVE_EVENT, e.getMessage());
-                return;
-            }
-        }
-
-        if(contentUri == null) {
-            promise.reject(SAVE_EVENT, "Invalid file");
-            return;
-        }
-
-        String extension = MimeTypeMap.getFileExtensionFromUrl(path).toLowerCase();
-        String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
-        if (mimeType == null) {
-            mimeType = RealPathUtil.getMimeType(path);
-        }
-
-        Intent intent = new Intent();
-        intent.setAction(Intent.ACTION_CREATE_DOCUMENT);
-        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        intent.addCategory(Intent.CATEGORY_OPENABLE);
-        intent.setType(mimeType);
-        intent.putExtra(Intent.EXTRA_TITLE, filename);
-
-        PackageManager pm = Objects.requireNonNull(getCurrentActivity()).getPackageManager();
-        if (intent.resolveActivity(pm) != null) {
-            try {
-                getCurrentActivity().startActivityForResult(intent, SAVE_REQUEST);
-                mPickerPromise = promise;
-                fileContent = path;
-            }
-            catch(Exception e) {
-                promise.reject(SAVE_EVENT, e.getMessage());
-            }
-        } else {
-            try {
-                if(mimeType == null) {
-                    throw new Exception("It wasn't possible to detect the type of the file");
-                }
-                throw new Exception("No app associated with this mime type");
-            }
-            catch(Exception e) {
-                promise.reject(SAVE_EVENT, e.getMessage());
-            }
-        }
-    }
-
-    @ReactMethod
-    public void createThumbnail(ReadableMap options, Promise promise) {
-        try {
-            WritableMap optionsMap = Arguments.createMap();
-            optionsMap.merge(options);
-            String url = options.hasKey("url") ? options.getString("url") : "";
-            URL videoUrl = new URL(url);
-            String serverUrl = videoUrl.getProtocol() + "://" + videoUrl.getHost() + ":" + videoUrl.getPort();
-            String token = Credentials.getCredentialsForServerSync(this.reactContext, serverUrl);
-            if (!TextUtils.isEmpty(token)) {
-                WritableMap headers = Arguments.createMap();
-                if (optionsMap.hasKey("headers")) {
-                    headers.merge(Objects.requireNonNull(optionsMap.getMap("headers")));
-                }
-                headers.putString("Authorization", "Bearer " + token);
-                optionsMap.putMap("headers", headers);
-            }
-            CreateThumbnailModule thumb = new CreateThumbnailModule(this.reactContext);
-            thumb.create(optionsMap.copy(), promise);
-        } catch (Exception e) {
-            promise.reject("CreateThumbnail_ERROR", e);
-        }
-    }
-
-    private static class SaveDataTask extends GuardedResultAsyncTask<Object> {
-        private final WeakReference<Context> weakContext;
-        private final String fromFile;
-        private final Uri toFile;
-
-        protected SaveDataTask(ReactApplicationContext reactContext, String path, Uri destination) {
-            super(reactContext.getExceptionHandler());
-            weakContext = new WeakReference<>(reactContext.getApplicationContext());
-            fromFile = path;
-            toFile = destination;
-        }
-
-        @Override
-        protected Object doInBackgroundGuarded() {
-            try {
-                ParcelFileDescriptor pfd = weakContext.get().getContentResolver().openFileDescriptor(toFile, "w");
-                File input = new File(this.fromFile);
-                try (FileInputStream fileInputStream = new FileInputStream(input)) {
-                    try (FileOutputStream fileOutputStream = new FileOutputStream(pfd.getFileDescriptor())) {
-                        FileChannel source = fileInputStream.getChannel();
-                        FileChannel dest = fileOutputStream.getChannel();
-                        dest.transferFrom(source, 0, source.size());
-                        source.close();
-                        dest.close();
-                    }
-                }
-                pfd.close();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-            return null;
-        }
-
-        @Override
-        protected void onPostExecuteGuarded(Object o) {
-
-        }
-    }
-}

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

@@ -6,20 +6,21 @@ import android.app.IntentService;
 import android.os.Bundle;
 import android.util.Log;
 
-import com.mattermost.helpers.NotificationHelper;
 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);
-
-        NotificationHelper.dismissNotification(context, bundle);
+        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

@@ -0,0 +1,57 @@
+package com.mattermost.rnbeta;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+public class NotificationPreferences {
+    private static NotificationPreferences instance;
+
+    public final String SHARED_NAME = "NotificationPreferences";
+    public final String SOUND_PREF = "NotificationSound";
+    public final String VIBRATE_PREF = "NotificationVibrate";
+    public final String BLINK_PREF = "NotificationLights";
+
+    private SharedPreferences mSharedPreferences;
+
+    private NotificationPreferences(Context context) {
+        mSharedPreferences = context.getSharedPreferences(SHARED_NAME, Context.MODE_PRIVATE);
+    }
+
+    public static NotificationPreferences getInstance(Context context) {
+        if (instance == null) {
+            instance = new NotificationPreferences(context);
+        }
+
+        return instance;
+    }
+
+    public String getNotificationSound() {
+        return mSharedPreferences.getString(SOUND_PREF, null);
+    }
+
+    public boolean getShouldVibrate() {
+        return mSharedPreferences.getBoolean(VIBRATE_PREF, true);
+    }
+
+    public boolean getShouldBlink() {
+        return mSharedPreferences.getBoolean(BLINK_PREF, false);
+    }
+
+    public void setNotificationSound(String soundUri) {
+        SharedPreferences.Editor editor = mSharedPreferences.edit();
+        editor.putString(SOUND_PREF, soundUri);
+        editor.commit();
+    }
+
+    public void setShouldVibrate(boolean vibrate) {
+        SharedPreferences.Editor editor = mSharedPreferences.edit();
+        editor.putBoolean(VIBRATE_PREF, vibrate);
+        editor.commit();
+    }
+
+    public void setShouldBlink(boolean blink) {
+        SharedPreferences.Editor editor = mSharedPreferences.edit();
+        editor.putBoolean(BLINK_PREF, blink);
+        editor.commit();
+    }
+}

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

@@ -0,0 +1,133 @@
+package com.mattermost.rnbeta;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.database.Cursor;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.os.Bundle;
+import android.net.Uri;
+import android.service.notification.StatusBarNotification;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+
+public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
+    private static NotificationPreferencesModule instance;
+    private final MainApplication mApplication;
+    private NotificationPreferences mNotificationPreference;
+
+    private NotificationPreferencesModule(MainApplication application, ReactApplicationContext reactContext) {
+        super(reactContext);
+        mApplication = application;
+        Context context = mApplication.getApplicationContext();
+        mNotificationPreference = NotificationPreferences.getInstance(context);
+    }
+
+    public static NotificationPreferencesModule getInstance(MainApplication application, ReactApplicationContext reactContext) {
+        if (instance == null) {
+            instance = new NotificationPreferencesModule(application, reactContext);
+        }
+
+        return instance;
+    }
+
+    public static NotificationPreferencesModule getInstance() {
+        return instance;
+    }
+
+    @Override
+    public String getName() {
+        return "NotificationPreferences";
+    }
+
+    @ReactMethod
+    public void getPreferences(final Promise promise) {
+        try {
+            Context context = mApplication.getApplicationContext();
+            RingtoneManager manager = new RingtoneManager(context);
+            manager.setType(RingtoneManager.TYPE_NOTIFICATION);
+            Cursor cursor = manager.getCursor();
+
+            WritableMap result = Arguments.createMap();
+            WritableArray sounds = Arguments.createArray();
+            while (cursor.moveToNext()) {
+                String notificationTitle = cursor.getString(RingtoneManager.TITLE_COLUMN_INDEX);
+                String notificationId = cursor.getString(RingtoneManager.ID_COLUMN_INDEX);
+                String notificationUri = cursor.getString(RingtoneManager.URI_COLUMN_INDEX);
+
+                WritableMap map = Arguments.createMap();
+                map.putString("name", notificationTitle);
+                map.putString("uri", (notificationUri + "/" + notificationId));
+                sounds.pushMap(map);
+            }
+
+            Uri defaultUri = RingtoneManager.getActualDefaultRingtoneUri(context, RingtoneManager.TYPE_NOTIFICATION);
+            if (defaultUri != null) {
+                result.putString("defaultUri", Uri.decode(defaultUri.toString()));
+            }
+            result.putString("selectedUri", mNotificationPreference.getNotificationSound());
+            result.putBoolean("shouldVibrate", mNotificationPreference.getShouldVibrate());
+            result.putBoolean("shouldBlink", mNotificationPreference.getShouldBlink());
+            result.putArray("sounds", sounds);
+
+            promise.resolve(result);
+        } catch (Exception e) {
+            promise.reject("no notification sounds found", e);
+        }
+    }
+
+    @ReactMethod
+    public void previewSound(String url) {
+        Context context = mApplication.getApplicationContext();
+        Uri uri = Uri.parse(url);
+        Ringtone r = RingtoneManager.getRingtone(context, uri);
+        r.play();
+    }
+
+    @ReactMethod
+    public void setNotificationSound(String soundUri) {
+        mNotificationPreference.setNotificationSound(soundUri);
+    }
+
+    @ReactMethod
+    public void setShouldVibrate(boolean vibrate) {
+        mNotificationPreference.setShouldVibrate(vibrate);
+    }
+
+    @ReactMethod
+    public void setShouldBlink(boolean blink) {
+        mNotificationPreference.setShouldBlink(blink);
+    }
+
+    @ReactMethod
+    public void getDeliveredNotifications(final Promise promise) {
+        Context context = mApplication.getApplicationContext();
+        final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        StatusBarNotification[] statusBarNotifications = notificationManager.getActiveNotifications();
+        WritableArray result = Arguments.createArray();
+        for (StatusBarNotification sbn:statusBarNotifications) {
+            WritableMap map = Arguments.createMap();
+            Notification n = sbn.getNotification();
+            Bundle bundle = n.extras;
+            int identifier = sbn.getId();
+            String channelId = bundle.getString("channel_id");
+            map.putInt("identifier", identifier);
+            map.putString("channel_id", channelId);
+            result.pushMap(map);
+        }
+        promise.resolve(result);
+    }
+
+    @ReactMethod
+    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,25 +1,33 @@
 package com.mattermost.rnbeta;
 
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.app.RemoteInput;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.os.Bundle;
-import android.util.Log;
-
 import androidx.annotation.Nullable;
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.Person;
+import android.util.Log;
+import java.io.IOException;
 
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
+import okhttp3.Call;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+import org.json.JSONObject;
+import org.json.JSONException;
 
 import com.mattermost.helpers.*;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.WritableMap;
+
 import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
-import com.wix.reactnativenotifications.core.notification.PushNotificationProps;
 
 public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
     private Context mContext;
@@ -28,29 +36,40 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        try {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
             final CharSequence message = getReplyMessage(intent);
             if (message == null) {
                 return;
             }
 
             mContext = context;
-            bundle = intent.getBundleExtra(CustomPushNotificationHelper.NOTIFICATION);
+            bundle = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
             notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
-            final int notificationId = intent.getIntExtra(CustomPushNotificationHelper.NOTIFICATION_ID, -1);
-            final String serverUrl = bundle.getString("server_url");
-            if (serverUrl != null) {
-                    replyToMessage(serverUrl, notificationId, message);
-            } else {
-                onReplyFailed(notificationId);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
+            final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
+            final int notificationId = intent.getIntExtra(CustomPushNotification.NOTIFICATION_ID, -1);
+
+
+            Credentials.getCredentialsForCurrentServer(reactApplicationContext, new ResolvePromise() {
+                @Override
+                public void resolve(@Nullable Object value) {
+                    if (value instanceof Boolean && !(Boolean)value) {
+                        return;
+                    }
+
+                    WritableMap map = (WritableMap) value;
+                    if (map != null) {
+                        String token = map.getString("password");
+                        String serverUrl = map.getString("service");
+
+                        replyToMessage(serverUrl, token, notificationId, message);
+                    }
+                }
+            });
         }
     }
 
-    protected void replyToMessage(final String serverUrl, final int notificationId, final CharSequence message) {
+    protected void replyToMessage(final String serverUrl, final String token, final int notificationId, final CharSequence message) {
         final String channelId = bundle.getString("channel_id");
         final String postId = bundle.getString("post_id");
         String rootId = bundle.getString("root_id");
@@ -58,77 +77,89 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
             rootId = postId;
         }
 
-        if (serverUrl == null) {
-            onReplyFailed(notificationId);
+        if (token == null || serverUrl == null) {
+            onReplyFailed(notificationManager, notificationId, channelId);
             return;
         }
 
-        WritableMap headers = Arguments.createMap();
-        headers.putString("Content-Type", "application/json");
-
-
-        WritableMap body = Arguments.createMap();
-        body.putString("channel_id", channelId);
-        body.putString("message", message.toString());
-        body.putString("root_id", rootId);
-
-        WritableMap options = Arguments.createMap();
-        options.putMap("headers", headers);
-        options.putMap("body", body);
+        final OkHttpClient client = new OkHttpClient();
+        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";
-        Network.post(serverUrl, postsEndpoint, options, new ResolvePromise() {
+        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();
+
+        client.newCall(request).enqueue(new okhttp3.Callback() {
             @Override
-            public void resolve(@Nullable Object value) {
-                if (value != null) {
-                    onReplySuccess(notificationId, message);
+            public void onFailure(Call call, IOException e) {
+                Log.i("ReactNative", String.format("Reply FAILED exception %s", e.getMessage()));
+                onReplyFailed(notificationManager, notificationId, channelId);
+            }
+
+            @Override
+            public void onResponse(Call call, final Response response) throws IOException {
+                if (response.isSuccessful()) {
+                    onReplySuccess(notificationManager, notificationId, channelId);
                     Log.i("ReactNative", "Reply SUCCESS");
                 } else {
-                    Log.i("ReactNative", "Reply FAILED resolved without value");
-                    onReplyFailed(notificationId);
+                    Log.i("ReactNative", String.format("Reply FAILED status %s BODY %s", response.code(), response.body().string()));
+                    onReplyFailed(notificationManager, notificationId, channelId);
                 }
             }
-
-            @Override
-            public void reject(Throwable reason) {
-                Log.i("ReactNative", String.format("Reply FAILED exception %s", reason.getMessage()));
-                onReplyFailed(notificationId);
-            }
-
-            @Override
-            public void reject(String code, String message) {
-                Log.i("ReactNative",
-                        String.format("Reply FAILED status %s BODY %s", code, message)
-                );
-                onReplyFailed(notificationId);
-            }
         });
     }
 
-    protected void onReplyFailed(int notificationId) {
-        recreateNotification(notificationId, "Message failed to send.");
+    protected String buildReplyPost(String channelId, String rootId, String message) {
+        try {
+            JSONObject json = new JSONObject();
+            json.put("channel_id", channelId);
+            json.put("message", message);
+            json.put("root_id", rootId);
+            return json.toString();
+        } catch(JSONException e) {
+            return "{}";
+        }
     }
 
-    protected void onReplySuccess(int notificationId, final CharSequence message) {
-        recreateNotification(notificationId, message);
-    }
+    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);
 
-    private void recreateNotification(int notificationId, final CharSequence message) {
-        final PushNotificationProps notificationProps = new PushNotificationProps(bundle);
-        final PendingIntent pendingIntent = NotificationIntentAdapter.createPendingNotificationIntent(mContext, 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();
+        Bundle userInfoBundle = new Bundle();
+        userInfoBundle.putString("channel_id", channelId);
+
+        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/NotificationsModule.java

@@ -1,79 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.app.Notification;
-import android.content.Context;
-import android.os.Bundle;
-import android.service.notification.StatusBarNotification;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.mattermost.helpers.NotificationHelper;
-
-import java.util.Set;
-
-public class NotificationsModule extends ReactContextBaseJavaModule {
-    private static NotificationsModule instance;
-    private final MainApplication mApplication;
-
-    private NotificationsModule(MainApplication application, ReactApplicationContext reactContext) {
-        super(reactContext);
-        mApplication = application;
-    }
-
-    public static NotificationsModule getInstance(MainApplication application, ReactApplicationContext reactContext) {
-        if (instance == null) {
-            instance = new NotificationsModule(application, reactContext);
-        }
-
-        return instance;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "Notifications";
-    }
-
-    @ReactMethod
-    public void getDeliveredNotifications(final Promise promise) {
-        Context context = mApplication.getApplicationContext();
-        StatusBarNotification[] notifications = NotificationHelper.getDeliveredNotifications(context);
-        WritableArray result = Arguments.createArray();
-        for (StatusBarNotification sbn:notifications) {
-            WritableMap map = Arguments.createMap();
-            Notification n = sbn.getNotification();
-            Bundle bundle = n.extras;
-            Set<String> keys = bundle.keySet();
-            for (String key: keys) {
-                map.putString(key, bundle.getString(key));
-            }
-            result.pushMap(map);
-        }
-        promise.resolve(result);
-    }
-
-    @ReactMethod
-    public void removeChannelNotifications(String serverUrl, String channelId) {
-        Context context = mApplication.getApplicationContext();
-        NotificationHelper.removeChannelNotifications(context, serverUrl, channelId);
-    }
-
-    @ReactMethod
-    public void removeThreadNotifications(String serverUrl, String threadId) {
-        Context context = mApplication.getApplicationContext();
-        NotificationHelper.removeThreadNotifications(context, serverUrl, threadId);
-    }
-
-    @ReactMethod
-    public void removeServerNotifications(String serverUrl) {
-        Context context = mApplication.getApplicationContext();
-        NotificationHelper.removeServerNotifications(context, serverUrl);
-    }
-}

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

@@ -0,0 +1,42 @@
+package com.mattermost.rnbeta;
+
+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;
+
+public class RNTextInputResetModule extends ReactContextBaseJavaModule {
+
+  private final ReactApplicationContext reactContext;
+
+  public RNTextInputResetModule(ReactApplicationContext reactContext) {
+    super(reactContext);
+    this.reactContext = reactContext;
+  }
+
+  @Override
+  public String getName() {
+    return "RNTextInputReset";
+  }
+
+  // https://github.com/facebook/react-native/pull/12462#issuecomment-298812731
+  @ReactMethod
+  public void resetKeyboardInput(final int reactTagToReset) {
+      UIManagerModule uiManager = getReactApplicationContext().getNativeModule(UIManagerModule.class);
+      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,60 +1,154 @@
 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 java.util.Objects;
+
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.HttpUrl;
 
 import org.json.JSONObject;
+import org.json.JSONException;
 
-import com.facebook.react.bridge.Arguments;
-
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.WritableMap;
+
 import com.mattermost.helpers.*;
 
-import okhttp3.Response;
-
 public class ReceiptDelivery {
-    private static final String[] ackKeys = new String[]{"post_id", "root_id", "category", "message", "team_id", "channel_id", "channel_name", "type", "sender_id", "sender_name", "version"};
+    static final String CURRENT_SERVER_URL = "@currentServerUrl";
 
-    public static Bundle send(final String ackId, final String serverUrl, final String postId, final String type, final boolean isIdLoaded) {
-        Log.i("ReactNative", String.format("Send receipt delivery ACK=%s TYPE=%s to URL=%s with ID-LOADED=%s", ackId, type, serverUrl, isIdLoaded));
-        WritableMap options = Arguments.createMap();
-        WritableMap headers = Arguments.createMap();
-        WritableMap body = Arguments.createMap();
-        headers.putString("Content-Type", "application/json");
-        options.putMap("headers", headers);
-        body.putString("id", ackId);
-        body.putDouble("received_at", System.currentTimeMillis());
-        body.putString("platform", "android");
-        body.putString("type", type);
-        body.putString("post_id", postId);
-        body.putBoolean("is_id_loaded", isIdLoaded);
-        options.putMap("body", body);
+    private static final int[] FIBONACCI_BACKOFFS = new int[] { 0, 1, 2, 3, 5, 8 };
 
-        try (Response response = Network.postSync(serverUrl, "api/v4/notifications/ack", options)) {
-            String responseBody = Objects.requireNonNull(response.body()).string();
-            JSONObject jsonResponse = new JSONObject(responseBody);
-            return parseAckResponse(jsonResponse);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
+    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);
+
+        Credentials.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) {
+        if (token == null) {
+            promise.reject("Receipt delivery failure", "Invalid token");
+            return;
+        }
+
+        if (serverUrl == null) {
+            promise.reject("Receipt delivery failure", "Invalid server URL");
+        }
+
+        JSONObject json;
+        long receivedAt = System.currentTimeMillis();
+
+        try {
+            json = new JSONObject();
+            json.put("id", ackId);
+            json.put("received_at", receivedAt);
+            json.put("platform", "android");
+            json.put("type", type);
+            json.put("post_id", postId);
+            json.put("is_id_loaded", isIdLoaded);
+        } catch (JSONException e) {
+            Log.e("ReactNative", "Receipt delivery failed to build json payload");
+            promise.reject("Receipt delivery failure", e.toString());
+            return;
+        }
+
+        final HttpUrl url = HttpUrl.parse(
+            String.format("%s/api/v4/notifications/ack", serverUrl.replaceAll("/$", "")));
+        if (url != null) {
+            final OkHttpClient client = new OkHttpClient();
+            final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+            RequestBody body = RequestBody.create(JSON, json.toString());
+            Request request = new Request.Builder()
+                    .header("Authorization", String.format("Bearer %s", token))
+                    .header("Content-Type", "application/json")
+                    .url(url)
+                    .post(body)
+                    .build();
+
+            makeServerRequest(client, request, isIdLoaded, 0, promise);
         }
     }
 
-    public static Bundle parseAckResponse(JSONObject jsonResponse) {
+    private static void makeServerRequest(OkHttpClient client, Request request, Boolean isIdLoaded, int reRequestCount, ResolvePromise promise) {
         try {
+            Response response = client.newCall(request).execute();
+            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;
+                }
+
+                throw new Exception(responseBody);
+            }
+
+            JSONObject jsonResponse = new JSONObject(responseBody);
             Bundle bundle = new Bundle();
-            for (String key : ackKeys) {
+            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));
                 }
             }
-            return bundle;
+            promise.resolve(bundle);
         } catch (Exception e) {
-            e.printStackTrace();
-            return null;
+            Log.e("ReactNative", "Receipt delivery failed to send");
+            if (isIdLoaded) {
+                try {
+                    reRequestCount++;
+                    if (reRequestCount < FIBONACCI_BACKOFFS.length) {
+                        Log.i("ReactNative", "Retry attempt " + reRequestCount + " with backoff delay: " + FIBONACCI_BACKOFFS[reRequestCount] + " seconds");
+                        Thread.sleep(FIBONACCI_BACKOFFS[reRequestCount] * 1000);
+                        makeServerRequest(client, request, isIdLoaded, reRequestCount, promise);
+                    }
+                } catch(InterruptedException ie) {}    
+            }
+
+            promise.reject("Receipt delivery failure", e.toString());
         }
     }
 }

android/app/src/main/java/com/mattermost/rnbeta/SplitViewModule.kt

@@ -1,72 +0,0 @@
-package com.mattermost.rnbeta
-
-import com.facebook.react.bridge.*
-import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
-import com.learnium.RNDeviceInfo.resolver.DeviceTypeResolver
-
-class SplitViewModule(private var reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
-    private var isDeviceFolded: Boolean = false
-    private var listenerCount = 0
-
-    companion object {
-        private var instance: SplitViewModule? = null
-
-        fun getInstance(reactContext: ReactApplicationContext): SplitViewModule {
-            if (instance == null) {
-                instance = SplitViewModule(reactContext)
-            } else {
-                instance!!.reactContext = reactContext
-            }
-
-            return instance!!
-        }
-
-        fun getInstance(): SplitViewModule? {
-            return instance
-        }
-    }
-
-
-    override fun getName() = "SplitView"
-
-    private fun sendEvent(params: WritableMap?) {
-        reactContext
-                .getJSModule(RCTDeviceEventEmitter::class.java)
-                .emit("SplitViewChanged", params)
-    }
-
-    private fun getSplitViewResults(folded: Boolean) : WritableMap? {
-        if (currentActivity != null) {
-            val deviceResolver = DeviceTypeResolver(this.reactContext)
-            val map = Arguments.createMap()
-            map.putBoolean("isSplitView", currentActivity!!.isInMultiWindowMode || folded)
-            map.putBoolean("isTablet", deviceResolver.isTablet)
-            return map
-        }
-
-        return null
-    }
-
-    fun setDeviceFolded(folded: Boolean) {
-        val map = getSplitViewResults(folded)
-        if (listenerCount > 0 && isDeviceFolded != folded) {
-            sendEvent(map)
-        }
-        isDeviceFolded = folded
-    }
-
-    @ReactMethod
-    fun isRunningInSplitView(promise: Promise) {
-        promise.resolve(getSplitViewResults(isDeviceFolded))
-    }
-
-    @ReactMethod
-    fun addListener(eventName: String) {
-        listenerCount += 1
-    }
-
-    @ReactMethod
-    fun removeListeners(count: Int) {
-        listenerCount -= count
-    }
-}

android/app/src/main/java/com/mattermost/rnbeta/generated/BasePackageList.java

@@ -0,0 +1,14 @@
+package com.mattermost.rnbeta.generated;
+
+import java.util.Arrays;
+import java.util.List;
+import org.unimodules.core.interfaces.Package;
+
+public class BasePackageList {
+  public List<Package> getPackageList() {
+    return Arrays.<Package>asList(
+        new expo.modules.constants.ConstantsPackage(),
+        new expo.modules.filesystem.FileSystemPackage()
+    );
+  }
+}

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

@@ -6,9 +6,9 @@ import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.Arguments;
-import com.mattermost.helpers.Credentials;
 import com.mattermost.rnbeta.MainApplication;
 import com.mattermost.helpers.RealPathUtil;
 
@@ -16,12 +16,11 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import java.io.File;
 import java.util.ArrayList;
 
+import javax.annotation.Nullable;
+
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.json.JSONException;
@@ -29,7 +28,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;
@@ -41,53 +39,24 @@ import okhttp3.Response;
 public class ShareModule extends ReactContextBaseJavaModule {
     private final OkHttpClient client = new OkHttpClient();
     public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-    private static ShareModule instance;
     private final MainApplication mApplication;
-    private ReactApplicationContext mReactContext;
+
+    public ShareModule(MainApplication application, ReactApplicationContext reactContext) {
+        super(reactContext);
+        mApplication = application;
+    }
     private File tempFolder;
 
-    private ShareModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        mReactContext = reactContext;
-        mApplication = (MainApplication)reactContext.getApplicationContext();
-    }
-
-    public static ShareModule getInstance(ReactApplicationContext reactContext) {
-        if (instance == null) {
-            instance = new ShareModule(reactContext);
-        } else {
-            instance.mReactContext = reactContext;
-        }
-
-        return instance;
-    }
-
-    public static ShareModule getInstance() {
-        return instance;
-    }
-
-    @NonNull
     @Override
     public String getName() {
         return "MattermostShare";
     }
 
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String getCurrentActivityName() {
-        Activity currentActivity = getCurrentActivity();
-        if (currentActivity != null) {
-            String activityName = currentActivity.getComponentName().getClassName();
-            String[] components = activityName.split("\\.");
-            return components[components.length - 1];
-        }
-
-        return "";
-    }
-
     @ReactMethod
     public void clear() {
         Activity currentActivity = getCurrentActivity();
-        if (currentActivity != null && this.getCurrentActivityName().equals("ShareActivity")) {
+
+        if (currentActivity != null) {
             Intent intent = currentActivity.getIntent();
             intent.setAction("");
             intent.removeExtra(Intent.EXTRA_TEXT);
@@ -101,6 +70,7 @@ public class ShareModule extends ReactContextBaseJavaModule {
         HashMap<String, Object> constants = new HashMap<>(1);
         constants.put("cacheDirName", RealPathUtil.CACHE_DIR_NAME);
         constants.put("isOpened", mApplication.sharedExtensionIsOpened);
+        mApplication.sharedExtensionIsOpened = false;
         return constants;
     }
 
@@ -108,18 +78,17 @@ public class ShareModule extends ReactContextBaseJavaModule {
     public void close(ReadableMap data) {
         this.clear();
         Activity currentActivity = getCurrentActivity();
-        if (currentActivity == null || !this.getCurrentActivityName().equals("ShareActivity")) {
-            return;
+        if (currentActivity != null) {
+            currentActivity.finishAndRemoveTask();
         }
 
-        currentActivity.finishAndRemoveTask();
-        if (data != null && data.hasKey("serverUrl")) {
+        if (data != null && data.hasKey("url")) {
             ReadableArray files = data.getArray("files");
-            String serverUrl = data.getString("serverUrl");
-            final String token = Credentials.getCredentialsForServerSync(mReactContext, serverUrl);
+            String serverUrl = data.getString("url");
+            String token = data.getString("token");
             JSONObject postData = buildPostObject(data);
 
-            if (files != null && files.size() > 0) {
+            if (files.size() > 0) {
                 uploadFiles(serverUrl, token, files, postData);
             } else {
                 try {
@@ -130,18 +99,39 @@ public class ShareModule extends ReactContextBaseJavaModule {
             }
         }
 
-        mApplication.sharedExtensionIsOpened = false;
         RealPathUtil.deleteTempFiles(this.tempFolder);
     }
 
     @ReactMethod
-    public void getSharedData(Promise promise) {
+    public void data(Promise promise) {
         promise.resolve(processIntent());
     }
 
+    @ReactMethod
+    public void getFilePath(String filePath, Promise promise) {
+        Activity currentActivity = getCurrentActivity();
+        WritableMap map = Arguments.createMap();
+
+        if (currentActivity != null) {
+            Uri uri = Uri.parse(filePath);
+            String path = RealPathUtil.getRealPathFromURI(currentActivity, uri);
+            if (path != null) {
+                String text = "file://" + path;
+                map.putString("filePath", text);
+            }
+        }
+
+        promise.resolve(map);
+    }
+
     public WritableArray processIntent() {
-        String type, action, extra;
+        WritableMap map = Arguments.createMap();
         WritableArray items = Arguments.createArray();
+
+        String text = "";
+        String type = "";
+        String action = "";
+
         Activity currentActivity = getCurrentActivity();
 
         if (currentActivity != null) {
@@ -149,32 +139,50 @@ 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) {
-                items.pushMap(ShareUtils.getTextItem(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);
+                items.pushMap(map);
             } else if (Intent.ACTION_SEND.equals(action)) {
-                if (extra != null) {
-                    items.pushMap(ShareUtils.getTextItem(extra));
-                }
-                Uri uri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+                Uri uri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
                 if (uri != null) {
-                    ReadableMap fileInfo = ShareUtils.getFileItem(currentActivity, uri);
-                    if (fileInfo != null) {
-                        items.pushMap(fileInfo);
+                    text = "file://" + RealPathUtil.getRealPathFromURI(currentActivity, uri);
+                    map.putString("value", text);
+
+                    if (type.equals("image/*")) {
+                        type = "image/jpeg";
+                    } else if (type.equals("video/*")) {
+                        type = "video/mp4";
                     }
+
+                    map.putString("type", type);
+                    items.pushMap(map);
                 }
             } else if (Intent.ACTION_SEND_MULTIPLE.equals(action)) {
-                if (extra != null) {
-                    items.pushMap(ShareUtils.getTextItem(extra));
-                }
-
                 ArrayList<Uri> uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
                 for (Uri uri : uris) {
-                    ReadableMap fileInfo = ShareUtils.getFileItem(currentActivity, uri);
-                    if (fileInfo != null) {
-                        items.pushMap(fileInfo);
+                    String filePath = RealPathUtil.getRealPathFromURI(currentActivity, uri);
+                    map = Arguments.createMap();
+                    text = "file://" + filePath;
+                    map.putString("value", text);
+
+                    type = RealPathUtil.getMimeTypeFromUri(currentActivity, uri);
+                    if (type != null) {
+                        if (type.equals("image/*")) {
+                            type = "image/jpeg";
+                        } else if (type.equals("video/*")) {
+                            type = "video/mp4";
+                        }
+                    } else {
+                        type = "application/octet-stream";
                     }
+                    map.putString("type", type);
+                    items.pushMap(map);
                 }
             }
         }
@@ -185,12 +193,12 @@ public class ShareModule extends ReactContextBaseJavaModule {
     private JSONObject buildPostObject(ReadableMap data) {
         JSONObject json = new JSONObject();
         try {
-            json.put("user_id", data.getString("userId"));
+            json.put("user_id", data.getString("currentUserId"));
             if (data.hasKey("channelId")) {
                 json.put("channel_id", data.getString("channelId"));
             }
-            if (data.hasKey("message")) {
-                json.put("message", data.getString("message"));
+            if (data.hasKey("value")) {
+                json.put("message", data.getString("value"));
             }
         } catch (JSONException e) {
             e.printStackTrace();
@@ -199,13 +207,13 @@ public class ShareModule extends ReactContextBaseJavaModule {
     }
 
     private void post(String serverUrl, String token, JSONObject postData) throws IOException {
-        RequestBody body = RequestBody.create(postData.toString(), JSON);
+        RequestBody body = RequestBody.create(JSON, postData.toString());
         Request request = new Request.Builder()
                 .header("Authorization", "BEARER " + token)
                 .url(serverUrl + "/api/v4/posts")
                 .post(body)
                 .build();
-        client.newCall(request).execute();
+        Response response = client.newCall(request).execute();
     }
 
     private void uploadFiles(String serverUrl, String token, ReadableArray files, JSONObject postData) {
@@ -215,15 +223,11 @@ public class ShareModule extends ReactContextBaseJavaModule {
 
             for(int i = 0 ; i < files.size() ; i++) {
                 ReadableMap file = files.getMap(i);
-                String mime = file.getString("type");
-                String fullPath = file.getString("value");
-                if (fullPath != null) {
-                    String filePath = fullPath.replaceFirst("file://", "");
-                    File fileInfo = new File(filePath);
-                    if (fileInfo.exists() && mime != null) {
-                        final MediaType MEDIA_TYPE = MediaType.parse(mime);
-                        builder.addFormDataPart("files", file.getString("filename"), RequestBody.create(fileInfo, MEDIA_TYPE));
-                    }
+                String filePath = file.getString("fullPath").replaceFirst("file://", "");
+                File fileInfo = new File(filePath);
+                if (fileInfo.exists()) {
+                    final MediaType MEDIA_TYPE = MediaType.parse(file.getString("mimeType"));
+                    builder.addFormDataPart("files", file.getString("filename"), RequestBody.create(MEDIA_TYPE, fileInfo));
                 }
             }
 
@@ -237,7 +241,7 @@ public class ShareModule extends ReactContextBaseJavaModule {
 
             try (Response response = client.newCall(request).execute()) {
                 if (response.isSuccessful()) {
-                    String responseData = Objects.requireNonNull(response.body()).string();
+                    String responseData = response.body().string();
                     JSONObject responseJson = new JSONObject(responseData);
                     JSONArray fileInfoArray = responseJson.getJSONArray("file_infos");
                     JSONArray file_ids = new JSONArray();

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

@@ -0,0 +1,34 @@
+package com.mattermost.share;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.JavaScriptModule;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.ReactPackage;
+import com.mattermost.rnbeta.MainApplication;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class SharePackage implements ReactPackage {
+    MainApplication mApplication;
+
+    public SharePackage(MainApplication application) {
+        mApplication = application;
+    }
+
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        return Arrays.<NativeModule>asList(new ShareModule(mApplication, reactContext));
+    }
+
+    public List<Class<? extends JavaScriptModule>> createJSModules() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return Collections.emptyList();
+    }
+}

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

@@ -1,115 +0,0 @@
-package com.mattermost.share;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.media.MediaMetadataRetriever;
-import android.net.Uri;
-import android.webkit.URLUtil;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.mattermost.helpers.RealPathUtil;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.UUID;
-
-public class ShareUtils {
-    public static ReadableMap getTextItem(String text) {
-        WritableMap map = Arguments.createMap();
-        map.putString("value", text);
-        map.putString("type", "");
-        map.putBoolean("isString", true);
-        return map;
-    }
-
-    public static ReadableMap getFileItem(Activity activity, Uri uri) {
-        WritableMap map = Arguments.createMap();
-        String filePath = RealPathUtil.getRealPathFromURI(activity, uri);
-        if (filePath == null) {
-            return null;
-        }
-
-        File file = new File(filePath);
-        String type = RealPathUtil.getMimeTypeFromUri(activity, uri);
-        if (type != null) {
-            if (type.startsWith("image/")) {
-                BitmapFactory.Options bitMapOption = ShareUtils.getImageDimensions(filePath);
-                map.putInt("height", bitMapOption.outHeight);
-                map.putInt("width", bitMapOption.outWidth);
-
-            } else if (type.startsWith("video/")) {
-                File cacheDir = new File(activity.getCacheDir(), RealPathUtil.CACHE_DIR_NAME);
-                addVideoThumbnailToMap(cacheDir, activity.getApplicationContext(), map, "file://" + filePath);
-            }
-        } else {
-            type = "application/octet-stream";
-        }
-
-        map.putString("value", "file://" + filePath);
-        map.putDouble("size", (double) file.length());
-        map.putString("filename", file.getName());
-        map.putString("type", type);
-        map.putString("extension", RealPathUtil.getExtension(filePath).replaceFirst(".", ""));
-        map.putBoolean("isString", false);
-        return map;
-    }
-
-    public static BitmapFactory.Options getImageDimensions(String filePath) {
-        BitmapFactory.Options bitMapOption = new BitmapFactory.Options();
-        bitMapOption.inJustDecodeBounds=true;
-        BitmapFactory.decodeFile(filePath, bitMapOption);
-        return bitMapOption;
-    }
-
-    private static void addVideoThumbnailToMap(File cacheDir, Context context, WritableMap map, String filePath) {
-        String fileName = ("thumb-" + UUID.randomUUID().toString()) + ".png";
-        OutputStream fOut = null;
-
-        try {
-            File file = new File(cacheDir, fileName);
-            Bitmap image = getBitmapAtTime(context, filePath, 1);
-            if (file.createNewFile()) {
-                fOut = new FileOutputStream(file);
-                image.compress(Bitmap.CompressFormat.PNG, 100, fOut);
-                fOut.flush();
-                fOut.close();
-
-                map.putString("videoThumb", "file://" + file.getAbsolutePath());
-                map.putInt("width", image.getWidth());
-                map.putInt("height", image.getHeight());
-            }
-        } catch (Exception ignored) {
-        }
-    }
-
-    private static Bitmap getBitmapAtTime(Context context, String filePath, int time) {
-        try {
-            MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-            if (URLUtil.isFileUrl(filePath)) {
-                String decodedPath;
-                try {
-                    decodedPath = URLDecoder.decode(filePath, "UTF-8");
-                } catch (UnsupportedEncodingException e) {
-                    decodedPath = filePath;
-                }
-
-                retriever.setDataSource(decodedPath.replace("file://", ""));
-            } else if (filePath.contains("content://")) {
-                retriever.setDataSource(context, Uri.parse(filePath));
-            }
-
-            Bitmap image = retriever.getFrameAtTime(time * 1000, MediaMetadataRetriever.OPTION_CLOSEST_SYNC);
-            retriever.release();
-            return image;
-        } catch (Exception e) {
-            throw new IllegalStateException("File doesn't exist or not supported");
-        }
-    }
-}