Upgrade react-native-sentry (#2815)

* Include all png, jpeg, and bmp MIME types

* Update snapshot

.circleci/config.yml

@@ -1,600 +0,0 @@
-version: 2.1
-orbs:
-  owasp: entur/owasp@0.0.10
-
-executors:
-  android:
-    parameters:
-      resource_class:
-        default: large
-        type: string
-    environment:
-      NODE_OPTIONS: --max_old_space_size=12000
-      NODE_ENV: production
-      BABEL_ENV: production
-    docker:
-      - image: circleci/android:api-29-node
-    working_directory: ~/mattermost-mobile
-    resource_class: <<parameters.resource_class>>
-
-  ios:
-    environment:
-      NODE_OPTIONS: --max_old_space_size=12000
-      NODE_ENV: production
-      BABEL_ENV: production
-    macos:
-      xcode: "12.0.0"
-    working_directory: ~/mattermost-mobile
-    shell: /bin/bash --login -o pipefail
-
-commands:
-  checkout-private:
-    description: "Checkout the private repo with build env vars"
-    steps:
-      - add_ssh_keys:
-          fingerprints:
-            - "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
-
-  fastlane-dependencies:
-    description: "Get Fastlane dependencies"
-    parameters:
-      for:
-        type: string
-    steps:
-      - restore_cache:
-          name: Restore Fastlane cache
-          key: v1-gems-<< parameters.for >>-{{ checksum "fastlane/Gemfile.lock" }}-{{ arch }}
-      - run:
-          working_directory: fastlane
-          name: Download Fastlane dependencies
-          command: bundle install --path vendor/bundle
-      - save_cache:
-          name: Save Fastlane cache
-          key: v1-gems-<< parameters.for >>-{{ checksum "fastlane/Gemfile.lock" }}-{{ arch }}
-          paths:
-            - fastlane/vendor/bundle
-
-  gradle-dependencies:
-    description: "Get Gradle dependencies"
-    steps:
-      - restore_cache:
-          name: Restore Gradle cache
-          key: v1-gradle-{{ checksum "android/build.gradle" }}-{{ checksum  "android/app/build.gradle" }}
-      - run:
-          working_directory: android
-          name: Download Gradle dependencies
-          command: ./gradlew dependencies
-      - save_cache:
-          name: Save Gradle cache
-          paths:
-            - ~/.gradle
-          key: v1-gradle-{{ checksum "android/build.gradle" }}-{{ checksum  "android/app/build.gradle" }}
-
-  assets:
-    description: "Generate app assets"
-    steps:
-      - restore_cache:
-          name: Restore assets cache
-          key: v1-assets-{{ checksum "assets/base/config.json" }}-{{ arch }}
-      - run:
-          name: Generate assets
-          command: node ./scripts/generate-assets.js
-      - save_cache:
-          name: Save assets cache
-          key: v1-assets-{{ checksum "assets/base/config.json" }}-{{ arch }}
-          paths:
-            - dist
-
-  npm-dependencies:
-    description: "Get JavaScript dependencies"
-    steps:
-      - restore_cache:
-          name: Restore npm cache
-          key: v2-npm-{{ checksum "package.json" }}-{{ arch }}
-      - run:
-          name: Getting JavaScript dependencies
-          command: NODE_ENV=development npm install --ignore-scripts
-      - save_cache:
-          name: Save npm cache
-          key: v2-npm-{{ checksum "package.json" }}-{{ arch }}
-          paths:
-            - node_modules
-      - run:
-          name: "Patch dependencies"
-          command: npx patch-package
-
-  pods-dependencies:
-    description: "Get cocoapods dependencies"
-    steps:
-      - restore_cache:
-          name: Restore cocoapods specs and pods
-          key: v1-cocoapods-{{ checksum "ios/Podfile.lock" }}-{{ arch }}
-      - run:
-          name: iOS gems
-          command: npm run ios-gems
-      - run:
-          name: Getting cocoapods dependencies
-          command: npm run pod-install
-      - save_cache:
-          name: Save cocoapods specs and pods cache
-          key: v1-cocoapods-{{ checksum "ios/Podfile.lock" }}-{{ arch }}
-          paths:
-            - ios/Pods
-            - ~/.cocoapods
-
-  build-android:
-    description: "Build the android app"
-    steps:
-      - checkout:
-          path: ~/mattermost-mobile
-      - checkout-private
-      - npm-dependencies
-      - assets
-      - fastlane-dependencies:
-          for: android
-      - gradle-dependencies
-      - run:
-          name: Append Keystore to build Android
-          command: |
-            cp ~/mattermost-mobile-private/android/${STORE_FILE} android/app/${STORE_FILE}
-            echo "" | tee -a android/gradle.properties > /dev/null
-            echo MATTERMOST_RELEASE_STORE_FILE=${STORE_FILE} | tee -a android/gradle.properties > /dev/null
-            echo ${STORE_ALIAS} | tee -a android/gradle.properties > /dev/null
-            echo ${STORE_PASSWORD} | tee -a android/gradle.properties > /dev/null
-      - run:
-          name: Jetify android libraries
-          command: ./node_modules/.bin/jetify
-      - run:
-          working_directory: fastlane
-          name: Run fastlane to build android
-          no_output_timeout: 30m
-          command: export TERM=xterm && bundle exec fastlane android build
-
-  build-ios:
-    description: "Build the iOS app"
-    steps:
-      - checkout:
-          path: ~/mattermost-mobile
-      - npm-dependencies
-      - pods-dependencies
-      - assets
-      - fastlane-dependencies:
-          for: ios
-      - run:
-          working_directory: fastlane
-          name: Run fastlane to build iOS
-          no_output_timeout: 30m
-          command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install watchman
-            export TERM=xterm && bundle exec fastlane ios build
-
-  deploy-to-store:
-    description: "Deploy build to store"
-    parameters:
-      task:
-        type: string
-      target:
-        type: string
-      file:
-        type: string
-    steps:
-      - attach_workspace:
-          at: ~/
-      - run:
-          name: <<parameters.task>>
-          working_directory: fastlane
-          command: bundle exec fastlane <<parameters.target>> deploy file:$HOME/mattermost-mobile/<<parameters.file>>
-
-  persist:
-    description: "Persist mattermost-mobile directory"
-    steps:
-      - persist_to_workspace:
-          root: ~/
-          paths:
-            - mattermost-mobile*
-
-  save:
-    description: "Save binaries artifacts"
-    parameters:
-      filename:
-        type: string
-    steps:
-      - run:
-          name: Copying artifacts
-          command: |
-            mkdir /tmp/artifacts;
-            cp ~/mattermost-mobile/<<parameters.filename>> /tmp/artifacts;
-      - store_artifacts:
-          path: /tmp/artifacts
-
-jobs:
-  test:
-    working_directory: ~/mattermost-mobile
-    docker:
-      - image: circleci/node:10
-    steps:
-      - checkout:
-          path: ~/mattermost-mobile
-      - npm-dependencies
-      - assets
-      - run:
-          name: Check styles
-          command: npm run check
-      - run:
-          name: Running Tests
-          command: npm test
-      - run:
-          name: Check i18n
-          command: ./scripts/precommit/i18n.sh
-
-  check-deps:
-    parameters:
-      cve_data_directory:
-        type: string
-        default: "~/.owasp/dependency-check-data"
-    working_directory: ~/mattermost-mobile
-    executor: owasp/default
-    environment:
-      version_url: "https://jeremylong.github.io/DependencyCheck/current.txt"
-      executable_url: "https://dl.bintray.com/jeremy-long/owasp/dependency-check-VERSION-release.zip"
-    steps:
-      - checkout
-      - restore_cache:
-          name: Restore npm cache
-          key: v2-npm-{{ checksum "package.json" }}-{{ arch }}
-      - run:
-          name: Checkout config
-          command: cd .. && git clone https://github.com/mattermost/security-automation-config
-      - run:
-          name: Install Go
-          command: sudo apt-get update && sudo apt-get install golang
-      - owasp/with_commandline:
-          steps:
-            # Taken from https://github.com/entur/owasp-orb/blob/master/src/%40orb.yml#L349-L361
-            - owasp/generate_cache_keys:
-                cache_key: commmandline-default-cache-key-v6
-            - owasp/restore_owasp_cache
-            - run:
-                name: Update OWASP Dependency-Check Database
-                command: |
-                  if ! ~/.owasp/dependency-check/bin/dependency-check.sh --data << parameters.cve_data_directory >> --updateonly; then
-                    # Update failed, probably due to a bad DB version; delete cached DB and try again
-                    rm -rv ~/.owasp/dependency-check-data/*.db
-                    ~/.owasp/dependency-check/bin/dependency-check.sh --data << parameters.cve_data_directory >> --updateonly
-                  fi
-            - 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:
-      - build-android
-      - persist
-      - save:
-          filename: "*.apk"
-
-  build-android-release:
-    executor: android
-    steps:
-      - build-android
-      - persist
-      - save:
-          filename: "*.apk"
-
-  build-android-pr:
-    executor: android
-    environment:
-      BRANCH_TO_BUILD: ${CIRCLE_BRANCH}
-    steps:
-      - build-android
-      - save:
-          filename: "*.apk"
-
-  build-android-unsigned:
-    executor: android
-    steps:
-      - checkout:
-          path: ~/mattermost-mobile
-      - npm-dependencies
-      - assets
-      - fastlane-dependencies:
-          for: android
-      - gradle-dependencies
-      - run:
-          name: Jetify Android libraries
-          command: ./node_modules/.bin/jetify
-      - run:
-          working_directory: fastlane
-          name: Run fastlane to build unsigned android
-          no_output_timeout: 30m
-          command: bundle exec fastlane android unsigned
-      - persist
-      - save:
-          filename: "*.apk"
-
-  build-ios-beta:
-    executor: ios
-    steps:
-      - build-ios
-      - persist
-      - save:
-          filename: "*.ipa"
-
-  build-ios-release:
-    executor: ios
-    steps:
-      - build-ios
-      - persist
-      - save:
-          filename: "*.ipa"
-
-  build-ios-pr:
-    executor: ios
-    environment:
-      BRANCH_TO_BUILD: ${CIRCLE_BRANCH}
-    steps:
-      - build-ios
-      - save:
-          filename: "*.ipa"
-
-  build-ios-unsigned:
-    executor: ios
-    steps:
-      - checkout:
-          path: ~/mattermost-mobile
-      - npm-dependencies
-      - pods-dependencies
-      - assets
-      - fastlane-dependencies:
-          for: ios
-      - run:
-          working_directory: fastlane
-          name: Run fastlane to build unsigned iOS
-          no_output_timeout: 30m
-          command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install watchman
-            bundle exec fastlane ios unsigned
-      - persist_to_workspace:
-          root: ~/
-          paths:
-            - mattermost-mobile/*.ipa
-      - save:
-          filename: "*.ipa"
-
-  build-ios-simulator:
-    executor: ios
-    steps:
-      - checkout:
-          path: ~/mattermost-mobile
-      - npm-dependencies
-      - pods-dependencies
-      - assets
-      - fastlane-dependencies:
-          for: ios
-      - run:
-          working_directory: fastlane
-          name: Run fastlane to build unsigned x86_64 iOS app for iPhone simulator
-          no_output_timeout: 30m
-          command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install watchman
-            bundle exec fastlane ios simulator
-      - persist_to_workspace:
-          root: ~/
-          paths:
-            - mattermost-mobile/Mattermost-simulator-x86_64.app.zip
-      - save:
-          filename: "Mattermost-simulator-x86_64.app.zip"
-
-  deploy-android-release:
-    executor:
-      name: android
-      resource_class: medium
-    steps:
-      - deploy-to-store:
-          task: "Deploy to Google Play"
-          target: android
-          file: "*.apk"
-
-  deploy-android-beta:
-    executor:
-      name: android
-      resource_class: medium
-    steps:
-      - deploy-to-store:
-          task: "Deploy to Google Play"
-          target: android
-          file: "*.apk"
-
-  deploy-ios-release:
-    executor: ios
-    steps:
-      - deploy-to-store:
-          task: "Deploy to TestFlight"
-          target: ios
-          file: "*.ipa"
-
-  deploy-ios-beta:
-    executor: ios
-    steps:
-      - deploy-to-store:
-          task: "Deploy to TestFlight"
-          target: ios
-          file: "*.ipa"
-
-  github-release:
-    executor:
-      name: android
-      resource_class: medium
-    steps:
-      - attach_workspace:
-          at: ~/
-      - run:
-          name: Create GitHub release
-          working_directory: fastlane
-          command: bundle exec fastlane github
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - test
-      - check-deps:
-          context: sast-webhook
-          requires:
-            - test
-
-      - build-android-release:
-          context: mattermost-mobile-android-release
-          requires:
-            - test
-          filters:
-            branches:
-              only:
-                - /^build-\d+$/
-                - /^build-android-\d+$/
-                - /^build-android-release-\d+$/
-      - deploy-android-release:
-          context: mattermost-mobile-android-release
-          requires:
-            - build-android-release
-          filters:
-            branches:
-              only:
-                - /^build-\d+$/
-                - /^build-android-\d+$/
-                - /^build-android-release-\d+$/
-
-      - build-android-beta:
-          context: mattermost-mobile-android-beta
-          requires:
-            - test
-          filters:
-            branches:
-              only:
-                - /^build-\d+$/
-                - /^build-android-\d+$/
-                - /^build-android-beta-\d+$/
-      - deploy-android-beta:
-          context: mattermost-mobile-android-beta
-          requires:
-            - build-android-beta
-          filters:
-            branches:
-              only:
-                - /^build-\d+$/
-                - /^build-android-\d+$/
-                - /^build-android-beta-\d+$/
-
-      - build-ios-release:
-          context: mattermost-mobile-ios-release
-          requires:
-            - test
-          filters:
-            branches:
-              only:
-                - /^build-\d+$/
-                - /^build-ios-\d+$/
-                - /^build-ios-release-\d+$/
-      - deploy-ios-release:
-          context: mattermost-mobile-ios-release
-          requires:
-            - build-ios-release
-          filters:
-            branches:
-              only:
-                - /^build-\d+$/
-                - /^build-ios-\d+$/
-                - /^build-ios-release-\d+$/
-
-      - build-ios-beta:
-          context: mattermost-mobile-ios-beta
-          requires:
-            - test
-          filters:
-            branches:
-              only:
-                - /^build-\d+$/
-                - /^build-ios-\d+$/
-                - /^build-ios-beta-\d+$/
-      - deploy-ios-beta:
-          context: mattermost-mobile-ios-beta
-          requires:
-            - build-ios-beta
-          filters:
-            branches:
-              only:
-                - /^build-\d+$/
-                - /^build-ios-\d+$/
-                - /^build-ios-beta-\d+$/
-
-      - build-android-pr:
-          context: mattermost-mobile-android-pr
-          requires:
-            - test
-          filters:
-            branches:
-              only: /^build-pr-.*/
-      - build-ios-pr:
-          context: mattermost-mobile-ios-pr
-          requires:
-            - test
-          filters:
-            branches:
-              only: /^build-pr-.*/
-
-      - build-android-unsigned:
-          context: mattermost-mobile-unsigned
-          requires:
-            - test
-          filters:
-            tags:
-              only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
-            branches:
-              only: unsigned
-      - build-ios-unsigned:
-          context: mattermost-mobile-unsigned
-          requires:
-            - test
-          filters:
-            tags:
-              only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
-            branches:
-              only: unsigned
-      - build-ios-simulator:
-          context: mattermost-mobile-unsigned
-          requires:
-            - test
-          filters:
-            branches:
-              only:
-                - /^build-\d+$/
-                - /^build-ios-\d+$/
-                - /^build-ios-beta-\d+$/
-                
-      - github-release:
-          context: mattermost-mobile-unsigned
-          requires:
-            - build-android-unsigned
-            - build-ios-unsigned
-          filters:
-            tags:
-              only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
-            branches:
-              only: unsigned

.eslintrc.json

@@ -1,13 +1,7 @@
 {
   "extends": [
-    "plugin:mattermost/react",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "mattermost",
-    "@typescript-eslint"
+    "./node_modules/eslint-config-mattermost/.eslintrc.json",
+    "./node_modules/eslint-config-mattermost/.eslintrc-react.json"
   ],
   "settings": {
     "react": {
@@ -23,29 +17,8 @@
   },
   "rules": {
     "global-require": 0,
-    "no-undefined": 0,
     "react/display-name": [2, { "ignoreTranspilerName": false }],
-    "react/jsx-filename-extension": 0,
-    "camelcase": [
-      0,
-      {
-        "properties": "never"
-      }
-    ],
-    "@typescript-eslint/ban-types": 0,
-    "@typescript-eslint/no-non-null-assertion": 0,
-    "@typescript-eslint/no-unused-vars": [
-      2,
-      {
-        "vars": "all",
-        "args": "after-used"
-      }
-    ],
-    "@typescript-eslint/no-explicit-any": "warn",
-    "@typescript-eslint/no-use-before-define": 0,
-    "@typescript-eslint/no-var-requires": 0,
-    "@typescript-eslint/explicit-function-return-type": 0,
-    "@typescript-eslint/explicit-module-boundary-types": "off"
+    "react/jsx-filename-extension": [2, {"extensions": [".js"]}]
   },
   "overrides": [
     {
@@ -53,23 +26,6 @@
       "env": {
         "jest": true
       }
-    },
-    {
-      "files": ["detox/e2e/**"],
-      "globals": {
-        "by": true,
-        "detox": true,
-        "device": true,
-        "element": true,
-        "waitFor": true
-      },
-      "rules": {
-        "func-names": 0,
-        "import/no-unresolved": 0,
-        "max-nested-callbacks": 0,
-        "no-process-env": 0,
-        "no-unused-expressions": 0
-      }
     }
   ]
 }

.flowconfig

@@ -5,24 +5,26 @@
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
 
+; Ignore unexpected extra "@providesModule"
+.*/node_modules/.*/node_modules/fbjs/.*
+
+; Ignore duplicate module providers
+; For RN Apps installed via npm, "Libraries" folder is inside
+; "node_modules/react-native" but in the source repo it is in the root
+.*/Libraries/react-native/React.js
+
 ; Ignore polyfills
-node_modules/react-native/Libraries/polyfills/.*
+.*/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
-
-[untyped]
-.*/node_modules/@react-native-community/cli/.*/.*
+; Ignore metro
+.*/node_modules/metro/.*
 
 [include]
 
 [libs]
-node_modules/react-native/interface.js
+node_modules/react-native/Libraries/react-native/react-native-interface.js
 node_modules/react-native/flow/
+node_modules/react-native/flow-github/
 
 [options]
 emoji=true
@@ -30,45 +32,39 @@ emoji=true
 esproposal.optional_chaining=enable
 esproposal.nullish_coalescing=enable
 
-module.file_ext=.js
-module.file_ext=.json
-module.file_ext=.ios.js
+module.system=haste
+module.system.haste.use_name_reducers=true
+# get basename
+module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
+# strip .js or .js.flow suffix
+module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
+# strip .ios suffix
+module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
+module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
+module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
+module.system.haste.paths.blacklist=.*/__tests__/.*
+module.system.haste.paths.blacklist=.*/__mocks__/.*
+module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
 
 munge_underscores=true
 
-module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
-module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
+module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
+
+module.file_ext=.js
+module.file_ext=.jsx
+module.file_ext=.json
+module.file_ext=.native.js
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
-[lints]
-sketchy-null-number=warn
-sketchy-null-mixed=warn
-sketchy-number=warn
-untyped-type-import=warn
-nonstrict-import=warn
-deprecated-type=warn
-unsafe-getters-setters=warn
-inexact-spread=warn
-unnecessary-invariant=warn
-signature-verification-failure=warn
-deprecated-utility=error
-
-[strict]
-deprecated-type
-nonstrict-import
-sketchy-null
-unclear-type
-unsafe-getters-setters
-untyped-import
-untyped-type-import
-
 [version]
-^0.122.0
+^0.78.0

.gitattributes

@@ -1,4 +1 @@
 *.pbxproj -text
-
-# specific for windows script files
-*.bat text eol=crlf

.gitignore

@@ -4,7 +4,6 @@ build-ios
 *.zip
 server.PID
 mattermost.keystore
-tmp/
 
 # OSX
 #
@@ -22,6 +21,7 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+xcshareddata
 *.xccheckout
 *.moved-aside
 DerivedData
@@ -30,8 +30,7 @@ DerivedData
 *.apk
 *.xcuserstate
 project.xcworkspace
-ios/Pods
-.podinstall
+xcshareddata/
 
 # Android/IntelliJ
 #
@@ -39,10 +38,6 @@ ios/Pods
 .gradle
 local.properties
 *.iml
-android/app/bin
-.settings
-.project
-.classpath
 
 # node.js
 #
@@ -87,7 +82,10 @@ ios/sentry.properties
 # Testing
 .nyc_output
 coverage
-.tmp
+
+# Pods
+.podinstall
+ios/Pods/
 
 # Bundle artifact
 *.jsbundle

CONTRIBUTING.md

@@ -2,4 +2,33 @@
 
 Thank you for your interest in contributing! Please see the [Mattermost Contribution Guide](https://developers.mattermost.com/contribute/getting-started/) which describes the process for making code contributions across Mattermost projects and [join our "Native Mobile Apps" community channel](https://pre-release.mattermost.com/core/channels/native-mobile-apps) to ask questions from community members and the Mattermost core team.
 
-When you submit a pull request, it goes through a [code review process outlined here](https://developers.mattermost.com/contribute/getting-started/code-review/).
+### Review Process for this Repo
+
+After following the steps in the [Contribution Guide](http://docs.mattermost.com/developer/contribution-guide.html), submitted pull requests go through the review process outlined below. We aim to start reviewing pull requests in this repo the week they are submitted, but the length of time to complete the process will vary depending on the pull request.
+
+The one exception may be around release time, where the review process may take longer as the team focuses on our [release process](https://docs.mattermost.com/process/release-process.html). 
+
+#### `Stage 1: PM Review`
+
+A Product Manager will review the pull request to make sure it:
+
+1. Fits with our product roadmap
+2. Works as expected
+3. Meets UX guidelines
+
+This step is sometimes skipped for bugs or small improvements with a ticket, but always happens for new features or pull requests without a related ticket. 
+
+The Product Manager may come back with some bugs or UI improvements to fix before the pull request moves on to the next stage.
+
+#### `Stage 2: Dev Review`
+
+Two developers will review the pull request and either give feedback or `+1` the PR.
+
+Any comments will need to be addressed before the pull request moves on to the last stage.
+
+- PRs that do not follow Style Guides cannot be merged
+
+#### `Stage 3: Ready to Merge`
+
+The review process is complete, and the pull request will be merged. 
+

Jenkinsfile

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

Makefile

@@ -0,0 +1,268 @@
+.PHONY: pre-run pre-build clean
+.PHONY: check-style
+.PHONY: start stop
+.PHONY: run run-ios run-android
+.PHONY: build build-ios build-android unsigned-ios unsigned-android ios-sim-x86_64
+.PHONY: build-pr can-build-pr prepare-pr
+.PHONY: test help
+
+POD := $(shell which pod 2> /dev/null)
+OS := $(shell sh -c 'uname -s 2>/dev/null')
+BASE_ASSETS = $(shell find assets/base -type d) $(shell find assets/base -type f -name '*')
+OVERRIDE_ASSETS = $(shell find assets/override -type d 2> /dev/null) $(shell find assets/override -type f -name '*' 2> /dev/null)
+MM_UTILITIES_DIR = ../mattermost-utilities
+
+node_modules: package.json
+	@if ! [ $(shell which npm 2> /dev/null) ]; then \
+		echo "npm is not installed https://npmjs.com"; \
+		exit 1; \
+	fi
+
+	@echo Getting Javascript dependencies
+	@npm install
+
+npm-ci: package.json
+	@if ! [ $(shell which npm 2> /dev/null) ]; then \
+		echo "npm is not installed https://npmjs.com"; \
+		exit 1; \
+	fi
+
+	@echo Getting Javascript dependencies
+	@npm ci
+
+.podinstall:
+ifeq ($(OS), Darwin)
+ifdef POD
+	@echo Getting Cocoapods dependencies;
+	@cd ios && pod install;
+else
+	@echo "Cocoapods is not installed https://cocoapods.org/"
+	@exit 1
+endif
+endif
+	@touch $@
+
+dist/assets: $(BASE_ASSETS) $(OVERRIDE_ASSETS)
+	@mkdir -p dist
+
+	@if [ -e dist/assets ] ; then \
+		rm -rf dist/assets; \
+	fi
+
+	@echo "Generating app assets"
+	@node scripts/make-dist-assets.js
+
+pre-run: | node_modules .podinstall dist/assets ## Installs dependencies and assets
+
+pre-build: | npm-ci .podinstall dist/assets ## Install dependencies and assets before building
+
+check-style: node_modules ## Runs eslint
+	@echo Checking for style guide compliance
+	@npm run check
+
+clean: ## Cleans dependencies, previous builds and temp files
+	@echo Cleaning started
+
+	@rm -rf node_modules
+	@rm -f .podinstall
+	@rm -rf dist
+	@rm -rf ios/build
+	@rm -rf ios/Pods
+	@rm -rf android/app/build
+
+	@echo Cleanup finished
+
+post-install:
+	@# Need to copy custom RNDocumentPicker.m that implements direct access to the document picker in iOS
+	@cp ./native_modules/RNDocumentPicker.m node_modules/react-native-document-picker/ios/RNDocumentPicker/RNDocumentPicker.m
+
+	@# Need to copy custom RNCWebViewManager.java and RNCWEKWebView.m that implements IWA support for the WebView to avoid forking the lib
+	@cp ./native_modules/RNCWebViewManager.java node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java
+	@cp ./native_modules/RNCWKWebView.m node_modules/react-native-webview/ios/RNCWKWebView.m
+
+	# Need to copy custom RNCookieManagerIOS.m that fixes a crash when cookies does not have expiration date set
+	@cp ./native_modules/RNCookieManagerIOS.m node_modules/react-native-cookies/ios/RNCookieManagerIOS/RNCookieManagerIOS.m
+
+	@rm -f node_modules/intl/.babelrc
+	@# Hack to get react-intl and its dependencies to work with react-native
+	@# Based off of https://github.com/este/este/blob/master/gulp/native-fix.js
+	@sed -i'' -e 's|"./locale-data/index.js": false|"./locale-data/index.js": "./locale-data/index.js"|g' node_modules/react-intl/package.json
+	@sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-messageformat/package.json
+	@sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-relativeformat/package.json
+	@sed -i'' -e 's|"./locale-data/complete.js": false|"./locale-data/complete.js": "./locale-data/complete.js"|g' node_modules/intl/package.json
+	@sed -i'' -e "s|super.onBackPressed();|this.moveTaskToBack(true);|g" node_modules/react-native-navigation/android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java
+	@sed -i'' -e "s|compile 'com.facebook.react:react-native:0.17.+'|compile 'com.facebook.react:react-native:+'|g" node_modules/react-native-bottom-sheet/android/build.gradle
+	@if [ $(shell grep "const Platform" node_modules/react-native/Libraries/Lists/VirtualizedList.js | grep -civ grep) -eq 0 ]; then \
+		sed $ -i'' -e "s|const ReactNative = require('ReactNative');|const ReactNative = require('ReactNative');`echo $\\\\\\r;`const Platform = require('Platform');|g" node_modules/react-native/Libraries/Lists/VirtualizedList.js; \
+	fi
+	@sed -i'' -e 's|transform: \[{scaleY: -1}\],|...Platform.select({android: {transform: \[{perspective: 1}, {scaleY: -1}\]}, ios: {transform: \[{scaleY: -1}\]}}),|g' node_modules/react-native/Libraries/Lists/VirtualizedList.js
+
+start: | pre-run ## Starts the React Native packager server
+	$(call start_packager)
+
+stop: ## Stops the React Native packager server
+	$(call stop_packager)
+
+check-device-ios:
+	@if ! [ $(shell which xcodebuild) ]; then \
+		echo "xcode is not installed"; \
+		exit 1; \
+	fi
+	@if ! [ $(shell which watchman) ]; then \
+		echo "watchman is not installed"; \
+		exit 1; \
+	fi
+
+check-device-android:
+	@if ! [ $(ANDROID_HOME) ]; then \
+		echo "ANDROID_HOME is not set"; \
+		exit 1; \
+	fi
+	@if ! [ $(shell which adb 2> /dev/null) ]; then \
+		echo "adb is not installed"; \
+		exit 1; \
+	fi
+
+	@echo "Connect your Android device or open the emulator"
+	@adb wait-for-device
+
+	@if ! [ $(shell which watchman 2> /dev/null) ]; then \
+		echo "watchman is not installed"; \
+		exit 1; \
+	fi
+
+prepare-android-build:
+	@rm -rf ./node_modules/react-native/local-cli/templates/HelloWorld
+	@rm -rf ./node_modules/react-native-linear-gradient/Examples/
+	@rm -rf ./node_modules/react-native-orientation/demo/
+
+run: run-ios ## alias for run-ios
+
+run-ios: | check-device-ios pre-run ## Runs the app on an iOS simulator
+	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
+		echo Starting React Native packager server; \
+		npm start & echo Running iOS app in development; \
+		if [ ! -z "${SIMULATOR}" ]; then \
+			react-native run-ios --simulator="${SIMULATOR}"; \
+		else \
+			react-native run-ios; \
+		fi; \
+		wait; \
+	else \
+		echo Running iOS app in development; \
+		if [ ! -z "${SIMULATOR}" ]; then \
+			react-native run-ios --simulator="${SIMULATOR}"; \
+		else \
+			react-native run-ios; \
+		fi; \
+	fi
+
+run-android: | check-device-android pre-run prepare-android-build ## Runs the app on an Android emulator or dev device
+	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
+        echo Starting React Native packager server; \
+    	npm start & echo Running Android app in development; \
+    	if [ ! -z ${VARIANT} ]; then \
+    		react-native run-android --no-packager --variant=${VARIANT}; \
+    	else \
+    		react-native run-android --no-packager; \
+    	fi; \
+    	wait; \
+    else \
+    	echo Running Android app in development; \
+        if [ ! -z ${VARIANT} ]; then \
+			react-native run-android --no-packager --variant=${VARIANT}; \
+		else \
+			react-native run-android --no-packager; \
+		fi; \
+    fi
+
+build: | stop pre-build check-style ## Builds the app for Android & iOS
+	$(call start_packager)
+	@echo "Building App"
+	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane build
+	$(call stop_packager)
+
+
+build-ios: | stop pre-build check-style ## Builds the iOS app
+	$(call start_packager)
+	@echo "Building iOS app"
+	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane ios build
+	$(call stop_packager)
+
+build-android: | stop pre-build check-style prepare-android-build ## Build the Android app
+	$(call start_packager)
+	@echo "Building Android app"
+	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane android build
+	$(call stop_packager)
+
+unsigned-ios: stop pre-build check-style ## Build an unsigned version of the iOS app
+	$(call start_packager)
+	@echo "Building unsigned iOS app"
+	@cd fastlane && NODE_ENV=production bundle exec fastlane ios unsigned
+	@mkdir -p build-ios
+	@cd ios/ && xcodebuild -workspace Mattermost.xcworkspace/ -scheme Mattermost -sdk iphoneos -configuration Release -parallelizeTargets -resultBundlePath ../build-ios/result -derivedDataPath ../build-ios/ CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+	@cd build-ios/ && mkdir -p Payload && cp -R Build/Products/Release-iphoneos/Mattermost.app Payload/ && zip -r Mattermost-unsigned.ipa Payload/
+	@mv build-ios/Mattermost-unsigned.ipa .
+	@rm -rf build-ios/
+	$(call stop_packager)
+
+ios-sim-x86_64: stop pre-build check-style ## Build an unsigned x86_64 version of the iOS app for iPhone simulator
+	$(call start_packager)
+	@echo "Building unsigned x86_64 iOS app for iPhone simulator"
+	@cd fastlane && NODE_ENV=production bundle exec fastlane ios unsigned
+	@mkdir -p build-ios
+	@cd ios/ && xcodebuild -workspace Mattermost.xcworkspace/ -scheme Mattermost -arch x86_64 -sdk iphonesimulator -configuration Release -parallelizeTargets -resultBundlePath ../build-ios/result -derivedDataPath ../build-ios/ ENABLE_BITCODE=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ENABLE_BITCODE=NO
+	@cd build-ios/Build/Products/Release-iphonesimulator/ && zip -r Mattermost-simulator-x86_64.app.zip Mattermost.app/
+	@mv build-ios/Build/Products/Release-iphonesimulator/Mattermost-simulator-x86_64.app.zip .
+	@rm -rf build-ios/
+	$(call stop_packager)
+
+unsigned-android: stop pre-build check-style prepare-android-build ## Build an unsigned version of the Android app
+	$(call start_packager)
+	@echo "Building unsigned Android app"
+	@cd fastlane && NODE_ENV=production bundle exec fastlane android unsigned
+	@mv android/app/build/outputs/apk/unsigned/app-unsigned-unsigned.apk ./Mattermost-unsigned.apk
+	$(call stop_packager)
+
+test: | pre-run check-style ## Runs tests
+	@npm test
+
+build-pr: | can-build-pr stop pre-build check-style ## Build a PR from the mattermost-mobile repo
+	$(call start_packager)
+	@echo "Building App from PR ${PR_ID}"
+	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane build_pr pr:PR-${PR_ID}
+	$(call stop_packager)
+
+can-build-pr:
+	@if [ -z ${PR_ID} ]; then \
+		echo a PR number needs to be specified; \
+		exit 1; \
+	fi
+
+i18n-extract: ## Extract strings for translation from the source code
+	@[[ -d $(MM_UTILITIES_DIR) ]] || echo "You must clone github.com/mattermost/mattermost-utilities repo in .. to use this command"
+	@[[ -d $(MM_UTILITIES_DIR) ]] && cd $(MM_UTILITIES_DIR) && npm install && npm run babel && node mmjstool/build/index.js i18n extract-mobile
+
+
+## Help documentation https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
+help:
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+define start_packager
+	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
+		echo Starting React Native packager server; \
+		npm start & echo; \
+	else \
+		echo React Native packager server already running; \
+	fi
+endef
+
+define stop_packager
+	@echo Stopping React Native packager server
+	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 1 ]; then \
+		ps -ef | grep -i "cli.js start" | grep -iv grep | awk '{print $$2}' | xargs kill -9; \
+		echo React Native packager server stopped; \
+	else \
+		echo No React Native packager server running; \
+	fi
+endef

PULL_REQUEST_TEMPLATE.md

@@ -1,36 +1,22 @@
-<!-- Thank you for contributing a pull request! Here are a few tips to help you:
+Please make sure you've read the [pull request](https://developers.mattermost.com/contribute/getting-started/contribution-checklist/) section of our [code contribution guidelines](https://developers.mattermost.com/contribute/getting-started/).
 
-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
--->
+When filling in a section please remove the help text and the above text.
 
 #### Summary
-<!--
-A brief description of what this pull request does.
--->
+[A brief description of what this pull request does.]
 
 #### Ticket Link
-<!--
-If this pull request addresses a Help Wanted ticket, please link the relevant GitHub issue, e.g.
-
-  Fixes https://github.com/mattermost/mattermost-server/issues/XXXXX
-
-Otherwise, link the JIRA ticket.
--->
+[Please link the GitHub issue or Jira ticket this PR addresses.]
 
 #### Checklist
-<!--
-Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.
--->
+[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]
 - [ ] Added or updated unit tests (required for all new features)
+- [ ] All new/modified APIs include changes to [mattermost-redux](https://github.com/mattermost/mattermost-redux) (please link)
 - [ ] Has UI changes
 - [ ] Includes text changes and localization file updates
 
 #### Device Information
-This PR was tested on: <!-- Device name(s), OS version(s) --> 
+This PR was tested on: [Device name(s), OS version(s)] 
 
 #### Screenshots
-<!--
-If the PR includes UI changes, include screenshots/GIFs (for both iOS and Android if possible).
--->
+[If the PR includes UI changes, include screenshots (for both iOS and Android if possible).]

README.md

@@ -1,7 +1,7 @@
 # Mattermost Mobile
 
-- **Minimum Server versions:** Current ESR version (5.19)
-- **Supported iOS versions:** 11+
+- **Supported Server versions:** 4.10+
+- **Supported iOS versions:** 10.3+
 - **Supported Android versions:** 7.0+
 
 Mattermost is an open source Slack-alternative used by thousands of companies around the world in 14 languages. Learn more at [https://about.mattermost.com](https://about.mattermost.com).
@@ -20,7 +20,7 @@ To help with testing app updates before they're released, you can:
 
 1. Sign up to be a beta tester
    - [Android](https://play.google.com/apps/testing/com.mattermost.rnbeta)
-   - [iOS](https://testflight.apple.com/join/Q7Rx7K9P) - Open this link from your iOS device
+   - [iOS](https://mattermost-fastlane.herokuapp.com/)
 2. Install the `Mattermost Beta` app. New updates in the Beta app are released periodically. You will receive a notification when the new updates are available.
 3. File any bugs you find by filing a [GitHub issue](https://github.com/mattermost/mattermost-mobile/issues) with:
    - Device information
@@ -29,14 +29,10 @@ To help with testing app updates before they're released, you can:
    - Expected behavior
 4. (Optional) [Sign up for our team site](https://pre-release.mattermost.com/signup_user_complete/?id=f1924a8db44ff3bb41c96424cdc20676)
    - Join the [Native Mobile Apps channel](https://pre-release.mattermost.com/core/channels/native-mobile-apps) to see what's new and discuss feedback with other contributors and the core team
-   
-You can leave the Beta testing program at any time:
-- On Android, [click this link](https://play.google.com/apps/testing/com.mattermost.rnbeta) while logged in with your Google Play email address used to opt-in for the Beta program, then click **Leave the program**. 
-- On iOS, access the `Mattermost Beta` app page in TestFlight and click **Stop Testing**.
 
 ### Contribute Code 
 
-1. Look in [GitHub issues](https://mattermost.com/pl/help-wanted-mattermost-mobile) for issues marked as [Help Wanted]
+1. Look in [GitHub issues](https://github.com/mattermost/mattermost-server/issues?q=label%3A"React+Native") for issues marked as [Help Wanted]
 2. Comment to let people know you’re working on it
 3. Follow [these instructions](https://developers.mattermost.com/contribute/mobile/developer-setup/) to set up your developer environment
 4. Join the [Native Mobile Apps channel](https://pre-release.mattermost.com/core/channels/native-mobile-apps) on our team site to ask questions

SECURITY.md

@@ -1,25 +0,0 @@
-Security
-========
-
-Safety and data security is of the utmost priority for the Mattermost community. If you are a security researcher and have discovered a security vulnerability in our codebase, we would appreciate your help in disclosing it to us in a responsible manner.
-
-Reporting security issues
--------------------------
-
-**Please do not use GitHub issues for security-sensitive communication.**
-
-Security issues in the community test server, any of the open source codebases maintained by Mattermost, or any of our commercial offerings should be reported via email to [responsibledisclosure@mattermost.com](mailto:responsibledisclosure@mattermost.com). Mattermost is committed to working together with researchers and keeping them updated throughout the patching process. Researchers who responsibly report valid security issues will be publicly credited for their efforts (if they so choose).
-
-For a more detailed description of the disclosure process and a list of researchers who have previously contributed to the disclosure program, see [Report a Security Vulnerability](https://mattermost.com/security-vulnerability-report/) on the Mattermost website.
-
-Security updates
-----------------
-
-Mattermost has a mandatory upgrade policy, and updates are only provided for the latest release. Critical updates are delivered as dot releases. Details on security updates are announced 30 days after the availability of the update.
-
-For more details about the security content of past releases, see the [Security Updates](https://mattermost.com/security-updates/) page on the Mattermost website. For timely notifications about new security updates, subscribe to the [Security Bulletins Mailing List](https://about.mattermost.com/security-bulletin).
-
-Contributing to this policy
----------------------------
-
-If you have feedback or suggestions on improving this policy document, please [create an issue](https://github.com/mattermost/mattermost-mobile/issues/new).

android/app/build.gradle

@@ -15,9 +15,7 @@ import com.android.build.OutputFile
  *   // the name of the generated asset file containing your JS bundle
  *   bundleAssetName: "index.android.bundle",
  *
- *   // the entry file for bundle generation. If none specified and
- *   // "index.android.js" exists, it will be used. Otherwise "index.js" is
- *   // default. Can be overridden with ENTRY_FILE environment variable.
+ *   // the entry file for bundle generation
  *   entryFile: "index.android.js",
  *
  *   // whether to bundle JS and assets in debug mode
@@ -76,9 +74,8 @@ import com.android.build.OutputFile
 
 project.ext.react = [
     entryFile: "index.js",
-    bundleConfig: "metro.config.js",
     bundleCommand: "ram-bundle",
-    enableHermes: false,
+    bundleConfig: "packager-config.js"
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
@@ -90,7 +87,7 @@ if (System.getenv("SENTRY_ENABLED") == "true") {
         flavorAware: false
     ]
 
-    apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
+    apply from: "../../node_modules/react-native-sentry/sentry.gradle"
 }
 
 /**
@@ -101,42 +98,33 @@ if (System.getenv("SENTRY_ENABLED") == "true") {
  * Upload all the APKs to the Play Store and people will download
  * the correct one based on the CPU architecture of their device.
  */
-def enableSeparateBuildPerCPUArchitecture = project.hasProperty('separateApk') ? project.property('separateApk').toBoolean() : false
+def enableSeparateBuildPerCPUArchitecture = false
 
 /**
  * Run Proguard to shrink the Java bytecode in release builds.
  */
 def enableProguardInReleaseBuilds = false
 
-def jscFlavor = 'org.webkit:android-jsc-intl:+'
-
-/**
- * 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 enableHermes = project.ext.react.get("enableHermes", false);
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+    packagingOptions {
+        pickFirst 'lib/x86_64/libjsc.so'
+        pickFirst 'lib/arm64-v8a/libjsc.so'
     }
 
     defaultConfig {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
-        versionCode 334
-        versionName "1.37.0"
+        versionCode 193
+        versionName "1.19.0"
         multiDexEnabled = true
-        testBuildType System.getProperty('testBuildType', 'debug')
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        ndk {
+            abiFilters "armeabi-v7a", "x86"
+        }
+
     }
     signingConfigs {
         release {
@@ -152,8 +140,8 @@ android {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
-            universalApk enableSeparateBuildPerCPUArchitecture  // If true, also generate a universal APK
-            include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+            universalApk false  // If true, also generate a universal APK
+            include "armeabi-v7a", "x86"
         }
     }
     buildTypes {
@@ -169,7 +157,7 @@ android {
         unsigned.initWith(buildTypes.release)
         unsigned {
             signingConfig null
-            matchingFallbacks = ['release']
+            matchingFallbacks = ['debug', 'release']
         }
     }
     // applicationVariants are e.g. debug, release
@@ -177,11 +165,11 @@ android {
         variant.outputs.each { output ->
             // 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 versionCodes = ["armeabi-v7a":1, "x86":2]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
-                        versionCodes.get(abi) * 1000000 + defaultConfig.versionCode
+                        versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
             }
         }
     }
@@ -190,7 +178,6 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
-
 }
 
 repositories {
@@ -202,6 +189,9 @@ repositories {
 configurations.all {
     resolutionStrategy {
         eachDependency { DependencyResolveDetails details ->
+            if (details.requested.name == 'android-jsc') {
+                details.useTarget group: details.requested.group, name: 'android-jsc-intl', version: 'r236355'
+            }
             if (details.requested.name == 'play-services-base') {
                 details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
             }
@@ -220,46 +210,40 @@ configurations.all {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-
-    //noinspection GradleDynamicVersio
+    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:percent:28.0.0'
+    implementation "com.google.firebase:firebase-messaging:17.3.0"
     implementation "com.facebook.react:react-native:+"  // From node_modules
-
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-      exclude group:'com.facebook.fbjni'
-    }
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-    }
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-    }
-
-
-    if (enableHermes) {
-        def hermesPath = "../../node_modules/hermes-engine/android/";
-        debugImplementation files(hermesPath + "hermes-debug.aar")
-        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(':react-native-document-picker')
+    implementation project(':react-native-keychain')
+    implementation project(':react-native-doc-viewer')
+    implementation project(':react-native-video')
+    implementation project(':react-native-navigation')
+    implementation project(':react-native-image-picker')
+    implementation project(':react-native-bottom-sheet')
+    implementation project(':react-native-device-info')
     implementation project(':reactnativenotifications')
-    implementation 'com.google.firebase:firebase-messaging:17.3.4'
+    implementation project(':react-native-cookies')
+    implementation project(':react-native-linear-gradient')
+    implementation project(':react-native-vector-icons')
+    implementation project(':react-native-svg')
+    implementation project(':react-native-local-auth')
+    implementation project(':jail-monkey')
+    implementation project(':react-native-youtube')
+    implementation project(':react-native-sentry')
+    implementation project(':react-native-exception-handler')
+    implementation project(':rn-fetch-blob')
+    implementation project(':react-native-recyclerview-list')
+    implementation project(':react-native-webview')
+    implementation project(':react-native-gesture-handler')
 
     // For animated GIF support
-    implementation 'com.facebook.fresco:fresco:2.0.0'
-    implementation 'com.facebook.fresco:animated-gif:2.0.0'
+    implementation 'com.facebook.fresco:fresco:1.10.0'
+    implementation 'com.facebook.fresco:animated-gif:1.10.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 'com.facebook.fresco:animated-webp:1.10.0'
+    implementation  'com.facebook.fresco:webpsupport:1.10.0'
 }
 
 // Run this once to be able to run the application with BUCK
@@ -270,4 +254,3 @@ task copyDownloadableDepsToLibs(type: Copy) {
 }
 
 apply plugin: 'com.google.gms.google-services'
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

android/app/google-services.json

@@ -26,7 +26,7 @@
       ],
       "services": {
         "analytics_service": {
-          "status": 2
+          "status": 1
         },
         "appinvite_service": {
           "status": 1,
@@ -57,7 +57,7 @@
       ],
       "services": {
         "analytics_service": {
-          "status": 2
+          "status": 1
         },
         "appinvite_service": {
           "status": 1,
@@ -88,7 +88,7 @@
       ],
       "services": {
         "analytics_service": {
-          "status": 2
+          "status": 1
         },
         "appinvite_service": {
           "status": 1,
@@ -101,4 +101,4 @@
     }
   ],
   "configuration_version": "1"
-}
+}

android/app/proguard-rules.pro

@@ -8,3 +8,10 @@
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

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

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

android/app/src/debug/AndroidManifest.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
-    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
-</manifest>

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

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

android/app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
     package="com.mattermost.rnbeta">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <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.WRITE_EXTERNAL_STORAGE"/>
@@ -15,13 +15,9 @@
       android:allowBackup="false"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
-      android:roundIcon="@mipmap/ic_launcher_round"
       android:theme="@style/AppTheme"
-      android:installLocation="auto"
       android:networkSecurityConfig="@xml/network_security_config"
-      android:requestLegacyExternalStorage="true"
     >
-        <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
         <meta-data android:name="android.content.APP_RESTRICTIONS"
                    android:resource="@xml/app_restrictions" />
 
@@ -29,20 +25,13 @@
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
-        android:windowSoftInputMode="adjustResize"
-        android:launchMode="singleTask">
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+        android:windowSoftInputMode="adjustResize">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
             <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
         </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="mattermost" />
-        </intent-filter>
       </activity>
       <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
       <service android:name=".NotificationDismissService"
@@ -53,16 +42,13 @@
                android:exported="false" />
         <activity
                 android:name="com.reactnativenavigation.controllers.NavigationActivity"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-                android:resizeableActivity="true"/>
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"/>
         <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">
+                android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <action android:name="android.intent.action.SEND_MULTIPLE" />

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

@@ -4,8 +4,6 @@ import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
-import android.app.Person;
-import android.app.Person.Builder;
 import android.app.RemoteInput;
 import android.content.Intent;
 import android.content.Context;
@@ -20,27 +18,23 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Build;
 import android.provider.Settings.System;
-import androidx.annotation.Nullable;
 import android.util.Log;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 import com.wix.reactnativenotifications.core.notification.PushNotification;
 import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
 import com.wix.reactnativenotifications.core.AppLaunchHelper;
 import com.wix.reactnativenotifications.core.AppLifecycleFacade;
 import com.wix.reactnativenotifications.core.JsIOHelper;
+import com.wix.reactnativenotifications.helpers.ApplicationBadgeHelper;
 
 import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_NAME;
 
-import com.mattermost.react_native_interface.ResolvePromise;
-import com.facebook.react.bridge.WritableMap;
-
 public class CustomPushNotification extends PushNotification {
     public static final int MESSAGE_NOTIFICATION_ID = 435345;
     public static final String GROUP_KEY_MESSAGES = "mm_group_key_messages";
@@ -48,16 +42,8 @@ public class CustomPushNotification extends PushNotification {
     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 LinkedHashMap<String,Integer> channelIdToNotificationCount = new LinkedHashMap<String,Integer>();
+    private static LinkedHashMap<String,List<Bundle>> channelIdToNotification = new LinkedHashMap<String,List<Bundle>>();
     private static AppLifecycleFacade lifecycleFacade;
     private static Context context;
     private static int badgeCount = 0;
@@ -65,14 +51,15 @@ public class CustomPushNotification extends PushNotification {
     public CustomPushNotification(Context context, Bundle bundle, AppLifecycleFacade appLifecycleFacade, AppLaunchHelper appLaunchHelper, JsIOHelper jsIoHelper) {
         super(context, bundle, appLifecycleFacade, appLaunchHelper, jsIoHelper);
         this.context = context;
-        createNotificationChannels();
     }
 
     public static void clearNotification(Context mContext, int notificationId, String channelId) {
         if (notificationId != -1) {
-            Integer count = channelIdToNotificationCount.get(channelId);
-            if (count == null) {
-                count = -1;
+           Object objCount = channelIdToNotificationCount.get(channelId);
+            Integer count = -1;
+
+            if (objCount != null) {
+                count = (Integer)objCount;
             }
 
             channelIdToNotificationCount.remove(channelId);
@@ -85,6 +72,7 @@ public class CustomPushNotification extends PushNotification {
                 if (count != -1) {
                     int total = CustomPushNotification.badgeCount - count;
                     int badgeCount = total < 0 ? 0 : total;
+                    ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), badgeCount);
                     CustomPushNotification.badgeCount = badgeCount;
                 }
             }
@@ -97,232 +85,102 @@ public class CustomPushNotification extends PushNotification {
         if (mContext != null) {
             final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
             notificationManager.cancelAll();
+            ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), 0);
         }
     }
 
     @Override
     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") : false;
+        Bundle data = mNotificationProps.asBundle();
+        final String channelId = data.getString("channel_id");
+        final String type = data.getString("type");
         int notificationId = MESSAGE_NOTIFICATION_ID;
-
-        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);
-                    }
-                }
-
-                @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);
+            Object objCount = channelIdToNotificationCount.get(channelId);
+            Integer count = 1;
+            if (objCount != null) {
+                count = (Integer)objCount + 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);
+            Object bundleArray = channelIdToNotification.get(channelId);
+            List list = null;
+            if (bundleArray == null) {
+                list = Collections.synchronizedList(new ArrayList(0));
+            } else {
+                list = Collections.synchronizedList((List)bundleArray);
+            }
+            synchronized (list) {
+                if (!"clear".equals(type)) {
+                    String senderName = getSenderName(data.getString("channel_name"), data.getString("message"));
                     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);
             }
         }
 
-        switch(type) {
-        case PUSH_TYPE_MESSAGE:
-        case PUSH_TYPE_SESSION:
-            super.postNotification(notificationId);
-            break;
-        case PUSH_TYPE_CLEAR:
+        if ("clear".equals(type)) {
             cancelNotification(data, notificationId);
-            break;
+        } else {
+            super.postNotification(notificationId);
         }
 
-        if (mAppLifecycleFacade.isReactInitialized()) {
-            notifyReceivedToJS();
-        }
+        notifyReceivedToJS();
     }
 
     @Override
     public void onOpened() {
         Bundle data = mNotificationProps.asBundle();
         final String channelId = data.getString("channel_id");
-        if (channelId != null) {
-            channelIdToNotificationCount.remove(channelId);
-            channelIdToNotification.remove(channelId);
-        }
+        channelIdToNotificationCount.remove(channelId);
+        channelIdToNotification.remove(channelId);
         digestNotification();
     }
 
+    @Override
+    protected void postNotification(int id, Notification notification) {
+        boolean force = false;
+        Bundle bundle = notification.extras;
+        if (bundle != null) {
+            force = bundle.getBoolean("localTest");
+        }
+
+        if (!mAppLifecycleFacade.isAppVisible() || force) {
+            super.postNotification(id, notification);
+        }
+    }
+
     @Override
     protected Notification.Builder getNotificationBuilder(PendingIntent intent) {
+        final Resources res = mContext.getResources();
+        String packageName = mContext.getPackageName();
+        NotificationPreferences notificationPreferences = NotificationPreferences.getInstance(mContext);
+
         // First, get a builder initialized with defaults from the core class.
         final Notification.Builder notification = new Notification.Builder(mContext);
 
+        // If Android Oreo or above we need to register a channel
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            String CHANNEL_ID = "channel_01";
+            String CHANNEL_NAME = "Mattermost notifications";
+
+            NotificationChannel channel = new NotificationChannel(CHANNEL_ID,
+                    CHANNEL_NAME,
+                    NotificationManager.IMPORTANCE_HIGH);
+            channel.setShowBadge(true);
+
+            final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+            notificationManager.createNotificationChannel(channel);
+            notification.setChannelId(CHANNEL_ID);
+        }
+
         Bundle bundle = mNotificationProps.asBundle();
-
-        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;
-    }
-
-    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;
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            messagingStyle = new Notification.MessagingStyle("");
-        } else {
-            String senderId = bundle.getString("sender_id");
-            Person sender = new Person.Builder()
-                .setKey(senderId)
-                .setName("")
-                .build();
-            messagingStyle = new Notification.MessagingStyle(sender);
-        }
-
-        String conversationTitle = getConversationTitle(bundle);
-        setMessagingStyleConversationTitle(messagingStyle, conversationTitle, bundle);
-        addMessagingStyleMessages(messagingStyle, conversationTitle, bundle);
-
-        return messagingStyle;
-    }
-
-    private String getConversationTitle(Bundle bundle) {
-        String title = null;
-
         String version = bundle.getString("version");
+
+        String title = null;
         if (version != null && version.equals("v2")) {
             title = bundle.getString("channel_name");
         } else {
@@ -334,103 +192,125 @@ public class CustomPushNotification extends PushNotification {
             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);
+        String postId = bundle.getString("post_id");
+        String badge = bundle.getString("badge");
+        String smallIcon = bundle.getString("smallIcon");
+        String largeIcon = bundle.getString("largeIcon");
+        int notificationId = channelId != null ? channelId.hashCode() : MESSAGE_NOTIFICATION_ID;
+
+        Bundle b = bundle.getBundle("userInfo");
+        if (b == null) {
+            b = new Bundle();
+        }
+        b.putString("channel_id", channelId);
+        notification.addExtras(b);
+
+        int smallIconResId;
+        int largeIconResId;
+
+        if (smallIcon != null) {
+            smallIconResId = res.getIdentifier(smallIcon, "mipmap", packageName);
         } else {
-            bundleList = new ArrayList<Bundle>();
-            bundleList.add(bundle);
+            smallIconResId = res.getIdentifier("ic_notification", "mipmap", packageName);
         }
 
-        int bundleCount = bundleList.size() - 1;
-        for (int i = bundleCount; i >= 0; i--) {
-            Bundle data = bundleList.get(i);
+        if (smallIconResId == 0) {
+            smallIconResId = res.getIdentifier("ic_launcher", "mipmap", packageName);
+
+            if (smallIconResId == 0) {
+                smallIconResId = android.R.drawable.ic_dialog_info;
+            }
+        }
+
+        if (largeIcon != null) {
+            largeIconResId = res.getIdentifier(largeIcon, "mipmap", packageName);
+        } else {
+            largeIconResId = res.getIdentifier("ic_launcher", "mipmap", packageName);
+        }
+
+        if (badge != null) {
+            int badgeCount = Integer.parseInt(badge);
+            CustomPushNotification.badgeCount = badgeCount;
+            notification.setNumber(badgeCount);
+            ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), CustomPushNotification.badgeCount);
+        } else {
+            // HERE ADD THE DOT INDICATOR STUFF
+        }
+
+        Notification.MessagingStyle messagingStyle = new Notification.MessagingStyle("You");
+        if (title != null && !title.startsWith("@")) {
+            messagingStyle
+                    .setConversationTitle(title);
+        }
+
+        List<Bundle> bundleArray = channelIdToNotification.get(channelId);
+        List<Bundle> list;
+        if (bundleArray != null) {
+            list = new ArrayList<Bundle>(bundleArray);
+        } else {
+            list = new ArrayList<Bundle>();
+            list.add(bundle);
+        }
+
+        for (Bundle data : list) {
             String message = data.getString("message");
-            String senderId = data.getString("sender_id");
-            if (senderId == null) {
-                senderId = "sender_id";
+            if (title == null || !title.startsWith("@")) {
+                message = removeSenderFromMessage(message);
             }
-            Bundle userInfoBundle = data.getBundle("userInfo");
-            String senderName = getSenderName(data);
-            if (userInfoBundle != null) {
-                boolean localPushNotificationTest = userInfoBundle.getBoolean("localTest");
-                if (localPushNotificationTest) {
-                    senderName = "Test";
-                }
-            }
-
-            if (conversationTitle == null || !android.text.TextUtils.isEmpty(senderName.trim())) {
-                message = removeSenderNameFromMessage(message, senderName);
-            }
-
-            long timestamp = data.getLong("time");
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-                messagingStyle.addMessage(message, timestamp, senderName);
-            } else {
-                Person sender = new Person.Builder()
-                    .setKey(senderId)
-                    .setName(senderName)
-                    .build();
-                messagingStyle.addMessage(message, timestamp, sender);
-            }
-        }
-    }
-
-    private void setNotificationChannel(Notification.Builder notification, Bundle bundle) {
-        // If Android Oreo or above we need to register a channel
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
+            messagingStyle.addMessage(message, data.getLong("time"), data.getString("sender_name"));
         }
 
-        NotificationChannel notificationChannel = mHighImportanceChannel;
+        notification
+                .setContentIntent(intent)
+                .setGroupSummary(true)
+                .setStyle(messagingStyle)
+                .setSmallIcon(smallIconResId)
+                .setVisibility(Notification.VISIBILITY_PRIVATE)
+                .setPriority(Notification.PRIORITY_HIGH)
+                .setAutoCancel(true);
 
-        boolean localPushNotificationTest = false;
-        Bundle userInfoBundle = bundle.getBundle("userInfo");
-        if (userInfoBundle != null) {
-            localPushNotificationTest = userInfoBundle.getBoolean("localTest");
-        }
-
-        if (mAppLifecycleFacade.isAppVisible() && !localPushNotificationTest) {
-            notificationChannel = mMinImportanceChannel;
-        }
-
-        notification.setChannelId(notificationChannel.getId());
-    }
-
-    private void setNotificationBadgeIconType(Notification.Builder notification) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             notification.setBadgeIconType(Notification.BADGE_ICON_SMALL);
         }
-    }
 
-    private void setNotificationGroup(Notification.Builder notification) {
+        // 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);
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            notification
-                .setGroup(GROUP_KEY_MESSAGES)
-                .setGroupSummary(true);
+            notification.setGroup(GROUP_KEY_MESSAGES);
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && postId != null) {
+            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();
+
+            Notification.Action replyAction = new Notification.Action.Builder(
+                    R.drawable.ic_notif_action_reply, "Reply", replyPendingIntent)
+                    .addRemoteInput(remoteInput)
+                    .setAllowGeneratedReplies(true)
+                    .build();
+
+            notification
+                    .setShowWhen(true)
+                    .addAction(replyAction);
+        }
+
+        Bitmap largeIconBitmap = BitmapFactory.decodeResource(res, largeIconResId);
+        if (largeIconResId != 0 && (largeIcon != null || Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)) {
+            notification.setLargeIcon(largeIconBitmap);
         }
-    }
 
-    private void setNotificationSound(Notification.Builder notification, NotificationPreferences notificationPreferences) {
         String soundUri = notificationPreferences.getNotificationSound();
         if (soundUri != null) {
             if (soundUri != "none") {
@@ -440,126 +320,59 @@ public class CustomPushNotification extends PushNotification {
             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
+            // 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);
+        return notification;
     }
 
     private void notifyReceivedToJS() {
         mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_EVENT_NAME, mNotificationProps.asBundle(), mAppLifecycleFacade.getRunningReactContext());
     }
 
-    private void cancelNotification(Bundle data, int notificationId) {
-        final String channelId = data.getString("channel_id");
-        final String badge = data.getString("badge");
-
-        CustomPushNotification.badgeCount = Integer.parseInt(badge);
-        CustomPushNotification.clearNotification(mContext.getApplicationContext(), notificationId, channelId);
-    }
-
-    private String getSenderName(Bundle bundle) {
-        String senderName = bundle.getString("sender_name");
-        if (senderName != null) {
-            return senderName;
+    public static Integer getMessageCountInChannel(String channelId) {
+        Object objCount = channelIdToNotificationCount.get(channelId);
+        if (objCount != null) {
+            return (Integer)objCount;
         }
 
-        String channelName = bundle.getString("channel_name");
+        return 1;
+    }
+
+    private void cancelNotification(Bundle data, int notificationId) {
+        final String channelId = data.getString("channel_id");
+        final String numberString = data.getString("badge");
+
+        CustomPushNotification.badgeCount = Integer.parseInt(numberString);
+        CustomPushNotification.clearNotification(mContext.getApplicationContext(), notificationId, channelId);
+
+        ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), CustomPushNotification.badgeCount);
+    }
+
+    private String getSenderName(String channelName, String message) {
         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;
-            }
+        String senderName = message.split(":")[0];
+        if (senderName != message) {
+            return senderName;
         }
 
-        return getConversationTitle(bundle);
+        return " ";
     }
 
-    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);
+    private String removeSenderFromMessage(String message) {
+        String sender = String.format("%s: ", getSenderName("", message));
+        return message.replaceFirst(sender, "");
     }
 }

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

@@ -6,7 +6,7 @@ import com.wix.reactnativenotifications.core.AppLaunchHelper;
 import com.wix.reactnativenotifications.core.notificationdrawer.PushNotificationsDrawer;
 import com.wix.reactnativenotifications.core.notificationdrawer.IPushNotificationsDrawer;
 import com.wix.reactnativenotifications.core.notificationdrawer.INotificationsDrawerApplication;
-
+import com.wix.reactnativenotifications.helpers.PushNotificationHelper;
 import static com.wix.reactnativenotifications.Defs.LOGTAG;
 
 public class CustomPushNotificationDrawer extends PushNotificationsDrawer {

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

@@ -0,0 +1,146 @@
+package com.mattermost.rnbeta;
+
+import android.app.Application;
+import android.support.annotation.Nullable;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
+import com.mattermost.react_native_interface.AsyncStorageHelper;
+import com.mattermost.react_native_interface.KeysReadableArray;
+import com.mattermost.react_native_interface.ResolvePromise;
+import com.oblador.keychain.KeychainModule;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+public class InitializationModule extends ReactContextBaseJavaModule {
+
+    static final String TOOLBAR_BACKGROUND = "TOOLBAR_BACKGROUND";
+    static final String TOOLBAR_TEXT_COLOR = "TOOLBAR_TEXT_COLOR";
+    static final String APP_BACKGROUND = "APP_BACKGROUND";
+
+    private final Application mApplication;
+
+    public InitializationModule(Application application, ReactApplicationContext reactContext) {
+        super(reactContext);
+        mApplication = application;
+    }
+
+    @Override
+    public String getName() {
+        return "Initialization";
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Object> getConstants() {
+        Map<String, Object> constants = new HashMap<>();
+
+        /**
+         * Package all native module variables in constants
+         * in order to avoid the native bridge
+         *
+         * KeyStore:
+         * credentialsExist
+         * deviceToken
+         * currentUserId
+         * token
+         * url
+         *
+         * AsyncStorage:
+         * toolbarBackground
+         * toolbarTextColor
+         * appBackground
+         *
+         * Miscellaneous:
+         * MattermostManaged.Config
+         * replyFromPushNotification
+         */
+
+        MainApplication app = (MainApplication) mApplication;
+        final Boolean[] credentialsExist = {false};
+        final WritableMap[] credentials = {null};
+        final Object[] config = {null};
+
+        // Get KeyStore credentials
+        KeychainModule module = new KeychainModule(this.getReactApplicationContext());
+        module.getGenericPasswordForOptions(null, new ResolvePromise() {
+            @Override
+            public void resolve(@Nullable Object value) {
+                if (value instanceof Boolean && !(Boolean)value) {
+                    credentialsExist[0] = false;
+                    return;
+                }
+
+                WritableMap map = (WritableMap) value;
+                if (map != null) {
+                    credentialsExist[0] = true;
+                    credentials[0] = map;
+                }
+            }
+        });
+
+        // Get managedConfig from MattermostManagedModule
+        MattermostManagedModule.getInstance().getConfig(new ResolvePromise() {
+            @Override
+            public void resolve(@Nullable Object value) {
+                WritableNativeMap nativeMap = (WritableNativeMap) value;
+                config[0] = value;
+            }
+        });
+
+
+        // Get AsyncStorage key/values
+        final ArrayList<String> keys = new ArrayList<String>(5);
+        keys.add(TOOLBAR_BACKGROUND);
+        keys.add(TOOLBAR_TEXT_COLOR);
+        keys.add(APP_BACKGROUND);
+        KeysReadableArray asyncStorageKeys = new KeysReadableArray() {
+            @Override
+            public int size() {
+                return keys.size();
+            }
+
+            @Override
+            public String getString(int index) {
+                return keys.get(index);
+            }
+        };
+
+        AsyncStorageHelper asyncStorage = new AsyncStorageHelper(this.getReactApplicationContext());
+        HashMap<String, String> asyncStorageResults = asyncStorage.multiGet(asyncStorageKeys);
+
+        String toolbarBackground = asyncStorageResults.get(TOOLBAR_BACKGROUND);
+        String toolbarTextColor = asyncStorageResults.get(TOOLBAR_TEXT_COLOR);
+        String appBackground = asyncStorageResults.get(APP_BACKGROUND);
+
+        if (toolbarBackground != null
+                && toolbarTextColor != null
+                && appBackground != null) {
+
+            constants.put("themesExist", true);
+            constants.put("toolbarBackground", toolbarBackground);
+            constants.put("toolbarTextColor", toolbarTextColor);
+            constants.put("appBackground", appBackground);
+        } else {
+            constants.put("themesExist", false);
+        }
+
+
+        if (credentialsExist[0]) {
+            constants.put("credentialsExist", true);
+            constants.put("credentials", credentials[0]);
+        } else {
+            constants.put("credentialsExist", false);
+        }
+
+        constants.put("managedConfig", config[0]);
+        constants.put("replyFromPushNotification", app.replyFromPushNotification);
+        app.replyFromPushNotification = false;
+
+        return constants;
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.mattermost.rnbeta;
+
+import android.app.Application;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.JavaScriptModule;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class InitializationPackage implements ReactPackage {
+
+    private final Application mApplication;
+
+    public InitializationPackage(Application application) {
+        mApplication = application;
+    }
+
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        return Arrays.<NativeModule>asList(new InitializationModule(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/rnbeta/MainActivity.java

@@ -1,50 +1,31 @@
 package com.mattermost.rnbeta;
 
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import android.view.KeyEvent;
-import android.content.res.Configuration;
-
-import com.reactnativenavigation.NavigationActivity;
-import com.github.emilioicai.hwkeyboardevent.HWKeyboardEventModule;
-
-public class MainActivity extends NavigationActivity {
-    private boolean HWKeyboardConnected = false;
+import android.support.annotation.Nullable;
+import com.reactnativenavigation.controllers.SplashActivity;
 
+public class MainActivity extends SplashActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.launch_screen);
-        setHWKeyboardConnected();
-    }
 
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-
-        if (newConfig.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO) {
-            HWKeyboardConnected = true;
-        } else if (newConfig.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_YES) {
-            HWKeyboardConnected = false;
+        /**
+         * Reference: https://stackoverflow.com/questions/7944338/resume-last-activity-when-launcher-icon-is-clicked
+         * 1. Open app from launcher/appDrawer
+         * 2. Go home
+         * 3. Send notification and open
+         * 4. It creates a new Activity and Destroys the old
+         * 5. Causing an unnecessary app restart
+         * 6. This solution short-circuits the restart
+         */
+        if (!isTaskRoot()) {
+            finish();
+            return;
         }
     }
 
-    /*
-    https://mattermost.atlassian.net/browse/MM-10601
-    Required by react-native-hw-keyboard-event
-    (https://github.com/emilioicai/react-native-hw-keyboard-event)
-    */
     @Override
-    public boolean dispatchKeyEvent(KeyEvent event) {
-        if (HWKeyboardConnected && event.getKeyCode() == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
-            String keyPressed = event.isShiftPressed() ? "shift-enter" : "enter";
-            HWKeyboardEventModule.getInstance().keyPressed(keyPressed);
-            return true;
-        }
-        return super.dispatchKeyEvent(event);
-    };
-
-    private void setHWKeyboardConnected() {
-        HWKeyboardConnected = getResources().getConfiguration().keyboard == Configuration.KEYBOARD_QWERTY;
+    public int getSplashLayout() {
+        return R.layout.launch_screen;
     }
 }

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

@@ -1,21 +1,42 @@
 package com.mattermost.rnbeta;
 
-import androidx.annotation.Nullable;
-import android.content.Context;
-import android.content.RestrictionsManager;
-import android.os.Bundle;
-import android.util.Log;
-import java.lang.reflect.InvocationTargetException;
-import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.mattermost.share.SharePackage;
 import com.mattermost.share.RealPathUtil;
-import com.mattermost.share.ShareModule;
-import com.wix.reactnativenotifications.RNNotificationsPackage;
 
+import android.app.Activity;
+import android.support.annotation.NonNull;
+import android.content.Context;
+import android.os.Bundle;
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import com.reactnativedocumentpicker.ReactNativeDocumentPicker;
+import com.oblador.keychain.KeychainPackage;
+import com.reactlibrary.RNReactNativeDocViewerPackage;
+import com.brentvatne.react.ReactVideoPackage;
+import com.horcrux.svg.SvgPackage;
+import com.inprogress.reactnativeyoutube.ReactNativeYouTube;
+import io.sentry.RNSentryPackage;
+import com.masteratul.exceptionhandler.ReactNativeExceptionHandlerPackage;
+import com.RNFetchBlob.RNFetchBlobPackage;
+import com.gantix.JailMonkey.JailMonkeyPackage;
+import io.tradle.react.LocalAuthPackage;
+import com.github.godness84.RNRecyclerViewList.RNRecyclerviewListPackage;
+import com.reactnativecommunity.webview.RNCWebViewPackage;
+import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.soloader.SoLoader;
+
+import com.imagepicker.ImagePickerPackage;
+import com.gnet.bottomsheet.RNBottomSheetPackage;
+import com.learnium.RNDeviceInfo.RNDeviceInfo;
+import com.psykar.cookiemanager.CookieManagerPackage;
+import com.oblador.vectoricons.VectorIconsPackage;
+import com.BV.LinearGradient.LinearGradientPackage;
 import com.reactnativenavigation.NavigationApplication;
+import com.wix.reactnativenotifications.RNNotificationsPackage;
 import com.wix.reactnativenotifications.core.notification.INotificationsApplication;
 import com.wix.reactnativenotifications.core.notification.IPushNotification;
 import com.wix.reactnativenotifications.core.notificationdrawer.IPushNotificationsDrawer;
@@ -24,100 +45,54 @@ import com.wix.reactnativenotifications.core.AppLaunchHelper;
 import com.wix.reactnativenotifications.core.AppLifecycleFacade;
 import com.wix.reactnativenotifications.core.JsIOHelper;
 
-import com.facebook.react.PackageList;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.TurboReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactMarker;
-import com.facebook.react.bridge.ReactMarkerConstants;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.module.model.ReactModuleInfo;
-import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.facebook.soloader.SoLoader;
+import android.util.Log;
 
 public class MainApplication extends NavigationApplication implements INotificationsApplication, INotificationsDrawerApplication {
-  public static MainApplication instance;
-
+  public NotificationsLifecycleFacade notificationsLifecycleFacade;
   public Boolean sharedExtensionIsOpened = false;
-
-  public long APP_START_TIME;
-
-  public long RELOAD;
-  public long CONTENT_APPEARED;
-
-  public long PROCESS_PACKAGES_START;
-  public long PROCESS_PACKAGES_END;
-
-  private Bundle mManagedConfig = null;
-
-private final ReactNativeHost mReactNativeHost =
-  new ReactNativeHost(this) {
-    @Override
-    public boolean getUseDeveloperSupport() {
-      return BuildConfig.DEBUG;
-    }
-
-    @Override
-    protected 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 RNPasteableTextInputPackage());
-      packages.add(
-        new TurboReactPackage() {
-              @Override
-              public NativeModule getModule(String name, ReactApplicationContext reactContext) {
-                switch (name) {
-                  case "MattermostManaged":
-                    return MattermostManagedModule.getInstance(reactContext);
-                  case "MattermostShare":
-                    return new ShareModule(instance, reactContext);
-                  case "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 new ReactModuleInfoProvider() {
-                  @Override
-                  public Map<String, ReactModuleInfo> getReactModuleInfos() {
-                    Map<String, ReactModuleInfo> map = new HashMap<>();
-                    map.put("MattermostManaged", new ReactModuleInfo("MattermostManaged", "com.mattermost.rnbeta.MattermostManagedModule", false, false, false, false, false));
-                    map.put("MattermostShare", new ReactModuleInfo("MattermostShare", "com.mattermost.share.ShareModule", false, false, true, false, false));
-                    map.put("NotificationPreferences", new ReactModuleInfo("NotificationPreferences", "com.mattermost.rnbeta.NotificationPreferencesModule", false, false, false, false, false));
-                    map.put("RNTextInputReset", new ReactModuleInfo("RNTextInputReset", "com.mattermost.rnbeta.RNTextInputResetModule", false, false, false, false, false));
-                    return map;
-                  }
-                };
-              }
-            }
-      );
-
-      return packages;
-    }
-
-    @Override
-    protected String getJSMainModuleName() {
-      return "index";
-    }
-  };
+  public Boolean replyFromPushNotification = false;
 
   @Override
-  public ReactNativeHost getReactNativeHost() {
-    return mReactNativeHost;
+  public boolean isDebug() {
+    return BuildConfig.DEBUG;
+  }
+
+  @NonNull
+  @Override
+  public List<ReactPackage> createAdditionalReactPackages() {
+    // Add the packages you require here.
+    // No need to add RnnPackage and MainReactPackage
+    return Arrays.<ReactPackage>asList(
+            new ImagePickerPackage(),
+            new RNBottomSheetPackage(),
+            new RNDeviceInfo(),
+            new CookieManagerPackage(),
+            new VectorIconsPackage(),
+            new SvgPackage(),
+            new LinearGradientPackage(),
+            new RNNotificationsPackage(this),
+            new LocalAuthPackage(),
+            new JailMonkeyPackage(),
+            new RNFetchBlobPackage(),
+            new MattermostPackage(this),
+            new RNSentryPackage(),
+            new ReactNativeExceptionHandlerPackage(),
+            new ReactNativeYouTube(),
+            new ReactVideoPackage(),
+            new RNReactNativeDocViewerPackage(),
+            new ReactNativeDocumentPicker(),
+            new SharePackage(this),
+            new KeychainPackage(),
+            new InitializationPackage(this),
+            new RNRecyclerviewListPackage(),
+            new RNCWebViewPackage(),
+            new RNGestureHandlerPackage()
+    );
+  }
+
+  @Override
+  public String getJSMainModuleName() {
+    return "index";
   }
 
   @Override
@@ -126,15 +101,23 @@ private final ReactNativeHost mReactNativeHost =
     instance = this;
 
     // Delete any previous temp files created by the app
-    File tempFolder = new File(getApplicationContext().getCacheDir(), ShareModule.CACHE_DIR_NAME);
+    File tempFolder = new File(getApplicationContext().getCacheDir(), "mmShare");
     RealPathUtil.deleteTempFiles(tempFolder);
     Log.i("ReactNative", "Cleaning temp cache " + tempFolder.getAbsolutePath());
 
-    SoLoader.init(this, /* native exopackage */ false);
-    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+    // Create an object of the custom facade impl
+    notificationsLifecycleFacade = NotificationsLifecycleFacade.getInstance();
+    // Attach it to react-native-navigation
+    setActivityCallbacks(notificationsLifecycleFacade);
 
-    // Uncomment to listen to react markers for build that has telemetry enabled
-    // addReactMarkerListener();
+    SoLoader.init(this, /* native exopackage */ false);
+  }
+
+  @Override
+  public boolean clearHostOnActivityDestroy(Activity activity) {
+    // This solves the issue where the splash screen does not go away
+    // after the app is killed by the OS cause of memory or a long time in the background
+    return false;
   }
 
   @Override
@@ -142,7 +125,7 @@ private final ReactNativeHost mReactNativeHost =
     return new CustomPushNotification(
             context,
             bundle,
-            defaultFacade,
+            notificationsLifecycleFacade, // Instead of defaultFacade!!!
             defaultAppLaunchHelper,
             new JsIOHelper()
     );
@@ -152,109 +135,4 @@ private final ReactNativeHost mReactNativeHost =
   public IPushNotificationsDrawer getPushNotificationsDrawer(Context context, AppLaunchHelper defaultAppLaunchHelper) {
     return new CustomPushNotificationDrawer(context, defaultAppLaunchHelper);
   }
-
-  public ReactContext getRunningReactContext() {
-    if (mReactNativeHost == null) {
-        return null;
-    }
-
-    return mReactNativeHost
-        .getReactInstanceManager()
-        .getCurrentReactContext();
-  }
-
-  public synchronized Bundle loadManagedConfig(Context ctx) {
-    if (ctx != null) {
-      RestrictionsManager myRestrictionsMgr =
-              (RestrictionsManager) ctx.getSystemService(Context.RESTRICTIONS_SERVICE);
-
-      mManagedConfig = myRestrictionsMgr.getApplicationRestrictions();
-      myRestrictionsMgr = null;
-
-      if (mManagedConfig!= null && mManagedConfig.size() > 0) {
-        return mManagedConfig;
-      }
-
-      return null;
-    }
-
-    return null;
-  }
-
-  public synchronized Bundle getManagedConfig() {
-    if (mManagedConfig != null && mManagedConfig.size() > 0) {
-        return mManagedConfig;
-    }
-
-    ReactContext ctx = getRunningReactContext();
-
-    if (ctx != null) {
-      return loadManagedConfig(ctx);
-    }
-
-    return null;
-  }
-
-  private void addReactMarkerListener() {
-    ReactMarker.addListener(new ReactMarker.MarkerListener() {
-      @Override
-      public void logMarker(ReactMarkerConstants name, @Nullable String tag, int instanceKey) {
-        if (name.toString() == ReactMarkerConstants.RELOAD.toString()) {
-          APP_START_TIME = System.currentTimeMillis();
-          RELOAD = System.currentTimeMillis();
-        } else if (name.toString() == ReactMarkerConstants.PROCESS_PACKAGES_START.toString()) {
-          PROCESS_PACKAGES_START = System.currentTimeMillis();
-        } else if (name.toString() == ReactMarkerConstants.PROCESS_PACKAGES_END.toString()) {
-          PROCESS_PACKAGES_END = System.currentTimeMillis();
-        } else if (name.toString() == ReactMarkerConstants.CONTENT_APPEARED.toString()) {
-          CONTENT_APPEARED = System.currentTimeMillis();
-          ReactContext ctx = getRunningReactContext();
-
-          if (ctx != null) {
-            WritableMap map = Arguments.createMap();
-
-            map.putDouble("appReload", RELOAD);
-            map.putDouble("appContentAppeared", CONTENT_APPEARED);
-
-            map.putDouble("processPackagesStart", PROCESS_PACKAGES_START);
-            map.putDouble("processPackagesEnd", PROCESS_PACKAGES_END);
-
-            ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).
-                    emit("nativeMetrics", map);
-          }
-        }
-      }
-    });
-  }
-
-  /**
-   * Loads Flipper in React Native templates. Call this in the onCreate method with something like
-   * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
-   *
-   * @param context
-   * @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/MattermostCredentialsHelper.java

@@ -1,42 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.content.Context;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.WritableMap;
-import com.oblador.keychain.KeychainModule;
-
-import com.mattermost.react_native_interface.ResolvePromise;
-import com.mattermost.react_native_interface.AsyncStorageHelper;
-import com.mattermost.react_native_interface.KeysReadableArray;
-
-public class MattermostCredentialsHelper {
-    static final String CURRENT_SERVER_URL = "@currentServerUrl";
-
-    public static void getCredentialsForCurrentServer(ReactApplicationContext context, ResolvePromise promise) {
-        final KeychainModule keychainModule = new KeychainModule(context);
-        final AsyncStorageHelper asyncStorage = new AsyncStorageHelper(context);
-        final ArrayList<String> keys = new ArrayList<String>(1);
-        keys.add(CURRENT_SERVER_URL);
-        KeysReadableArray asyncStorageKeys = new KeysReadableArray() {
-            @Override
-            public int size() {
-                return keys.size();
-            }
-
-            @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/rnbeta/MattermostManagedModule.java

@@ -1,18 +1,8 @@
 package com.mattermost.rnbeta;
 
-import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.BroadcastReceiver;
 import android.os.Bundle;
-import android.provider.Settings;
-import android.view.WindowManager.LayoutParams;
-import android.util.ArraySet;
-import android.util.Log;
-
-import java.util.Set;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.NativeModule;
@@ -21,35 +11,14 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.LifecycleEventListener;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
 
-public class MattermostManagedModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
+public class MattermostManagedModule extends ReactContextBaseJavaModule {
     private static MattermostManagedModule instance;
 
-    private static final String TAG = MattermostManagedModule.class.getSimpleName();
-
-    private final IntentFilter restrictionsFilter =
-            new IntentFilter(Intent.ACTION_APPLICATION_RESTRICTIONS_CHANGED);
-
-    private final BroadcastReceiver restrictionsReceiver = new BroadcastReceiver() {
-        @Override public void onReceive(Context ctx, Intent intent) {
-            if (ctx != null) {
-                Bundle managedConfig = MainApplication.instance.loadManagedConfig(ctx);
-
-                // Check current configuration settings, change your app's UI and
-                // functionality as necessary.
-                Log.i(TAG, "Managed Configuration Changed");
-                sendConfigChanged(managedConfig);
-                handleBlurScreen(managedConfig);
-            }
-        }
-    };
+    private boolean shouldBlurAppScreen = false;
 
     private MattermostManagedModule(ReactApplicationContext reactContext) {
         super(reactContext);
-        reactContext.addLifecycleEventListener(this);
     }
 
     public static MattermostManagedModule getInstance(ReactApplicationContext reactContext) {
@@ -69,10 +38,19 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule implemen
         return "MattermostManaged";
     }
 
+    @ReactMethod
+    public void blurAppScreen(boolean enabled) {
+        shouldBlurAppScreen = enabled;
+    }
+
+    public boolean isBlurAppScreenEnabled() {
+        return shouldBlurAppScreen;
+    }
+
     @ReactMethod
     public void getConfig(final Promise promise) {
         try {
-            Bundle config = MainApplication.instance.getManagedConfig();
+            Bundle config = NotificationsLifecycleFacade.getInstance().getManagedConfig();
 
             if (config != null) {
                 Object result = Arguments.fromBundle(config);
@@ -84,140 +62,4 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule implemen
             promise.resolve(Arguments.createMap());
         }
     }
-
-    @ReactMethod
-    // Close the current activity and open the security settings.
-    public void goToSecuritySettings() {
-        Intent intent = new Intent(Settings.ACTION_SECURITY_SETTINGS);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getReactApplicationContext().startActivity(intent);
-
-        getCurrentActivity().finish();
-        System.exit(0);
-    }
-
-    @ReactMethod
-    public void isRunningInSplitView(final Promise promise) {
-        WritableMap result = Arguments.createMap();
-        Activity current = getCurrentActivity();
-        if (current != null) {
-            result.putBoolean("isSplitView", current.isInMultiWindowMode());
-        } else {
-            result.putBoolean("isSplitView", false);
-        }
-
-        promise.resolve(result);
-    }
-
-    @ReactMethod
-    public void quitApp() {
-        getCurrentActivity().finish();
-        System.exit(0);
-    }
-
-    @Override
-    public void onHostResume() {
-        Activity activity = getCurrentActivity();
-        Bundle managedConfig = MainApplication.instance.getManagedConfig();
-
-        if (activity != null && managedConfig != null) {
-            activity.registerReceiver(restrictionsReceiver, restrictionsFilter);
-        }
-
-        ReactContext ctx = MainApplication.instance.getRunningReactContext();
-        Bundle newManagedConfig = null;
-        if (ctx != null) {
-            newManagedConfig = MainApplication.instance.loadManagedConfig(ctx);
-            if (!equalBundles(newManagedConfig, managedConfig)) {
-                Log.i(TAG, "onResumed Managed Configuration Changed");
-                sendConfigChanged(newManagedConfig);
-            }
-        }
-
-        handleBlurScreen(newManagedConfig);
-    }
-
-    @Override
-    public void onHostPause() {
-        Activity activity = getCurrentActivity();
-        Bundle managedConfig = MainApplication.instance.getManagedConfig();
-
-        if (activity != null && managedConfig != null) {
-            try {
-                activity.unregisterReceiver(restrictionsReceiver);
-            } catch (IllegalArgumentException e) {
-                // Just ignore this cause the receiver wasn't registered for this activity
-            }
-        }
-    }
-
-    @Override
-    public void onHostDestroy() {
-    }
-
-    private void handleBlurScreen(Bundle config) {
-        Activity activity = getCurrentActivity();
-        boolean blurAppScreen = false;
-
-        if (config != null) {
-            blurAppScreen = Boolean.parseBoolean(config.getString("blurApplicationScreen"));
-        }
-
-        if (blurAppScreen) {
-            activity.getWindow().setFlags(LayoutParams.FLAG_SECURE, LayoutParams.FLAG_SECURE);
-        } else {
-            activity.getWindow().clearFlags(LayoutParams.FLAG_SECURE);
-        }
-    }
-
-    private void sendConfigChanged(Bundle config) {
-        WritableMap result = Arguments.createMap();
-        if (config != null) {
-            result = Arguments.fromBundle(config);
-        }
-        ReactContext ctx = MainApplication.instance.getRunningReactContext();
-
-        if (ctx != null) {
-            ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit("managedConfigDidChange", result);
-        }
-    }
-
-    private boolean equalBundles(Bundle one, Bundle two) {
-        if (one == null && two == null) {
-            return true;
-        }
-
-        if (one == null || two == null)
-            return false;
-
-        if(one.size() != two.size())
-            return false;
-
-        Set<String> setOne = new ArraySet<String>();
-        setOne.addAll(one.keySet());
-        setOne.addAll(two.keySet());
-        Object valueOne;
-        Object valueTwo;
-
-        for(String key : setOne) {
-            if (!one.containsKey(key) || !two.containsKey(key))
-                return false;
-
-            valueOne = one.get(key);
-            valueTwo = two.get(key);
-            if(valueOne instanceof Bundle && valueTwo instanceof Bundle &&
-                    !equalBundles((Bundle) valueOne, (Bundle) valueTwo)) {
-                return false;
-            }
-            else if(valueOne == null) {
-                if(valueTwo != null)
-                    return false;
-            }
-            else if(!valueOne.equals(valueTwo))
-                return false;
-        }
-
-        return true;
-    }
 }

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

@@ -0,0 +1,32 @@
+package com.mattermost.rnbeta;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.bridge.JavaScriptModule;
+
+public class MattermostPackage implements ReactPackage {
+    private final MainApplication mApplication;
+
+    public MattermostPackage(MainApplication application) {
+        mApplication = application;
+    }
+
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        return Arrays.<NativeModule>asList(
+                MattermostManagedModule.getInstance(reactContext),
+                NotificationPreferencesModule.getInstance(mApplication, reactContext)
+        );
+    }
+
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return Arrays.<ViewManager>asList();
+    }
+}

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

@@ -10,7 +10,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import java.io.IOException;
 
@@ -21,12 +21,10 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
 
-import org.json.JSONObject;
-import org.json.JSONException;
-
 import com.mattermost.react_native_interface.ResolvePromise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.WritableMap;
+import com.oblador.keychain.KeychainModule;
 
 import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
 
@@ -38,31 +36,36 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         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 = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
             notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
             final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
             final int notificationId = intent.getIntExtra(CustomPushNotification.NOTIFICATION_ID, -1);
+            final CharSequence message = getReplyMessage(intent);
+            final KeychainModule keychainModule = new KeychainModule(reactApplicationContext);
 
-
-            MattermostCredentialsHelper.getCredentialsForCurrentServer(reactApplicationContext, new ResolvePromise() {
+            keychainModule.getGenericPasswordForOptions(null, new ResolvePromise() {
                 @Override
                 public void resolve(@Nullable Object value) {
                     if (value instanceof Boolean && !(Boolean)value) {
+                        String channelId = bundle.getString("channel_id");
+                        onReplyFailed(notificationManager, notificationId, channelId);
                         return;
                     }
 
                     WritableMap map = (WritableMap) value;
                     if (map != null) {
-                        String token = map.getString("password");
-                        String serverUrl = map.getString("service");
+                        String[] credentials = map.getString("password").split(",[ ]*");
+                        String token = null;
+                        String serverUrl = null;
+                        if (credentials.length == 2) {
+                            token = credentials[0];
+                            serverUrl = credentials[1];
 
+                        }
+
+                        Log.i("ReactNative", String.format("URL=%s TOKEN=%s", serverUrl, token));
                         replyToMessage(serverUrl, token, notificationId, message);
                     }
                 }
@@ -72,11 +75,7 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
 
     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");
-        if (android.text.TextUtils.isEmpty(rootId)) {
-            rootId = postId;
-        }
+        final String rootId = bundle.getString("post_id");
 
         if (token == null || serverUrl == null) {
             onReplyFailed(notificationManager, notificationId, channelId);
@@ -86,22 +85,19 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
         final OkHttpClient client = new OkHttpClient();
         final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
         String json = buildReplyPost(channelId, rootId, message.toString());
+        Log.i("ReactNative", String.format("JSON STRING %s", json));
         RequestBody body = RequestBody.create(JSON, json);
-
-        String postsEndpoint = "/api/v4/posts?set_online=false";
-        String url = String.format("%s%s", serverUrl.replaceAll("/$", ""), postsEndpoint);
-        Log.i("ReactNative", String.format("Reply URL=%s", url));
         Request request = new Request.Builder()
-            .header("Authorization", String.format("Bearer %s", token))
-            .header("Content-Type", "application/json")
-            .url(url)
-            .post(body)
-            .build();
+                .header("Authorization", String.format("Bearer %s", token))
+                .header("Content-Type", "application/json")
+                .url(String.format("%s/api/v4/posts", serverUrl.replaceAll("/$", "")))
+                .post(body)
+                .build();
 
         client.newCall(request).enqueue(new okhttp3.Callback() {
             @Override
             public void onFailure(Call call, IOException e) {
-                Log.i("ReactNative", String.format("Reply FAILED exception %s", e.getMessage()));
+                Log.i("ReactNative", String.format("Reply with message %s FAILED exception %s", message, e.getMessage()));
                 onReplyFailed(notificationManager, notificationId, channelId);
             }
 
@@ -109,9 +105,9 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
             public void onResponse(Call call, final Response response) throws IOException {
                 if (response.isSuccessful()) {
                     onReplySuccess(notificationManager, notificationId, channelId);
-                    Log.i("ReactNative", "Reply SUCCESS");
+                    Log.i("ReactNative", String.format("Reply with message %s", message));
                 } else {
-                    Log.i("ReactNative", String.format("Reply FAILED status %s BODY %s", response.code(), response.body().string()));
+                    Log.i("ReactNative", String.format("Reply with message %s FAILED status %s BODY %s", message, response.code(), response.body().string()));
                     onReplyFailed(notificationManager, notificationId, channelId);
                 }
             }
@@ -119,15 +115,11 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
     }
 
     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 "{}";
-        }
+        return "{"
+                + "\"channel_id\": \"" + channelId + "\","
+                + "\"message\": \"" + message + "\","
+                + "\"root_id\": \"" + rootId + "\""
+                + "}";
     }
 
     protected void onReplyFailed(NotificationManager notificationManager, int notificationId, String channelId) {
@@ -136,16 +128,12 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
         String packageName = mContext.getPackageName();
         int smallIconResId = res.getIdentifier("ic_notification", "mipmap", packageName);
 
-        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);

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

@@ -0,0 +1,251 @@
+package com.mattermost.rnbeta;
+
+import android.app.Activity;
+import android.content.pm.ActivityInfo;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.RestrictionsManager;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.util.Log;
+import android.util.ArraySet;
+import android.view.WindowManager;
+import android.view.WindowManager.LayoutParams;
+import android.content.res.Configuration;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.controllers.ActivityCallbacks;
+import com.reactnativenavigation.react.ReactGateway;
+import com.wix.reactnativenotifications.core.AppLifecycleFacade;
+
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+
+public class NotificationsLifecycleFacade extends ActivityCallbacks implements AppLifecycleFacade {
+    private static final String TAG = NotificationsLifecycleFacade.class.getSimpleName();
+    private static NotificationsLifecycleFacade instance;
+
+    private Bundle managedConfig = null;
+    private Activity mVisibleActivity;
+    private Set<AppVisibilityListener> mListeners = new CopyOnWriteArraySet<>();
+
+    private final IntentFilter restrictionsFilter =
+            new IntentFilter(Intent.ACTION_APPLICATION_RESTRICTIONS_CHANGED);
+
+    private final BroadcastReceiver restrictionsReceiver = new BroadcastReceiver() {
+        @Override public void onReceive(Context context, Intent intent) {
+            if (context != null) {
+                // Get the current configuration bundle
+                RestrictionsManager myRestrictionsMgr =
+                        (RestrictionsManager) context
+                                .getSystemService(Context.RESTRICTIONS_SERVICE);
+                managedConfig = myRestrictionsMgr.getApplicationRestrictions();
+
+                // Check current configuration settings, change your app's UI and
+                // functionality as necessary.
+                Log.i("ReactNative", "Managed Configuration Changed");
+                sendConfigChanged(managedConfig);
+            }
+        }
+    };
+
+    public static NotificationsLifecycleFacade getInstance() {
+        if (instance == null) {
+            instance = new NotificationsLifecycleFacade();
+        }
+
+        return instance;
+    }
+
+    @Override
+    public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+        MattermostManagedModule managedModule = MattermostManagedModule.getInstance();
+        if (managedModule != null && managedModule.isBlurAppScreenEnabled() && activity != null) {
+            activity.getWindow().setFlags(LayoutParams.FLAG_SECURE,
+                    LayoutParams.FLAG_SECURE);
+        }
+        if (managedConfig != null && managedConfig.size() > 0 && activity != null) {
+            activity.registerReceiver(restrictionsReceiver, restrictionsFilter);
+        }
+
+        if (activity != null) {
+            activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        }
+    }
+
+    @Override
+    public void onActivityResumed(Activity activity) {
+        switchToVisible(activity);
+
+        ReactContext ctx = getRunningReactContext();
+        if (managedConfig != null && managedConfig.size() > 0 && ctx != null) {
+
+            RestrictionsManager myRestrictionsMgr =
+                    (RestrictionsManager) ctx
+                            .getSystemService(Context.RESTRICTIONS_SERVICE);
+
+            Bundle newConfig = myRestrictionsMgr.getApplicationRestrictions();
+            if (!equalBundles(newConfig ,managedConfig)) {
+                Log.i("ReactNative", "onResumed Managed Configuration Changed");
+                managedConfig = newConfig;
+                sendConfigChanged(managedConfig);
+            }
+        }
+    }
+
+    @Override
+    public void onActivityPaused(Activity activity) {
+        switchToInvisible(activity);
+    }
+
+    @Override
+    public void onActivityStopped(Activity activity) {
+        switchToInvisible(activity);
+        if (managedConfig != null && managedConfig.size() > 0) {
+            try {
+                activity.unregisterReceiver(restrictionsReceiver);
+            } catch (IllegalArgumentException e) {
+                // Just ignore this cause the receiver wasn't registered for this activity
+            }
+        }
+    }
+
+    @Override
+    public void onActivityDestroyed(Activity activity) {
+        switchToInvisible(activity);
+    }
+
+    @Override
+    public boolean isReactInitialized() {
+        return NavigationApplication.instance.isReactContextInitialized();
+    }
+
+    @Override
+    public ReactContext getRunningReactContext() {
+        final ReactGateway reactGateway = NavigationApplication.instance.getReactGateway();
+        if (reactGateway == null || !reactGateway.isInitialized()) {
+            return null;
+        }
+
+        return reactGateway.getReactContext();
+    }
+
+    @Override
+    public boolean isAppVisible() {
+        return mVisibleActivity != null;
+    }
+
+    @Override
+    public synchronized void addVisibilityListener(AppVisibilityListener listener) {
+        mListeners.add(listener);
+    }
+
+    @Override
+    public synchronized void removeVisibilityListener(AppVisibilityListener listener) {
+        mListeners.remove(listener);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        if (mVisibleActivity != null) {
+            Intent intent = new Intent("onConfigurationChanged");
+            intent.putExtra("newConfig", newConfig);
+            mVisibleActivity.sendBroadcast(intent);
+        }
+    }
+
+    private synchronized void switchToVisible(Activity activity) {
+        if (mVisibleActivity == null) {
+            mVisibleActivity = activity;
+            Log.v(TAG, "Activity is now visible ("+activity+")");
+            for (AppVisibilityListener listener : mListeners) {
+                listener.onAppVisible();
+            }
+        }
+    }
+
+    private synchronized void switchToInvisible(Activity activity) {
+        if (mVisibleActivity == activity) {
+            mVisibleActivity = null;
+            Log.v(TAG, "Activity is now NOT visible ("+activity+")");
+            for (AppVisibilityListener listener : mListeners) {
+                listener.onAppNotVisible();
+            }
+        }
+    }
+
+    public synchronized void LoadManagedConfig(ReactContext ctx) {
+        if (ctx != null) {
+            RestrictionsManager myRestrictionsMgr =
+                    (RestrictionsManager) ctx
+                            .getSystemService(Context.RESTRICTIONS_SERVICE);
+
+            managedConfig = myRestrictionsMgr.getApplicationRestrictions();
+            myRestrictionsMgr = null;
+        }
+    }
+
+    public synchronized Bundle getManagedConfig() {
+        if (managedConfig!= null && managedConfig.size() > 0) {
+            return managedConfig;
+        }
+
+        ReactContext ctx = getRunningReactContext();
+
+        if (ctx != null) {
+            LoadManagedConfig(ctx);
+            return managedConfig;
+        }
+
+        return null;
+    }
+
+    public void sendConfigChanged(Bundle config) {
+        Object result = Arguments.fromBundle(config);
+        ReactContext ctx = getRunningReactContext();
+        if (ctx != null) {
+            ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).
+                    emit("managedConfigDidChange", result);
+        }
+    }
+
+    private boolean equalBundles(Bundle one, Bundle two) {
+        if (one == null || two == null)
+            return false;
+
+        if(one.size() != two.size())
+            return false;
+
+        Set<String> setOne = new ArraySet<String>();
+        setOne.addAll(one.keySet());
+        setOne.addAll(two.keySet());
+        Object valueOne;
+        Object valueTwo;
+
+        for(String key : setOne) {
+            if (!one.containsKey(key) || !two.containsKey(key))
+                return false;
+
+            valueOne = one.get(key);
+            valueTwo = two.get(key);
+            if(valueOne instanceof Bundle && valueTwo instanceof Bundle &&
+                    !equalBundles((Bundle) valueOne, (Bundle) valueTwo)) {
+                return false;
+            }
+            else if(valueOne == null) {
+                if(valueTwo != null)
+                    return false;
+            }
+            else if(!valueOne.equals(valueTwo))
+                return false;
+        }
+
+        return true;
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,42 +0,0 @@
-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,156 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.content.Context;
-import androidx.annotation.Nullable;
-import android.os.Bundle;
-import android.util.Log;
-import java.lang.System;
-
-import okhttp3.Call;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import okhttp3.HttpUrl;
-
-import org.json.JSONObject;
-import org.json.JSONException;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.Arguments;
-
-import com.mattermost.react_native_interface.ResolvePromise;
-
-public class ReceiptDelivery {
-    static final String CURRENT_SERVER_URL = "@currentServerUrl";
-
-    private static final int[] FIBONACCI_BACKOFFS = new int[] { 0, 1, 2, 3, 5, 8 };
-
-    public static void send(Context context, final String ackId, final String postId, final String type, final boolean isIdLoaded, ResolvePromise promise) {
-        final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
-
-        MattermostCredentialsHelper.getCredentialsForCurrentServer(reactApplicationContext, new ResolvePromise() {
-            @Override
-            public void resolve(@Nullable Object value) {
-                if (value instanceof Boolean && !(Boolean)value) {
-                    return;
-                }
-
-                WritableMap map = (WritableMap) value;
-                if (map != null) {
-                    String token = map.getString("password");
-                    String serverUrl = map.getString("service");
-                    if (serverUrl.isEmpty()) {
-                        String[] credentials = token.split(",[ ]*");
-                        if (credentials.length == 2) {
-                            token = credentials[0];
-                            serverUrl = credentials[1];
-                        }
-                    }
-
-                    Log.i("ReactNative", String.format("Send receipt delivery ACK=%s TYPE=%s to URL=%s with ID-LOADED=%s", ackId, type, serverUrl, isIdLoaded));
-                    execute(serverUrl, postId, token, ackId, type, isIdLoaded, promise);
-                }
-            }
-        });
-    }
-
-    protected static void execute(String serverUrl, String postId, String token, String ackId, String type, boolean isIdLoaded, ResolvePromise promise) {
-        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);
-        }
-    }
-
-    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();
-            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));
-                }
-            }
-            promise.resolve(bundle);
-        } catch (Exception e) {
-            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/share/RealPathUtil.java

@@ -113,7 +113,7 @@ public class RealPathUtil {
             }
 
 
-            File cacheDir = new File(context.getCacheDir(), ShareModule.CACHE_DIR_NAME);
+            File cacheDir = new File(context.getCacheDir(), "mmShare");
             if (!cacheDir.exists()) {
                 cacheDir.mkdirs();
             }

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

@@ -39,7 +39,6 @@ public class ShareModule extends ReactContextBaseJavaModule {
     private final OkHttpClient client = new OkHttpClient();
     public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
     private final MainApplication mApplication;
-    public static final String CACHE_DIR_NAME = "mmShare";
 
     public ShareModule(MainApplication application, ReactApplicationContext reactContext) {
         super(reactContext);
@@ -68,7 +67,6 @@ public class ShareModule extends ReactContextBaseJavaModule {
     @Override
     public Map<String, Object> getConstants() {
         HashMap<String, Object> constants = new HashMap<>(1);
-        constants.put("cacheDirName", CACHE_DIR_NAME);
         constants.put("isOpened", mApplication.sharedExtensionIsOpened);
         mApplication.sharedExtensionIsOpened = false;
         return constants;
@@ -79,7 +77,7 @@ public class ShareModule extends ReactContextBaseJavaModule {
         this.clear();
         Activity currentActivity = getCurrentActivity();
         if (currentActivity != null) {
-            currentActivity.finishAndRemoveTask();
+            currentActivity.finish();
         }
 
         if (data != null && data.hasKey("url")) {
@@ -135,7 +133,7 @@ public class ShareModule extends ReactContextBaseJavaModule {
         Activity currentActivity = getCurrentActivity();
 
         if (currentActivity != null) {
-            this.tempFolder = new File(currentActivity.getCacheDir(), CACHE_DIR_NAME);
+            this.tempFolder = new File(currentActivity.getCacheDir(), "mmShare");
             Intent intent = currentActivity.getIntent();
             action = intent.getAction();
             type = intent.getType();
@@ -194,12 +192,8 @@ public class ShareModule extends ReactContextBaseJavaModule {
         JSONObject json = new JSONObject();
         try {
             json.put("user_id", data.getString("currentUserId"));
-            if (data.hasKey("channelId")) {
-                json.put("channel_id", data.getString("channelId"));
-            }
-            if (data.hasKey("value")) {
-                json.put("message", data.getString("value"));
-            }
+            json.put("channel_id", data.getString("channelId"));
+            json.put("message", data.getString("value"));
         } catch (JSONException e) {
             e.printStackTrace();
         }

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<android.support.percent.PercentRelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -16,4 +16,4 @@
         android:adjustViewBounds="true"
         android:src="@drawable/splash" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</android.support.percent.PercentRelativeLayout>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

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

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

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

@@ -43,12 +43,6 @@
             android:description="@string/username_description"
             android:restrictionType="string"
             android:defaultValue="" />
-    <restriction
-            android:key="timeout"
-            android:title="@string/timeout_title"
-            android:description="@string/timeout_description"
-            android:restrictionType="string"
-            android:defaultValue="10000" />
     <restriction
             android:key="vendor"
             android:title="@string/vendor_title"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <base-config cleartextTrafficPermitted="true">
+    <base-config>
         <trust-anchors>
             <!-- Trust preinstalled CAs -->
             <certificates src="system" />

android/build.gradle

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

android/gradle.properties

@@ -20,14 +20,3 @@ org.gradle.jvmargs=-Xmx2048M
 
 #android.enableAapt2=false
 #android.useDeprecatedNdk=true
-
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
-
-# Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.37.0

android/gradle/wrapper/gradle-wrapper.properties

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

android/gradlew

@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -125,8 +109,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -154,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        i=$((i+1))
     done
     case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,9 +159,14 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-exec "$JAVACMD" "$@"
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

android/gradlew.bat

@@ -1,103 +1,84 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

android/keystores/BUCK

@@ -0,0 +1,8 @@
+keystore(
+    name = "debug",
+    properties = "debug.keystore.properties",
+    store = "debug.keystore",
+    visibility = [
+        "PUBLIC",
+    ],
+)

android/keystores/debug.keystore.properties

@@ -0,0 +1,4 @@
+key.store=debug.keystore
+key.alias=androiddebugkey
+key.store.password=android
+key.alias.password=android

android/settings.gradle

@@ -1,5 +1,47 @@
 rootProject.name = 'Mattermost'
+include ':react-native-gesture-handler'
+project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
+include ':react-native-document-picker'
+project(':react-native-document-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-document-picker/android')
+include ':react-native-keychain'
+project(':react-native-keychain').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keychain/android')
+include ':react-native-doc-viewer'
+project(':react-native-doc-viewer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-doc-viewer/android')
+include ':react-native-video'
+project(':react-native-video').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-video/android')
+include ':react-native-youtube'
+project(':react-native-youtube').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-youtube/android')
+include ':react-native-sentry'
+project(':react-native-sentry').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sentry/android')
+include ':react-native-exception-handler'
+project(':react-native-exception-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-exception-handler/android')
+include ':rn-fetch-blob'
+project(':rn-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/rn-fetch-blob/android')
+include ':jail-monkey'
+project(':jail-monkey').projectDir = new File(rootProject.projectDir, '../node_modules/jail-monkey/android')
+include ':react-native-local-auth'
+project(':react-native-local-auth').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-local-auth/android')
+include ':react-native-navigation'
+project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/android/app/')
+include ':react-native-image-picker'
+project(':react-native-image-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-picker/android')
+include ':react-native-bottom-sheet'
+project(':react-native-bottom-sheet').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-bottom-sheet/android')
+include ':react-native-device-info'
+project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
+include ':react-native-cookies'
+project(':react-native-cookies').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-cookies/android')
+include ':react-native-vector-icons'
+project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 include ':reactnativenotifications'
-project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android/app')
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
+project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android')
+
 include ':app'
+include ':react-native-svg'
+project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
+include ':react-native-linear-gradient'
+project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
+include ':react-native-recyclerview-list'
+project(':react-native-recyclerview-list').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-recyclerview-list/android')
+include ':react-native-webview'
+project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')

app/actions/device/index.js

@@ -1,17 +1,17 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import {networkStatusChangedAction} from 'redux-offline';
+
 import {DeviceTypes} from 'app/constants';
 
 export function connection(isOnline) {
-    return async (dispatch, getState) => {
-        const state = getState();
-        if (isOnline !== undefined && isOnline !== state.device.connection) {
-            dispatch({
-                type: DeviceTypes.CONNECTION_CHANGED,
-                data: isOnline,
-            });
-        }
+    return async (dispatch) => {
+        dispatch(networkStatusChangedAction(isOnline));
+        dispatch({
+            type: DeviceTypes.CONNECTION_CHANGED,
+            data: isOnline,
+        });
     };
 }
 

app/actions/helpers/channels.test.js

@@ -1,186 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-/* eslint-disable no-import-assign */
-
-import {Client4} from '@mm-redux/client';
-
-import {Preferences} from '@mm-redux/constants';
-import {PreferenceTypes} from '@mm-redux/action_types';
-
-import * as CommonSelectors from '@mm-redux/selectors/entities/common';
-import * as PreferenceSelectors from '@mm-redux/selectors/entities/preferences';
-import * as PreferenceUtils from '@mm-redux/utils/preference_utils';
-
-import {
-    makeDirectChannelVisibleIfNecessary,
-    makeGroupMessageVisibleIfNecessary,
-} from './channels';
-
-describe('Actions.Helpers.Channels', () => {
-    describe('makeDirectChannelVisibleIfNecessary', () => {
-        const state = {};
-        const currentUserId = 'current-user-id';
-        const otherUserId = 'other-user-id';
-
-        CommonSelectors.getCurrentUserId = jest.fn().mockReturnValue(currentUserId);
-        PreferenceSelectors.getMyPreferences = jest.fn();
-        PreferenceUtils.getPreferenceKey = jest.fn();
-        Client4.savePreferences = jest.fn();
-
-        beforeEach(() => {
-            PreferenceSelectors.getMyPreferences.mockClear();
-            PreferenceUtils.getPreferenceKey.mockClear();
-            Client4.savePreferences.mockClear();
-        });
-
-        it('makes direct channel visible when visibility preference does not exist', () => {
-            PreferenceSelectors.getMyPreferences.mockReturnValueOnce({});
-
-            const expectedResult = {
-                type: PreferenceTypes.RECEIVED_PREFERENCES,
-                data: [{
-                    user_id: currentUserId,
-                    category: Preferences.CATEGORY_DIRECT_CHANNEL_SHOW,
-                    name: otherUserId,
-                    value: 'true',
-                }],
-            };
-
-            const result = makeDirectChannelVisibleIfNecessary(state, otherUserId);
-            expect(result).toStrictEqual(expectedResult);
-
-            expect(PreferenceUtils.getPreferenceKey).toHaveBeenCalledTimes(1);
-            expect(PreferenceUtils.getPreferenceKey).toHaveBeenCalledWith(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, otherUserId);
-            expect(Client4.savePreferences).toHaveBeenCalledTimes(1);
-            expect(Client4.savePreferences).toHaveBeenCalledWith(currentUserId, expectedResult.data);
-        });
-
-        it('makes direct channel visible when visibilty preference is false', () => {
-            const preference = {value: 'false'};
-            const preferenceKey = 'preference-key';
-            PreferenceSelectors.getMyPreferences.mockReturnValueOnce({
-                [preferenceKey]: preference,
-            });
-            PreferenceUtils.getPreferenceKey.mockReturnValueOnce(preferenceKey);
-
-            const expectedResult = {
-                type: PreferenceTypes.RECEIVED_PREFERENCES,
-                data: [{
-                    user_id: currentUserId,
-                    category: Preferences.CATEGORY_DIRECT_CHANNEL_SHOW,
-                    name: otherUserId,
-                    value: 'true',
-                }],
-            };
-
-            const result = makeDirectChannelVisibleIfNecessary(state, otherUserId);
-            expect(result).toStrictEqual(expectedResult);
-
-            expect(PreferenceUtils.getPreferenceKey).toHaveBeenCalledTimes(1);
-            expect(PreferenceUtils.getPreferenceKey).toHaveBeenCalledWith(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, otherUserId);
-            expect(Client4.savePreferences).toHaveBeenCalledTimes(1);
-            expect(Client4.savePreferences).toHaveBeenCalledWith(currentUserId, expectedResult.data);
-        });
-
-        it('does nothing if direct channel visibility preference is true', () => {
-            const preference = {value: 'true'};
-            const preferenceKey = 'preference-key';
-            PreferenceSelectors.getMyPreferences.mockReturnValueOnce({
-                [preferenceKey]: preference,
-            });
-            PreferenceUtils.getPreferenceKey.mockReturnValueOnce(preferenceKey);
-
-            const result = makeDirectChannelVisibleIfNecessary(state, otherUserId);
-            expect(result).toEqual(null);
-
-            expect(PreferenceUtils.getPreferenceKey).toHaveBeenCalledTimes(1);
-            expect(PreferenceUtils.getPreferenceKey).toHaveBeenCalledWith(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, otherUserId);
-            expect(Client4.savePreferences).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('makeGroupMessageVisibleIfNecessary', () => {
-        const state = {};
-        const currentUserId = 'current-user-id';
-        const channelId = 'channel-id';
-
-        CommonSelectors.getCurrentUserId = jest.fn().mockReturnValue(currentUserId);
-        PreferenceSelectors.getMyPreferences = jest.fn();
-        PreferenceUtils.getPreferenceKey = jest.fn();
-        Client4.savePreferences = jest.fn();
-
-        beforeEach(() => {
-            PreferenceSelectors.getMyPreferences.mockClear();
-            PreferenceUtils.getPreferenceKey.mockClear();
-            Client4.savePreferences.mockClear();
-        });
-
-        it('makes group channel visible when visibility preference does not exist', async () => {
-            PreferenceSelectors.getMyPreferences.mockReturnValueOnce({});
-
-            const expectedPreferenceResult = {
-                type: PreferenceTypes.RECEIVED_PREFERENCES,
-                data: [{
-                    user_id: currentUserId,
-                    category: Preferences.CATEGORY_GROUP_CHANNEL_SHOW,
-                    name: channelId,
-                    value: 'true',
-                }],
-            };
-
-            const result = await makeGroupMessageVisibleIfNecessary(state, channelId);
-            expect(result.length).toEqual(2);
-            expect(result[1]).toStrictEqual(expectedPreferenceResult);
-
-            expect(PreferenceUtils.getPreferenceKey).toHaveBeenCalledTimes(1);
-            expect(PreferenceUtils.getPreferenceKey).toHaveBeenCalledWith(Preferences.CATEGORY_GROUP_CHANNEL_SHOW, channelId);
-            expect(Client4.savePreferences).toHaveBeenCalledTimes(1);
-            expect(Client4.savePreferences).toHaveBeenCalledWith(currentUserId, expectedPreferenceResult.data);
-        });
-
-        it('makes group channel visible when visibilty preference is false', async () => {
-            const preference = {value: 'false'};
-            const preferenceKey = 'preference-key';
-            PreferenceSelectors.getMyPreferences.mockReturnValueOnce({
-                [preferenceKey]: preference,
-            });
-            PreferenceUtils.getPreferenceKey.mockReturnValueOnce(preferenceKey);
-
-            const expectedPreferenceResult = {
-                type: PreferenceTypes.RECEIVED_PREFERENCES,
-                data: [{
-                    user_id: currentUserId,
-                    category: Preferences.CATEGORY_GROUP_CHANNEL_SHOW,
-                    name: channelId,
-                    value: 'true',
-                }],
-            };
-
-            const result = await makeGroupMessageVisibleIfNecessary(state, channelId);
-            expect(result.length).toEqual(2);
-            expect(result[1]).toStrictEqual(expectedPreferenceResult);
-
-            expect(PreferenceUtils.getPreferenceKey).toHaveBeenCalledTimes(1);
-            expect(PreferenceUtils.getPreferenceKey).toHaveBeenCalledWith(Preferences.CATEGORY_GROUP_CHANNEL_SHOW, channelId);
-            expect(Client4.savePreferences).toHaveBeenCalledTimes(1);
-            expect(Client4.savePreferences).toHaveBeenCalledWith(currentUserId, expectedPreferenceResult.data);
-        });
-
-        it('does nothing if group channel visibility preference is true', async () => {
-            const preference = {value: 'true'};
-            const preferenceKey = 'preference-key';
-            PreferenceSelectors.getMyPreferences.mockReturnValueOnce({
-                [preferenceKey]: preference,
-            });
-            PreferenceUtils.getPreferenceKey.mockReturnValueOnce(preferenceKey);
-
-            const result = await makeGroupMessageVisibleIfNecessary(state, channelId);
-            expect(result).toEqual(null);
-
-            expect(PreferenceUtils.getPreferenceKey).toHaveBeenCalledTimes(1);
-            expect(PreferenceUtils.getPreferenceKey).toHaveBeenCalledWith(Preferences.CATEGORY_GROUP_CHANNEL_SHOW, channelId);
-            expect(Client4.savePreferences).not.toHaveBeenCalled();
-        });
-    });
-});

app/actions/helpers/channels.ts

@@ -1,422 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {ChannelTypes, PreferenceTypes, RoleTypes, UserTypes} from '@mm-redux/action_types';
-import {Client4} from '@mm-redux/client';
-import {General, Preferences} from '@mm-redux/constants';
-import {getCurrentChannelId, getRedirectChannelNameForTeam, getChannelsNameMapInTeam} from '@mm-redux/selectors/entities/channels';
-import {getConfig} from '@mm-redux/selectors/entities/general';
-import {getMyPreferences} from '@mm-redux/selectors/entities/preferences';
-import {getCurrentUserId, getUsers, getUserIdsInChannels} from '@mm-redux/selectors/entities/users';
-import {getChannelByName as selectChannelByName, getUserIdFromChannelName, isAutoClosed} from '@mm-redux/utils/channel_utils';
-import {getPreferenceKey} from '@mm-redux/utils/preference_utils';
-
-import {ActionResult, GenericAction} from '@mm-redux/types/actions';
-import {Channel, ChannelMembership} from '@mm-redux/types/channels';
-import {PreferenceType} from '@mm-redux/types/preferences';
-import {GlobalState} from '@mm-redux/types/store';
-import {UserProfile} from '@mm-redux/types/users';
-import {RelationOneToMany} from '@mm-redux/types/utilities';
-
-import {isDirectChannelVisible, isGroupChannelVisible} from '@utils/channels';
-import {buildPreference} from '@utils/preferences';
-
-export async function loadSidebarDirectMessagesProfiles(state: GlobalState, channels: Array<Channel>, channelMembers: Array<ChannelMembership>) {
-    const currentUserId = getCurrentUserId(state);
-    const usersInChannel: RelationOneToMany<Channel, UserProfile> = getUserIdsInChannels(state);
-    const directChannels = Object.values(channels).filter((c) => c.type === General.DM_CHANNEL || c.type === General.GM_CHANNEL);
-    const prefs: Array<PreferenceType> = [];
-    const promises: Array<Promise<ActionResult>> = []; //only fetch profiles that we don't have and the Direct channel should be visible
-    const actions = [];
-    const userIds: Array<string> = [];
-
-    // Prepare preferences and start fetching profiles to batch them
-    directChannels.forEach((c) => {
-        const profileIds = Array.from(usersInChannel[c.id] || []);
-        const profilesInChannel: Array<string> = profileIds.filter((u: string) => u !== currentUserId);
-        userIds.push(...profilesInChannel);
-
-        switch (c.type) {
-        case General.DM_CHANNEL: {
-            const dm = fetchDirectMessageProfileIfNeeded(state, c, channelMembers, profilesInChannel);
-            if (dm.preferences.length) {
-                prefs.push(...dm.preferences);
-            }
-
-            if (dm.promise) {
-                promises.push(dm.promise);
-            }
-            break;
-        }
-        case General.GM_CHANNEL: {
-            const gm = fetchGroupMessageProfilesIfNeeded(state, c, channelMembers, profilesInChannel);
-
-            if (gm.preferences.length) {
-                prefs.push(...gm.preferences);
-            }
-
-            if (gm.promise) {
-                promises.push(gm.promise);
-            }
-            break;
-        }
-        }
-    });
-
-    // Save preferences if there are any changes
-    if (prefs.length) {
-        Client4.savePreferences(currentUserId, prefs);
-        actions.push({
-            type: PreferenceTypes.RECEIVED_PREFERENCES,
-            data: prefs,
-        });
-    }
-
-    const profilesAction = await getProfilesFromPromises(promises);
-    const userIdsSet: Set<string> = new Set(userIds);
-
-    if (profilesAction) {
-        actions.push(profilesAction);
-        profilesAction.data.forEach((d: any) => {
-            const {users} = d.data;
-            users.forEach((u: UserProfile) => userIdsSet.add(u.id));
-        });
-    }
-
-    if (userIdsSet.size > 0) {
-        try {
-            const statuses = await Client4.getStatusesByIds(Array.from(userIdsSet));
-            if (statuses.length) {
-                actions.push({
-                    type: UserTypes.RECEIVED_STATUSES,
-                    data: statuses,
-                });
-            }
-        } catch {
-            // do nothing (status will get fetched later on regardless)
-        }
-    }
-
-    return actions;
-}
-
-export async function fetchMyChannel(channelId: string) {
-    try {
-        const data = await Client4.getChannel(channelId);
-
-        return {data};
-    } catch (error) {
-        return {error};
-    }
-}
-
-export async function fetchMyChannelMember(channelId: string) {
-    try {
-        const data = await Client4.getMyChannelMember(channelId);
-
-        return {data};
-    } catch (error) {
-        return {error};
-    }
-}
-
-export function markChannelAsUnread(state: GlobalState, teamId: string, channelId: string, mentions: Array<string>): Array<GenericAction> {
-    const {myMembers} = state.entities.channels;
-    const {currentUserId} = state.entities.users;
-
-    const actions: GenericAction[] = [{
-        type: ChannelTypes.INCREMENT_TOTAL_MSG_COUNT,
-        data: {
-            channelId,
-            amount: 1,
-        },
-    }, {
-        type: ChannelTypes.INCREMENT_UNREAD_MSG_COUNT,
-        data: {
-            teamId,
-            channelId,
-            amount: 1,
-            onlyMentions: myMembers[channelId] && myMembers[channelId].notify_props &&
-                myMembers[channelId].notify_props.mark_unread === General.MENTION,
-        },
-    }];
-
-    if (mentions && mentions.indexOf(currentUserId) !== -1) {
-        actions.push({
-            type: ChannelTypes.INCREMENT_UNREAD_MENTION_COUNT,
-            data: {
-                teamId,
-                channelId,
-                amount: 1,
-            },
-        });
-    }
-
-    return actions;
-}
-
-export function makeDirectChannelVisibleIfNecessary(state: GlobalState, otherUserId: string): GenericAction|null {
-    const myPreferences = getMyPreferences(state);
-    const currentUserId = getCurrentUserId(state);
-
-    let preference = myPreferences[getPreferenceKey(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, otherUserId)];
-
-    if (!preference || preference.value === 'false') {
-        preference = {
-            user_id: currentUserId,
-            category: Preferences.CATEGORY_DIRECT_CHANNEL_SHOW,
-            name: otherUserId,
-            value: 'true',
-        };
-
-        Client4.savePreferences(currentUserId, [preference]);
-        return {
-            type: PreferenceTypes.RECEIVED_PREFERENCES,
-            data: [preference],
-        };
-    }
-
-    return null;
-}
-
-export async function makeGroupMessageVisibleIfNecessary(state: GlobalState, channelId: string) {
-    try {
-        const myPreferences = getMyPreferences(state);
-        const currentUserId = getCurrentUserId(state);
-
-        let preference = myPreferences[getPreferenceKey(Preferences.CATEGORY_GROUP_CHANNEL_SHOW, channelId)];
-
-        if (!preference || preference.value === 'false') {
-            preference = {
-                user_id: currentUserId,
-                category: Preferences.CATEGORY_GROUP_CHANNEL_SHOW,
-                name: channelId,
-                value: 'true',
-            };
-
-            Client4.savePreferences(currentUserId, [preference]);
-
-            const profilesInChannel = await fetchUsersInChannel(state, channelId);
-
-            return [{
-                type: UserTypes.RECEIVED_BATCHED_PROFILES_IN_CHANNEL,
-                data: [profilesInChannel],
-            }, {
-                type: PreferenceTypes.RECEIVED_PREFERENCES,
-                data: [preference],
-            }];
-        }
-
-        return null;
-    } catch {
-        return null;
-    }
-}
-
-export async function fetchChannelAndMyMember(channelId: string): Promise<Array<GenericAction>> {
-    const actions: Array<GenericAction> = [];
-
-    try {
-        const [channel, member] = await Promise.all([
-            Client4.getChannel(channelId),
-            Client4.getMyChannelMember(channelId),
-        ]);
-
-        actions.push({
-            type: ChannelTypes.RECEIVED_CHANNEL,
-            data: channel,
-        },
-        {
-            type: ChannelTypes.RECEIVED_MY_CHANNEL_MEMBER,
-            data: member,
-        });
-
-        const roles = await Client4.getRolesByNames(member.roles.split(' '));
-        if (roles.length) {
-            actions.push({
-                type: RoleTypes.RECEIVED_ROLES,
-                data: roles,
-            });
-        }
-    } catch {
-        // do nothing
-    }
-
-    return actions;
-}
-
-export async function getAddedDmUsersIfNecessary(state: GlobalState, preferences: PreferenceType[]): Promise<Array<GenericAction>> {
-    const userIds: string[] = [];
-    const actions: Array<GenericAction> = [];
-
-    for (const preference of preferences) {
-        if (preference.category === Preferences.CATEGORY_DIRECT_CHANNEL_SHOW && preference.value === 'true') {
-            userIds.push(preference.name);
-        }
-    }
-
-    if (userIds.length !== 0) {
-        const profiles = getUsers(state);
-        const currentUserId = getCurrentUserId(state);
-
-        const needProfiles: string[] = [];
-
-        for (const userId of userIds) {
-            if (!profiles[userId] && userId !== currentUserId) {
-                needProfiles.push(userId);
-            }
-        }
-
-        if (needProfiles.length > 0) {
-            const data = await Client4.getProfilesByIds(userIds);
-            if (profiles.lenght) {
-                actions.push({
-                    type: UserTypes.RECEIVED_PROFILES_LIST,
-                    data,
-                });
-            }
-        }
-    }
-
-    return actions;
-}
-
-export function lastChannelIdForTeam(state: GlobalState, teamId: string): string {
-    const {channels, myMembers} = state.entities.channels;
-    const {currentUserId} = state.entities.users;
-    const {myPreferences} = state.entities.preferences;
-    const lastChannelForTeam = state.views.team.lastChannelForTeam[teamId];
-    const lastChannelId = lastChannelForTeam && lastChannelForTeam.length ? lastChannelForTeam[0] : '';
-    const lastChannel = channels[lastChannelId];
-
-    const isDMVisible = lastChannel && lastChannel.type === General.DM_CHANNEL &&
-            isDirectChannelVisible(currentUserId, myPreferences, lastChannel);
-
-    const isGMVisible = lastChannel && lastChannel.type === General.GM_CHANNEL &&
-        isGroupChannelVisible(myPreferences, lastChannel);
-
-    if (
-        myMembers[lastChannelId] &&
-        lastChannel &&
-        (lastChannel.team_id === teamId || isDMVisible || isGMVisible)
-    ) {
-        return lastChannelId;
-    }
-
-    // Fallback to default channel
-    const channelsInTeam = getChannelsNameMapInTeam(state, teamId);
-    const channel = selectChannelByName(channelsInTeam, getRedirectChannelNameForTeam(state, teamId));
-
-    if (channel) {
-        return channel.id;
-    }
-
-    // Handle case when the default channel cannot be found
-    // so we need to get the first available channel of the team
-    const teamChannels = Object.values(channelsInTeam);
-    const firstChannel = teamChannels.length ? teamChannels[0].id : '';
-    return firstChannel;
-}
-
-function fetchDirectMessageProfileIfNeeded(state: GlobalState, channel: Channel, channelMembers: Array<ChannelMembership>, profilesInChannel: Array<string>) {
-    const currentUserId = getCurrentUserId(state);
-    const myPreferences = getMyPreferences(state);
-    const users = getUsers(state);
-    const config = getConfig(state);
-    const currentChannelId = getCurrentChannelId(state);
-    const otherUserId = getUserIdFromChannelName(currentUserId, channel.name);
-    const otherUser = users[otherUserId];
-    const dmVisible = isDirectChannelVisible(currentUserId, myPreferences, channel);
-    const dmAutoClosed = isAutoClosed(config, myPreferences, channel, channel.last_post_at, otherUser ? otherUser.delete_at : 0, currentChannelId);
-    const member = channelMembers.find((cm) => cm.channel_id === channel.id);
-    const dmIsUnread = member ? member.mention_count > 0 : false;
-    const dmFetchProfile = dmIsUnread || (dmVisible && !dmAutoClosed);
-    const preferences = [];
-
-    // when then DM is hidden but has new messages
-    if ((!dmVisible || dmAutoClosed) && dmIsUnread) {
-        preferences.push(buildPreference(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, currentUserId, otherUserId));
-        preferences.push(buildPreference(Preferences.CATEGORY_CHANNEL_OPEN_TIME, currentUserId, channel.id, Date.now().toString()));
-    }
-
-    if (dmFetchProfile && !profilesInChannel.includes(otherUserId) && otherUserId !== currentUserId) {
-        return {
-            preferences,
-            promise: fetchUsersInChannel(state, channel.id),
-        };
-    }
-
-    return {preferences};
-}
-
-function fetchGroupMessageProfilesIfNeeded(state: GlobalState, channel: Channel, channelMembers: Array<ChannelMembership>, profilesInChannel: Array<string>) {
-    const currentUserId = getCurrentUserId(state);
-    const myPreferences = getMyPreferences(state);
-    const config = getConfig(state);
-    const gmVisible = isGroupChannelVisible(myPreferences, channel);
-    const gmAutoClosed = isAutoClosed(config, myPreferences, channel, channel.last_post_at, 0);
-    const channelMember = channelMembers.find((cm) => cm.channel_id === channel.id);
-    let hasMentions = false;
-    let isUnread = false;
-
-    if (channelMember) {
-        hasMentions = channelMember.mention_count > 0;
-        isUnread = channelMember.msg_count < channel.total_msg_count;
-    }
-
-    const gmIsUnread = hasMentions || isUnread;
-    const gmFetchProfile = gmIsUnread || (gmVisible && !gmAutoClosed);
-    const preferences = [];
-
-    // when then GM is hidden but has new messages
-    if ((!gmVisible || gmAutoClosed) && gmIsUnread) {
-        preferences.push(buildPreference(Preferences.CATEGORY_GROUP_CHANNEL_SHOW, currentUserId, channel.id));
-        preferences.push(buildPreference(Preferences.CATEGORY_CHANNEL_OPEN_TIME, currentUserId, channel.id, Date.now().toString()));
-    }
-
-    if (gmFetchProfile && !profilesInChannel.length) {
-        return {
-            preferences,
-            promise: fetchUsersInChannel(state, channel.id),
-        };
-    }
-
-    return {preferences};
-}
-
-async function fetchUsersInChannel(state: GlobalState, channelId: string): Promise<ActionResult> {
-    try {
-        const currentUserId = getCurrentUserId(state);
-        const profiles = await Client4.getProfilesInChannel(channelId);
-
-        // When fetching profiles in channels we exclude our own user
-        const users = profiles.filter((p: UserProfile) => p.id !== currentUserId);
-        const data = {
-            channelId,
-            users,
-        };
-
-        return {data};
-    } catch (error) {
-        return {error};
-    }
-}
-
-async function getProfilesFromPromises(promises: Array<Promise<ActionResult>>): Promise<GenericAction | null> {
-    // Get the profiles returned by the promises
-    if (!promises.length) {
-        return null;
-    }
-
-    try {
-        const result = await Promise.all(promises);
-        const data = result.filter((p: any) => !p.error);
-
-        return {
-            type: UserTypes.RECEIVED_BATCHED_PROFILES_IN_CHANNEL,
-            data,
-        };
-    } catch {
-        return null;
-    }
-}

app/actions/navigation/index.js

@@ -1,476 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {Keyboard, Platform} from 'react-native';
-import {Navigation} from 'react-native-navigation';
-import merge from 'deepmerge';
-
-import {Preferences} from '@mm-redux/constants';
-import {getTheme} from '@mm-redux/selectors/entities/preferences';
-import EventEmmiter from '@mm-redux/utils/event_emitter';
-
-import EphemeralStore from '@store/ephemeral_store';
-import Store from '@store/store';
-import {NavigationTypes} from '@constants';
-
-function getThemeFromState() {
-    const state = Store.redux?.getState() || {};
-
-    return getTheme(state);
-}
-
-export function resetToChannel(passProps = {}) {
-    const theme = getThemeFromState();
-
-    EphemeralStore.clearNavigationComponents();
-
-    const stack = {
-        children: [{
-            component: {
-                id: NavigationTypes.CHANNEL_SCREEN,
-                name: NavigationTypes.CHANNEL_SCREEN,
-                passProps,
-                options: {
-                    layout: {
-                        componentBackgroundColor: theme.centerChannelBg,
-                    },
-                    statusBar: {
-                        visible: true,
-                    },
-                    topBar: {
-                        visible: false,
-                        height: 0,
-                        background: {
-                            color: theme.sidebarHeaderBg,
-                        },
-                        backButton: {
-                            visible: false,
-                            color: theme.sidebarHeaderTextColor,
-                        },
-                    },
-                },
-            },
-        }],
-    };
-
-    let platformStack = {stack};
-    if (Platform.OS === 'android') {
-        platformStack = {
-            sideMenu: {
-                left: {
-                    component: {
-                        id: 'MainSidebar',
-                        name: 'MainSidebar',
-                    },
-                },
-                center: {
-                    stack,
-                },
-                right: {
-                    component: {
-                        id: 'SettingsSidebar',
-                        name: 'SettingsSidebar',
-                    },
-                },
-            },
-        };
-    }
-
-    Navigation.setRoot({
-        root: {
-            ...platformStack,
-        },
-    });
-}
-
-export function resetToSelectServer(allowOtherServers) {
-    const theme = Preferences.THEMES.default;
-
-    EphemeralStore.clearNavigationComponents();
-
-    Navigation.setRoot({
-        root: {
-            stack: {
-                children: [{
-                    component: {
-                        id: 'SelectServer',
-                        name: 'SelectServer',
-                        passProps: {
-                            allowOtherServers,
-                        },
-                        options: {
-                            layout: {
-                                backgroundColor: theme.centerChannelBg,
-                                componentBackgroundColor: theme.centerChannelBg,
-                            },
-                            statusBar: {
-                                visible: true,
-                            },
-                            topBar: {
-                                backButton: {
-                                    color: theme.sidebarHeaderTextColor,
-                                    title: '',
-                                },
-                                background: {
-                                    color: theme.sidebarHeaderBg,
-                                },
-                                visible: false,
-                                height: 0,
-                            },
-                        },
-                    },
-                }],
-            },
-        },
-    });
-}
-
-export function resetToTeams(name, title, passProps = {}, options = {}) {
-    const theme = getThemeFromState();
-    const defaultOptions = {
-        layout: {
-            componentBackgroundColor: theme.centerChannelBg,
-        },
-        statusBar: {
-            visible: true,
-        },
-        topBar: {
-            visible: true,
-            title: {
-                color: theme.sidebarHeaderTextColor,
-                text: title,
-            },
-            backButton: {
-                color: theme.sidebarHeaderTextColor,
-                title: '',
-            },
-            background: {
-                color: theme.sidebarHeaderBg,
-            },
-        },
-    };
-
-    EphemeralStore.clearNavigationComponents();
-
-    Navigation.setRoot({
-        root: {
-            stack: {
-                children: [{
-                    component: {
-                        id: name,
-                        name,
-                        passProps,
-                        options: merge(defaultOptions, options),
-                    },
-                }],
-            },
-        },
-    });
-}
-
-export function goToScreen(name, title, passProps = {}, options = {}) {
-    const theme = getThemeFromState();
-    const componentId = EphemeralStore.getNavigationTopComponentId();
-    const defaultOptions = {
-        layout: {
-            componentBackgroundColor: theme.centerChannelBg,
-        },
-        popGesture: true,
-        sideMenu: {
-            left: {enabled: false},
-            right: {enabled: false},
-        },
-        topBar: {
-            animate: true,
-            visible: true,
-            backButton: {
-                color: theme.sidebarHeaderTextColor,
-                title: '',
-                testID: 'screen.back.button',
-            },
-            background: {
-                color: theme.sidebarHeaderBg,
-            },
-            title: {
-                color: theme.sidebarHeaderTextColor,
-                text: title,
-            },
-        },
-    };
-
-    Navigation.push(componentId, {
-        component: {
-            id: name,
-            name,
-            passProps,
-            options: merge(defaultOptions, options),
-        },
-    });
-}
-
-export function popTopScreen(screenId) {
-    if (screenId) {
-        Navigation.pop(screenId);
-    } else {
-        const componentId = EphemeralStore.getNavigationTopComponentId();
-        Navigation.pop(componentId);
-    }
-}
-
-export async function popToRoot() {
-    const componentId = EphemeralStore.getNavigationTopComponentId();
-
-    try {
-        await Navigation.popToRoot(componentId);
-    } catch (error) {
-        // RNN returns a promise rejection if there are no screens
-        // atop the root screen to pop. We'll do nothing in this case.
-    }
-}
-
-export async function dismissAllModalsAndPopToRoot() {
-    await dismissAllModals();
-    await popToRoot();
-
-    EventEmmiter.emit(NavigationTypes.NAVIGATION_DISMISS_AND_POP_TO_ROOT);
-}
-
-export function showModal(name, title, passProps = {}, options = {}) {
-    const theme = getThemeFromState();
-    const defaultOptions = {
-        modalPresentationStyle: Platform.select({ios: 'pageSheet', android: 'none'}),
-        layout: {
-            componentBackgroundColor: theme.centerChannelBg,
-        },
-        statusBar: {
-            visible: true,
-        },
-        topBar: {
-            animate: true,
-            visible: true,
-            backButton: {
-                color: theme.sidebarHeaderTextColor,
-                title: '',
-            },
-            background: {
-                color: theme.sidebarHeaderBg,
-            },
-            title: {
-                color: theme.sidebarHeaderTextColor,
-                text: title,
-            },
-            leftButtonColor: theme.sidebarHeaderTextColor,
-            rightButtonColor: theme.sidebarHeaderTextColor,
-        },
-    };
-
-    EphemeralStore.addNavigationModal(name);
-    Navigation.showModal({
-        stack: {
-            children: [{
-                component: {
-                    id: name,
-                    name,
-                    passProps,
-                    options: merge(defaultOptions, options),
-                },
-            }],
-        },
-    });
-}
-
-export function showModalOverCurrentContext(name, passProps = {}, options = {}) {
-    const title = '';
-    const animationsEnabled = (Platform.OS === 'android').toString();
-    const defaultOptions = {
-        modalPresentationStyle: 'overCurrentContext',
-        layout: {
-            backgroundColor: 'transparent',
-            componentBackgroundColor: 'transparent',
-        },
-        topBar: {
-            visible: false,
-            height: 0,
-        },
-        animations: {
-            showModal: {
-                waitForRender: true,
-                enabled: animationsEnabled,
-                alpha: {
-                    from: 0,
-                    to: 1,
-                    duration: 250,
-                },
-            },
-            dismissModal: {
-                enabled: animationsEnabled,
-                alpha: {
-                    from: 1,
-                    to: 0,
-                    duration: 250,
-                },
-            },
-        },
-    };
-    const mergeOptions = merge(defaultOptions, options);
-
-    showModal(name, title, passProps, mergeOptions);
-}
-
-export function showSearchModal(initialValue = '') {
-    const name = 'Search';
-    const title = '';
-    const passProps = {initialValue};
-    const options = {
-        topBar: {
-            visible: false,
-            height: 0,
-        },
-        ...Platform.select({
-            ios: {
-                modalPresentationStyle: 'pageSheet',
-            },
-        }),
-    };
-
-    showModal(name, title, passProps, options);
-}
-
-export async function dismissModal(options = {}) {
-    if (!EphemeralStore.hasModalsOpened()) {
-        return;
-    }
-
-    const componentId = EphemeralStore.getNavigationTopComponentId();
-
-    try {
-        await Navigation.dismissModal(componentId, options);
-        EphemeralStore.removeNavigationModal(componentId);
-    } catch (error) {
-        // RNN returns a promise rejection if there is no modal to
-        // dismiss. We'll do nothing in this case.
-    }
-}
-
-export async function dismissAllModals(options = {}) {
-    if (!EphemeralStore.hasModalsOpened()) {
-        return;
-    }
-
-    try {
-        await Navigation.dismissAllModals(options);
-        EphemeralStore.clearNavigationModals();
-    } catch (error) {
-        // RNN returns a promise rejection if there are no modals to
-        // dismiss. We'll do nothing in this case.
-    }
-}
-
-export function setButtons(componentId, buttons = {leftButtons: [], rightButtons: []}) {
-    const options = {
-        topBar: {
-            ...buttons,
-        },
-    };
-
-    mergeNavigationOptions(componentId, options);
-}
-
-export function mergeNavigationOptions(componentId, options) {
-    Navigation.mergeOptions(componentId, options);
-}
-
-export function showOverlay(name, passProps, options = {}) {
-    const defaultOptions = {
-        layout: {
-            backgroundColor: 'transparent',
-            componentBackgroundColor: 'transparent',
-        },
-        overlay: {
-            interceptTouchOutside: false,
-        },
-    };
-
-    Navigation.showOverlay({
-        component: {
-            name,
-            passProps,
-            options: merge(defaultOptions, options),
-        },
-    });
-}
-
-export async function dismissOverlay(componentId) {
-    try {
-        await Navigation.dismissOverlay(componentId);
-    } catch (error) {
-        // RNN returns a promise rejection if there is no modal with
-        // this componentId to dismiss. We'll do nothing in this case.
-    }
-}
-
-export function openMainSideMenu() {
-    if (Platform.OS === 'ios') {
-        return;
-    }
-
-    const componentId = EphemeralStore.getNavigationTopComponentId();
-
-    Keyboard.dismiss();
-    Navigation.mergeOptions(componentId, {
-        sideMenu: {
-            left: {visible: true},
-        },
-    });
-}
-
-export function closeMainSideMenu() {
-    if (Platform.OS === 'ios') {
-        return;
-    }
-
-    Keyboard.dismiss();
-    Navigation.mergeOptions(NavigationTypes.CHANNEL_SCREEN, {
-        sideMenu: {
-            left: {visible: false},
-        },
-    });
-}
-
-export function enableMainSideMenu(enabled, visible = true) {
-    if (Platform.OS === 'ios') {
-        return;
-    }
-
-    Navigation.mergeOptions(NavigationTypes.CHANNEL_SCREEN, {
-        sideMenu: {
-            left: {enabled, visible},
-        },
-    });
-}
-
-export function openSettingsSideMenu() {
-    if (Platform.OS === 'ios') {
-        return;
-    }
-
-    Keyboard.dismiss();
-    Navigation.mergeOptions(NavigationTypes.CHANNEL_SCREEN, {
-        sideMenu: {
-            right: {visible: true},
-        },
-    });
-}
-
-export function closeSettingsSideMenu() {
-    if (Platform.OS === 'ios') {
-        return;
-    }
-
-    Keyboard.dismiss();
-    Navigation.mergeOptions(NavigationTypes.CHANNEL_SCREEN, {
-        sideMenu: {
-            right: {visible: false},
-        },
-    });
-}

app/actions/navigation/index.test.js

@@ -1,498 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {Platform} from 'react-native';
-import {Navigation} from 'react-native-navigation';
-import configureMockStore from 'redux-mock-store';
-import thunk from 'redux-thunk';
-import merge from 'deepmerge';
-
-import EventEmitter from '@mm-redux/utils/event_emitter';
-
-import * as NavigationActions from '@actions/navigation';
-import Preferences from '@mm-redux/constants/preferences';
-import EphemeralStore from '@store/ephemeral_store';
-import intitialState from '@store/initial_state';
-import Store from '@store/store';
-import {NavigationTypes} from '@constants';
-
-jest.unmock('@actions/navigation');
-jest.mock('@store/ephemeral_store', () => ({
-    getNavigationTopComponentId: jest.fn(),
-    clearNavigationComponents: jest.fn(),
-    addNavigationModal: jest.fn(),
-    hasModalsOpened: jest.fn().mockReturnValue(true),
-}));
-
-const mockStore = configureMockStore([thunk]);
-const store = mockStore(intitialState);
-Store.redux = store;
-
-describe('@actions/navigation', () => {
-    const topComponentId = 'top-component-id';
-    const name = 'name';
-    const title = 'title';
-    const theme = Preferences.THEMES.default;
-    const passProps = {
-        testProp: 'prop',
-    };
-    const options = {
-        testOption: 'test',
-    };
-    EphemeralStore.getNavigationTopComponentId.mockReturnValue(topComponentId);
-
-    test('resetToChannel should call Navigation.setRoot', () => {
-        const setRoot = jest.spyOn(Navigation, 'setRoot');
-
-        const expectedLayout = {
-            root: {
-                stack: {
-                    children: [{
-                        component: {
-                            id: 'Channel',
-                            name: 'Channel',
-                            passProps,
-                            options: {
-                                layout: {
-                                    componentBackgroundColor: theme.centerChannelBg,
-                                },
-                                statusBar: {
-                                    visible: true,
-                                },
-                                topBar: {
-                                    visible: false,
-                                    height: 0,
-                                    backButton: {
-                                        visible: false,
-                                        color: theme.sidebarHeaderTextColor,
-                                    },
-                                    background: {
-                                        color: theme.sidebarHeaderBg,
-                                    },
-                                },
-                            },
-                        },
-                    }],
-                },
-            },
-        };
-
-        NavigationActions.resetToChannel(passProps);
-        expect(setRoot).toHaveBeenCalledWith(expectedLayout);
-    });
-
-    test('resetToSelectServer should call Navigation.setRoot', () => {
-        const setRoot = jest.spyOn(Navigation, 'setRoot');
-
-        const allowOtherServers = false;
-        const expectedLayout = {
-            root: {
-                stack: {
-                    children: [{
-                        component: {
-                            id: 'SelectServer',
-                            name: 'SelectServer',
-                            passProps: {
-                                allowOtherServers,
-                            },
-                            options: {
-                                layout: {
-                                    backgroundColor: theme.centerChannelBg,
-                                    componentBackgroundColor: theme.centerChannelBg,
-                                },
-                                statusBar: {
-                                    visible: true,
-                                },
-                                topBar: {
-                                    backButton: {
-                                        color: theme.sidebarHeaderTextColor,
-                                        title: '',
-                                    },
-                                    background: {
-                                        color: theme.sidebarHeaderBg,
-                                    },
-                                    visible: false,
-                                    height: 0,
-                                },
-                            },
-                        },
-                    }],
-                },
-            },
-        };
-
-        NavigationActions.resetToSelectServer(allowOtherServers);
-        expect(setRoot).toHaveBeenCalledWith(expectedLayout);
-    });
-
-    test('resetToTeams should call Navigation.setRoot', () => {
-        const setRoot = jest.spyOn(Navigation, 'setRoot');
-
-        const defaultOptions = {
-            layout: {
-                componentBackgroundColor: theme.centerChannelBg,
-            },
-            statusBar: {
-                visible: true,
-            },
-            topBar: {
-                visible: true,
-                title: {
-                    color: theme.sidebarHeaderTextColor,
-                    text: title,
-                },
-                backButton: {
-                    color: theme.sidebarHeaderTextColor,
-                    title: '',
-                },
-                background: {
-                    color: theme.sidebarHeaderBg,
-                },
-            },
-        };
-
-        const expectedLayout = {
-            root: {
-                stack: {
-                    children: [{
-                        component: {
-                            id: name,
-                            name,
-                            passProps,
-                            options: merge(defaultOptions, options),
-                        },
-                    }],
-                },
-            },
-        };
-
-        NavigationActions.resetToTeams(name, title, passProps, options);
-        expect(setRoot).toHaveBeenCalledWith(expectedLayout);
-    });
-
-    test('goToScreen should call Navigation.push', () => {
-        const push = jest.spyOn(Navigation, 'push');
-
-        const defaultOptions = {
-            layout: {
-                componentBackgroundColor: theme.centerChannelBg,
-            },
-            popGesture: true,
-            sideMenu: {
-                left: {enabled: false},
-                right: {enabled: false},
-            },
-            topBar: {
-                animate: true,
-                visible: true,
-                backButton: {
-                    color: theme.sidebarHeaderTextColor,
-                    title: '',
-                    testID: 'screen.back.button',
-                },
-                background: {
-                    color: theme.sidebarHeaderBg,
-                },
-                title: {
-                    color: theme.sidebarHeaderTextColor,
-                    text: title,
-                },
-            },
-        };
-
-        const expectedLayout = {
-            component: {
-                id: name,
-                name,
-                passProps,
-                options: merge(defaultOptions, options),
-            },
-        };
-
-        NavigationActions.goToScreen(name, title, passProps, options);
-        expect(push).toHaveBeenCalledWith(topComponentId, expectedLayout);
-    });
-
-    test('popTopScreen should call Navigation.pop', () => {
-        const pop = jest.spyOn(Navigation, 'pop');
-
-        NavigationActions.popTopScreen();
-        expect(pop).toHaveBeenCalledWith(topComponentId);
-
-        const otherComponentId = `other-${topComponentId}`;
-        NavigationActions.popTopScreen(otherComponentId);
-        expect(pop).toHaveBeenCalledWith(otherComponentId);
-    });
-
-    test('popToRoot should call Navigation.popToRoot', async () => {
-        const popToRoot = jest.spyOn(Navigation, 'popToRoot');
-
-        await NavigationActions.popToRoot();
-        expect(popToRoot).toHaveBeenCalledWith(topComponentId);
-    });
-
-    test('showModal should call Navigation.showModal', () => {
-        const showModal = jest.spyOn(Navigation, 'showModal');
-
-        const defaultOptions = {
-            modalPresentationStyle: Platform.select({ios: 'pageSheet', android: 'none'}),
-            layout: {
-                componentBackgroundColor: theme.centerChannelBg,
-            },
-            statusBar: {
-                visible: true,
-            },
-            topBar: {
-                animate: true,
-                visible: true,
-                backButton: {
-                    color: theme.sidebarHeaderTextColor,
-                    title: '',
-                },
-                background: {
-                    color: theme.sidebarHeaderBg,
-                },
-                title: {
-                    color: theme.sidebarHeaderTextColor,
-                    text: title,
-                },
-                leftButtonColor: theme.sidebarHeaderTextColor,
-                rightButtonColor: theme.sidebarHeaderTextColor,
-            },
-        };
-
-        const expectedLayout = {
-            stack: {
-                children: [{
-                    component: {
-                        id: name,
-                        name,
-                        passProps,
-                        options: merge(defaultOptions, options),
-                    },
-                }],
-            },
-        };
-
-        NavigationActions.showModal(name, title, passProps, options);
-        expect(showModal).toHaveBeenCalledWith(expectedLayout);
-    });
-
-    test('showModalOverCurrentContext should call Navigation.showModal', () => {
-        const showModal = jest.spyOn(Navigation, 'showModal');
-
-        const animationsEnabled = (Platform.OS === 'android').toString();
-        const showModalOverCurrentContextTitle = '';
-        const showModalOverCurrentContextOptions = {
-            modalPresentationStyle: 'overCurrentContext',
-            layout: {
-                backgroundColor: 'transparent',
-                componentBackgroundColor: 'transparent',
-            },
-            topBar: {
-                visible: false,
-                height: 0,
-            },
-            animations: {
-                showModal: {
-                    waitForRender: true,
-                    enabled: animationsEnabled,
-                    alpha: {
-                        from: 0,
-                        to: 1,
-                        duration: 250,
-                    },
-                },
-                dismissModal: {
-                    enabled: animationsEnabled,
-                    alpha: {
-                        from: 1,
-                        to: 0,
-                        duration: 250,
-                    },
-                },
-            },
-        };
-        const showModalOptions = {
-            modalPresentationStyle: Platform.select({ios: 'fullScreen', android: 'none'}),
-            layout: {
-                componentBackgroundColor: theme.centerChannelBg,
-            },
-            statusBar: {
-                visible: true,
-            },
-            topBar: {
-                animate: true,
-                visible: true,
-                backButton: {
-                    color: theme.sidebarHeaderTextColor,
-                    title: '',
-                },
-                background: {
-                    color: theme.sidebarHeaderBg,
-                },
-                title: {
-                    color: theme.sidebarHeaderTextColor,
-                    text: showModalOverCurrentContextTitle,
-                },
-                leftButtonColor: theme.sidebarHeaderTextColor,
-                rightButtonColor: theme.sidebarHeaderTextColor,
-            },
-        };
-        const defaultOptions = merge(showModalOverCurrentContextOptions, options);
-
-        const expectedLayout = {
-            stack: {
-                children: [{
-                    component: {
-                        id: name,
-                        name,
-                        passProps,
-                        options: merge(showModalOptions, defaultOptions),
-                    },
-                }],
-            },
-        };
-
-        NavigationActions.showModalOverCurrentContext(name, passProps, options);
-        expect(showModal).toHaveBeenCalledWith(expectedLayout);
-    });
-
-    test('showSearchModal should call Navigation.showModal', () => {
-        const showModal = jest.spyOn(Navigation, 'showModal');
-
-        const showSearchModalName = 'Search';
-        const showSearchModalTitle = '';
-        const initialValue = 'initial-value';
-        const showSearchModalPassProps = {initialValue};
-        const showSearchModalOptions = {
-            topBar: {
-                visible: false,
-                height: 0,
-            },
-        };
-        const defaultOptions = {
-            modalPresentationStyle: Platform.select({ios: 'pageSheet', android: 'none'}),
-            layout: {
-                componentBackgroundColor: theme.centerChannelBg,
-            },
-            statusBar: {
-                visible: true,
-            },
-            topBar: {
-                animate: true,
-                visible: true,
-                backButton: {
-                    color: theme.sidebarHeaderTextColor,
-                    title: '',
-                },
-                background: {
-                    color: theme.sidebarHeaderBg,
-                },
-                title: {
-                    color: theme.sidebarHeaderTextColor,
-                    text: showSearchModalTitle,
-                },
-                leftButtonColor: theme.sidebarHeaderTextColor,
-                rightButtonColor: theme.sidebarHeaderTextColor,
-            },
-        };
-
-        const expectedLayout = {
-            stack: {
-                children: [{
-                    component: {
-                        id: showSearchModalName,
-                        name: showSearchModalName,
-                        passProps: showSearchModalPassProps,
-                        options: merge(defaultOptions, showSearchModalOptions),
-                    },
-                }],
-            },
-        };
-
-        NavigationActions.showSearchModal(initialValue);
-        expect(showModal).toHaveBeenCalledWith(expectedLayout);
-    });
-
-    test('dismissModal should call Navigation.dismissModal', async () => {
-        const dismissModal = jest.spyOn(Navigation, 'dismissModal');
-
-        await NavigationActions.dismissModal(options);
-        expect(dismissModal).toHaveBeenCalledWith(topComponentId, options);
-    });
-
-    test('dismissAllModals should call Navigation.dismissAllModals', async () => {
-        const dismissAllModals = jest.spyOn(Navigation, 'dismissAllModals');
-
-        await NavigationActions.dismissAllModals(options);
-        expect(dismissAllModals).toHaveBeenCalledWith(options);
-    });
-
-    test('mergeNavigationOptions should call Navigation.mergeOptions', () => {
-        const mergeOptions = jest.spyOn(Navigation, 'mergeOptions');
-
-        NavigationActions.mergeNavigationOptions(topComponentId, options);
-        expect(mergeOptions).toHaveBeenCalledWith(topComponentId, options);
-    });
-
-    test('setButtons should call Navigation.mergeOptions', () => {
-        const mergeOptions = jest.spyOn(Navigation, 'mergeOptions');
-
-        const buttons = {
-            leftButtons: ['left-button'],
-            rightButtons: ['right-button'],
-        };
-        const setButtonsOptions = {
-            topBar: {
-                ...buttons,
-            },
-        };
-
-        NavigationActions.setButtons(topComponentId, buttons);
-        expect(mergeOptions).toHaveBeenCalledWith(topComponentId, setButtonsOptions);
-    });
-
-    test('showOverlay should call Navigation.showOverlay', () => {
-        const showOverlay = jest.spyOn(Navigation, 'showOverlay');
-
-        const defaultOptions = {
-            layout: {
-                backgroundColor: 'transparent',
-                componentBackgroundColor: 'transparent',
-            },
-            overlay: {
-                interceptTouchOutside: false,
-            },
-        };
-
-        const expectedLayout = {
-            component: {
-                name,
-                passProps,
-                options: merge(defaultOptions, options),
-            },
-        };
-
-        NavigationActions.showOverlay(name, passProps, options);
-        expect(showOverlay).toHaveBeenCalledWith(expectedLayout);
-    });
-
-    test('dismissOverlay should call Navigation.dismissOverlay', async () => {
-        const dismissOverlay = jest.spyOn(Navigation, 'dismissOverlay');
-
-        await NavigationActions.dismissOverlay(topComponentId);
-        expect(dismissOverlay).toHaveBeenCalledWith(topComponentId);
-    });
-
-    test('dismissAllModalsAndPopToRoot should call Navigation.dismissAllModals, Navigation.popToRoot, and emit event', async () => {
-        const dismissAllModals = jest.spyOn(Navigation, 'dismissAllModals');
-        const popToRoot = jest.spyOn(Navigation, 'popToRoot');
-        EventEmitter.emit = jest.fn();
-
-        await NavigationActions.dismissAllModalsAndPopToRoot();
-        expect(dismissAllModals).toHaveBeenCalled();
-        expect(popToRoot).toHaveBeenCalledWith(topComponentId);
-        expect(EventEmitter.emit).toHaveBeenCalledWith(NavigationTypes.NAVIGATION_DISMISS_AND_POP_TO_ROOT);
-    });
-});

app/actions/views/channel.js

@@ -5,126 +5,289 @@ import {batchActions} from 'redux-batched-actions';
 
 import {ViewTypes} from 'app/constants';
 
-import {ChannelTypes, RoleTypes, GroupTypes} from '@mm-redux/action_types';
+import {UserTypes} from 'mattermost-redux/action_types';
 import {
     fetchMyChannelsAndMembers,
     getChannelByNameAndTeamName,
-    joinChannel,
-    leaveChannel as serviceLeaveChannel,
-} from '@mm-redux/actions/channels';
-import {savePreferences} from '@mm-redux/actions/preferences';
-import {getLicense} from '@mm-redux/selectors/entities/general';
-import {selectTeam} from '@mm-redux/actions/teams';
-import {Client4} from '@mm-redux/client';
-import {General, Preferences} from '@mm-redux/constants';
-import {getPostIdsInChannel} from '@mm-redux/selectors/entities/posts';
-import {isMinimumServerVersion} from '@mm-redux/utils/helpers';
+    markChannelAsRead,
+    leaveChannel as serviceLeaveChannel, markChannelAsViewed,
+    selectChannel,
+} from 'mattermost-redux/actions/channels';
+import {getPosts, getPostsBefore, getPostsSince, getPostThread} from 'mattermost-redux/actions/posts';
+import {getFilesForPost} from 'mattermost-redux/actions/files';
+import {savePreferences} from 'mattermost-redux/actions/preferences';
+import {getTeamMembersByIds} from 'mattermost-redux/actions/teams';
+import {getProfilesInChannel} from 'mattermost-redux/actions/users';
+import {General, Preferences} from 'mattermost-redux/constants';
+import {getChannel, getCurrentChannelId, getMyChannelMember} from 'mattermost-redux/selectors/entities/channels';
+import {getCurrentTeamId, getTeamByName} from 'mattermost-redux/selectors/entities/teams';
+
 import {
-    getCurrentChannelId,
-    getRedirectChannelNameForTeam,
-    getChannelsNameMapInTeam,
-    getMyChannelMemberships,
-    isManuallyUnread,
-} from '@mm-redux/selectors/entities/channels';
-import {getCurrentUserId} from '@mm-redux/selectors/entities/users';
-import {getTeamByName, getCurrentTeam} from '@mm-redux/selectors/entities/teams';
+    getChannelByName,
+    getDirectChannelName,
+    getUserIdFromChannelName,
+    isDirectChannel,
+    isGroupChannel,
+} from 'mattermost-redux/utils/channel_utils';
+import EventEmitter from 'mattermost-redux/utils/event_emitter';
+import {getLastCreateAt} from 'mattermost-redux/utils/post_utils';
+import {getPreferencesByCategory} from 'mattermost-redux/utils/preference_utils';
 
-import {getChannelByName as selectChannelByName, getChannelsIdForTeam} from '@mm-redux/utils/channel_utils';
-import EventEmitter from '@mm-redux/utils/event_emitter';
+import {INSERT_TO_COMMENT, INSERT_TO_DRAFT} from 'app/constants/post_textbox';
+import {isDirectChannelVisible, isGroupChannelVisible} from 'app/utils/channels';
 
-import {lastChannelIdForTeam, loadSidebarDirectMessagesProfiles} from '@actions/helpers/channels';
-import {getPosts, getPostsBefore, getPostsSince, loadUnreadChannelPosts} from '@actions/views/post';
-import {INSERT_TO_COMMENT, INSERT_TO_DRAFT} from '@constants/post_draft';
-import {getChannelReachable} from '@selectors/channel';
-import telemetry from '@telemetry';
-import {isDirectChannelVisible, isGroupChannelVisible, getChannelSinceValue} from '@utils/channels';
-import {isPendingPost} from '@utils/general';
+const MAX_POST_TRIES = 3;
 
-const MAX_RETRIES = 3;
+export function loadChannelsIfNecessary(teamId) {
+    return async (dispatch, getState) => {
+        await fetchMyChannelsAndMembers(teamId)(dispatch, getState);
+    };
+}
 
-export function loadChannelsByTeamName(teamName, errorHandler) {
+export function loadChannelsByTeamName(teamName) {
     return async (dispatch, getState) => {
         const state = getState();
         const {currentTeamId} = state.entities.teams;
+        const team = getTeamByName(state, teamName);
 
-        if (teamName) {
-            const team = getTeamByName(state, teamName);
+        if (team && team.id !== currentTeamId) {
+            await dispatch(fetchMyChannelsAndMembers(team.id));
+        }
+    };
+}
 
-            if (!team && errorHandler) {
-                errorHandler();
-                return {error: true};
+export function loadProfilesAndTeamMembersForDMSidebar(teamId) {
+    return async (dispatch, getState) => {
+        const state = getState();
+        const {currentUserId, profilesInChannel} = state.entities.users;
+        const {channels, myMembers} = state.entities.channels;
+        const {myPreferences} = state.entities.preferences;
+        const {membersInTeam} = state.entities.teams;
+        const dmPrefs = getPreferencesByCategory(myPreferences, Preferences.CATEGORY_DIRECT_CHANNEL_SHOW);
+        const gmPrefs = getPreferencesByCategory(myPreferences, Preferences.CATEGORY_GROUP_CHANNEL_SHOW);
+        const members = [];
+        const loadProfilesForChannels = [];
+        const prefs = [];
+
+        function buildPref(name) {
+            return {
+                user_id: currentUserId,
+                category: Preferences.CATEGORY_DIRECT_CHANNEL_SHOW,
+                name,
+                value: 'true',
+            };
+        }
+
+        // Find DM's and GM's that need to be shown
+        const directChannels = Object.values(channels).filter((c) => (isDirectChannel(c) || isGroupChannel(c)));
+        directChannels.forEach((channel) => {
+            const member = myMembers[channel.id];
+            if (isDirectChannel(channel) && !isDirectChannelVisible(currentUserId, myPreferences, channel) && member.mention_count > 0) {
+                const teammateId = getUserIdFromChannelName(currentUserId, channel.name);
+                let pref = dmPrefs.get(teammateId);
+                if (pref) {
+                    pref = {...pref, value: 'true'};
+                } else {
+                    pref = buildPref(teammateId);
+                }
+                dmPrefs.set(teammateId, pref);
+                prefs.push(pref);
+            } else if (isGroupChannel(channel) && !isGroupChannelVisible(myPreferences, channel) && (member.mention_count > 0 || member.msg_count < channel.total_msg_count)) {
+                const id = channel.id;
+                let pref = gmPrefs.get(id);
+                if (pref) {
+                    pref = {...pref, value: 'true'};
+                } else {
+                    pref = buildPref(id);
+                }
+                gmPrefs.set(id, pref);
+                prefs.push(pref);
             }
+        });
 
-            if (team && team.id !== currentTeamId) {
-                await dispatch(fetchMyChannelsAndMembers(team.id));
+        if (prefs.length) {
+            savePreferences(currentUserId, prefs)(dispatch, getState);
+        }
+
+        for (const [key, pref] of dmPrefs) {
+            if (pref.value === 'true') {
+                members.push(key);
             }
         }
 
-        return {data: true};
+        for (const [key, pref] of gmPrefs) {
+            //only load the profiles in channels if we don't already have them
+            if (pref.value === 'true' && !profilesInChannel[key]) {
+                loadProfilesForChannels.push(key);
+            }
+        }
+
+        if (loadProfilesForChannels.length) {
+            for (let i = 0; i < loadProfilesForChannels.length; i++) {
+                const channelId = loadProfilesForChannels[i];
+                getProfilesInChannel(channelId, 0)(dispatch, getState);
+            }
+        }
+
+        let membersToLoad = members;
+        if (membersInTeam[teamId]) {
+            membersToLoad = members.filter((m) => !membersInTeam[teamId].hasOwnProperty(m));
+        }
+
+        if (membersToLoad.length) {
+            getTeamMembersByIds(teamId, membersToLoad)(dispatch, getState);
+        }
+
+        const actions = [];
+        for (let i = 0; i < members.length; i++) {
+            const channelName = getDirectChannelName(currentUserId, members[i]);
+            const channel = getChannelByName(channels, channelName);
+            if (channel) {
+                actions.push({
+                    type: UserTypes.RECEIVED_PROFILE_IN_CHANNEL,
+                    data: {id: channel.id, user_id: members[i]},
+                });
+            }
+        }
+
+        if (actions.length) {
+            dispatch(batchActions(actions), getState);
+        }
     };
 }
 
 export function loadPostsIfNecessaryWithRetry(channelId) {
     return async (dispatch, getState) => {
         const state = getState();
-        const postIds = getPostIdsInChannel(state, channelId);
+        const {posts, postsInChannel} = state.entities.posts;
+        const postsIds = postsInChannel[channelId];
         const actions = [];
 
         const time = Date.now();
 
         let loadMorePostsVisible = true;
-        let postAction;
-        if (!postIds || postIds.length < ViewTypes.POST_VISIBILITY_CHUNK_SIZE) {
+        let received;
+        if (!postsIds || postsIds.length < ViewTypes.POST_VISIBILITY_CHUNK_SIZE) {
             // Get the first page of posts if it appears we haven't gotten it yet, like the webapp
-            postAction = getPosts(channelId);
-        } else {
-            const since = getChannelSinceValue(state, channelId, postIds);
-            postAction = getPostsSince(channelId, since);
-        }
+            received = await retryGetPostsAction(getPosts(channelId), dispatch, getState);
 
-        const received = await dispatch(fetchPostActionWithRetry(postAction));
+            if (received?.order) {
+                const count = received.order.length;
+                loadMorePostsVisible = count >= ViewTypes.POST_VISIBILITY_CHUNK_SIZE;
+                actions.push({
+                    type: ViewTypes.SET_INITIAL_POST_COUNT,
+                    data: {
+                        channelId,
+                        count,
+                    },
+                });
+            }
+        } else {
+            const {lastConnectAt} = state.device.websocket;
+            const lastGetPosts = state.views.channel.lastGetPosts[channelId];
+
+            let since;
+            if (lastGetPosts && lastGetPosts < lastConnectAt) {
+                // Since the websocket disconnected, we may have missed some posts since then
+                since = lastGetPosts;
+            } else {
+                // Trust that we've received all posts since the last time the websocket disconnected
+                // so just get any that have changed since the latest one we've received
+                const postsForChannel = postsIds.map((id) => posts[id]);
+                since = getLastCreateAt(postsForChannel);
+            }
+
+            received = await retryGetPostsAction(getPostsSince(channelId, since), dispatch, getState);
+
+            if (received?.order) {
+                const count = received.order.length;
+                loadMorePostsVisible = postsIds.length + count >= ViewTypes.POST_VISIBILITY_CHUNK_SIZE;
+                actions.push({
+                    type: ViewTypes.SET_INITIAL_POST_COUNT,
+                    data: {
+                        channelId,
+                        count: postsIds.length + count,
+                    },
+                });
+            }
+        }
 
         if (received) {
             actions.push({
                 type: ViewTypes.RECEIVED_POSTS_FOR_CHANNEL_AT_TIME,
                 channelId,
                 time,
-            },
-            setChannelRetryFailed(false));
-
-            if (received?.order) {
-                const count = received.order.length;
-                loadMorePostsVisible = count >= ViewTypes.POST_VISIBILITY_CHUNK_SIZE;
-            }
+            });
         }
 
         actions.push(setLoadMorePostsVisible(loadMorePostsVisible));
-        dispatch(batchActions(actions, 'BATCH_LOAD_POSTS_IN_CHANNEL'));
+        dispatch(batchActions(actions));
     };
 }
 
-export function fetchPostActionWithRetry(action, maxTries = MAX_RETRIES) {
-    return async (dispatch) => {
-        for (let i = 0; i <= maxTries; i++) {
-            const {data} = await dispatch(action); // eslint-disable-line no-await-in-loop
+export async function retryGetPostsAction(action, dispatch, getState, maxTries = MAX_POST_TRIES) {
+    for (let i = 0; i < maxTries; i++) {
+        const {data} = await dispatch(action); // eslint-disable-line no-await-in-loop
 
-            if (data) {
-                return data;
-            }
+        if (data) {
+            dispatch(setChannelRetryFailed(false));
+            return data;
         }
+    }
 
-        dispatch(setChannelRetryFailed(true));
+    dispatch(setChannelRetryFailed(true));
+    return null;
+}
 
-        return null;
+export function loadFilesForPostIfNecessary(postId) {
+    return async (dispatch, getState) => {
+        const {files} = getState().entities;
+        const fileIdsForPost = files.fileIdsByPostId[postId];
+
+        if (!fileIdsForPost?.length) {
+            await dispatch(getFilesForPost(postId));
+        }
+    };
+}
+
+export function loadThreadIfNecessary(rootId, channelId) {
+    return async (dispatch, getState) => {
+        const state = getState();
+        const {posts, postsInChannel} = state.entities.posts;
+        const channelPosts = postsInChannel[channelId];
+
+        if (rootId && (!posts[rootId] || !channelPosts || !channelPosts[rootId])) {
+            getPostThread(rootId, false)(dispatch, getState);
+        }
     };
 }
 
 export function selectInitialChannel(teamId) {
     return (dispatch, getState) => {
         const state = getState();
-        const channelId = lastChannelIdForTeam(state, teamId);
+        const {channels, myMembers} = state.entities.channels;
+        const {currentUserId} = state.entities.users;
+        const {myPreferences} = state.entities.preferences;
+        const lastChannelForTeam = state.views.team.lastChannelForTeam[teamId];
+        const lastChannelId = lastChannelForTeam && lastChannelForTeam.length ? lastChannelForTeam[0] : '';
+        const lastChannel = channels[lastChannelId];
 
-        dispatch(handleSelectChannel(channelId));
+        const isDMVisible = lastChannel && lastChannel.type === General.DM_CHANNEL &&
+            isDirectChannelVisible(currentUserId, myPreferences, lastChannel);
+
+        const isGMVisible = lastChannel && lastChannel.type === General.GM_CHANNEL &&
+            isGroupChannelVisible(myPreferences, lastChannel);
+
+        if (
+            myMembers[lastChannelId] &&
+            lastChannel &&
+            (lastChannel.team_id === teamId || isDMVisible || isGMVisible)
+        ) {
+            dispatch(handleSelectChannel(lastChannelId));
+            return;
+        }
+
+        dispatch(selectDefaultChannel(teamId));
     };
 }
 
@@ -150,6 +313,7 @@ export function selectPenultimateChannel(teamId) {
             lastChannel.delete_at === 0 &&
             (lastChannel.team_id === teamId || isDMVisible || isGMVisible)
         ) {
+            dispatch(setChannelLoading(true));
             dispatch(handleSelectChannel(lastChannelId));
             return;
         }
@@ -160,19 +324,19 @@ export function selectPenultimateChannel(teamId) {
 
 export function selectDefaultChannel(teamId) {
     return (dispatch, getState) => {
-        const state = getState();
+        const {channels} = getState().entities.channels;
 
-        const channelsInTeam = getChannelsNameMapInTeam(state, teamId);
-        const channel = selectChannelByName(channelsInTeam, getRedirectChannelNameForTeam(state, teamId));
+        const channel = Object.values(channels).find((c) => c.team_id === teamId && c.name === General.DEFAULT_CHANNEL);
         let channelId;
         if (channel) {
             channelId = channel.id;
         } else {
             // Handle case when the default channel cannot be found
             // so we need to get the first available channel of the team
-            const channels = Object.values(channelsInTeam);
-            const firstChannel = channels.length ? channels[0].id : '';
-            channelId = firstChannel;
+            const channelsInTeam = Object.values(channels).filter((c) => c.team_id === teamId);
+            const firstChannel = channelsInTeam.length ? channelsInTeam[0].id : {id: ''};
+
+            channelId = firstChannel.id;
         }
 
         if (channelId) {
@@ -181,98 +345,71 @@ export function selectDefaultChannel(teamId) {
     };
 }
 
-export function handleSelectChannel(channelId) {
+export function handleSelectChannel(channelId, fromPushNotification = false) {
     return async (dispatch, getState) => {
-        const dt = Date.now();
         const state = getState();
-        const {channels, currentChannelId, myMembers} = state.entities.channels;
-        const {currentTeamId} = state.entities.teams;
-        const channel = channels[channelId];
-        const member = myMembers[channelId];
+        const channel = getChannel(state, channelId);
+        const currentTeamId = getCurrentTeamId(state);
+        const currentChannelId = getCurrentChannelId(state);
+        const sameChannel = channelId === currentChannelId;
+        const member = getMyChannelMember(state, channelId);
 
-        if (channel) {
+        dispatch(setLoadMorePostsVisible(true));
+
+        // If the app is open from push notification, we already fetched the posts.
+        if (!fromPushNotification) {
             dispatch(loadPostsIfNecessaryWithRetry(channelId));
-
-            let previousChannelId = null;
-            if (currentChannelId !== channelId) {
-                previousChannelId = currentChannelId;
-            }
-
-            const actions = markAsViewedAndReadBatch(state, channelId, previousChannelId);
-            actions.push({
-                type: ChannelTypes.SELECT_CHANNEL,
-                data: channelId,
-                extra: {
-                    channel,
-                    member,
-                    teamId: channel.team_id || currentTeamId,
-                },
-            });
-
-            dispatch(batchActions(actions, 'BATCH_SWITCH_CHANNEL'));
-
-            console.log('channel switch to', channel?.display_name, channelId, (Date.now() - dt), 'ms'); //eslint-disable-line
         }
+
+        dispatch(batchActions([
+            selectChannel(channelId),
+            setChannelDisplayName(channel.display_name),
+            {
+                type: ViewTypes.SET_INITIAL_POST_VISIBILITY,
+                data: channelId,
+            },
+            setChannelLoading(false),
+            {
+                type: ViewTypes.SET_LAST_CHANNEL_FOR_TEAM,
+                teamId: currentTeamId,
+                channelId,
+            },
+            {
+                type: ViewTypes.SELECT_CHANNEL_WITH_MEMBER,
+                data: channelId,
+                member,
+            },
+        ]));
+
+        let markPreviousChannelId;
+        if (!fromPushNotification && !sameChannel) {
+            markPreviousChannelId = currentChannelId;
+        }
+
+        dispatch(markChannelViewedAndRead(channelId, markPreviousChannelId));
     };
 }
 
-export function handleSelectChannelByName(channelName, teamName, errorHandler) {
+export function handleSelectChannelByName(channelName, teamName) {
     return async (dispatch, getState) => {
-        let state = getState();
+        const state = getState();
         const {teams: currentTeams, currentTeamId} = state.entities.teams;
-        const currentTeam = currentTeams[currentTeamId];
-        const currentTeamName = currentTeam?.name;
-        const response = await dispatch(getChannelByNameAndTeamName(teamName || currentTeamName, channelName));
-        const {error, data: channel} = response;
+        const currentTeamName = currentTeams[currentTeamId]?.name;
+        const {data: channel} = await dispatch(getChannelByNameAndTeamName(teamName || currentTeamName, channelName));
         const currentChannelId = getCurrentChannelId(state);
-
-        state = getState();
-        const reachable = getChannelReachable(state, channelName, teamName);
-
-        if (!reachable && errorHandler) {
-            errorHandler();
-        }
-
-        // Fallback to API response error, if any.
-        if (error) {
-            return {error};
-        }
-
-        if (teamName && teamName !== currentTeamName) {
-            const team = getTeamByName(state, teamName);
-            dispatch(selectTeam(team));
-        }
-
         if (channel && currentChannelId !== channel.id) {
-            if (channel.type === General.OPEN_CHANNEL) {
-                const myMemberships = getMyChannelMemberships(state);
-                if (!myMemberships[channel.id]) {
-                    const currentUserId = getCurrentUserId(state);
-                    console.log('joining channel', channel?.display_name, channel.id); //eslint-disable-line
-                    const result = await dispatch(joinChannel(currentUserId, teamName, channel.id));
-                    if (result.error || !result.data || !result.data.channel) {
-                        return {error};
-                    }
-                }
-            }
             dispatch(handleSelectChannel(channel.id));
         }
-
-        return null;
     };
 }
 
 export function handlePostDraftChanged(channelId, draft) {
-    return (dispatch, getState) => {
-        const state = getState();
-
-        if (state.views.channel.drafts[channelId]?.draft !== draft) {
-            dispatch({
-                type: ViewTypes.POST_DRAFT_CHANGED,
-                channelId,
-                draft,
-            });
-        }
+    return async (dispatch, getState) => {
+        dispatch({
+            type: ViewTypes.POST_DRAFT_CHANGED,
+            channelId,
+            draft,
+        }, getState);
     };
 }
 
@@ -288,105 +425,9 @@ export function insertToDraft(value) {
 }
 
 export function markChannelViewedAndRead(channelId, previousChannelId, markOnServer = true) {
-    return (dispatch, getState) => {
-        const state = getState();
-        const actions = markAsViewedAndReadBatch(state, channelId, previousChannelId, markOnServer);
-
-        dispatch(batchActions(actions, 'BATCH_MARK_CHANNEL_VIEWED_AND_READ'));
-    };
-}
-
-export function markAsViewedAndReadBatch(state, channelId, prevChannelId = '', markOnServer = true) {
-    const actions = [];
-    const {channels, myMembers} = state.entities.channels;
-    const channel = channels[channelId];
-    const member = myMembers[channelId];
-    const prevMember = myMembers[prevChannelId];
-    const prevChanManuallyUnread = isManuallyUnread(state, prevChannelId);
-    const prevChannel = (!prevChanManuallyUnread && prevChannelId) ? channels[prevChannelId] : null; // May be null since prevChannelId is optional
-
-    if (markOnServer) {
-        Client4.viewMyChannel(channelId, prevChanManuallyUnread ? '' : prevChannelId).catch(() => {
-            // do nothing just adding the handler to avoid the warning
-        });
-    }
-
-    if (member) {
-        actions.push({
-            type: ChannelTypes.RECEIVED_MY_CHANNEL_MEMBER,
-            data: {...member, last_viewed_at: Date.now()},
-        });
-
-        if (isManuallyUnread(state, channelId)) {
-            actions.push({
-                type: ChannelTypes.REMOVE_MANUALLY_UNREAD,
-                data: {channelId},
-            });
-        }
-
-        if (channel) {
-            const unreadMessageCount = channel.total_msg_count - member.msg_count;
-            actions.push({
-                type: ChannelTypes.SET_UNREAD_MSG_COUNT,
-                data: {
-                    channelId,
-                    count: unreadMessageCount,
-                },
-            }, {
-                type: ChannelTypes.DECREMENT_UNREAD_MSG_COUNT,
-                data: {
-                    teamId: channel.team_id,
-                    channelId,
-                    amount: unreadMessageCount,
-                },
-            }, {
-                type: ChannelTypes.DECREMENT_UNREAD_MENTION_COUNT,
-                data: {
-                    teamId: channel.team_id,
-                    channelId,
-                    amount: member.mention_count,
-                },
-            });
-        }
-    }
-
-    if (prevMember) {
-        if (!prevChanManuallyUnread) {
-            actions.push({
-                type: ChannelTypes.RECEIVED_MY_CHANNEL_MEMBER,
-                data: {...prevMember, last_viewed_at: Date.now()},
-            });
-        }
-
-        if (prevChannel) {
-            actions.push({
-                type: ChannelTypes.DECREMENT_UNREAD_MSG_COUNT,
-                data: {
-                    teamId: prevChannel.team_id,
-                    channelId: prevChannelId,
-                    amount: prevChannel.total_msg_count - prevMember.msg_count,
-                },
-            }, {
-                type: ChannelTypes.DECREMENT_UNREAD_MENTION_COUNT,
-                data: {
-                    teamId: prevChannel.team_id,
-                    channelId: prevChannelId,
-                    amount: prevMember.mention_count,
-                },
-            });
-        }
-    }
-
-    return actions;
-}
-
-export function markChannelViewedAndReadOnReconnect(channelId) {
-    return (dispatch, getState) => {
-        if (isManuallyUnread(getState(), channelId)) {
-            return;
-        }
-
-        dispatch(markChannelViewedAndRead(channelId));
+    return (dispatch) => {
+        dispatch(markChannelAsRead(channelId, previousChannelId, markOnServer));
+        dispatch(markChannelAsViewed(channelId, previousChannelId));
     };
 }
 
@@ -452,16 +493,10 @@ export function closeGMChannel(channel) {
 }
 
 export function refreshChannelWithRetry(channelId) {
-    return async (dispatch) => {
+    return async (dispatch, getState) => {
         dispatch(setChannelRefreshing(true));
-        const posts = await dispatch(fetchPostActionWithRetry(getPosts(channelId)));
-        const actions = [setChannelRefreshing(false)];
-
-        if (posts) {
-            actions.push(setChannelRetryFailed(false));
-        }
-
-        dispatch(batchActions(actions, 'BATCH_REEFRESH_CHANNEL'));
+        const posts = await retryGetPostsAction(getPosts(channelId), dispatch, getState);
+        dispatch(setChannelRefreshing(false));
         return posts;
     };
 }
@@ -489,12 +524,6 @@ export function leaveChannel(channel, reset = false) {
 }
 
 export function setChannelLoading(loading = true) {
-    if (loading) {
-        telemetry.start(['channel:loading']);
-    } else {
-        telemetry.end(['channel:loading']);
-    }
-
     return {
         type: ViewTypes.SET_CHANNEL_LOADER,
         loading,
@@ -523,28 +552,31 @@ export function setChannelDisplayName(displayName) {
 }
 
 // Returns true if there are more posts to load
-export function increasePostVisibility(channelId, postId) {
+export function increasePostVisibility(channelId, focusedPostId) {
     return async (dispatch, getState) => {
         const state = getState();
-        const {loadingPosts} = state.views.channel;
-        const currentUserId = getCurrentUserId(state);
+        const {loadingPosts, postVisibility} = state.views.channel;
+        const currentPostVisibility = postVisibility[channelId] || 0;
 
         if (loadingPosts[channelId]) {
             return true;
         }
 
-        if (!postId) {
-            // No posts are visible, so the channel is empty
-            return true;
-        }
+        // Check if we already have the posts that we want to show
+        if (!focusedPostId) {
+            const loadedPostCount = state.views.channel.postCountInChannel[channelId] || 0;
+            const desiredPostVisibility = currentPostVisibility + ViewTypes.POST_VISIBILITY_CHUNK_SIZE;
 
-        if (isPendingPost(postId, currentUserId)) {
-            // This is the first created post in the channel
-            return true;
-        }
+            if (loadedPostCount >= desiredPostVisibility) {
+                // We already have the posts, so we just need to show them
+                dispatch(batchActions([
+                    doIncreasePostVisibility(channelId),
+                    setLoadMorePostsVisible(true),
+                ]));
 
-        telemetry.reset();
-        telemetry.start(['posts:loading']);
+                return true;
+            }
+        }
 
         dispatch({
             type: ViewTypes.LOADING_POSTS,
@@ -553,9 +585,14 @@ export function increasePostVisibility(channelId, postId) {
         });
 
         const pageSize = ViewTypes.POST_VISIBILITY_CHUNK_SIZE;
+        const page = Math.floor(currentPostVisibility / pageSize);
 
-        const postAction = getPostsBefore(channelId, postId, 0, pageSize);
-        const result = await dispatch(fetchPostActionWithRetry(postAction));
+        let result;
+        if (focusedPostId) {
+            result = await retryGetPostsAction(getPostsBefore(channelId, focusedPostId, page, pageSize), dispatch, getState);
+        } else {
+            result = await retryGetPostsAction(getPosts(channelId, page, pageSize), dispatch, getState);
+        }
 
         const actions = [{
             type: ViewTypes.LOADING_POSTS,
@@ -563,214 +600,42 @@ export function increasePostVisibility(channelId, postId) {
             channelId,
         }];
 
-        if (result) {
-            actions.push(setChannelRetryFailed(false));
-        }
-
         let hasMorePost = false;
         if (result?.order) {
             const count = result.order.length;
             hasMorePost = count >= pageSize;
 
+            actions.push({
+                type: ViewTypes.INCREASE_POST_COUNT,
+                data: {
+                    channelId,
+                    count,
+                },
+            });
+
+            // make sure to increment the posts visibility
+            // only if we got results
+            actions.push(doIncreasePostVisibility(channelId));
+
             actions.push(setLoadMorePostsVisible(hasMorePost));
         }
 
-        dispatch(batchActions(actions, 'BATCH_LOAD_MORE_POSTS'));
-        telemetry.end(['posts:loading']);
-        telemetry.save();
-
+        dispatch(batchActions(actions));
         return hasMorePost;
     };
 }
 
+function doIncreasePostVisibility(channelId) {
+    return {
+        type: ViewTypes.INCREASE_POST_VISIBILITY,
+        data: channelId,
+        amount: ViewTypes.POST_VISIBILITY_CHUNK_SIZE,
+    };
+}
+
 function setLoadMorePostsVisible(visible) {
     return {
         type: ViewTypes.SET_LOAD_MORE_POSTS_VISIBLE,
         data: visible,
     };
 }
-
-function loadGroupData() {
-    return async (dispatch, getState) => {
-        const state = getState();
-        const actions = [];
-        const team = getCurrentTeam(state);
-        const currentUserId = getCurrentUserId(state);
-        const serverVersion = state.entities.general.serverVersion;
-        const license = getLicense(state);
-        const hasLicense = license?.IsLicensed === 'true' && license?.LDAPGroups === 'true';
-
-        if (hasLicense && team && isMinimumServerVersion(serverVersion, 5, 24)) {
-            for (let i = 0; i <= MAX_RETRIES; i++) {
-                try {
-                    if (team.group_constrained) {
-                        const [getAllGroupsAssociatedToChannelsInTeam, getAllGroupsAssociatedToTeam] = await Promise.all([ //eslint-disable-line no-await-in-loop
-                            Client4.getAllGroupsAssociatedToChannelsInTeam(team.id, true),
-                            Client4.getAllGroupsAssociatedToTeam(team.id, true),
-                        ]);
-
-                        if (getAllGroupsAssociatedToChannelsInTeam.groups) {
-                            actions.push({
-                                type: GroupTypes.RECEIVED_ALL_GROUPS_ASSOCIATED_TO_CHANNELS_IN_TEAM,
-                                data: {groupsByChannelId: getAllGroupsAssociatedToChannelsInTeam.groups},
-                            });
-                        }
-
-                        if (getAllGroupsAssociatedToTeam) {
-                            actions.push({
-                                type: GroupTypes.RECEIVED_ALL_GROUPS_ASSOCIATED_TO_TEAM,
-                                data: {...getAllGroupsAssociatedToTeam, teamID: team.id},
-                            });
-                        }
-                    } else {
-                        const [getAllGroupsAssociatedToChannelsInTeam, getGroups] = await Promise.all([ //eslint-disable-line no-await-in-loop
-                            Client4.getAllGroupsAssociatedToChannelsInTeam(team.id, true),
-                            Client4.getGroups(true, 0, 0),
-                        ]);
-
-                        if (getAllGroupsAssociatedToChannelsInTeam.groups) {
-                            actions.push({
-                                type: GroupTypes.RECEIVED_ALL_GROUPS_ASSOCIATED_TO_CHANNELS_IN_TEAM,
-                                data: {groupsByChannelId: getAllGroupsAssociatedToChannelsInTeam.groups},
-                            });
-                        }
-
-                        if (getGroups) {
-                            actions.push({
-                                type: GroupTypes.RECEIVED_GROUPS,
-                                data: getGroups,
-                            });
-                        }
-                    }
-                    break;
-                } catch (err) {
-                    if (i === MAX_RETRIES) {
-                        return {error: err};
-                    }
-                }
-            }
-
-            try {
-                const myGroups = await Client4.getGroupsByUserId(currentUserId);
-                if (myGroups.length) {
-                    actions.push({
-                        type: GroupTypes.RECEIVED_MY_GROUPS,
-                        data: myGroups,
-                    });
-                }
-            } catch {
-                // do nothing
-            }
-        }
-
-        if (actions.length) {
-            dispatch(batchActions(actions, 'BATCH_GROUP_DATA'));
-        }
-
-        return {data: true};
-    };
-}
-
-export function loadChannelsForTeam(teamId, skipDispatch = false) {
-    return async (dispatch, getState) => {
-        const state = getState();
-        const currentUserId = getCurrentUserId(state);
-        const data = {
-            sync: true,
-            teamId,
-            teamChannels: getChannelsIdForTeam(state, teamId),
-        };
-
-        const actions = [];
-
-        if (currentUserId) {
-            for (let i = 0; i <= MAX_RETRIES; i++) {
-                try {
-                    console.log('Fetching channels attempt', teamId, (i + 1)); //eslint-disable-line no-console
-                    const [channels, channelMembers] = await Promise.all([ //eslint-disable-line no-await-in-loop
-                        Client4.getMyChannels(teamId, true),
-                        Client4.getMyChannelMembers(teamId),
-                    ]);
-
-                    data.channels = channels;
-                    data.channelMembers = channelMembers;
-                    break;
-                } catch (err) {
-                    if (i === MAX_RETRIES) {
-                        const hasChannelsLoaded = state.entities.channels.channelsInTeam[teamId]?.size > 0;
-                        return {error: hasChannelsLoaded ? null : err};
-                    }
-                }
-            }
-
-            if (data.channels) {
-                actions.push({
-                    type: ChannelTypes.RECEIVED_MY_CHANNELS_WITH_MEMBERS,
-                    data,
-                });
-
-                if (!skipDispatch) {
-                    const rolesToLoad = new Set();
-                    const members = data.channelMembers;
-                    for (const member of members) {
-                        for (const role of member.roles.split(' ')) {
-                            rolesToLoad.add(role);
-                        }
-                    }
-
-                    if (rolesToLoad.size > 0) {
-                        try {
-                            data.roles = await Client4.getRolesByNames(Array.from(rolesToLoad));
-                            if (data.roles.length) {
-                                actions.push({
-                                    type: RoleTypes.RECEIVED_ROLES,
-                                    data: data.roles,
-                                });
-                            }
-                        } catch {
-                            //eslint-disable-next-line no-console
-                            console.log('Could not retrieve channel members roles for the user');
-                        }
-                    }
-
-                    dispatch(batchActions(actions, 'BATCH_LOAD_CHANNELS_FOR_TEAM'));
-                }
-
-                // Fetch needed profiles from channel creators and direct channels
-                dispatch(loadSidebar(data));
-
-                dispatch(loadUnreadChannelPosts(data.channels, data.channelMembers));
-            }
-
-            dispatch(loadGroupData());
-        }
-
-        return {data};
-    };
-}
-
-export function loadSidebar(data) {
-    return async (dispatch, getState) => {
-        const state = getState();
-        const {channels, channelMembers} = data;
-
-        const sidebarActions = await loadSidebarDirectMessagesProfiles(state, channels, channelMembers);
-        if (sidebarActions.length) {
-            dispatch(batchActions(sidebarActions, 'BATCH_LOAD_SIDEBAR'));
-        }
-
-        return {data: true};
-    };
-}
-
-export function resetUnreadMessageCount(channelId) {
-    return async (dispatch) => {
-        dispatch({
-            type: ChannelTypes.SET_UNREAD_MSG_COUNT,
-            data: {
-                channelId,
-                count: 0,
-            },
-        });
-    };
-}