translations PR 20170905 (#882 )

Update minimum server version (#878 )
Version Bump to 49 (#876 )
2017-09-05 09:46:41 -03:00 · 2017-09-02 21:29:47 -03:00 · 2017-09-01 14:50:01 -03:00 · 2017-09-01 14:49:48 -03:00 · 2017-08-24 18:07:07 -03:00 · 2017-08-24 11:31:03 -03:00
1332 changed files with 63391 additions and 131475 deletions
--- a/.babelrc
+++ b/.babelrc
@@ -0,0 +1,11 @@
+{
+  "presets": [ "react-native" ],
+  "plugins": [
+    ["module-resolver", {
+      "root": ["./src", "."],
+      "alias": {
+        "assets": "./dist/assets"
+      }
+    }]
+  ]
+}
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,500 +0,0 @@
-version: 2.1
-
-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-27-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: "11.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:
-      - ruby-setup
-      - 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: make dist/assets
-      - 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: "Run post install scripts"
-          command: make post-install
-
-  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: Getting cocoapods dependencies
-          working_directory: ios
-          command: 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:
-          working_directory: fastlane
-          name: Run fastlane to build android
-          no_output_timeout: 30m
-          command: 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
-            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:
-      - store_artifacts:
-          path: ~/mattermost-mobile/<<parameters.filename>>
-
-  ruby-setup:
-    steps:
-      - run:
-          name: Set Ruby Version
-          command: echo "ruby-2.6.3" > ~/.ruby-version
-
-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: make i18n-extract-ci
-
-  build-android-beta:
-    executor: android
-    steps:
-      - build-android
-      - persist
-      - save:
-          filename: "Mattermost_Beta.apk"
-
-  build-android-release:
-    executor: android
-    steps:
-      - build-android
-      - persist
-      - save:
-          filename: "Mattermost.apk"
-
-  build-android-pr:
-    executor: android
-    environment:
-      BRANCH_TO_BUILD: ${CIRCLE_BRANCH}
-    steps:
-      - build-android
-      - save:
-          filename: "Mattermost_Beta.apk"
-
-  build-android-unsigned:
-    executor: android
-    steps:
-      - checkout:
-          path: ~/mattermost-mobile
-      - npm-dependencies
-      - assets
-      - fastlane-dependencies:
-          for: android
-      - gradle-dependencies
-      - run:
-          working_directory: fastlane
-          name: Run fastlane to build unsigned android
-          no_output_timeout: 30m
-          command: bundle exec fastlane android unsigned
-      - persist
-      - save:
-          filename: "Mattermost-unsigned.apk"
-
-  build-ios-beta:
-    executor: ios
-    steps:
-      - build-ios
-      - persist
-      - save:
-          filename: "Mattermost_Beta.ipa"
-
-  build-ios-release:
-    executor: ios
-    steps:
-      - build-ios
-      - persist
-      - save:
-          filename: "Mattermost.ipa"
-
-  build-ios-pr:
-    executor: ios
-    environment:
-      BRANCH_TO_BUILD: ${CIRCLE_BRANCH}
-    steps:
-      - build-ios
-      - save:
-          filename: "Mattermost_Beta.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: bundle exec fastlane ios unsigned
-      - persist
-      - save:
-          filename: "Mattermost-unsigned.ipa"
-
-  deploy-android-release:
-    executor:
-      name: android
-      resource_class: medium
-    steps:
-      - ruby-setup
-      - deploy-to-store:
-          task: "Deploy to Google Play"
-          target: android
-          file: Mattermost.apk
-
-  deploy-android-beta:
-    executor:
-      name: android
-      resource_class: medium
-    steps:
-      - ruby-setup
-      - deploy-to-store:
-          task: "Deploy to Google Play"
-          target: android
-          file: Mattermost_Beta.apk
-
-  deploy-ios-release:
-    executor: ios
-    steps:
-      - ruby-setup
-      - deploy-to-store:
-          task: "Deploy to TestFlight"
-          target: ios
-          file: Mattermost.ipa
-
-  deploy-ios-beta:
-    executor: ios
-    steps:
-      - ruby-setup
-      - deploy-to-store:
-          task: "Deploy to TestFlight"
-          target: ios
-          file: Mattermost_Beta.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
-
-      - 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:
-              ignore: /.*/
-      - build-ios-unsigned:
-          context: mattermost-mobile-unsigned
-          requires:
-            - test
-          filters:
-            tags:
-              only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
-            branches:
-              ignore: /.*/
-      - github-release:
-          context: mattermost-mobile-unsigned
-          requires:
-            - build-android-unsigned
-            - build-ios-unsigned
-          filters:
-            tags:
-              only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
-            branches:
-              ignore: /.*/
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,7 +11,7 @@ charset = utf-8
 indent_style = space
 indent_size = 4

-[{package.json,.eslintrc.json}]
+[webapp/package.json]
 indent_size = 2

 [Makefile]
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,31 +1,262 @@
 {
-  "extends": [
-    "./node_modules/eslint-config-mattermost/.eslintrc.json",
-    "./node_modules/eslint-config-mattermost/.eslintrc-react.json"
-  ],
-  "settings": {
-    "react": {
-      "pragma": "React",
-      "version": "16.5"
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module",
+        "ecmaFeatures": {
+            "jsx": true,
+            "impliedStrict": true,
+            "modules": true
+        }
+    },
+    "parser": "babel-eslint",
+    "plugins": [
+        "react",
+        "mocha"
+    ],
+    "env": {
+        "browser": true,
+        "node": true,
+        "jquery": true,
+        "es6": true
+    },
+    "globals": {
+        "jest": true,
+        "describe": true,
+        "it": true,
+        "expect": true,
+        "before": true,
+        "beforeEach": true,
+        "after": true,
+        "afterEach": true
+    },
+    "rules": {
+        "array-bracket-spacing": [2, "never"],
+        "array-callback-return": 2,
+        "arrow-body-style": 0,
+        "arrow-parens": [2, "always"],
+        "arrow-spacing": [2, { "before": true, "after": true }],
+        "block-scoped-var": 2,
+        "brace-style": [2, "1tbs", { "allowSingleLine": false }],
+        "camelcase": [2, {"properties": "never"}],
+        "class-methods-use-this": 0,
+        "comma-dangle": [2, "never"],
+        "comma-spacing": [2, {"before": false, "after": true}],
+        "comma-style": [2, "last"],
+        "complexity": [1, 10],
+        "computed-property-spacing": [2, "never"],
+        "consistent-return": 2,
+        "consistent-this": [2, "self"],
+        "constructor-super": 2,
+        "curly": [2, "all"],
+        "dot-location": [2, "object"],
+        "dot-notation": 2,
+        "eqeqeq": [2, "smart"],
+        "func-call-spacing": [2, "never"],
+        "func-names": 2,
+        "func-style": [2, "declaration"],
+        "generator-star-spacing": [0, {"before": false, "after": true}],
+        "global-require": 2,
+        "guard-for-in": 2,
+        "id-blacklist": 0,
+        "indent": [2, 4, {"SwitchCase": 0}],
+        "jsx-quotes": [2, "prefer-single"],
+        "key-spacing": [2, {"beforeColon": false, "afterColon": true, "mode": "strict"}],
+        "keyword-spacing": [2, {"before": true, "after": true, "overrides": {}}],
+        "line-comment-position": 0,
+        "linebreak-style": 2,
+        "lines-around-comment": [2, { "beforeBlockComment": true, "beforeLineComment": true, "allowBlockStart": true, "allowBlockEnd": true }],
+        "max-lines": [1, {"max": 450, "skipBlankLines": true, "skipComments": false}],
+        "max-nested-callbacks": [2, {"max":2}],
+        "max-statements-per-line": [2, {"max": 1}],
+        "multiline-ternary": [1, "never"],
+        "new-cap": 2,
+        "new-parens": 2,
+        "newline-before-return": 0,
+        "newline-per-chained-call": 0,
+        "no-alert": 2,
+        "no-array-constructor": 2,
+        "no-caller": 2,
+        "no-case-declarations": 2,
+        "no-class-assign": 2,
+        "no-cond-assign": [2, "except-parens"],
+        "no-confusing-arrow": 2,
+        "no-console": 2,
+        "no-const-assign": 2,
+        "no-constant-condition": 2,
+        "no-debugger": 2,
+        "no-div-regex": 2,
+        "no-dupe-args": 2,
+        "no-dupe-class-members": 2,
+        "no-dupe-keys": 2,
+        "no-duplicate-case": 2,
+        "no-duplicate-imports": [2, {"includeExports": true}],
+        "no-else-return": 2,
+        "no-empty": 2,
+        "no-empty-function": 2,
+        "no-empty-pattern": 2,
+        "no-eval": 2,
+        "no-ex-assign": 2,
+        "no-extend-native": 2,
+        "no-extra-bind": 2,
+        "no-extra-label": 2,
+        "no-extra-parens": 0,
+        "no-extra-semi": 2,
+        "no-fallthrough": 2,
+        "no-floating-decimal": 2,
+        "no-func-assign": 2,
+        "no-global-assign": 2,
+        "no-implicit-coercion": 2,
+        "no-implicit-globals": 0,
+        "no-implied-eval": 2,
+        "no-inner-declarations": 0,
+        "no-invalid-regexp": 2,
+        "no-irregular-whitespace": 2,
+        "no-iterator": 2,
+        "no-labels": 2,
+        "no-lone-blocks": 2,
+        "no-lonely-if": 2,
+        "no-loop-func": 2,
+        "no-magic-numbers": 0,
+        "no-mixed-operators": [2, {"allowSamePrecedence": false}],
+        "no-mixed-spaces-and-tabs": 2,
+        "no-multi-spaces": [2, { "exceptions": { "Property": false } }],
+        "no-multi-str": 0,
+        "no-multiple-empty-lines": [2, {"max": 1}],
+        "no-native-reassign": 2,
+        "no-negated-condition": 2,
+        "no-nested-ternary": 2,
+        "no-new": 2,
+        "no-new-func": 2,
+        "no-new-object": 2,
+        "no-new-symbol": 2,
+        "no-new-wrappers": 2,
+        "no-octal-escape": 2,
+        "no-param-reassign": 2,
+        "no-process-env": 2,
+        "no-process-exit": 2,
+        "no-proto": 2,
+        "no-redeclare": 2,
+        "no-return-assign": [2, "always"],
+        "no-script-url": 2,
+        "no-self-assign": [2, {"props": true}],
+        "no-self-compare": 2,
+        "no-sequences": 2,
+        "no-shadow": [2, {"hoist": "functions"}],
+        "no-shadow-restricted-names": 2,
+        "no-spaced-func": 2,
+        "no-tabs": 0,
+        "no-template-curly-in-string": 2,
+        "no-ternary": 0,
+        "no-this-before-super": 2,
+        "no-throw-literal": 0,
+        "no-trailing-spaces": [2, { "skipBlankLines": false }],
+        "no-undef-init": 2,
+        "no-undefined": 2,
+        "no-underscore-dangle": 2,
+        "no-unexpected-multiline": 2,
+        "no-unmodified-loop-condition": 2,
+        "no-unneeded-ternary": [2, {"defaultAssignment": false}],
+        "no-unreachable": 2,
+        "no-unsafe-finally": 2,
+        "no-unsafe-negation": 2,
+        "no-unused-expressions": 2,
+        "no-unused-vars": [2, {"vars": "all", "args": "after-used"}],
+        "no-use-before-define": [2, {"classes": false, "functions": false, "variables": false}],
+        "no-useless-computed-key": 2,
+        "no-useless-concat": 2,
+        "no-useless-constructor": 2,
+        "no-useless-escape": 2,
+        "no-useless-rename": 2,
+        "no-var": 0,
+        "no-void": 2,
+        "no-warning-comments": 1,
+        "no-whitespace-before-property": 2,
+        "no-with": 2,
+        "object-curly-newline": 0,
+        "object-curly-spacing": [2, "never"],
+        "object-property-newline": [2, {"allowMultiplePropertiesPerLine": true}],
+        "object-shorthand": [2, "always"],
+        "one-var": [2, "never"],
+        "one-var-declaration-per-line": 0,
+        "operator-linebreak": [2, "after"],
+        "padded-blocks": [2, "never"],
+        "prefer-arrow-callback": 2,
+        "prefer-const": 2,
+        "prefer-numeric-literals": 2,
+        "prefer-reflect": 2,
+        "prefer-rest-params": 2,
+        "prefer-spread": 2,
+        "prefer-template": 0,
+        "quote-props": [2, "as-needed"],
+        "quotes": [2, "single", "avoid-escape"],
+        "radix": 2,
+        "react/display-name": [2, { "ignoreTranspilerName": false }],
+        "react/jsx-boolean-value": [2, "always"],
+        "react/jsx-closing-bracket-location": [2, { "location": "tag-aligned" }],
+        "react/jsx-curly-spacing": [2, "never"],
+        "react/jsx-equals-spacing": [2, "never"],
+        "react/jsx-filename-extension": [2, {"extensions": [".js"]}],
+        "react/jsx-first-prop-new-line": [2, "multiline"],
+        "react/jsx-handler-names": 0,
+        "react/jsx-indent": [2, 4],
+        "react/jsx-indent-props": [2, 4],
+        "react/jsx-key": 2,
+        "react/jsx-max-props-per-line": [2, { "maximum": 1 }],
+        "react/jsx-no-bind": 0,
+        "react/jsx-no-duplicate-props": [2, { "ignoreCase": false }],
+        "react/jsx-no-literals": 2,
+        "react/jsx-no-target-blank": 2,
+        "react/jsx-no-undef": 2,
+        "react/jsx-pascal-case": 2,
+        "react/jsx-tag-spacing": [2, {"closingSlash": "never", "beforeSelfClosing": "never", "afterOpening": "never"}],
+        "react/jsx-uses-react": 2,
+        "react/jsx-uses-vars": 2,
+        "react/jsx-no-comment-textnodes": 2,
+        "react/no-danger": 0,
+        "react/no-deprecated": 2,
+        "react/no-did-mount-set-state": 2,
+        "react/no-did-update-set-state": 2,
+        "react/no-direct-mutation-state": 2,
+        "react/no-is-mounted": 2,
+        "react/no-multi-comp": [2, { "ignoreStateless": true }],
+        "react/no-render-return-value": 2,
+        "react/no-set-state": 0,
+        "react/no-string-refs": 0,
+        "react/no-unknown-property": 2,
+        "react/prefer-es6-class": 2,
+        "react/prefer-stateless-function": 0,
+        "react/prop-types": 2,
+        "react/require-optimization": 1,
+        "react/require-render-return": 2,
+        "react/self-closing-comp": 2,
+        "react/sort-comp": 0,
+        "react/jsx-wrap-multilines": 2,
+        "react/no-find-dom-node": 1,
+        "react/forbid-component-props": 0,
+        "react/no-danger-with-children": 2,
+        "react/no-unused-prop-types": [1, {"skipShapeProps": true}],
+        "react/style-prop-object": 2,
+        "react/no-children-prop": 2,
+        "react/no-unescaped-entities": 2,
+        "require-yield": 2,
+        "rest-spread-spacing": [2, "never"],
+        "semi": [2, "always"],
+        "semi-spacing": [2, {"before": false, "after": true}],
+        "sort-imports": 0,
+        "sort-keys": 0,
+        "space-before-blocks": [2, "always"],
+        "space-before-function-paren": [2, {"anonymous": "never", "named": "never", "asyncArrow": "always"}],
+        "space-in-parens": [2, "never"],
+        "space-infix-ops": 2,
+        "space-unary-ops": [2, { "words": true, "nonwords": false }],
+        "symbol-description": 2,
+        "template-curly-spacing": [2, "never"],
+        "valid-typeof": [2, {"requireStringLiterals": false}],
+        "vars-on-top": 0,
+        "wrap-iife": [2, "outside"],
+        "wrap-regex": 2,
+        "yoda": [2, "never", {"exceptRange": false, "onlyEquality": false}],
+        "mocha/no-exclusive-tests": 2
    }
-  },
-  "env": {
-    "jest": true
-  },
-  "globals": {
-    "__DEV__": true
-  },
-  "rules": {
-    "global-require": 0,
-    "react/display-name": [2, { "ignoreTranspilerName": false }],
-    "react/jsx-filename-extension": [2, {"extensions": [".js"]}]
-  },
-  "overrides": [
-    {
-      "files": ["*.test.js", "*.test.jsx"],
-      "env": {
-        "jest": true
-      }
-    }
-  ]
 }
--- a/.flowconfig
+++ b/.flowconfig
@@ -1,75 +1,58 @@
 [ignore]
-; We fork some components by platform
+
+# We fork some components by platform.
 .*/*[.]android.js

-; Ignore "BUCK" generated dirs
+# Ignore templates with `@flow` in header
+.*/local-cli/generator.*
+
+# Ignore malformed json
+.*/node_modules/y18n/test/.*\.json
+
+# Ignore the website subdir
+<PROJECT_ROOT>/website/.*
+
+# Ignore BUCK generated dirs
 <PROJECT_ROOT>/\.buckd/

-; Ignore polyfills
-node_modules/react-native/Libraries/polyfills/.*
+# Ignore unexpected extra @providesModule
+.*/node_modules/commoner/test/source/widget/share.js

-; 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 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
+.*/Libraries/react-native/ReactNative.js
+.*/node_modules/jest-runtime/build/__tests__/.*

 [include]

 [libs]
 node_modules/react-native/Libraries/react-native/react-native-interface.js
-node_modules/react-native/flow/
+node_modules/react-native/flow
+flow/

 [options]
-emoji=true
+module.system=haste

-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
+esproposal.class_static_fields=enable
+esproposal.class_instance_fields=enable

-module.file_ext=.js
-module.file_ext=.json
-module.file_ext=.ios.js
+experimental.strict_type_args=true

 munge_underscores=true

-module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
-module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
+module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
+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'

 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
-suppress_type=$FlowFixMeProps
-suppress_type=$FlowFixMeState
+suppress_type=$FixMe

-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
-suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-2]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-2]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy

-[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
+unsafe.enable_getters_and_setters=true

 [version]
-^0.105.0
+^0.32.0
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,5 @@
 assets/override
 dist
-build-ios
-*.zip
-server.PID
-mattermost.keystore
-tmp/

 # OSX
 #
@@ -30,33 +25,29 @@ DerivedData
 *.apk
 *.xcuserstate
 project.xcworkspace
-ios/Pods
-.podinstall

-# Android/IntelliJ
+# Android/IJ
 #
+*.iml
 .idea
 .gradle
 local.properties
-*.iml
-android/app/bin
-.settings
-.project
-.classpath

 # node.js
 #
 node_modules/
 npm-debug.log
 .npminstall
-yarn-error.log
+
+# yarn
+#
 .yarninstall

 # BUCK
 buck-out/
 \.buckd/
 android/app/libs
-*.keystore
+android/keystores/debug.keystore

 # Vim
 [._]*.s[a-w][a-z]
@@ -67,29 +58,13 @@ Session.vim
 *~
 tags

-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/
-
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
-fastlane/.env
 fastlane/report.xml
+*.zip
+server.PID
+mattermost.keystore

 # Sentry
 android/sentry.properties
-ios/sentry.properties

 # Testing
 .nyc_output
-coverage
-
-# Bundle artifact
-*.jsbundle
-
-#editor-settings
-.vscode
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,36 @@
 # Code Contribution Guidelines

-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.
+Please see the [Mattermost Contribution Guide](http://docs.mattermost.com/developer/contribution-guide.html) which describes the process for making code contributions across Mattermost projects. 
+
+Note: Community work won't start until October 31, and no community pull requests will be accepted before then.
+
+### 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. 

-When you submit a pull request, it goes through a [code review process outlined here](https://developers.mattermost.com/contribute/getting-started/code-review/).
--- a/14
+++ b/14
@@ -1,14 +0,0 @@
-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'
-            }
-        }
-    }
-}
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright 2015-present Mattermost, Inc. 
+Copyright 2016 Mattermost, Inc. 

                                 Apache License
                           Version 2.0, January 2004
--- a/333
+++ b/333
@@ -1,254 +1,163 @@
-.PHONY: pre-run pre-build clean
-.PHONY: check-style
-.PHONY: i18n-extract-ci
-.PHONY: start stop
-.PHONY: run run-ios run-android
-.PHONY: build build-ios build-android unsigned-ios unsigned-android ios-sim-x86_64
-.PHONY: build-pr can-build-pr prepare-pr
-.PHONY: test help
+.PHONY: run run-ios run-android check-style test clean post-install start stop
+.PHONY: check-ios-target build-ios
+.PHONY: check-android-target prepare-android-build build-android
+.PHONY: start-packager stop-packager
+
+ios_target := $(filter-out build-ios,$(MAKECMDGOALS))
+android_target := $(filter-out build-android,$(MAKECMDGOALS))
+
+.yarninstall: package.json
+	@if ! [ $(shell command -v yarn 2> /dev/null) ]; then \
+		echo "yarn is not installed https://yarnpkg.com"; \
+		exit 1; \
+	fi
+
+	@echo Getting dependencies using yarn
+
+	yarn install --pure-lockfile
+
+	touch $@

-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
+
+	mkdir -p dist

 	@if [ -e dist/assets ] ; then \
 		rm -rf dist/assets; \
 	fi

-	@echo "Generating app assets"
-	@node scripts/make-dist-assets.js
+	node scripts/make-dist-assets.js

-pre-run: | node_modules .podinstall dist/assets ## Installs dependencies and assets
+pre-run: .yarninstall dist/assets

-pre-build: | npm-ci .podinstall dist/assets ## Install dependencies and assets before building
+run: run-ios

-check-style: node_modules ## Runs eslint
-	@echo Checking for style guide compliance
-	@npm run check
+start: | pre-run start-packager

-clean: ## Cleans dependencies, previous builds and temp files
-	@echo Cleaning started
+stop: stop-packager

-	@rm -f .podinstall
-	@rm -rf ios/Pods
-	@rm -rf node_modules
-	@rm -rf dist
-	@rm -rf ios/build
-	@rm -rf android/app/build
-
-	@echo Cleanup finished
-
-post-install:
-	@./node_modules/.bin/patch-package
-	@./node_modules/.bin/jetify
-
-	@rm -f node_modules/intl/.babelrc
-	@# Hack to get react-intl and its dependencies to work with react-native
-	@# Based off of https://github.com/este/este/blob/master/gulp/native-fix.js
-	@sed -i'' -e 's|"./locale-data/index.js": false|"./locale-data/index.js": "./locale-data/index.js"|g' node_modules/react-intl/package.json
-	@sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-messageformat/package.json
-	@sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-relativeformat/package.json
-	@sed -i'' -e 's|"./locale-data/complete.js": false|"./locale-data/complete.js": "./locale-data/complete.js"|g' node_modules/intl/package.json
-
-start: | pre-run ## Starts the React Native packager server
-	$(call start_packager)
-
-stop: ## Stops the React Native packager server
-	$(call stop_packager)
-
-check-device-ios:
-	@if ! [ $(shell which xcodebuild) ]; then \
+run-ios: | start
+	@if ! [ $(shell command -v xcodebuild) ]; then \
 		echo "xcode is not installed"; \
 		exit 1; \
 	fi
-	@if ! [ $(shell which watchman) ]; then \
+	@if ! [ $(shell command -v watchman) ]; then \
 		echo "watchman is not installed"; \
 		exit 1; \
 	fi

-check-device-android:
+	@echo Running iOS app in development
+
+	npm run run-ios
+	open -a Simulator
+
+run-android: | start prepare-android-build
 	@if ! [ $(ANDROID_HOME) ]; then \
 		echo "ANDROID_HOME is not set"; \
 		exit 1; \
 	fi
-	@if ! [ $(shell which adb 2> /dev/null) ]; then \
+	@if ! [ $(shell command -v 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 \
+    ifneq ($(shell adb get-state),device)
+		echo "no android device or emulator is running"
+		exit 1;
+    endif
+	@if ! [ $(shell command -v watchman 2> /dev/null) ]; then \
 		echo "watchman is not installed"; \
 		exit 1; \
 	fi

+	@echo Running Android app in development
+
+	npm run run-android
+
+test: pre-run
+	npm test
+
+check-style: .yarninstall
+	@echo Checking for style guide compliance
+
+	npm run check
+
+clean:
+	@echo Cleaning app
+
+	yarn cache clean
+	rm -rf node_modules
+	rm -f .yarninstall
+	rm -rf dist
+	rm -rf ios/build
+	rm -rf android/app/build
+
+post-install:
+	./node_modules/.bin/remotedev-debugger --hostname localhost --port 5678 --injectserver
+	@# Must remove the .babelrc for 0.42.0 to work correctly
+	rm -f node_modules/intl/.babelrc
+	@# Hack to get react-intl and its dependencies to work with react-native
+	@# Based off of https://github.com/este/este/blob/master/gulp/native-fix.js
+	sed -i'' -e 's|"./locale-data/index.js": false|"./locale-data/index.js": "./locale-data/index.js"|g' node_modules/react-intl/package.json
+	sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-messageformat/package.json
+	sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-relativeformat/package.json
+	sed -i'' -e 's|"./locale-data/complete.js": false|"./locale-data/complete.js": "./locale-data/complete.js"|g' node_modules/intl/package.json
+
+start-packager:
+	@if [ $(shell ps -e | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
+		echo Starting React Native packager server; \
+		node ./node_modules/react-native/local-cli/cli.js start --reset-cache & echo $$! > server.PID; \
+	else \
+		echo React Native packager server already running; \
+		ps -e | grep -i "cli.js start" | grep -v grep | awk '{print $$1}' > server.PID; \
+	fi
+
+stop-packager:
+	@echo Stopping React Native packager server
+	@if [ -e "server.PID" ] ; then \
+		kill -9 `cat server.PID` && rm server.PID; \
+	fi
+
+check-ios-target:
+ifneq ($(ios_target), $(filter $(ios_target), dev beta release))
+	@echo "Try running make build-ios TARGET\nWhere TARGET is one of dev, beta or release"
+	@exit 1
+endif
+
+do-build-ios:
+	@echo "Building ios $(ios_target) app"
+	@cd fastlane && NODE_ENV=production bundle exec fastlane ios $(ios_target)
+
+
+build-ios: | check-ios-target pre-run check-style start-packager do-build-ios stop-packager
+
+check-android-target:
+ifneq ($(android_target), $(filter $(android_target), dev alpha release))
+	@echo "Try running make build-android TARGET\nWhere TARGET is one of dev, beta or release"
+	@exit 1
+endif
+
 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/
+	@cd android && ./gradlew clean

-run: run-ios ## alias for run-ios
+do-build-android:
+	@echo "Building android $(android_target) app"
+	@cd fastlane && NODE_ENV=production bundle exec fastlane android $(android_target)

-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
+build-android: | check-android-target pre-run check-style start-packager prepare-android-build do-build-android stop-packager

-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
+alpha:
+	@:

-build: | stop pre-build check-style i18n-extract-ci ## Builds the app for Android & iOS
-	$(call start_packager)
-	@echo "Building App"
-	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane build
-	$(call stop_packager)
+dev:
+	@:

+beta:
+	@:

-build-ios: | stop pre-build check-style i18n-extract-ci ## Builds the iOS app
-	$(call start_packager)
-	@echo "Building iOS app"
-	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane ios build
-	$(call stop_packager)
-
-build-android: | stop pre-build check-style i18n-extract-ci prepare-android-build ## Build the Android app
-	$(call start_packager)
-	@echo "Building Android app"
-	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane android build
-	$(call stop_packager)
-
-unsigned-ios: stop pre-build check-style ## Build an unsigned version of the iOS app
-	$(call start_packager)
-	@cd fastlane && NODE_ENV=production bundle exec fastlane ios unsigned
-	$(call stop_packager)
-
-ios-sim-x86_64: stop pre-build check-style ## Build an unsigned x86_64 version of the iOS app for iPhone simulator
-	$(call start_packager)
-	@echo "Building unsigned x86_64 iOS app for iPhone simulator"
-	@cd fastlane && NODE_ENV=production bundle exec fastlane ios unsigned
-	@mkdir -p build-ios
-	@cd ios/ && xcodebuild -workspace Mattermost.xcworkspace/ -scheme Mattermost -arch x86_64 -sdk iphonesimulator -configuration Release -parallelizeTargets -resultBundlePath ../build-ios/result -derivedDataPath ../build-ios/ ENABLE_BITCODE=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ENABLE_BITCODE=NO
-	@cd build-ios/Build/Products/Release-iphonesimulator/ && zip -r Mattermost-simulator-x86_64.app.zip Mattermost.app/
-	@mv build-ios/Build/Products/Release-iphonesimulator/Mattermost-simulator-x86_64.app.zip .
-	@rm -rf build-ios/
-	@cd fastlane && bundle exec fastlane upload_file_to_s3 file:Mattermost-simulator-x86_64.app.zip os_type:iOS
-	$(call stop_packager)
-
-unsigned-android: stop pre-build check-style prepare-android-build ## Build an unsigned version of the Android app
-	@cd fastlane && NODE_ENV=production bundle exec fastlane android unsigned
-
-test: | pre-run check-style ## Runs tests
-	@npm test
-
-build-pr: | can-build-pr stop pre-build check-style i18n-extract-ci ## Build a PR from the mattermost-mobile repo
-	$(call start_packager)
-	@echo "Building App from PR ${PR_ID}"
-	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane build_pr pr:PR-${PR_ID}
-	$(call stop_packager)
-
-can-build-pr:
-	@if [ -z ${PR_ID} ]; then \
-		echo a PR number needs to be specified; \
-		exit 1; \
-	fi
-
-i18n-extract: ## Extract strings for translation from the source code
-	npm run mmjstool -- i18n extract-mobile
-
-i18n-extract-ci:
-	mkdir -p tmp
-	cp assets/base/i18n/en.json tmp/en.json
-	mkdir -p tmp/fake-webapp-dir/i18n/
-	echo '{}' > tmp/fake-webapp-dir/i18n/en.json
-	npm run mmjstool -- i18n extract-mobile --webapp-dir tmp/fake-webapp-dir --mobile-dir .
-	diff tmp/en.json assets/base/i18n/en.json
-	rm -rf tmp
-
-## Help documentation https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
-help:
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
-define start_packager
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
-		echo Starting React Native packager server; \
-		npm start & echo; \
-	else \
-		echo React Native packager server already running; \
-	fi
-endef
-
-define stop_packager
-	@echo Stopping React Native packager server
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 1 ]; then \
-		ps -ef | grep -i "cli.js start" | grep -iv grep | awk '{print $$2}' | xargs kill -9; \
-		echo React Native packager server stopped; \
-	else \
-		echo No React Native packager server running; \
-	fi
-endef
+release:
+	@:
--- a/NOTICE.txt
+++ b/NOTICE.txt
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,37 +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](http://docs.mattermost.com/developer/contribution-guide.html#preparing-a-pull-request) section of our [code contribution guidelines](http://docs.mattermost.com/developer/contribution-guide.html).

-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).]
--- a/README.md
+++ b/README.md
@@ -1,17 +1,13 @@
 # Mattermost Mobile

- **Supported Server versions:** 4.10+
- **Supported iOS versions:** 10.3+
- **Supported Android versions:** 7.0+
+**Supported Server Versions:** 4.0+

-Mattermost is an open source Slack-alternative used by thousands of companies around the world in 14 languages. Learn more at [https://about.mattermost.com](https://about.mattermost.com).
+Mattermost is an open source Slack-alternative used by thousands of companies around the world in 11 languages. Learn more at https://mattermost.com.

-You can download our apps from the [App Store](https://about.mattermost.com/mattermost-ios-app/) or [Google Play Store](https://about.mattermost.com/mattermost-android-app/), or [build them yourself](https://developers.mattermost.com/contribute/mobile/build-your-own/). 
+You can download our apps from the [App Store](https://about.mattermost.com/mattermost-ios-app/) or [Google Play Store](https://about.mattermost.com/mattermost-android-app/), or package them yourself. 

 We plan on releasing monthly updates with new features - check the [changelog](https://github.com/mattermost/mattermost-mobile/blob/master/CHANGELOG.md) for what features are currently supported! 

-**Important:** If you self-compile the Mattermost Mobile apps you also need to deploy your own [Mattermost Push Notification Service](https://github.com/mattermost/mattermost-push-proxy/releases). 
-
 # How to Contribute

 ### Testing
@@ -19,29 +15,102 @@ We plan on releasing monthly updates with new features - check the [changelog](h
 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)
-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.
+  - [Android](https://play.google.com/apps/testing/com.mattermost.rnbeta)
+  - [iOS](https://mattermost-fastlane.herokuapp.com/)
+2. Install the `Mattermost Beta` app
 3. File any bugs you find by filing a [GitHub issue](https://github.com/mattermost/mattermost-mobile/issues) with:
-   - Device information
-   - Repro steps
-   - Observed behavior (including screenshot / video when possible)
-   - Expected behavior
+  - Device information
+  - Repro steps
+  - Observed behavior (including screenshot / video when possible)
+  - 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**.
+  - 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

 ### 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-mobile/issues) 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
+3. Follow [these instructions](https://docs.mattermost.com/developer/mobile-developer-setup.html) 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

+# Installing Dependencies

+Follow the [React Native Getting Started Guide](https://facebook.github.io/react-native/docs/getting-started.html) for detailed instructions on setting up your local machine for development.
+
+# Detailed configuration:
+
+## Mac
+
+- General requirements
+
+    - XCode 8.3
+    - Install required packages using homebrew:
+      ```bash
+      $ brew install watchman
+      $ brew install yarn
+      ```
+	  
+- Clone repository and configure:
+    ```bash
+    $ git clone git@github.com:mattermost/mattermost-mobile.git
+    $ cd mattermost-mobile
+    $ npm install
+    $ npm install -g react-native-cli
+    ```
+
+- Run application
+    ```bash
+    $ make run
+    ```
+
+- Stop the packager server
+    ```bash
+    $ make stop
+    ```
+## Linux:
+
+- General requiriments:
+
+  - JDK 7 or greater
+  - Android SDK
+  - Virtualbox
+  - An Android emulator: Genymotion or Android emulator. If using genymotion ensure that it uses existing adb tools (Settings: "Use custom Android SDK Tools")
+  - Install watchman (do this globally):
+      ```bash
+      $ git clone https://github.com/facebook/watchman.git
+      $ cd watchman
+      $ git checkout master
+      $ ./autogen.sh
+      $ ./configure make
+      $ sudo make install
+      ```
+      Configure your kernel to accept a lot of file watches, using a command like:
+      ```bash
+      $ sudo sysctl -w fs.inotify.max_user_watches=1048576
+      ```
+
+- Clone repository and configure:
+    ```bash
+    $ git clone git@github.com:mattermost/mattermost-mobile.git
+    $ cd mattermost-mobile
+    $ npm install
+    $ npm install -g react-native-cli
+    ```
+
+  - You can create a file named `assets/override/config.json` and add the url to the Mattermost server that you will use to develop:
+    `{
+       "DefaultServerUrl": "https://pre-release.mattermost.com"
+    }`
+
+    To use a local Mattermost server you will need to configure the "DefaultServerUrl" depending on the emulator you will use:
+      * IOs:        "DefaultServerUrl": "http://localhost:8065"
+      * Android:    "DefaultServerUrl": "http://10.0.2.2:3000"
+      * Genymotion: "DefaultServerUrl": "http://10.0.3.2:8065"
+
+- Run application
+  - Start emulator
+  - Start react packager: `$ react-native start`
+  - Run in emulator: `$ react-native run-android`

 # Frequently Asked Questions

@@ -49,13 +118,13 @@ You can leave the Beta testing program at any time:

 App data is wiped from the device when a user logs out of the app. If the user is logged in when the account is deactivated, then within one minute the system logs the user out, and as a result all app data is wiped from the device.

-### Can I connect to multiple Mattermost servers using the mobile apps?
+### Can I connect to multiple Mattermost servers using the mobile apps?**

 At the moment, we only support connecting to one server at a time. If you need to connect to multiple servers, please [upvote the feature request](https://mattermost.uservoice.com/forums/306457/suggestions/10975938) so we can track demand for it. 

 As a work around, you can install both the released "Mattermost" app and sign up to be a [tester](#testing) for the "Mattermost Beta" app so you can connect to two servers at once.

-### Will there be second generation apps available for tablets?
+### Will there be second generation apps available for tablets?**

 We plan to add support for tablets in the future, but the timeline depends on how many people have a need for it. If you're looking for a tablet version, please help us out by [upvoting the feature request](https://mattermost.uservoice.com/forums/306457/suggestions/20082079)!

--- a/android/app/BUCK
+++ b/android/app/BUCK
@@ -1,3 +1,5 @@
+import re
+
 # To learn about Buck see [Docs](https://buckbuild.com/).
 # To run your application with Buck:
 # - install Buck
@@ -9,9 +11,8 @@
 #

 lib_deps = []
-
 for jarfile in glob(['libs/*.jar']):
-  name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
+  name = 'jars__' + re.sub(r'^.*/([^/]+)\.jar$', r'\1', jarfile)
  lib_deps.append(':' + name)
  prebuilt_jar(
    name = name,
@@ -19,7 +20,7 @@ for jarfile in glob(['libs/*.jar']):
  )

 for aarfile in glob(['libs/*.aar']):
-  name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
+  name = 'aars__' + re.sub(r'^.*/([^/]+)\.aar$', r'\1', aarfile)
  lib_deps.append(':' + name)
  android_prebuilt_aar(
    name = name,
@@ -27,39 +28,39 @@ for aarfile in glob(['libs/*.aar']):
  )

 android_library(
-    name = "all-libs",
-    exported_deps = lib_deps,
+  name = 'all-libs',
+  exported_deps = lib_deps
 )

 android_library(
-    name = "app-code",
-    srcs = glob([
-        "src/main/java/**/*.java",
-    ]),
-    deps = [
-        ":all-libs",
-        ":build_config",
-        ":res",
-    ],
+  name = 'app-code',
+  srcs = glob([
+    'src/main/java/**/*.java',
+  ]),
+  deps = [
+    ':all-libs',
+    ':build_config',
+    ':res',
+  ],
 )

 android_build_config(
-    name = "build_config",
-    package = "com.mattermost.rnbeta",
+  name = 'build_config',
+  package = 'com.mattermost.rnbeta',
 )

 android_resource(
-    name = "res",
-    package = "com.mattermost.rnbeta",
-    res = "src/main/res",
+  name = 'res',
+  res = 'src/main/res',
+  package = 'com.mattermost.rnbeta',
 )

 android_binary(
-    name = "app",
-    keystore = "//android/keystores:debug",
-    manifest = "src/main/AndroidManifest.xml",
-    package_type = "debug",
-    deps = [
-        ":app-code",
-    ],
+  name = 'app',
+  package_type = 'debug',
+  manifest = 'src/main/AndroidManifest.xml',
+  keystore = '//android/keystores:debug',
+  deps = [
+    ':app-code',
+  ],
 )
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -33,13 +33,6 @@ import com.android.build.OutputFile
 *   // bundleInPaidRelease: true,
 *   // bundleInBeta: true,
 *
- *   // whether to disable dev mode in custom build variants (by default only disabled in release)
- *   // for example: to disable dev mode in the staging build type (if configured)
- *   devDisabledInStaging: true,
- *   // The configuration property can be in the following formats
- *   //         'devDisabledIn${productFlavor}${buildType}'
- *   //         'devDisabledIn${buildType}'
- *
 *   // the root of your project, i.e. where "package.json" lives
 *   root: "../../",
 *
@@ -65,31 +58,16 @@ import com.android.build.OutputFile
 *   inputExcludes: ["android/**", "ios/**"],
 *
 *   // override which node gets called and with what additional arguments
- *   nodeExecutableAndArgs: ["node"],
+ *   nodeExecutableAndArgs: ["node"]
 *
 *   // supply additional arguments to the packager
 *   extraPackagerArgs: []
 * ]
 */

-project.ext.react = [
-    entryFile: "index.js",
-    bundleConfig: "metro.config.js",
-    enableHermes: false,
-]
-
 apply from: "../../node_modules/react-native/react.gradle"
 apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"

-if (System.getenv("SENTRY_ENABLED") == "true") {
-    project.ext.sentryCli = [
-        logLevel: "error",
-        flavorAware: false
-    ]
-
-    apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
-}
-
 /**
 * Set this to true to create two separate APKs instead of one:
 *   - An APK that only works on ARM devices
@@ -105,46 +83,19 @@ def enableSeparateBuildPerCPUArchitecture = false
 */
 def enableProguardInReleaseBuilds = false

-/**
- * The preferred build flavor of JavaScriptCore.
- *
- * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
- *
- * The international variant includes ICU i18n library and necessary data
- * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
- * give correct results when using with locales other than en-US.  Note that
- * this variant is about 6MiB larger per architecture than default.
- */
-def jscFlavor = 'org.webkit:android-jsc-intl:r241213'
-
-/**
- * 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
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"

    defaultConfig {
        applicationId "com.mattermost.rnbeta"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        missingDimensionStrategy "RNN.reactNativeVersion", "reactNative60"
-        versionCode 256
-        versionName "1.26.1"
-        multiDexEnabled = true
+        minSdkVersion 16
+        targetSdkVersion 23
+        versionCode 49
+        versionName "1.2.0"
+        multiDexEnabled true
        ndk {
-            abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
+            abiFilters "armeabi-v7a", "x86"
        }

    }
@@ -163,7 +114,7 @@ android {
            reset()
            enable enableSeparateBuildPerCPUArchitecture
            universalApk false  // If true, also generate a universal APK
-            include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+            include "armeabi-v7a", "x86"
        }
    }
    buildTypes {
@@ -176,18 +127,13 @@ android {
            minifyEnabled enableProguardInReleaseBuilds
            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
        }
-        unsigned.initWith(buildTypes.release)
-        unsigned {
-            signingConfig null
-            matchingFallbacks = ['release']
-        }
    }
    // applicationVariants are e.g. debug, release
    applicationVariants.all { variant ->
        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 =
@@ -195,86 +141,27 @@ android {
            }
        }
    }
-
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
-    }
-}
-
-repositories {
-    maven {
-        url 'https://maven.google.com'
-    }
-}
-
-configurations.all {
-    resolutionStrategy {
-        eachDependency { DependencyResolveDetails details ->
-            if (details.requested.name == 'play-services-base') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
-            }
-            if (details.requested.name == 'play-services-tasks') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
-            }
-            if (details.requested.name == 'play-services-stats') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
-            }
-            if (details.requested.name == 'play-services-basement') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
-            }
-        }
-    }
 }

 dependencies {
-    if (enableHermes) {
-        def hermesPath = "../../node_modules/hermes-engine/android/";
-        debugImplementation files(hermesPath + "hermes-debug.aar")
-        releaseImplementation files(hermesPath + "hermes-release.aar")
-    } else {
-        implementation jscFlavor
+    compile fileTree(dir: "libs", include: ["*.jar"])
+    compile "com.android.support:appcompat-v7:25.0.1"
+    compile "com.facebook.react:react-native:+"  // From node_modules
+    compile project(':react-native-navigation')
+    compile project(':react-native-image-picker')
+    compile project(':react-native-orientation')
+    compile project(':react-native-bottom-sheet')
+    compile ('com.google.android.gms:play-services-gcm:9.4.0') {
+        force = true;
    }
-
-    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation "com.google.firebase:firebase-messaging:17.3.0"
-    implementation project(':react-native-document-picker')
-    implementation project(':react-native-keychain')
-    implementation project(':react-native-doc-viewer')
-    implementation project(':react-native-video')
-    implementation project(':react-native-navigation')
-    implementation project(':react-native-image-picker')
-    implementation project(':react-native-device-info')
-    implementation project(':reactnativenotifications')
-    implementation project(':react-native-cookies')
-    implementation project(':react-native-linear-gradient')
-    implementation project(':react-native-vector-icons')
-    implementation project(':react-native-svg')
-    implementation project(':react-native-local-auth')
-    implementation project(':jail-monkey')
-    implementation project(':react-native-youtube')
-    implementation project(':react-native-exception-handler')
-    implementation project(':rn-fetch-blob')
-    implementation project(':react-native-webview')
-    implementation project(':react-native-gesture-handler')
-    implementation project(':@react-native-community_async-storage')
-    implementation project(':@react-native-community_netinfo')
-    implementation project(':@sentry_react-native')
-    implementation project(':react-native-android-open-settings')
-    implementation project(':react-native-haptic-feedback')
-
-    implementation project(':react-native-fast-image')
-    // For animated GIF support
-    implementation 'com.facebook.fresco:fresco:2.0.0'
-    implementation 'com.facebook.fresco:animated-gif:2.0.0'
-    // For WebP support, including animated WebP
-    implementation 'com.facebook.fresco:animated-webp:2.0.0'
-    implementation  'com.facebook.fresco:webpsupport:2.0.0'
+    compile project(':react-native-device-info')
+    compile project(':reactnativenotifications')
+    compile project(':react-native-cookies')
+    compile project(':react-native-linear-gradient')
+    compile project(':react-native-vector-icons')
+    compile project(':react-native-svg')
+    compile project(':react-native-local-auth')
+    compile project(':jail-monkey')
 }

 // Run this once to be able to run the application with BUCK
@@ -283,5 +170,3 @@ task copyDownloadableDepsToLibs(type: Copy) {
    from configurations.compile
    into 'libs'
 }
-
-apply plugin: 'com.google.gms.google-services'
--- a/android/app/google-services.json
+++ b/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"
-}
+}
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@@ -8,3 +8,59 @@
 #   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 *;
+#}
+
+# Disabling obfuscation is useful if you collect stack traces from production crashes
+# (unless you are using a system that supports de-obfuscate the stack traces).
+-dontobfuscate
+
+# React Native
+
+# Keep our interfaces so they can be used by other ProGuard rules.
+# See http://sourceforge.net/p/proguard/bugs/466/
+-keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
+-keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
+-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
+
+# Do not strip any method/class that is annotated with @DoNotStrip
+-keep @com.facebook.proguard.annotations.DoNotStrip class *
+-keep @com.facebook.common.internal.DoNotStrip class *
+-keepclassmembers class * {
+    @com.facebook.proguard.annotations.DoNotStrip *;
+    @com.facebook.common.internal.DoNotStrip *;
+}
+
+-keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
+  void set*(***);
+  *** get*();
+}
+
+-keep class * extends com.facebook.react.bridge.JavaScriptModule { *; }
+-keep class * extends com.facebook.react.bridge.NativeModule { *; }
+-keepclassmembers,includedescriptorclasses class * { native <methods>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.UIProp <fields>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactProp <methods>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
+
+-dontwarn com.facebook.react.**
+
+# okhttp
+
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+
+# okio
+
+-keep class sun.misc.Unsafe { *; }
+-dontwarn java.nio.file.*
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn okio.**
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/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>
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,68 +1,51 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mattermost.rnbeta">
+    package="com.mattermost.rnbeta"
+    android:versionCode="1"
+    android:versionName="1.0">

    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <permission
+            android:name="${applicationId}.permission.C2D_MESSAGE"
+            android:protectionLevel="signature" />
+    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
    <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"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+    <uses-permission android:name="com.google.android.c2dm.permission.SEND" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="22" />
+
    <application
      android:name=".MainApplication"
-      android:allowBackup="false"
+      android:allowBackup="true"
      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"
    >
-        <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
        <meta-data android:name="android.content.APP_RESTRICTIONS"
                   android:resource="@xml/app_restrictions" />

-        <meta-data android:name="com.wix.reactnativenotifications.gcmSenderId" android:value="184930218130\"/>
+        <meta-data android:name="com.wix.reactnativenotifications.gcmSenderId" android:value="184930218130\0"/>
      <activity
        android:name=".MainActivity"
        android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
        android:windowSoftInputMode="adjustResize"
-        android:launchMode="singleInstance">
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+      >
        <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>
      </activity>
      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-      <service android:name=".NotificationDismissService"
-                android:enabled="true"
-                android:exported="false" />
-      <receiver android:name=".NotificationReplyBroadcastReceiver"
-               android:enabled="true"
-               android:exported="false" />
-        <activity
-                android:name="com.reactnativenavigation.controllers.NavigationActivity"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-                android:resizeableActivity="true"/>
-        <activity
-                android:name="com.mattermost.share.ShareActivity"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-                android:label="@string/app_name"
-                android:screenOrientation="portrait"
-                android:theme="@style/AppTheme"
-                android:taskAffinity="com.mattermost.share">
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <!-- for sharing-->
-                <data android:mimeType="*/*" />
-            </intent-filter>
-        </activity>
+      <receiver android:name=".NotificationDismissReceiver" />
    </application>

 </manifest>
--- a/android/app/src/main/assets/fonts/AntDesign.ttf
+++ b/android/app/src/main/assets/fonts/AntDesign.ttf
--- a/android/app/src/main/assets/fonts/EvilIcons.ttf
+++ b/android/app/src/main/assets/fonts/EvilIcons.ttf
--- a/android/app/src/main/assets/fonts/Feather.ttf
+++ b/android/app/src/main/assets/fonts/Feather.ttf
--- a/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf
+++ b/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf
--- a/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf
+++ b/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf
--- a/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf
+++ b/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf
--- a/android/app/src/main/assets/fonts/Ionicons.ttf
+++ b/android/app/src/main/assets/fonts/Ionicons.ttf
--- a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
+++ b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
--- a/android/app/src/main/assets/fonts/Mattermost-Regular.otf
+++ b/android/app/src/main/assets/fonts/Mattermost-Regular.otf
--- a/android/app/src/main/assets/fonts/Octicons.ttf
+++ b/android/app/src/main/assets/fonts/Octicons.ttf
--- a/android/app/src/main/assets/fonts/Roboto-Black.ttf
+++ b/android/app/src/main/assets/fonts/Roboto-Black.ttf
--- a/android/app/src/main/assets/fonts/Roboto-BlackItalic.ttf
+++ b/android/app/src/main/assets/fonts/Roboto-BlackItalic.ttf
--- a/android/app/src/main/assets/fonts/Roboto-Bold.ttf
+++ b/android/app/src/main/assets/fonts/Roboto-Bold.ttf
--- a/android/app/src/main/assets/fonts/Roboto-BoldItalic.ttf
+++ b/android/app/src/main/assets/fonts/Roboto-BoldItalic.ttf
--- a/android/app/src/main/assets/fonts/Roboto-Italic.ttf
+++ b/android/app/src/main/assets/fonts/Roboto-Italic.ttf
--- a/android/app/src/main/assets/fonts/Roboto-Light.ttf
+++ b/android/app/src/main/assets/fonts/Roboto-Light.ttf
--- a/android/app/src/main/assets/fonts/Roboto-LightItalic.ttf
+++ b/android/app/src/main/assets/fonts/Roboto-LightItalic.ttf
--- a/android/app/src/main/assets/fonts/Roboto-Medium.ttf
+++ b/android/app/src/main/assets/fonts/Roboto-Medium.ttf
--- a/android/app/src/main/assets/fonts/Roboto-MediumItalic.ttf
+++ b/android/app/src/main/assets/fonts/Roboto-MediumItalic.ttf
--- a/android/app/src/main/assets/fonts/Roboto-Regular.ttf
+++ b/android/app/src/main/assets/fonts/Roboto-Regular.ttf
--- a/android/app/src/main/assets/fonts/Roboto-Thin.ttf
+++ b/android/app/src/main/assets/fonts/Roboto-Thin.ttf
--- a/android/app/src/main/assets/fonts/Roboto-ThinItalic.ttf
+++ b/android/app/src/main/assets/fonts/Roboto-ThinItalic.ttf
--- a/android/app/src/main/java/com/mattermost/react_native_interface/AsyncStorageHelper.java
+++ b/android/app/src/main/java/com/mattermost/react_native_interface/AsyncStorageHelper.java
@@ -1,93 +0,0 @@
-package com.mattermost.react_native_interface;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.text.TextUtils;
-
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.modules.storage.ReactDatabaseSupplier;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-
-/**
- * AsyncStorageHelper: Class that accesses React Native AsyncStorage Database synchronously
- */
-public class AsyncStorageHelper {
-
-    // Static variables from: com.facebook.react.modules.storage.ReactDatabaseSupplier
-    static final String TABLE_CATALYST = "catalystLocalStorage";
-    static final String KEY_COLUMN = "key";
-    static final String VALUE_COLUMN = "value";
-
-
-    private static final int MAX_SQL_KEYS = 999;
-
-    Context mReactContext = null;
-
-    public AsyncStorageHelper(Context mReactContext) {
-        this.mReactContext = mReactContext;
-    }
-
-    public HashMap<String, String> multiGet(ReadableArray keys) {
-        HashMap<String, String> results = new HashMap<>(keys.size());
-
-        HashSet<String> keysRemaining = new HashSet<>();
-        String[] columns = {KEY_COLUMN, VALUE_COLUMN};
-        ReactDatabaseSupplier reactDatabaseSupplier = ReactDatabaseSupplier.getInstance(this.mReactContext);
-        for (int keyStart = 0; keyStart < keys.size(); keyStart += MAX_SQL_KEYS) {
-            int keyCount = Math.min(keys.size() - keyStart, MAX_SQL_KEYS);
-            Cursor cursor = reactDatabaseSupplier.get().query(
-                    TABLE_CATALYST,
-                    columns,
-                    buildKeySelection(keyCount),
-                    buildKeySelectionArgs(keys, keyStart, keyCount),
-                    null,
-                    null,
-                    null);
-            keysRemaining.clear();
-
-            try {
-                if (cursor.getCount() != keys.size()) {
-                    // some keys have not been found - insert them with null into the final array
-                    for (int keyIndex = keyStart; keyIndex < keyStart + keyCount; keyIndex++) {
-                        keysRemaining.add(keys.getString(keyIndex));
-                    }
-                }
-
-                if (cursor.moveToFirst()) {
-                    do {
-                        results.put(cursor.getString(0), cursor.getString(1));
-                        keysRemaining.remove(cursor.getString(0));
-                    } while (cursor.moveToNext());
-                }
-            } catch (Exception e) {
-                return new HashMap<>(1);
-            } finally {
-                cursor.close();
-            }
-
-            for (String key : keysRemaining) {
-                results.put(key, null);
-            }
-            keysRemaining.clear();
-        }
-
-        return results;
-    }
-
-    private static String buildKeySelection(int selectionCount) {
-        String[] list = new String[selectionCount];
-        Arrays.fill(list, "?");
-        return KEY_COLUMN + " IN (" + TextUtils.join(", ", list) + ")";
-    }
-
-    private static String[] buildKeySelectionArgs(ReadableArray keys, int start, int count) {
-        String[] selectionArgs = new String[count];
-        for (int keyIndex = 0; keyIndex < count; keyIndex++) {
-            selectionArgs[keyIndex] = keys.getString(start + keyIndex);
-        }
-        return selectionArgs;
-    }
-}
--- a/android/app/src/main/java/com/mattermost/react_native_interface/KeysReadableArray.java
+++ b/android/app/src/main/java/com/mattermost/react_native_interface/KeysReadableArray.java
@@ -1,68 +0,0 @@
-package com.mattermost.react_native_interface;
-
-import com.facebook.react.bridge.Dynamic;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableType;
-
-import java.util.ArrayList;
-
-/**
- * KeysReadableArray: Helper class that abstracts boilerplate
- */
-public class KeysReadableArray implements ReadableArray {
-    @Override
-    public int size() {
-        return 0;
-    }
-
-    @Override
-    public boolean isNull(int index) {
-        return false;
-    }
-
-    @Override
-    public boolean getBoolean(int index) {
-        return false;
-    }
-
-    @Override
-    public double getDouble(int index) {
-        return 0;
-    }
-
-    @Override
-    public int getInt(int index) {
-        return 0;
-    }
-
-    @Override
-    public String getString(int index) {
-        return null;
-    }
-
-    @Override
-    public ReadableArray getArray(int index) {
-        return null;
-    }
-
-    @Override
-    public ReadableMap getMap(int index) {
-        return null;
-    }
-
-    @Override
-    public Dynamic getDynamic(int index) {
-        return null;
-    }
-
-    @Override
-    public ReadableType getType(int index) {
-        return null;
-    }
-
-    @Override
-    public ArrayList<Object> toArrayList() {
-        return null;
-    }
-}
--- a/android/app/src/main/java/com/mattermost/react_native_interface/ResolvePromise.java
+++ b/android/app/src/main/java/com/mattermost/react_native_interface/ResolvePromise.java
@@ -1,64 +0,0 @@
-package com.mattermost.react_native_interface;
-
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.WritableMap;
-
-/**
- * ResolvePromise: Helper class that abstracts boilerplate
- */
-public class ResolvePromise implements Promise {
-    @Override
-    public void resolve(@javax.annotation.Nullable Object value) {
-
-    }
-
-    @Override
-    public void reject(String code, String message) {
-
-    }
-
-    @Override
-    public void reject(String code, WritableMap map) {
-
-    }
-
-    @Override
-    public void reject(String code, Throwable e) {
-
-    }
-
-    @Override
-    public void reject(Throwable e, WritableMap map) {
-
-    }
-
-    @Override
-    public void reject(String code, Throwable e, WritableMap map) {
-
-    }
-
-    @Override
-    public void reject(String code, String message, Throwable e, WritableMap map) {
-
-    }
-
-    @Override
-    public void reject(String code, String message, Throwable e) {
-
-    }
-
-    @Override
-    public void reject(String code, String message, WritableMap map) {
-
-    }
-
-    @Override
-    public void reject(String message) {
-
-    }
-
-    @Override
-    public void reject(Throwable reason) {
-
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
@@ -1,173 +1,77 @@
 package com.mattermost.rnbeta;

-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
-import android.app.Person;
-import android.app.Person.Builder;
-import android.app.RemoteInput;
 import android.content.Intent;
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
 import android.content.res.Resources;
+import android.content.pm.ApplicationInfo;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.media.AudioManager;
-import android.media.RingtoneManager;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Build;
-import android.provider.Settings.System;
-import androidx.annotation.Nullable;
-import android.util.Log;
-import java.lang.reflect.Field;
+import android.app.Notification;
+import android.app.NotificationManager;
+import java.util.LinkedHashMap;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;

 import 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";
    public static final String NOTIFICATION_ID = "notificationId";
-    public static final String KEY_TEXT_REPLY = "CAN_REPLY";
-    public static final String NOTIFICATION_REPLIED_EVENT_NAME = "notificationReplied";
-
-    private static final String PUSH_TYPE_MESSAGE = "message";
-    private static final String PUSH_TYPE_CLEAR = "clear";
-    private static final String PUSH_TYPE_UPDATE_BADGE = "update_badge";
-
-    private NotificationChannel mHighImportanceChannel;
-    private NotificationChannel mMinImportanceChannel;
-
-    private static Map<String, Integer> channelIdToNotificationCount = new HashMap<String, Integer>();
-    private static Map<String, List<Bundle>> channelIdToNotification = new HashMap<String, List<Bundle>>();
-    private static AppLifecycleFacade lifecycleFacade;
-    private static Context context;
-    private static int badgeCount = 0;
+    private static LinkedHashMap<String,Integer> channelIdToNotificationCount = new LinkedHashMap<String,Integer>();
+    private static LinkedHashMap<String,ArrayList<Bundle>> channelIdToNotification = new LinkedHashMap<String,ArrayList<Bundle>>();

    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) {
+    public static void clearNotification(int notificationId) {
        if (notificationId != -1) {
-            Integer count = channelIdToNotificationCount.get(channelId);
-            if (count == null) {
-                count = -1;
-            }
-
+            String channelId = String.valueOf(notificationId);
            channelIdToNotificationCount.remove(channelId);
            channelIdToNotification.remove(channelId);
-
-            if (mContext != null) {
-                final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-                notificationManager.cancel(notificationId);
-
-                if (count != -1) {
-                    int total = CustomPushNotification.badgeCount - count;
-                    int badgeCount = total < 0 ? 0 : total;
-                    CustomPushNotification.badgeCount = badgeCount;
-                }
-            }
-        }
-    }
-
-    public static void clearAllNotifications(Context mContext) {
-        channelIdToNotificationCount.clear();
-        channelIdToNotification.clear();
-        if (mContext != null) {
-            final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-            notificationManager.cancelAll();
        }
    }

    @Override
    public void onReceived() 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);
-                    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);
+            Object bundleArray = channelIdToNotification.get(channelId);
+            ArrayList list = null;
+            if (bundleArray == null) {
+                list = new ArrayList();
+            } else {
+                list = (ArrayList)bundleArray;
            }
+            list.add(data);
+            channelIdToNotification.put(channelId, list);
        }

-        switch(type) {
-        case PUSH_TYPE_MESSAGE:
-            super.postNotification(notificationId);
-            break;
-        case PUSH_TYPE_CLEAR:
+        if ("clear".equals(type)) {
            cancelNotification(data, notificationId);
-            break;
+        } else {
+            super.postNotification(notificationId);
        }

        notifyReceivedToJS();
@@ -180,314 +84,118 @@ public class CustomPushNotification extends PushNotification {
        channelIdToNotificationCount.remove(channelId);
        channelIdToNotification.remove(channelId);
        digestNotification();
+        clearAllNotifications();
+    }
+
+    @Override
+    protected void postNotification(int id, Notification notification) {
+        if (!mAppLifecycleFacade.isAppVisible()) {
+            super.postNotification(id, notification);
+        }
    }

    @Override
    protected Notification.Builder getNotificationBuilder(PendingIntent intent) {
-        // First, get a builder initialized with defaults from the core class.
-        final Notification.Builder notification = new Notification.Builder(mContext);
-
-        Bundle bundle = mNotificationProps.asBundle();
-
-        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");
-        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");
-        if (version != null && version.equals("v2")) {
-            title = bundle.getString("channel_name");
-        } else {
-            title = bundle.getString("title");
-        }
-
-        if (android.text.TextUtils.isEmpty(title)) {
+        // First, get a builder initialized with defaults from the core class.
+        final Notification.Builder notification = super.getNotificationBuilder(intent);
+        Bundle bundle = mNotificationProps.asBundle();
+        String title = bundle.getString("title");
+        if (title == null) {
            ApplicationInfo appInfo = mContext.getApplicationInfo();
            title = mContext.getPackageManager().getApplicationLabel(appInfo).toString();
        }

-        return title;
-    }
-
-    private void setMessagingStyleConversationTitle(Notification.MessagingStyle messagingStyle, String conversationTitle, Bundle bundle) {
-        String channelName = getConversationTitle(bundle);
-        String senderName = bundle.getString("sender_name");
-        if (android.text.TextUtils.isEmpty(senderName)) {
-            senderName = getSenderName(bundle);
-        }
-
-        if (conversationTitle != null && (!conversationTitle.startsWith("@") || channelName != senderName)) {
-            messagingStyle.setConversationTitle(conversationTitle);
-        }
-    }
-
-    private void addMessagingStyleMessages(Notification.MessagingStyle messagingStyle, String conversationTitle, Bundle bundle) {
-        List<Bundle> bundleList;
-
+        int notificationId = bundle.getString("channel_id").hashCode();
        String channelId = bundle.getString("channel_id");
-        List<Bundle> bundleArray = channelIdToNotification.get(channelId);
-        if (bundleArray != null) {
-            bundleList = new ArrayList<Bundle>(bundleArray);
+        String message = bundle.getString("message");
+        String subText = bundle.getString("subText");
+        String numberString = bundle.getString("badge");
+        String smallIcon = bundle.getString("smallIcon");
+        String largeIcon = bundle.getString("largeIcon");
+
+        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);
-            String message = data.getString("message");
-            String senderId = data.getString("sender_id");
-            if (senderId == null) {
-                senderId = "sender_id";
-            }
-            Bundle userInfoBundle = data.getBundle("userInfo");
-            String senderName = getSenderName(data);
-            if (userInfoBundle != null) {
-                boolean localPushNotificationTest = userInfoBundle.getBoolean("localTest");
-                if (localPushNotificationTest) {
-                    senderName = "Test";
-                }
-            }
+        if (smallIconResId == 0) {
+            smallIconResId = res.getIdentifier("ic_launcher", "mipmap", packageName);

-            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);
+            if (smallIconResId == 0) {
+                smallIconResId = android.R.drawable.ic_dialog_info;
            }
        }
-    }

-    private void setNotificationChannel(Notification.Builder notification, Bundle bundle) {
-        // If Android Oreo or above we need to register a channel
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
-        }
-
-        NotificationChannel notificationChannel = mHighImportanceChannel;
-
-        boolean localPushNotificationTest = false;
-        Bundle userInfoBundle = bundle.getBundle("userInfo");
-        if (userInfoBundle != null) {
-            localPushNotificationTest = userInfoBundle.getBoolean("localTest");
-        }
-
-        if (mAppLifecycleFacade.isAppVisible() && !localPushNotificationTest) {
-            notificationChannel = mMinImportanceChannel;
-        }
-
-        notification.setChannelId(notificationChannel.getId());
-    }
-
-    private void setNotificationBadgeIconType(Notification.Builder notification) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            notification.setBadgeIconType(Notification.BADGE_ICON_SMALL);
-        }
-    }
-
-    private void setNotificationGroup(Notification.Builder notification) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            notification
-                .setGroup(GROUP_KEY_MESSAGES)
-                .setGroupSummary(true);
-        }
-    }
-
-    private void setNotificationSound(Notification.Builder notification, NotificationPreferences notificationPreferences) {
-        String soundUri = notificationPreferences.getNotificationSound();
-        if (soundUri != null) {
-            if (soundUri != "none") {
-                notification.setSound(Uri.parse(soundUri), AudioManager.STREAM_NOTIFICATION);
-            }
+        if (largeIcon != null) {
+            largeIconResId = res.getIdentifier(largeIcon, "mipmap", packageName);
        } else {
-            Uri defaultUri = System.DEFAULT_NOTIFICATION_URI;
-            notification.setSound(defaultUri, AudioManager.STREAM_NOTIFICATION);
-        }
-    }
-
-    private void setNotificationVibrate(Notification.Builder notification, NotificationPreferences notificationPreferences) {
-        boolean vibrate = notificationPreferences.getShouldVibrate();
-        if (vibrate) {
-            // Use the system default for vibration
-            notification.setDefaults(Notification.DEFAULT_VIBRATE);
-        }
-    }
-
-    private void setNotificationBlink(Notification.Builder notification, NotificationPreferences notificationPreferences) {
-        boolean blink = notificationPreferences.getShouldBlink();
-        if (blink) {
-            notification.setLights(Color.CYAN, 500, 500);
-        }
-    }
-
-    private void setNotificationDeleteIntent(Notification.Builder notification, int notificationId) {
-        // Let's add a delete intent when the notification is dismissed
-        Intent delIntent = new Intent(mContext, NotificationDismissService.class);
-        delIntent.putExtra(NOTIFICATION_ID, notificationId);
-        PendingIntent deleteIntent = NotificationIntentAdapter.createPendingNotificationIntent(mContext, delIntent, mNotificationProps);
-        notification.setDeleteIntent(deleteIntent);
-    }
-
-    private void addNotificationReplyAction(Notification.Builder notification, int notificationId, Bundle bundle) {
-        String postId = bundle.getString("post_id");
-        if (postId == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            return;
+            largeIconResId = res.getIdentifier("ic_launcher", "mipmap", packageName);
        }

-        Intent replyIntent = new Intent(mContext, NotificationReplyBroadcastReceiver.class);
-        replyIntent.setAction(KEY_TEXT_REPLY);
-        replyIntent.putExtra(NOTIFICATION_ID, notificationId);
-        replyIntent.putExtra("pushNotification", bundle);
+        if (numberString != null) {
+            ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), Integer.parseInt(numberString));
+        }

-        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();
+        int numMessages = 0;
+        Object objCount = channelIdToNotificationCount.get(channelId);
+        if (objCount != null) {
+            numMessages = (Integer)objCount;
+        }

        notification
-            .setShowWhen(true)
-            .addAction(replyAction);
+                .setGroupSummary(true)
+                .setSmallIcon(smallIconResId)
+                .setVisibility(Notification.VISIBILITY_PRIVATE)
+                .setPriority(Notification.PRIORITY_HIGH);
+
+        if (numMessages == 1) {
+            notification
+                    .setContentTitle(title)
+                    .setContentText(message)
+                    .setStyle(new Notification.BigTextStyle()
+                            .bigText(message));
+        } else {
+            String summaryTitle = String.format("%s (%d)", title, numMessages);
+
+            Notification.InboxStyle style = new Notification.InboxStyle();
+            ArrayList<Bundle> list = (ArrayList<Bundle>) channelIdToNotification.get(channelId);
+            for (Bundle data : list){
+                style.addLine(data.getString("message"));
+            }
+
+            style.setBigContentTitle(title);
+            notification.setStyle(style)
+                    .setContentTitle(summaryTitle);
+//                    .setNumber(numMessages);
+        }
+
+        // Let's add a delete intent when the notification is dismissed
+        Intent delIntent = new Intent(mContext, NotificationDismissReceiver.class);
+        delIntent.putExtra(NOTIFICATION_ID, notificationId);
+        PendingIntent deleteIntent = PendingIntent.getBroadcast(mContext, 0, delIntent, 0);
+        notification.setDeleteIntent(deleteIntent);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            notification.setGroup(GROUP_KEY_MESSAGES);
+        }
+
+        Bitmap largeIconBitmap = BitmapFactory.decodeResource(res, largeIconResId);
+        if (largeIconResId != 0 && (largeIcon != null || Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)) {
+            notification.setLargeIcon(largeIconBitmap);
+        }
+
+        if (subText != null) {
+            notification.setSubText(subText);
+        }
+
+        return notification;
    }

    private void notifyReceivedToJS() {
@@ -496,56 +204,15 @@ public class CustomPushNotification extends PushNotification {

    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;
-        }
-
-        String channelName = bundle.getString("channel_name");
-        if (channelName != null && channelName.startsWith("@")) {
-            return channelName;
-        }
-
-        String message = bundle.getString("message");
-        if (message != null) {
-            String name = message.split(":")[0];
-            if (name != message) {
-                return name;
-            }
-        }
-
-        return getConversationTitle(bundle);
-    }
-
-    private String removeSenderNameFromMessage(String message, String senderName) {
-        return message.replaceFirst(senderName, "").replaceFirst(": ", "").trim();
-    }
-
-    private void notificationReceiptDelivery(String ackId, String postId, String type, boolean isIdLoaded, ResolvePromise promise) {
-        ReceiptDelivery.send(context, ackId, postId, type, isIdLoaded, promise);
-    }
-
-    private void createNotificationChannels() {
-        // Notification channels are not supported in Android Nougat and below
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
+        String numberString = data.getString("badge");
+        if (numberString != null) {
+            ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), Integer.parseInt(numberString));
        }

+        channelIdToNotificationCount.remove(channelId);
+        channelIdToNotification.remove(channelId);
        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);
+        notificationManager.cancel(notificationId);
    }
 }
--- a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotificationDrawer.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotificationDrawer.java
@@ -1,39 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.content.Context;
-
-import com.wix.reactnativenotifications.core.AppLaunchHelper;
-import com.wix.reactnativenotifications.core.notificationdrawer.PushNotificationsDrawer;
-import com.wix.reactnativenotifications.core.notificationdrawer.IPushNotificationsDrawer;
-import com.wix.reactnativenotifications.core.notificationdrawer.INotificationsDrawerApplication;
-
-import static com.wix.reactnativenotifications.Defs.LOGTAG;
-
-public class CustomPushNotificationDrawer extends PushNotificationsDrawer {
-    final protected Context mContext;
-    final protected AppLaunchHelper mAppLaunchHelper;
-
-   protected CustomPushNotificationDrawer(Context context, AppLaunchHelper appLaunchHelper) {
-        super(context, appLaunchHelper);
-        mContext = context;
-        mAppLaunchHelper = appLaunchHelper;
-    }
-
-    @Override
-    public void onAppInit() {
-    }
-
-    @Override
-    public void onAppVisible() {
-    }
-
-    @Override
-    public void onNotificationOpened() {
-    }
-
-    @Override
-    public void onCancelAllLocalNotifications() {
-        CustomPushNotification.clearAllNotifications(mContext);
-        cancelAllScheduledNotifications();
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/MainActivity.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MainActivity.java
@@ -1,14 +1,63 @@
 package com.mattermost.rnbeta;

-import android.os.Bundle;
-import androidx.annotation.Nullable;
+import com.reactnativenavigation.controllers.SplashActivity;

-import com.reactnativenavigation.NavigationActivity;
+import java.lang.ref.WeakReference;
+
+import android.content.Context;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.graphics.Color;
+import android.widget.TextView;
+import android.view.ViewGroup.LayoutParams;
+import android.view.Gravity;
+import android.util.TypedValue;
+
+public class MainActivity extends SplashActivity {
+
+    private static ImageView imageView;
+    private static WeakReference<MainActivity> wr_activity;
+    protected static MainActivity getActivity() {
+        return wr_activity.get();
+    }
+
+    /**
+     * Returns the name of the main component registered from JavaScript.
+     * This is used to schedule rendering of the component.
+     */
+    // @Override
+    // protected String getMainComponentName() {
+    //     return "Mattermost";
+    // }

-public class MainActivity extends NavigationActivity {
    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.launch_screen);
+    public LinearLayout createSplashLayout() {
+        wr_activity = new WeakReference<>(this);
+        LayoutParams layoutParams = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        Context context = getActivity();
+        final int drawableId = getImageId();
+
+        NotificationsLifecycleFacade.getInstance().LoadManagedConfig(getActivity());
+
+        imageView = new ImageView(context);
+        imageView.setImageResource(drawableId);
+
+        imageView.setLayoutParams(layoutParams);
+        imageView.setScaleType(ImageView.ScaleType.CENTER);
+
+        LinearLayout view = new LinearLayout(this);
+        view.setBackgroundColor(Color.parseColor("#FFFFFF"));
+        view.setGravity(Gravity.CENTER);
+        view.addView(imageView);
+
+        return view;
+    }
+
+    private static int getImageId() {
+        int drawableId = getActivity().getResources().getIdentifier("splash", "drawable", getActivity().getClass().getPackage().getName());
+        if (drawableId == 0) {
+            drawableId = getActivity().getResources().getIdentifier("splash", "drawable", getActivity().getPackageName());
+        }
+        return drawableId;
    }
 }
--- a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
@@ -1,98 +1,40 @@
 package com.mattermost.rnbeta;

-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.app.Application;
+import android.support.annotation.NonNull;
 import android.content.Context;
-import android.content.RestrictionsManager;
 import android.os.Bundle;
-import android.util.Log;
-import java.io.File;
-import java.util.HashMap;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;

-import com.mattermost.share.ShareModule;
-import com.learnium.RNDeviceInfo.RNDeviceModule;
-import com.imagepicker.ImagePickerModule;
-import com.psykar.cookiemanager.CookieManagerModule;
-import com.oblador.vectoricons.VectorIconsModule;
-import com.wix.reactnativenotifications.RNNotificationsModule;
-import io.tradle.react.LocalAuthModule;
-import com.gantix.JailMonkey.JailMonkeyModule;
-import com.RNFetchBlob.RNFetchBlob;
-import com.masteratul.exceptionhandler.ReactNativeExceptionHandlerModule;
-import com.inprogress.reactnativeyoutube.YouTubeStandaloneModule;
-import com.philipphecht.RNDocViewerModule;
-import io.github.elyx0.reactnativedocumentpicker.DocumentPickerModule;
-import com.oblador.keychain.KeychainModule;
-import com.reactnativecommunity.asyncstorage.AsyncStorageModule;
-import com.reactnativecommunity.netinfo.NetInfoModule;
-import com.reactnativecommunity.webview.RNCWebViewPackage;
-import io.sentry.RNSentryModule;
-import com.dylanvann.fastimage.FastImageViewPackage;
-import com.levelasquez.androidopensettings.AndroidOpenSettings;
-import com.mkuczera.RNReactNativeHapticFeedbackModule;
+import com.facebook.react.ReactApplication;
+import com.gantix.JailMonkey.JailMonkeyPackage;
+import io.tradle.react.LocalAuthPackage;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.shell.MainReactPackage;
+import com.facebook.soloader.SoLoader;

-import com.reactnativecommunity.webview.RNCWebViewPackage;
-import com.brentvatne.react.ReactVideoPackage;
-import com.BV.LinearGradient.LinearGradientPackage;
+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.horcrux.svg.SvgPackage;
-import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
-
+import com.BV.LinearGradient.LinearGradientPackage;
+import com.github.yamill.orientation.OrientationPackage;
 import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.react.NavigationReactNativeHost;
-import com.reactnativenavigation.react.ReactGateway;
+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;
-import com.wix.reactnativenotifications.core.notificationdrawer.INotificationsDrawerApplication;
 import com.wix.reactnativenotifications.core.AppLaunchHelper;
 import com.wix.reactnativenotifications.core.AppLifecycleFacade;
 import com.wix.reactnativenotifications.core.JsIOHelper;

-import com.facebook.react.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 java.util.Arrays;
+import java.util.List;

-import com.mattermost.share.RealPathUtil;
-
-public class MainApplication extends NavigationApplication implements INotificationsApplication, INotificationsDrawerApplication {
-  public static MainApplication instance;
-
-  public Boolean sharedExtensionIsOpened = false;
-
-  public long APP_START_TIME;
-
-  public long RELOAD;
-  public long CONTENT_APPEARED;
-
-  public long PROCESS_PACKAGES_START;
-  public long PROCESS_PACKAGES_END;
-
-  private Bundle mManagedConfig = null;
-
-  @Override
-  protected ReactGateway createReactGateway() {
-    ReactNativeHost host = new NavigationReactNativeHost(this, isDebug(), createAdditionalReactPackages()) {
-      @Override
-      protected String getJSMainModuleName() {
-        return "index";
-      }
-    };
-    return new ReactGateway(this, isDebug(), host);
-  }
+public class MainApplication extends NavigationApplication implements INotificationsApplication {
+  public NotificationsLifecycleFacade notificationsLifecycleFacade;

  @Override
  public boolean isDebug() {
@@ -105,100 +47,18 @@ public class MainApplication extends NavigationApplication implements INotificat
    // Add the packages you require here.
    // No need to add RnnPackage and MainReactPackage
    return Arrays.<ReactPackage>asList(
-            new TurboReactPackage() {
-              @Override
-              public NativeModule getModule(String name, ReactApplicationContext reactContext) {
-                switch (name) {
-                  case "MattermostShare":
-                    return new ShareModule(instance, reactContext);
-                  case "RNDeviceInfo":
-                    return new RNDeviceModule(reactContext, false);
-                  case "ImagePickerManager":
-                    return new ImagePickerModule(reactContext, R.style.DefaultExplainingPermissionsTheme);
-                  case "RNCookieManagerAndroid":
-                    return new CookieManagerModule(reactContext);
-                  case "RNVectorIconsModule":
-                    return new VectorIconsModule(reactContext);
-                  case "WixRNNotifications":
-                    return new RNNotificationsModule(instance, reactContext);
-                  case "RNLocalAuth":
-                    return new LocalAuthModule(reactContext);
-                  case "JailMonkey":
-                    return new JailMonkeyModule(reactContext, false);
-                  case "RNFetchBlob":
-                    return new RNFetchBlob(reactContext);
-                  case "MattermostManaged":
-                    return MattermostManagedModule.getInstance(reactContext);
-                  case "NotificationPreferences":
-                    return NotificationPreferencesModule.getInstance(instance, reactContext);
-                  case "RNTextInputReset":
-                    return new RNTextInputResetModule(reactContext);
-                  case "ReactNativeExceptionHandler":
-                    return new ReactNativeExceptionHandlerModule(reactContext);
-                  case "YouTubeStandaloneModule":
-                    return new YouTubeStandaloneModule(reactContext);
-                  case "RNDocViewer":
-                    return new RNDocViewerModule(reactContext);
-                  case "RNDocumentPicker":
-                    return new DocumentPickerModule(reactContext);
-                  case "RNKeychainManager":
-                    return new KeychainModule(reactContext);
-                  case "RNSentry":
-                    return new RNSentryModule(reactContext);
-                  case AsyncStorageModule.NAME:
-                    return new AsyncStorageModule(reactContext);
-                  case NetInfoModule.NAME:
-                    return new NetInfoModule(reactContext);
-                  case "RNAndroidOpenSettings":
-                    return new AndroidOpenSettings(reactContext);
-                  case "RNReactNativeHapticFeedbackModule":
-                    return new RNReactNativeHapticFeedbackModule(reactContext);
-                  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("NotificationPreferences", new ReactModuleInfo("NotificationPreferences", "com.mattermost.rnbeta.NotificationPreferencesModule", false, false, false, false, false));
-                    map.put("RNTextInputReset", new ReactModuleInfo("RNTextInputReset", "com.mattermost.rnbeta.RNTextInputResetModule", false, false, false, false, false));
-
-                    map.put("MattermostShare", new ReactModuleInfo("MattermostShare", "com.mattermost.share.ShareModule", false, false, true, false, false));
-                    map.put("RNDeviceInfo", new ReactModuleInfo("RNDeviceInfo", "com.learnium.RNDeviceInfo.RNDeviceModule", false, false, true, false, false));
-                    map.put("ImagePickerManager", new ReactModuleInfo("ImagePickerManager", "com.imagepicker.ImagePickerModule", false, false, false, false, false));
-                    map.put("RNCookieManagerAndroid", new ReactModuleInfo("RNCookieManagerAndroid", "com.psykar.cookiemanager.CookieManagerModule", false, false, false, false, false));
-                    map.put("RNVectorIconsModule", new ReactModuleInfo("RNVectorIconsModule", "com.oblador.vectoricons.VectorIconsModule", false, false, false, false, false));
-                    map.put("WixRNNotifications", new ReactModuleInfo("WixRNNotifications", "com.wix.reactnativenotifications.RNNotificationsModule", false, false, false, false, false));
-                    map.put("RNLocalAuth", new ReactModuleInfo("RNLocalAuth", "io.tradle.react.LocalAuthModule", false, false, false, false, false));
-                    map.put("JailMonkey", new ReactModuleInfo("JailMonkey", "com.gantix.JailMonkey.JailMonkeyModule", false, false, true, false, false));
-                    map.put("RNFetchBlob", new ReactModuleInfo("RNFetchBlob", "com.RNFetchBlob.RNFetchBlob", false, false, true, false, false));
-                    map.put("ReactNativeExceptionHandler", new ReactModuleInfo("ReactNativeExceptionHandler", "com.masteratul.exceptionhandler.ReactNativeExceptionHandlerModule", false, false, false, false, false));
-                    map.put("YouTubeStandaloneModule", new ReactModuleInfo("YouTubeStandaloneModule", "com.inprogress.reactnativeyoutube.YouTubeStandaloneModule", false, false, false, false, false));
-                    map.put("RNDocViewer", new ReactModuleInfo("RNDocViewer", "com.philipphecht.RNDocViewerModule", false, false, false, false, false));
-                    map.put("RNDocumentPicker", new ReactModuleInfo("RNDocumentPicker", "io.github.elyx0.reactnativedocumentpicker.DocumentPickerModule", false, false, false, false, false));
-                    map.put("RNKeychainManager", new ReactModuleInfo("RNKeychainManager", "com.oblador.keychain.KeychainModule", false, false, true, false, false));
-                    map.put("RNSentry", new ReactModuleInfo("RNSentry", "com.sentry.RNSentryModule", false, false, true, false, false));
-                    map.put(AsyncStorageModule.NAME, new ReactModuleInfo(AsyncStorageModule.NAME, "com.reactnativecommunity.asyncstorage.AsyncStorageModule", false, false, false, false, false));
-                    map.put(NetInfoModule.NAME, new ReactModuleInfo(NetInfoModule.NAME, "com.reactnativecommunity.netinfo.NetInfoModule", false, false, false, false, false));
-                    map.put("RNAndroidOpenSettings", new ReactModuleInfo("RNAndroidOpenSettings", "com.levelasquez.androidopensettings.AndroidOpenSettings", false, false, false, false, false));
-                    map.put("RNReactNativeHapticFeedbackModule", new ReactModuleInfo("RNReactNativeHapticFeedback", "com.mkuczera.RNReactNativeHapticFeedbackModule", false, false, false, false, false));
-                    return map;
-                  }
-                };
-              }
-            },
-            new FastImageViewPackage(),
-            new RNCWebViewPackage(),
+            new ImagePickerPackage(),
+            new RNBottomSheetPackage(),
+            new RNDeviceInfo(),
+            new CookieManagerPackage(),
+            new VectorIconsPackage(),
            new SvgPackage(),
            new LinearGradientPackage(),
-            new ReactVideoPackage(),
-            new RNGestureHandlerPackage(),
-            new RNPasteableTextInputPackage()
+            new OrientationPackage(),
+            new RNNotificationsPackage(this),
+            new LocalAuthPackage(),
+            new JailMonkeyPackage(),
+            new MattermostManagedPackage()
    );
  }

@@ -206,16 +66,12 @@ public class MainApplication extends NavigationApplication implements INotificat
  public void onCreate() {
    super.onCreate();
    instance = this;
-
-    // Delete any previous temp files created by the app
-    File tempFolder = new File(getApplicationContext().getCacheDir(), "mmShare");
-    RealPathUtil.deleteTempFiles(tempFolder);
-    Log.i("ReactNative", "Cleaning temp cache " + tempFolder.getAbsolutePath());
+    // Create an object of the custom facade impl
+    notificationsLifecycleFacade = NotificationsLifecycleFacade.getInstance();
+    // Attach it to react-native-navigation
+    setActivityCallbacks(notificationsLifecycleFacade);

    SoLoader.init(this, /* native exopackage */ false);
-
-    // Uncomment to listen to react markers for build that has telemetry enabled
-    // addReactMarkerListener();
  }

  @Override
@@ -223,91 +79,9 @@ public class MainApplication extends NavigationApplication implements INotificat
    return new CustomPushNotification(
            context,
            bundle,
-            defaultFacade,
+            notificationsLifecycleFacade, // Instead of defaultFacade!!!
            defaultAppLaunchHelper,
            new JsIOHelper()
    );
  }
-
-  @Override
-  public IPushNotificationsDrawer getPushNotificationsDrawer(Context context, AppLaunchHelper defaultAppLaunchHelper) {
-    return new CustomPushNotificationDrawer(context, defaultAppLaunchHelper);
-  }
-
-  public ReactContext getRunningReactContext() {
-    final ReactGateway reactGateway = getReactGateway();
-
-    if (reactGateway == null) {
-        return null;
-    }
-
-    return reactGateway
-        .getReactNativeHost()
-        .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);
-          }
-        }
-      }
-    });
-  }
 }
--- a/android/app/src/main/java/com/mattermost/rnbeta/MattermostCredentialsHelper.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MattermostCredentialsHelper.java
@@ -1,41 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.content.Context;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-
-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);
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/MattermostManagedModule.java
+++ b/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,155 +38,28 @@ 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);
                promise.resolve(result);
            } else {
-                promise.resolve(Arguments.createMap());
+                throw new Exception("The MDM vendor has not sent any Managed configuration");
            }
        } catch (Exception e) {
-            promise.resolve(Arguments.createMap());
+            promise.reject("no managed configuration", e);
        }
    }
-
-    @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;
-    }
 }
--- a/android/app/src/main/java/com/mattermost/rnbeta/MattermostManagedPackage.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MattermostManagedPackage.java
@@ -1,28 +1,22 @@
-package com.mattermost.share;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.JavaScriptModule;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.ReactPackage;
-import com.mattermost.rnbeta.MainApplication;
+package com.mattermost.rnbeta;

 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

-public class SharePackage implements ReactPackage {
-    MainApplication mApplication;
+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 SharePackage(MainApplication application) {
-        mApplication = application;
+public class MattermostManagedPackage implements ReactPackage {
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        return Arrays.<NativeModule>asList(MattermostManagedModule.getInstance(reactContext));
    }

    @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(new ShareModule(mApplication, reactContext));
-    }
-
    public List<Class<? extends JavaScriptModule>> createJSModules() {
        return Collections.emptyList();
    }
--- a/android/app/src/main/java/com/mattermost/rnbeta/NotificationDismissReceiver.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/NotificationDismissReceiver.java
@@ -0,0 +1,14 @@
+package com.mattermost.rnbeta;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.BroadcastReceiver;
+
+
+public class NotificationDismissReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        int notificationId = intent.getIntExtra(CustomPushNotification.NOTIFICATION_ID, -1);
+        CustomPushNotification.clearNotification(notificationId);
+    }
+}
--- a/android/app/src/main/java/com/mattermost/rnbeta/NotificationDismissService.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/NotificationDismissService.java
@@ -1,26 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.content.Context;
-import android.content.Intent;
-import android.app.IntentService;
-import android.os.Bundle;
-import android.util.Log;
-
-import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
-
-public class NotificationDismissService extends IntentService {
-    private Context mContext;
-    public NotificationDismissService() {
-            super("notificationDismissService");
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        mContext = getApplicationContext();
-        Bundle bundle = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
-        int notificationId = intent.getIntExtra(CustomPushNotification.NOTIFICATION_ID, -1);
-        String channelId = bundle.getString("channel_id");
-        CustomPushNotification.clearNotification(mContext, notificationId, channelId);
-        Log.i("ReactNative", "Dismiss notification");
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/NotificationPreferences.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/NotificationPreferences.java
@@ -1,57 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-public class NotificationPreferences {
-    private static NotificationPreferences instance;
-
-    public final String SHARED_NAME = "NotificationPreferences";
-    public final String SOUND_PREF = "NotificationSound";
-    public final String VIBRATE_PREF = "NotificationVibrate";
-    public final String BLINK_PREF = "NotificationLights";
-
-    private SharedPreferences mSharedPreferences;
-
-    private NotificationPreferences(Context context) {
-        mSharedPreferences = context.getSharedPreferences(SHARED_NAME, Context.MODE_PRIVATE);
-    }
-
-    public static NotificationPreferences getInstance(Context context) {
-        if (instance == null) {
-            instance = new NotificationPreferences(context);
-        }
-
-        return instance;
-    }
-
-    public String getNotificationSound() {
-        return mSharedPreferences.getString(SOUND_PREF, null);
-    }
-
-    public boolean getShouldVibrate() {
-        return mSharedPreferences.getBoolean(VIBRATE_PREF, true);
-    }
-
-    public boolean getShouldBlink() {
-        return mSharedPreferences.getBoolean(BLINK_PREF, false);
-    }
-
-    public void setNotificationSound(String soundUri) {
-        SharedPreferences.Editor editor = mSharedPreferences.edit();
-        editor.putString(SOUND_PREF, soundUri);
-        editor.commit();
-    }
-
-    public void setShouldVibrate(boolean vibrate) {
-        SharedPreferences.Editor editor = mSharedPreferences.edit();
-        editor.putBoolean(VIBRATE_PREF, vibrate);
-        editor.commit();
-    }
-
-    public void setShouldBlink(boolean blink) {
-        SharedPreferences.Editor editor = mSharedPreferences.edit();
-        editor.putBoolean(BLINK_PREF, blink);
-        editor.commit();
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/NotificationPreferencesModule.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/NotificationPreferencesModule.java
@@ -1,136 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.app.Application;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.database.Cursor;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.os.Bundle;
-import android.net.Uri;
-import android.service.notification.StatusBarNotification;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-
-public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
-    private static NotificationPreferencesModule instance;
-    private final MainApplication mApplication;
-    private NotificationPreferences mNotificationPreference;
-
-    private NotificationPreferencesModule(MainApplication application, ReactApplicationContext reactContext) {
-        super(reactContext);
-        mApplication = application;
-        Context context = mApplication.getApplicationContext();
-        mNotificationPreference = NotificationPreferences.getInstance(context);
-    }
-
-    public static NotificationPreferencesModule getInstance(MainApplication application, ReactApplicationContext reactContext) {
-        if (instance == null) {
-            instance = new NotificationPreferencesModule(application, reactContext);
-        }
-
-        return instance;
-    }
-
-    public static NotificationPreferencesModule getInstance() {
-        return instance;
-    }
-
-    @Override
-    public String getName() {
-        return "NotificationPreferences";
-    }
-
-    @ReactMethod
-    public void getPreferences(final Promise promise) {
-        try {
-            Context context = mApplication.getApplicationContext();
-            RingtoneManager manager = new RingtoneManager(context);
-            manager.setType(RingtoneManager.TYPE_NOTIFICATION);
-            Cursor cursor = manager.getCursor();
-
-            WritableMap result = Arguments.createMap();
-            WritableArray sounds = Arguments.createArray();
-            while (cursor.moveToNext()) {
-                String notificationTitle = cursor.getString(RingtoneManager.TITLE_COLUMN_INDEX);
-                String notificationId = cursor.getString(RingtoneManager.ID_COLUMN_INDEX);
-                String notificationUri = cursor.getString(RingtoneManager.URI_COLUMN_INDEX);
-
-                WritableMap map = Arguments.createMap();
-                map.putString("name", notificationTitle);
-                map.putString("uri", (notificationUri + "/" + notificationId));
-                sounds.pushMap(map);
-            }
-
-            Uri defaultUri = RingtoneManager.getActualDefaultRingtoneUri(context, RingtoneManager.TYPE_NOTIFICATION);
-            if (defaultUri != null) {
-                result.putString("defaultUri", Uri.decode(defaultUri.toString()));
-            }
-            result.putString("selectedUri", mNotificationPreference.getNotificationSound());
-            result.putBoolean("shouldVibrate", mNotificationPreference.getShouldVibrate());
-            result.putBoolean("shouldBlink", mNotificationPreference.getShouldBlink());
-            result.putArray("sounds", sounds);
-
-            promise.resolve(result);
-        } catch (Exception e) {
-            promise.reject("no notification sounds found", e);
-        }
-    }
-
-    @ReactMethod
-    public void previewSound(String url) {
-        Context context = mApplication.getApplicationContext();
-        Uri uri = Uri.parse(url);
-        Ringtone r = RingtoneManager.getRingtone(context, uri);
-        r.play();
-    }
-
-    @ReactMethod
-    public void setNotificationSound(String soundUri) {
-        mNotificationPreference.setNotificationSound(soundUri);
-    }
-
-    @ReactMethod
-    public void setShouldVibrate(boolean vibrate) {
-        mNotificationPreference.setShouldVibrate(vibrate);
-    }
-
-    @ReactMethod
-    public void setShouldBlink(boolean blink) {
-        mNotificationPreference.setShouldBlink(blink);
-    }
-
-    @ReactMethod
-    public void getDeliveredNotifications(final Promise promise) {
-        Context context = mApplication.getApplicationContext();
-        final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        StatusBarNotification[] statusBarNotifications = notificationManager.getActiveNotifications();
-        WritableArray result = Arguments.createArray();
-        for (StatusBarNotification sbn:statusBarNotifications) {
-            WritableMap map = Arguments.createMap();
-            Notification n = sbn.getNotification();
-            Bundle bundle = n.extras;
-            int identifier = sbn.getId();
-            String channelId = bundle.getString("channel_id");
-            map.putInt("identifier", identifier);
-            map.putString("channel_id", channelId);
-            result.pushMap(map);
-        }
-        promise.resolve(result);
-    }
-
-    @ReactMethod
-    public void removeDeliveredNotifications(int identifier, String channelId) {
-        Context context = mApplication.getApplicationContext();
-        CustomPushNotification.clearNotification(context, identifier, channelId);
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java
@@ -1,164 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.RemoteInput;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Build;
-import android.os.Bundle;
-import androidx.annotation.Nullable;
-import android.util.Log;
-import java.io.IOException;
-
-import okhttp3.Call;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-import org.json.JSONObject;
-import org.json.JSONException;
-
-import com.mattermost.react_native_interface.ResolvePromise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.WritableMap;
-
-import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
-
-public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
-    private Context mContext;
-    private Bundle bundle;
-    private NotificationManager notificationManager;
-
-    @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);
-
-
-            MattermostCredentialsHelper.getCredentialsForCurrentServer(reactApplicationContext, new ResolvePromise() {
-                @Override
-                public void resolve(@Nullable Object value) {
-                    if (value instanceof Boolean && !(Boolean)value) {
-                        return;
-                    }
-
-                    WritableMap map = (WritableMap) value;
-                    if (map != null) {
-                        String token = map.getString("password");
-                        String serverUrl = map.getString("service");
-
-                        Log.i("ReactNative", String.format("URL=%s", serverUrl));
-                        replyToMessage(serverUrl, token, notificationId, message);
-                    }
-                }
-            });
-        }
-    }
-
-    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;
-        }
-
-        if (token == null || serverUrl == null) {
-            onReplyFailed(notificationManager, notificationId, channelId);
-            return;
-        }
-
-        final OkHttpClient client = new OkHttpClient();
-        final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-        String json = buildReplyPost(channelId, rootId, message.toString());
-        RequestBody body = RequestBody.create(JSON, json);
-        Request request = new Request.Builder()
-                .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()));
-                onReplyFailed(notificationManager, notificationId, channelId);
-            }
-
-            @Override
-            public void onResponse(Call call, final Response response) throws IOException {
-                if (response.isSuccessful()) {
-                    onReplySuccess(notificationManager, notificationId, channelId);
-                    Log.i("ReactNative", "Reply SUCCESS");
-                } else {
-                    Log.i("ReactNative", String.format("Reply FAILED status %s BODY %s", response.code(), response.body().string()));
-                    onReplyFailed(notificationManager, notificationId, channelId);
-                }
-            }
-        });
-    }
-
-    protected String buildReplyPost(String channelId, String rootId, String message) {
-        try {
-            JSONObject json = new JSONObject();
-            json.put("channel_id", channelId);
-            json.put("message", message);
-            json.put("root_id", rootId);
-            return json.toString();
-        } catch(JSONException e) {
-            return "{}";
-        }
-    }
-
-    protected void onReplyFailed(NotificationManager notificationManager, int notificationId, String channelId) {
-        String CHANNEL_ID = "Reply job";
-        Resources res = mContext.getResources();
-        String packageName = mContext.getPackageName();
-        int smallIconResId = res.getIdentifier("ic_notification", "mipmap", packageName);
-
-        Bundle userInfoBundle = new Bundle();
-        userInfoBundle.putString("channel_id", channelId);
-
-        NotificationChannel channel = new NotificationChannel(CHANNEL_ID, CHANNEL_ID, NotificationManager.IMPORTANCE_LOW);
-        notificationManager.createNotificationChannel(channel);
-        Notification notification =
-                new Notification.Builder(mContext, CHANNEL_ID)
-                        .setContentTitle("Message failed to send.")
-                        .setSmallIcon(smallIconResId)
-                        .addExtras(userInfoBundle)
-                        .build();
-
-        CustomPushNotification.clearNotification(mContext, notificationId, channelId);
-        notificationManager.notify(notificationId, notification);
-    }
-
-    protected void onReplySuccess(NotificationManager notificationManager, int notificationId, String channelId) {
-        notificationManager.cancel(notificationId);
-        CustomPushNotification.clearNotification(mContext, notificationId, channelId);
-    }
-
-    private CharSequence getReplyMessage(Intent intent) {
-        Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
-        if (remoteInput != null) {
-            return remoteInput.getCharSequence(CustomPushNotification.KEY_TEXT_REPLY);
-        }
-        return null;
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/NotificationsLifecycleFacade.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/NotificationsLifecycleFacade.java
@@ -0,0 +1,228 @@
+package com.mattermost.rnbeta;
+
+import android.app.Activity;
+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.LayoutParams;
+
+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 (mVisibleActivity != null) {
+                // Get the current configuration bundle
+                RestrictionsManager myRestrictionsMgr =
+                    (RestrictionsManager) mVisibleActivity
+                            .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.getWindow().setFlags(LayoutParams.FLAG_SECURE,
+                    LayoutParams.FLAG_SECURE);
+        }
+        if (managedConfig!= null && managedConfig.size() > 0) {
+            activity.registerReceiver(restrictionsReceiver, restrictionsFilter);
+        }
+    }
+
+    @Override
+    public void onActivityResumed(Activity activity) {
+        switchToVisible(activity);
+
+        if (managedConfig != null && managedConfig.size() > 0) {
+            RestrictionsManager myRestrictionsMgr =
+                    (RestrictionsManager) activity
+                            .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);
+    }
+
+    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(Activity activity) {
+        RestrictionsManager myRestrictionsMgr =
+                (RestrictionsManager) activity
+                        .getSystemService(Context.RESTRICTIONS_SERVICE);
+
+        managedConfig = myRestrictionsMgr.getApplicationRestrictions();
+        myRestrictionsMgr = null;
+    }
+
+    public synchronized Bundle getManagedConfig() {
+        if (managedConfig!= null && managedConfig.size() > 0) {
+            return managedConfig;
+        }
+
+        if (mVisibleActivity != null) {
+            LoadManagedConfig(mVisibleActivity);
+            return managedConfig;
+        }
+
+        return null;
+    }
+
+    public void sendConfigChanged(Bundle config) {
+        Object result = Arguments.fromBundle(config);
+        getRunningReactContext().
+                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;
+    }
+}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNEditTextOnPasteListener.java
+++ b/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);
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableActionCallback.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableActionCallback.java
@@ -1,92 +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;
-        }
-
-        String text = item.getText().toString();
-        if (text.length() > 0) {
-            return null;
-        }
-
-        return item.getUri();
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableEditText.java
+++ b/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;
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableEditTextOnPasteListener.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableEditTextOnPasteListener.java
@@ -1,122 +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 java.io.FileNotFoundException;
-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);
-
-        // 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
-                );
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableImageFromUrl.java
+++ b/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
-                );
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableTextInputManager.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableTextInputManager.java
@@ -1,78 +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 map = super.getExportedViewConstants();
-        map.put("onPaste", MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onPaste")));
-        return map;
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableTextInputPackage.java
+++ b/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()
-        );
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNTextInputResetModule.java
+++ b/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);
-              }
-          }
-      });
-  }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/ReceiptDelivery.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/ReceiptDelivery.java
@@ -1,120 +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";
-
-    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();
-
-            try {
-                Response response = client.newCall(request).execute();
-                String responseBody = response.body().string();
-                if (response.code() != 200 || !isIdLoaded) {
-                    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");
-                promise.reject("Receipt delivery failure", e.toString());
-            }
-        }
-    }
-}
--- a/android/app/src/main/java/com/mattermost/share/RealPathUtil.java
+++ b/android/app/src/main/java/com/mattermost/share/RealPathUtil.java
@@ -1,233 +0,0 @@
-package com.mattermost.share;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
-import android.provider.OpenableColumns;
-import android.content.ContentUris;
-import android.content.ContentResolver;
-import android.os.Environment;
-import android.webkit.MimeTypeMap;
-import android.util.Log;
-import android.text.TextUtils;
-
-import android.os.ParcelFileDescriptor;
-import java.io.*;
-import java.nio.channels.FileChannel;
-
-// Class based on the steveevers DocumentHelper https://gist.github.com/steveevers/a5af24c226f44bb8fdc3
-
-public class RealPathUtil {
-    public static String getRealPathFromURI(final Context context, final Uri uri) {
-
-        final boolean isKitKatOrNewer = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
-
-        // DocumentProvider
-        if (isKitKatOrNewer && DocumentsContract.isDocumentUri(context, uri)) {
-            // ExternalStorageProvider
-            if (isExternalStorageDocument(uri)) {
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                if ("primary".equalsIgnoreCase(type)) {
-                    return Environment.getExternalStorageDirectory() + "/" + split[1];
-                }
-            } else if (isDownloadsDocument(uri)) {
-                // DownloadsProvider
-
-                final String id = DocumentsContract.getDocumentId(uri);
-                if (!TextUtils.isEmpty(id)) {
-                    if (id.startsWith("raw:")) {
-                        return id.replaceFirst("raw:", "");
-                    }
-                    try {
-                        return getPathFromSavingTempFile(context, uri);
-                    } catch (NumberFormatException e) {
-                        Log.e("ReactNative", "DownloadsProvider unexpected uri " + uri.toString());
-                        return null;
-                    }
-                }
-            } else if (isMediaDocument(uri)) {
-                // MediaProvider
-
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                Uri contentUri = null;
-                if ("image".equals(type)) {
-                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-                } else if ("video".equals(type)) {
-                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
-                } else if ("audio".equals(type)) {
-                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
-                }
-
-                final String selection = "_id=?";
-                final String[] selectionArgs = new String[] {
-                        split[1]
-                };
-
-                return getDataColumn(context, contentUri, selection, selectionArgs);
-            }
-        }
-
-        if ("content".equalsIgnoreCase(uri.getScheme())) {
-            // MediaStore (and general)
-
-            if (isGooglePhotosUri(uri)) {
-                return uri.getLastPathSegment();
-            }
-
-            // Try save to tmp file, and return tmp file path
-            return getPathFromSavingTempFile(context, uri);
-        } else if ("file".equalsIgnoreCase(uri.getScheme())) {
-            return uri.getPath();
-        }
-
-        return null;
-    }
-
-    public static String getPathFromSavingTempFile(Context context, final Uri uri) {
-        File tmpFile;
-        String fileName = null;
-
-        // Try and get the filename from the Uri
-        try {
-            Cursor returnCursor =
-                    context.getContentResolver().query(uri, null, null, null, null);
-            int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-            returnCursor.moveToFirst();
-            fileName = returnCursor.getString(nameIndex);
-        } catch (Exception e) {
-            // just continue to get the filename with the last segment of the path
-        }
-
-        try {
-            if (fileName == null) {
-                fileName = uri.getLastPathSegment().toString().trim();
-            }
-
-
-            File cacheDir = new File(context.getCacheDir(), "mmShare");
-            if (!cacheDir.exists()) {
-                cacheDir.mkdirs();
-            }
-
-            String mimeType = getMimeType(uri.getPath());
-            tmpFile = new File(cacheDir, fileName);
-            tmpFile.createNewFile();
-
-            ParcelFileDescriptor pfd = context.getContentResolver().openFileDescriptor(uri, "r");
-
-            FileChannel src = new FileInputStream(pfd.getFileDescriptor()).getChannel();
-            FileChannel dst = new FileOutputStream(tmpFile).getChannel();
-            dst.transferFrom(src, 0, src.size());
-            src.close();
-            dst.close();
-        } catch (IOException ex) {
-            return null;
-        }
-        return tmpFile.getAbsolutePath();
-    }
-
-    public static String getDataColumn(Context context, Uri uri, String selection,
-                                       String[] selectionArgs) {
-
-        Cursor cursor = null;
-        final String column = "_data";
-        final String[] projection = {
-                column
-        };
-
-        try {
-            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
-                    null);
-            if (cursor != null && cursor.moveToFirst()) {
-                final int index = cursor.getColumnIndexOrThrow(column);
-                return cursor.getString(index);
-            }
-        } finally {
-            if (cursor != null)
-                cursor.close();
-        }
-        return null;
-    }
-
-
-    public static boolean isExternalStorageDocument(Uri uri) {
-        return "com.android.externalstorage.documents".equals(uri.getAuthority());
-    }
-
-    public static boolean isDownloadsDocument(Uri uri) {
-        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
-    }
-
-    public static boolean isMediaDocument(Uri uri) {
-        return "com.android.providers.media.documents".equals(uri.getAuthority());
-    }
-
-    public static boolean isGooglePhotosUri(Uri uri) {
-        return "com.google.android.apps.photos.content".equals(uri.getAuthority());
-    }
-
-    public static String getExtension(String uri) {
-        if (uri == null) {
-            return null;
-        }
-
-        int dot = uri.lastIndexOf(".");
-        if (dot >= 0) {
-            return uri.substring(dot);
-        } else {
-            // No extension.
-            return "";
-        }
-    }
-
-    public static String getMimeType(File file) {
-
-        String extension = getExtension(file.getName());
-
-        if (extension.length() > 0)
-            return MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.substring(1));
-
-        return "application/octet-stream";
-    }
-
-    public static String getMimeType(String filePath) {
-        File file = new File(filePath);
-        return getMimeType(file);
-    }
-
-    public static String getMimeTypeFromUri(final Context context, final Uri uri) {
-        try {
-            ContentResolver cR = context.getContentResolver();
-            return cR.getType(uri);
-        } catch (Exception e) {
-            return "application/octet-stream";
-        }
-    }
-
-    public static void deleteTempFiles(final File dir) {
-        try {
-            if (dir.isDirectory()) {
-                deleteRecursive(dir);
-            }
-        } catch (Exception e) {
-            // do nothing
-        }
-    }
-
-    private static void deleteRecursive(File fileOrDirectory) {
-        if (fileOrDirectory.isDirectory())
-            for (File child : fileOrDirectory.listFiles())
-                deleteRecursive(child);
-
-        fileOrDirectory.delete();
-    }
-}
--- a/android/app/src/main/java/com/mattermost/share/ShareActivity.java
+++ b/android/app/src/main/java/com/mattermost/share/ShareActivity.java
@@ -1,20 +0,0 @@
-package com.mattermost.share;
-
-import android.os.Bundle;
-
-import com.facebook.react.ReactActivity;
-import com.mattermost.rnbeta.MainApplication;
-
-public class ShareActivity extends ReactActivity {
-    @Override
-    protected String getMainComponentName() {
-        return "MattermostShare";
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        MainApplication app = (MainApplication) this.getApplication();
-        app.sharedExtensionIsOpened = true;
-    }
-}
--- a/android/app/src/main/java/com/mattermost/share/ShareModule.java
+++ b/android/app/src/main/java/com/mattermost/share/ShareModule.java
@@ -1,257 +0,0 @@
-package com.mattermost.share;
-
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.Arguments;
-import com.mattermost.rnbeta.MainApplication;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import javax.annotation.Nullable;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONException;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-public class ShareModule extends ReactContextBaseJavaModule {
-    private final OkHttpClient client = new OkHttpClient();
-    public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-    private final MainApplication mApplication;
-
-    public ShareModule(MainApplication application, ReactApplicationContext reactContext) {
-        super(reactContext);
-        mApplication = application;
-    }
-    private File tempFolder;
-
-    @Override
-    public String getName() {
-        return "MattermostShare";
-    }
-
-    @ReactMethod
-    public void clear() {
-        Activity currentActivity = getCurrentActivity();
-
-        if (currentActivity != null) {
-            Intent intent = currentActivity.getIntent();
-            intent.setAction("");
-            intent.removeExtra(Intent.EXTRA_TEXT);
-            intent.removeExtra(Intent.EXTRA_STREAM);
-        }
-    }
-
-    @Nullable
-    @Override
-    public Map<String, Object> getConstants() {
-        HashMap<String, Object> constants = new HashMap<>(1);
-        constants.put("isOpened", mApplication.sharedExtensionIsOpened);
-        mApplication.sharedExtensionIsOpened = false;
-        return constants;
-    }
-
-    @ReactMethod
-    public void close(ReadableMap data) {
-        this.clear();
-        Activity currentActivity = getCurrentActivity();
-        if (currentActivity != null) {
-            currentActivity.finishAndRemoveTask();
-        }
-
-        if (data != null && data.hasKey("url")) {
-            ReadableArray files = data.getArray("files");
-            String serverUrl = data.getString("url");
-            String token = data.getString("token");
-            JSONObject postData = buildPostObject(data);
-
-            if (files.size() > 0) {
-                uploadFiles(serverUrl, token, files, postData);
-            } else {
-                try {
-                    post(serverUrl, token, postData);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        RealPathUtil.deleteTempFiles(this.tempFolder);
-    }
-
-    @ReactMethod
-    public void data(Promise promise) {
-        promise.resolve(processIntent());
-    }
-
-    @ReactMethod
-    public void getFilePath(String filePath, Promise promise) {
-        Activity currentActivity = getCurrentActivity();
-        WritableMap map = Arguments.createMap();
-
-        if (currentActivity != null) {
-            Uri uri = Uri.parse(filePath);
-            String path = RealPathUtil.getRealPathFromURI(currentActivity, uri);
-            if (path != null) {
-                String text = "file://" + path;
-                map.putString("filePath", text);
-            }
-        }
-
-        promise.resolve(map);
-    }
-
-    public WritableArray processIntent() {
-        WritableMap map = Arguments.createMap();
-        WritableArray items = Arguments.createArray();
-
-        String text = "";
-        String type = "";
-        String action = "";
-
-        Activity currentActivity = getCurrentActivity();
-
-        if (currentActivity != null) {
-            this.tempFolder = new File(currentActivity.getCacheDir(), "mmShare");
-            Intent intent = currentActivity.getIntent();
-            action = intent.getAction();
-            type = intent.getType();
-            if (type == null) {
-                type = "";
-            }
-
-            if (Intent.ACTION_SEND.equals(action) && "text/plain".equals(type)) {
-                text = intent.getStringExtra(Intent.EXTRA_TEXT);
-                map.putString("value", text);
-                map.putString("type", type);
-                items.pushMap(map);
-            } else if (Intent.ACTION_SEND.equals(action)) {
-                Uri uri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
-                if (uri != null) {
-                    text = "file://" + RealPathUtil.getRealPathFromURI(currentActivity, uri);
-                    map.putString("value", text);
-
-                    if (type.equals("image/*")) {
-                        type = "image/jpeg";
-                    } else if (type.equals("video/*")) {
-                        type = "video/mp4";
-                    }
-
-                    map.putString("type", type);
-                    items.pushMap(map);
-                }
-            } else if (Intent.ACTION_SEND_MULTIPLE.equals(action)) {
-                ArrayList<Uri> uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
-                for (Uri uri : uris) {
-                    String filePath = RealPathUtil.getRealPathFromURI(currentActivity, uri);
-                    map = Arguments.createMap();
-                    text = "file://" + filePath;
-                    map.putString("value", text);
-
-                    type = RealPathUtil.getMimeTypeFromUri(currentActivity, uri);
-                    if (type != null) {
-                        if (type.equals("image/*")) {
-                            type = "image/jpeg";
-                        } else if (type.equals("video/*")) {
-                            type = "video/mp4";
-                        }
-                    } else {
-                        type = "application/octet-stream";
-                    }
-                    map.putString("type", type);
-                    items.pushMap(map);
-                }
-            }
-        }
-
-        return items;
-    }
-
-    private JSONObject buildPostObject(ReadableMap data) {
-        JSONObject json = new JSONObject();
-        try {
-            json.put("user_id", data.getString("currentUserId"));
-            json.put("channel_id", data.getString("channelId"));
-            json.put("message", data.getString("value"));
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        return json;
-    }
-
-    private void post(String serverUrl, String token, JSONObject postData) throws IOException {
-        RequestBody body = RequestBody.create(JSON, postData.toString());
-        Request request = new Request.Builder()
-                .header("Authorization", "BEARER " + token)
-                .url(serverUrl + "/api/v4/posts")
-                .post(body)
-                .build();
-        Response response = client.newCall(request).execute();
-    }
-
-    private void uploadFiles(String serverUrl, String token, ReadableArray files, JSONObject postData) {
-        try {
-            MultipartBody.Builder builder = new MultipartBody.Builder()
-                    .setType(MultipartBody.FORM);
-
-            for(int i = 0 ; i < files.size() ; i++) {
-                ReadableMap file = files.getMap(i);
-                String filePath = file.getString("fullPath").replaceFirst("file://", "");
-                File fileInfo = new File(filePath);
-                if (fileInfo.exists()) {
-                    final MediaType MEDIA_TYPE = MediaType.parse(file.getString("mimeType"));
-                    builder.addFormDataPart("files", file.getString("filename"), RequestBody.create(MEDIA_TYPE, fileInfo));
-                }
-            }
-
-            builder.addFormDataPart("channel_id", postData.getString("channel_id"));
-            RequestBody body = builder.build();
-            Request request = new Request.Builder()
-                    .header("Authorization", "BEARER " + token)
-                    .url(serverUrl + "/api/v4/files")
-                    .post(body)
-                    .build();
-
-            try (Response response = client.newCall(request).execute()) {
-                if (response.isSuccessful()) {
-                    String responseData = response.body().string();
-                    JSONObject responseJson = new JSONObject(responseData);
-                    JSONArray fileInfoArray = responseJson.getJSONArray("file_infos");
-                    JSONArray file_ids = new JSONArray();
-                    for(int i = 0 ; i < fileInfoArray.length() ; i++) {
-                        JSONObject fileInfo = fileInfoArray.getJSONObject(i);
-                        file_ids.put(fileInfo.getString("id"));
-                    }
-                    postData.put("file_ids", file_ids);
-                    post(serverUrl, token, postData);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-}
--- a/android/app/src/main/res/drawable-hdpi/ic_notif_action_reply.png
+++ b/android/app/src/main/res/drawable-hdpi/ic_notif_action_reply.png
--- a/android/app/src/main/res/drawable-hdpi/splash.png
+++ b/android/app/src/main/res/drawable-hdpi/splash.png
--- a/android/app/src/main/res/drawable-mdpi/ic_notif_action_reply.png
+++ b/android/app/src/main/res/drawable-mdpi/ic_notif_action_reply.png
--- a/android/app/src/main/res/drawable-mdpi/splash.png
+++ b/android/app/src/main/res/drawable-mdpi/splash.png
--- a/android/app/src/main/res/drawable-xhdpi/ic_notif_action_reply.png
+++ b/android/app/src/main/res/drawable-xhdpi/ic_notif_action_reply.png
--- a/android/app/src/main/res/drawable-xhdpi/splash.png
+++ b/android/app/src/main/res/drawable-xhdpi/splash.png
--- a/android/app/src/main/res/drawable-xxhdpi/ic_notif_action_reply.png
+++ b/android/app/src/main/res/drawable-xxhdpi/ic_notif_action_reply.png
--- a/android/app/src/main/res/drawable-xxhdpi/splash.png
+++ b/android/app/src/main/res/drawable-xxhdpi/splash.png
--- a/android/app/src/main/res/drawable-xxxhdpi/ic_notif_action_reply.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/ic_notif_action_reply.png
--- a/android/app/src/main/res/drawable-xxxhdpi/splash.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/splash.png
--- a/android/app/src/main/res/layout/launch_screen.xml
+++ b/android/app/src/main/res/layout/launch_screen.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#ffffff"
-    android:gravity="center_horizontal"
-    tools:context=".SplashScreenActivity">
-
-    <ImageView
-        android:id="@+id/imgLogo"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:adjustViewBounds="true"
-        android:src="@drawable/splash" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/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>
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/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>
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/android/app/src/main/res/mipmap-hdpi/ic_notification.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_notification.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_notification.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_notification.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_notification.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_notification.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
enahum	fc179a6516	translations PR 20170905 (#882 )	2017-09-05 09:46:41 -03:00
lfbrock	fea6372819	Update minimum server version (#878 )	2017-09-02 21:29:47 -03:00
enahum	87e89de854	Version Bump to 49 (#876 )	2017-09-01 14:50:01 -03:00
enahum	534af426c9	Version Bump to 49 (#875 )	2017-09-01 14:49:48 -03:00
enahum	553f3796b1	RN-220 Add "in:" and "from:" search modifiers (#869 ) * Fix search and search preview * Add "in:" and "from:" search modifiers	2017-08-24 18:07:07 -03:00
enahum	18b3d6eec9	Fix badge display on Android (#867 )	2017-08-24 11:31:03 -03:00
Harrison Healey	73c81bb863	RN-73 Fixed code block text colour being incorrect (#868 )	2017-08-24 10:59:03 -03:00