MM-10617 Fixed checking if a link is an image

.babelrc

@@ -0,0 +1,16 @@
+{
+  "presets": [ "react-native" ],
+  "env": {
+    "production": {
+      "plugins": ["transform-remove-console"]
+    }
+  },
+  "plugins": [
+    ["module-resolver", {
+      "root": ["./src", "."],
+      "alias": {
+        "assets": "./dist/assets"
+      }
+    }]
+  ]
+}

.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: /.*/

.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]

.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, "always-multiline"],
+        "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", { "allowArrowFunctions": true }],
+        "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
-      }
-    }
-  ]
-}
+}

.flowconfig

@@ -5,18 +5,16 @@
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
 
+; Ignore unexpected extra "@providesModule"
+.*/node_modules/.*/node_modules/fbjs/.*
+
+; Ignore duplicate module providers
+; For RN Apps installed via npm, "Libraries" folder is inside
+; "node_modules/react-native" but in the source repo it is in the root
+.*/Libraries/react-native/React.js
+
 ; Ignore polyfills
-node_modules/react-native/Libraries/polyfills/.*
-
-; 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/.*/.*
+.*/Libraries/polyfills/.*
 
 [include]
 
@@ -27,49 +25,24 @@ node_modules/react-native/flow/
 [options]
 emoji=true
 
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
-module.file_ext=.js
-module.file_ext=.json
-module.file_ext=.ios.js
+module.system=haste
 
 munge_underscores=true
 
-module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
-module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
+module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '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\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
-[lints]
-sketchy-null-number=warn
-sketchy-null-mixed=warn
-sketchy-number=warn
-untyped-type-import=warn
-nonstrict-import=warn
-deprecated-type=warn
-unsafe-getters-setters=warn
-inexact-spread=warn
-unnecessary-invariant=warn
-signature-verification-failure=warn
-deprecated-utility=error
-
-[strict]
-deprecated-type
-nonstrict-import
-sketchy-null
-unclear-type
-unsafe-getters-setters
-untyped-import
-untyped-type-import
+unsafe.enable_getters_and_setters=true
 
 [version]
-^0.105.0
+^0.56.0

.gitignore

@@ -1,10 +1,8 @@
 assets/override
 dist
-build-ios
 *.zip
 server.PID
 mattermost.keystore
-tmp/
 
 # OSX
 #
@@ -30,19 +28,14 @@ DerivedData
 *.apk
 *.xcuserstate
 project.xcworkspace
-ios/Pods
-.podinstall
 
 # Android/IntelliJ
 #
+build/
 .idea
 .gradle
 local.properties
 *.iml
-android/app/bin
-.settings
-.project
-.classpath
 
 # node.js
 #
@@ -74,11 +67,10 @@ tags
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/
 
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
-fastlane/.env
 fastlane/report.xml
+fastlane/Preview.html
+*/fastlane/screenshots
+
 
 # Sentry
 android/sentry.properties
@@ -86,10 +78,10 @@ ios/sentry.properties
 
 # Testing
 .nyc_output
-coverage
 
-# Bundle artifact
-*.jsbundle
+# Pods
+.podinstall
+ios/Pods/
 
 #editor-settings
-.vscode
+.vscode

CHANGELOG.md

@@ -1,789 +1,5 @@
 # Mattermost Mobile Apps Changelog
 
-## 1.25.0 Release
-- Release Date: November 16, 2019
-- Server Versions Supported: Server v5.9+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
-
-### Bug Fixes
- - Fixed an issue where Mattermost monokai theme no longer worked properly on mobile apps.
- - Fixed an issue on Android where the notification badge count didn't update when using multiple channels.
- - Fixed an issue on Android where test notifications did not work properly.
- - Fixed an issue where "In-app" notifications caused the app badge count to get out of sync.
- - Fixed an issue on Android where email notification setting displayed was not updated when the setting was changed.
- - Fixed an issue where Favorite channels list didn't update if the app was running in the background.
- - Fixed an issue where the timezone setting did not update when changing it back to set automatically.
- - Fixed an issue on iOS where clicking on a hashtag from "recent mentions" (or flagged posts) returned the user to the channel instead of displaying hashtag search results.
- - Fixed an issue where tapping on a hashtag engaged a keyboard for a moment before displaying search results.
- - Fixed an issue where posts of the same thread appeared to be from different threads if separated by a new message line.
- - Fixed styling issues on iOS for Name, Purpose and Header information on the channel info screen.
- - Fixed styling issues with bot posts timestamps in search results and pinned posts.
- - Fixed styling issues on single sign-on screen in landscape view on iOS iPhone X and later.
- - Fixed styling issues on iOS for the Helper text on Settings screens.
- - Fixed an issue where the thread view header theme was inconsistent during transition back to main channel view.
- - Fixed an issue on iOS where the navigation bar tucked under the phone's status bar when switching orientation.
- - Fixed an issue on iOS where the keyboard flashed darker when Automatic Replies had been previously enabled.
- - Fixed an issue on Android where uploading pictures from storage or camera required unwanted permissions.
- - Fixed an issue where ``mobile.message_length.message`` did not match webapp's ``create_post.error_message``.
- 
-### Known Issues
- - App slows down when opening a channel with large number of animated emoji. [MM-15792](https://mattermost.atlassian.net/browse/MM-15792)
-
-## 1.24.0 Release
-- Release Date: October 16, 2019
-- Server Versions Supported: Server v5.9+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
-
-### Highlights
-
-#### Sidebar UI/UX improvements
- - Improved usability and styling of the channel drawer.
-
-### Improvements
- - Added the ability to paste images on input text box.
- - Added copy and paste protection managed configuration support for Android.
- - Added a confirmation dialog when posting a message with `@channel` and `@all`.
- - Added support for safe area in landscape view on iOS.
- - Changed recent date separators to read Today/Yesterday.
- - Added an autocomplete to the edit channel screen.
- - Emoji picker search now ignores the leading colon.
- - Added support for emoji not requiring a whitespace to render.
- - Added support for footer and footer_icon in message attachments.
- - Added a password type for interactive dialogs.
- - Added support for introductory markdown paragraph in interactive dialogs.
- - Added support for boolean elements in interactive dialogs.
- - Improved the permissions prompt if Mattermost doesn't have permission to the photo library.
-
-### Bug Fixes
- - Fixed an issue where the notification badge could get out of sync when reading messages in another client.
- - Fixed an issue where the notification badge number did not reset when opening a push notification.
- - Fixed an issue where SafeArea insets were not working properly on new iPhone 11 models.
- - Fixed an issue where long press on a system message in an archived channel locked up the app.
- - Fixed an issue where tapping on a hashtag while replying to search results didn't open search correctly.
- - Fixed an issue where the channel list panel was missing for a user when they were added to a new team by another user.
- - Fixed an issue where once in a thread, pressing a channel link appeared to do nothing.
- - Fixed an issue where file previews could scroll to the left until all files were out of view.
- - Fixed an issue on iOS where user was unable to select an emoji from two rows on the bottom of the emoji picker.
- - Fixed an issue where duplicate pinned posts displayed after editing pinned post from Pinned Posts screen.
- - Fixed an issue where the reply arrow overlapped a posts's timestamp in some cases.
- - Fixed an issue where post textbox did not clear after using a slash command.
- - Fixed an issue where users were are not immediately removed from the mention auto-complete when those users were deactivated.
- - Fixed an issue where returning to a channel from a thread view could trigger a long-press menu that couldn't be dismissed.
- - Fixed an issue with a missing "(you)" suffix in the channel header of a self Direct Message.
- - Fixed an issue where the Connected banner got stuck open after the WebSocket was connected.
- - Fixed an issue where the text input area in Android Share extension did not use available space.
- - Fixed an issue where Windows dark theme was not consistent when viewing an archived channel.
- - Fixed an issue where interactive dialogs rendered out of safe area view on landscape orientation.
- - Fixed an issue where a themed "Delete Documents & Data" action flashed a white screen.
-
-### Known Issues
- - App slows down when opening a channel with large number of animated emoji. [MM-15792](https://mattermost.atlassian.net/browse/MM-15792)
-
-## 1.23.1 Release
-- Release Date: September 27, 2019
-- Server Versions Supported: Server v5.9+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
-
-### Bug Fixes
- - Fixed issues causing the app to crash on some devices.
-
-## 1.23.0 Release
-- Release Date: September 16, 2019
-- Server Versions Supported: Server v5.9+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
-
-### Bug Fixes
- - Fixed an issue where some Giphy actions were not working in ephemeral posts on mobile.
- - Fixed an issue where users were unable to create new channels when "Combine all channel types" was selected.
- - Fixed an issue on Android EMM where a crash occurred when tapping **Go to Settings**.
- - Fixed an issue on iOS where the in-app "Date" localization persisted after server and user changed.
- - Fixed an issue where the download step was showing when previewing a video right after posting it. 
- - Fixed an issue on Android where cancelling a video download twice in a row showed an error.
- - Fixed an issue where file attachment thumbnail/preview could fail to load and not be able to be reloaded.
- - Fixed an issue on Android where **Channel > Add Members > ADD** text changed to black.
- - Fixed an issue on iOS where the **Cancel** label text didn't fit in one line in German language.
- - Fixed an issue where longer than allowed reply posts kept showing a warning with every backspace.
- - Fixed an issue where there was a delay in search box and emoji content width change when switching to/from portrait/landscape view.
- - Fixed an issue where deactivated users did not appear in the "Jump to..." screen.
- - Fixed an issue where "@undefined has joined the channel" was shown instead of "Someone has joined the channel" when a user joined a channel that another user was viewing.
- - Fixed an issue on Android where the reply arrow was cut off in search results.
- - Fixed an issue where changing display theme from webapp didn't work properly on mobile.
- - Fixed an issue on iOS where a bot account icon style was broken.
- - Fixed an issue with an incorrect UI text for location of touch ID setting.
- 
-### Known Issues
-  - App slows down when opening a channel with large number of animated emoji. [MM-15792](https://mattermost.atlassian.net/browse/MM-15792)
-  - When users are deactivated, they are not immediately removed from the mention auto-complete. [MM-17953](https://mattermost.atlassian.net/browse/MM-17953)
-
-## 1.22.1 Release
-- Release Date: August 23, 2019
-- Server Versions Supported: Server v5.9+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
-
-### Bug Fixes
- - Fixed an issue where the apps crashed when setting the language to Chinese Traditional.
- - Fixed an issue on Android where push notification receipt delivery failed due to invalid server URL.
- - Fixed an issue where the apps crashed when launched via a notification.
- - Fixed an issue where posts made while the app was closed did not appear until refresh.
-
-## 1.22.0 Release
-- Release Date: August 16, 2019
-- Server Versions Supported: Server v5.9+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
-
-### Highlights
-
-#### Support for iOS13 and Android Q
- - Added support for iOS13 and Android Q which are to be released later this year.
-
-### Improvements
- - Added support for Interactive Dialog with no elements.
- - Added a setting for tablets to enable or disable fixed sidebar.
- - Changed "about" section references to use the site name when it is configured in **System Console > Custom Branding > Site Name**.
- - Added support for plus-sign and period/dot in custom URL schemes.
- - Added "Edit profile" button to right-hand side menu and to users' own profile pop-over.
- - Message draft is now saved when closing the app.
- - Removing a link preview on webapp now also removes it on the mobile app.
- - Added ability to select and copy channel header text and purpose.
-
-### Bug Fixes
- - Fixed a few mobile app crash / fatal error issues.
- - Fixed an issue where timestamps were off on Android.
- - Fixed an issue where contents of ephemeral posts from /giphy were not being displayed on mobile.
- - Fixed an issue where team/channel page dots at the bottom of left-hand side overlapped with the last Direct Message channel.
- - Fixed an issue where network reconnection incorrectly showed refreshing messages failed.
- - Fixed an issue with the channel sidebar theme colors not being respected on iPhone X.
- - Fixed an issue where "Message failed to send" had incorrect app badge behaviour.
- - Fixed an issue where a white screen was briefly shown after pressing "Send Message" when viewing a user's profile.
- - Fixed an issue on Android where using "Https" instead of "https" in the url of an image didn't show the preview.
- - Fixed an issue where the client ``setCSRFFromCookie`` did not look for subpaths when accessing cookies.
- - Fixed an issue where archived teams reappeared in selector.
- - Fixed an issue where users' profile picture and name did not get updated after websocket disconnect.
- 
-### Known Issues
-  - App slows down when opening a channel with large number of animated emoji. [MM-15792](https://mattermost.atlassian.net/browse/MM-15792)
-  - Some Giphy actions do not work in ephemeral posts. [MM-17842](https://mattermost.atlassian.net/browse/MM-17842)
-
-## 1.21.2 Release
-- Release Date: August 1, 2019
-- Server Versions Supported: Server v5.9+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
-
-### Bug Fixes
- - Fixed an issue where the mobile apps logged out without a session expiry notification.
-
-## 1.21.1 Release
-- Release Date: July 22, 2019
-- Server Versions Supported: Server v5.9+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
-
-### Bug Fixes
- - Fixed an issue on Android where logging in using SSO failed when the Mattermost server was running on a subpath.
-
-## 1.21.0 Release
-- Release Date: July 16, 2019
-- Server Versions Supported: Server v5.9+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
-
-### Bug Fixes
- - Fixed a few mobile app crash / fatal error issues.
- - Fixed an issue where having the sidebar open at all times on tablets did not work for split view.
- - Fixed an issue where new messages were often hidden behind a keyboard or text field.
- - Fixed an issue on Android where channel sorting didn't match the web app.
- - Fixed an issue where sharing a GIF via keyboard resulted in an error screen.
- - Fixed an issue where long-press menu could not be dragged up when rotating the device to landscape view while the menu was open.
- - Fixed an issue on Android where push notification settings were only saved after closing the settings page.
- - Fixed an issue where users on View Members list had an icon that appeared to be selectable but was not.
- - Fixed an issue where "Jump To" showed archived channels the user did not belong to instead of the ones the user was a member of.
- - Fixed an issue where changing the timezone setting manually to "Set automatically" did not work on the mobile app.
- - Fixed an issue where setting a position field for AD/LDAP sync or SAML in the System Console did not block the user from changing it in account settings.
- - Fixed an issue where **Channel Info > Manage/View Members** screen didn't load channel users.
- - Fixed an issue where enabling large fonts on iOS caused the left-hand side text to be cut off.
- - Fixed an issue on Android where users could not reply to a push notification if the mention was in a thread message.
-
-### Known Issues
-  - (Android) On subpath server, logging in using GitLab or OneLogin fails to display Mattermost. [MM-16829](https://mattermost.atlassian.net/browse/MM-16829)
-  - Buttons inside ephemeral posts are not clickable / functional on the mobile app. [MM-15084](https://mattermost.atlassian.net/browse/MM-15084)
-  - Android apps slow down when opening a channel with large number of animated emoji. [MM-15792](https://mattermost.atlassian.net/browse/MM-15792)
-
-## 1.20.2 Release
-- Release Date: July 10, 2019
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Mobile App v1.13+ is required for Mattermost Server v5.4+.
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
- 
-### Bug Fixes
- - Fixed an issue where Moto G7 devices were detected as tablets and showed a fixed width sidebar.
- - Fixed an issue where having the sidebar open at all times on tablets did not work on split view.
-
-## 1.20.1 Release
-- Release Date: June 21, 2019
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Mobile App v1.13+ is required for Mattermost Server v5.4+.
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
-
-### Bug Fixes
- - Fixed an issue where some Android devices were crashing.
- - Fixed an issue where messages were missing after reconnecting the network.
-
-## 1.20.0 Release
-- Release Date: June 16, 2019
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Mobile App v1.13+ is required for Mattermost Server v5.4+.
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
-
-### Highlights
-
-#### Tablet Improvements
- - Channel sidebar now remains open at a fixed width on tablet devices.
- 
-#### iOS Keyboard Dismissal
- - If the keyboard is open, swiping down past it now closes it.
- 
-#### Profile Telemetry for Android Beta Builds
- - To improve Android app performance, we are collecting trace events and device information, collectively known as metrics, to identify slow performing key areas. Those metrics will be sent only from users using Android app beta build starting in version v1.20, who are logged in to servers that allow sending [diagnostic information](https://docs.mattermost.com/administration/config-settings.html#enable-diagnostics-and-error-reporting).
-
-### Improvements
- - Increased the double tap delay for post action buttons.
- - Implemented assets for Adaptive icons.
- - Users are now brought to the bottom of the channel when posting a message.
- - Users can now execute actions while the keyboard is open.
- - Added support on iOS for IPv6 on LTE networks.
- - Added support for LDAP Group constrained feature with v5.12 servers.
-
-### Bug Fixes
- - Fixed an issue where a post wasn't immediately removed when deleting another user's post.
- - Fixed an issue where the cursor jumped back when typing after auto-completing a slash command.
- - Fixed an issue where the iOS app didn’t properly restore its connection after disconnect.
- - Fixed an issue where the long press menu persisted after returning from a thread.
- - Fixed an issue on Android where the "Write to [channel name]" was cut off for group messages with several users.
- - Fixed an issue where users were not able to flag or unflag posts in a read-only channel.
- - Fixed an issue where the progress indicator was negative while downloading a video.
- - Fixed an issue where the edit post modal didn’t have an autocorrect.
- - Fixed an issue where the 'I forgot my password' option was available on the mobile client even with Email Authentication disabled on the server.
- - Fixed an issue with large separation between placeholders on iPad when a channel was loading.
- - Fixed an issue where "Show More" was not removed after the post was edited to a single line.
- 
-### Known Issues
-  - Buttons inside ephemeral posts are not clickable / functional on the mobile app. [MM-15084](https://mattermost.atlassian.net/browse/MM-15084)
-  - App slows down when opening a channel with large number of animated emoji. [MM-15792](https://mattermost.atlassian.net/browse/MM-15792)
- 
-## 1.19.0 Release
-- Release Date: May 16, 2019
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Mobile App v1.13+ is required for Mattermost Server v5.4+.
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
- 
-### Bug Fixes
- - Fixed an issue where Android managed config was lost on the thread view.
- - Fixed an issue where contents of ephemeral posts did not display on the mobile app.
- - Fixed a few mobile app crash / fatal error issues.
- - Fixed an issue with an expanding animation when tapping on Jump to Channel in the channel list.
- - Fixed an issue on iOS where animated custom emoji weren't animated.
- - Fixed an issue on iOS where users were unable to create channel name of 2 characters.
- - Fixed an issue on iOS where emoji appeared too close, with uneven spacing, and too small in the info modal.
- - Added an error handler when sharing text that was over server's maximum post size with the iOS Share Extension.
- - Fixed an issue where users could upload a GIF as a profile image.
- 
-### Known Issues
- - Buttons inside ephemeral posts are not clickable / functional on the mobile app.
-
-## 1.18.1 Release
-- Release Date: April 18, 2019
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Mobile App v1.13+ is required for Mattermost Server v5.4+.
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
-
-### Bug Fixes 
- - Fixed a crash issue caused by a malformed post textbox localize string.
- - Fixed an issue where iOS crashed when trying to log in using SSO and the SSO provider set a cookie without an expiration date.
-
-## 1.18.0 Release
-- Release Date: April 16, 2019
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Mobile App v1.13+ is required for Mattermost Server v5.4+.
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
- - ``Bot`` tags were added for bot accounts feature in server v5.10 and mobile v1.18, meaning that mobile v1.17 and earlier don't support the tags.
- 
-### Highlights
- - Added support for Office365 single sign-on (SSO).
- - Added support for Integrated Windows Authentication (IWA).
-
-### Improvements
- - Added the ability for channel links to open inside the app.
- - Added ability for emojis and hyperlinks to render in the message attachment title.
- - Added Chinese support for words that trigger mentions.
- - Added a setting to the system console to change the minimum length of hashtags.
- - Added a reply option to long press context menu.
-
-### Bug Fixes
- - Fixed an issue where blank spaces broke markdown tables.
- - Fixed an issue where deactivated users appeared on "Add Members" modal but not on the search results.
- - Fixed an issue on Android where extra text in the search box appeared after using the autocomplete drop-down.
- - Fixed an issue with multiple text entries when typing with Shift+Letter on Android.
- - Fixed an issue where push notifications badges did not always clear when read on another device.
- - Fixed an issue where opening a single or group notification did not take the user into the channel where the notification came from.
- - Fixed an issue where timezone did not automatically update on Android when travelling to another timezone.
- - Fixed an issue where the user mention autocomplete drop-down was case sensitive.
- - Fixed an issue where system admininistrators were able to see the full long press menu when long pressing a system message.
- - Fixed an issue where users were not able to unflag posts from "Flagged Posts" when opened from a read-only channel.
- - Fixed an issue where users were unable to create channel names of 2 byte characters.
- 
-### Known Issues
- - Content for ephemeral messages is not displayed on Mattermost Mobile Apps.
-
-## 1.17.0 Release
-- Release Date: March 20, 2019
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - If **DisableLegacyMfa** setting in ``config.json`` is set to ``true`` and [multi-factor authentication](https://docs.mattermost.com/deployment/auth.html) is enabled, ensure your users have upgraded to mobile app version 1.17 or later. See [Important Upgrade Notes](https://docs.mattermost.com/administration/important-upgrade-notes.html) for more details.
- - If you are using an EMM provider via AppConfig, make sure to add two new settings, `useVPN` and `timeoutVPN`, to your AppConfig file. The settings were added for EMM connections using VPN on-demand - one to indicate if every request should wait for the VPN connection to be established, and another to set the timeout in seconds. See docs for more details on [setting AppConfig values](https://docs.mattermost.com/mobile/mobile-appconfig.html#mattermost-appconfig-values) for VPN support.
- - Mobile App v1.13+ is required for Mattermost Server v5.4+.
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- - iPhone 5s devices and later with iOS 11+ is required.
- 
-### Highlights
- - iOS Share Extension now supports large file sizes and improved performance
-
-### Bug Fixes
- - Fixed support for EMM connections using VPN on-demand. See docs for more details on [setting AppConfig values](https://docs.mattermost.com/mobile/mobile-appconfig.html#mattermost-appconfig-values) for VPN support.
- - Fixed several Android app crash / fatal error issues.
- - Fixed an issue on Android where the app crashed intermittently when selecting a link.
- - Fixed an issue where email notifications setting was out of sync with the webapp until the setting was edited.
- - Fixed an issue where notification badges were not cleared from other clients when clicking on a push notification after opening the mobile app.
- - Fixed an issue where the app did not show local notification when session expired.
- - Fixed an issue where the profile picture for webhooks was showing the hook owner picture.
- - Fixed an issue where some emoji were not rendered as jumbo.
- - Fixed an issue where jumbo emoji posted as a reply sometimes appeared with large space beneath.
- - Fixed an issue where the "No Internet Connection" banner did not always display when internet connectivity was lost.
- - Fixed an issue where the "No Internet Connection" banner did not always disappear when connection was re-estabilished.
- - Fixed an issue where opening channels with unreads had loading indicator placed above unread messages line.
-
-## 1.16.1 Release
-- Release Date: February 21, 2019
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
- - Mobile App v1.13+ is required for Mattermost Server v5.4+.
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
-
-### Bug Fixes
- - Fixed an issue where link previews and reactions weren't displayed when post metadata was disabled.
- - Fixed an issue on Android where the app crashed when sharing multiple files.
- 
-## 1.16.0 Release
-- Release Date: February 16, 2019
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
-
- - Mobile App v1.13+ is required for Mattermost Server v5.4+.
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
-
-### Improvements
- - Added the ability to remove own profile picture.
- - Changed "X" to "Cancel" on Edit Profile page.
- - Added support for relative permalinks.
-
-### Bug Fixes
- - Fixed an issue where the iOS app did not wait until the on-demand VPN connection was established. (EMM Providers)
- - Fixed an issue with a white screen caused by missing Russian translations.
- - Fixed an issue where the iOS badge notification did not always clear.
- - Fixed an issue where the thread view displayed a new message indicator.
- - Fixed an issue where quick multiple taps on the file icon opened multiple file previews.
- - Fixed an issue where the settings page did not show an option to join other teams.
- - Fixed an issue where image previews didn't work after using Delete File Cache.
- - Fixed an issue on Android where the notification trigger word modal title was "Send email notifications" instead of "Keywords".
- - Fixed an issue where the Webhook icon was misaligned and bottom edges were cut off.
- - Fixed an issue on Android where the user was not asked to authenticate to the app first when trying to share a photo, resulting in a white "Share modal" screen with a never-ending loading indicator.
- - Fixed an issue on iOS where push notifications were not preserved when opening the app via the Mattermost icon.
-
-## 1.15.2 Release
-- Release Date: January 16, 2019
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
-
- - Mobile App v1.13+ is required for Mattermost Server v5.4+.
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
-
-### Bug Fixes
-
- - Fixed an issue where the status changes for other users did not always stay current in the mobile app.
- - Fixed an issue where a post did not fail properly when the user attempted to send the post while there was no network access.
- - Fixed an issue where date separators did not update when changing timezones.
- - Fixed an issue where the Favorites section did not clear from a users's channel drawer.
- - Removed an extra divider below "Edit Channel" of Direct Message Channel Info.
- - Fixed an issue where a user was not returned to previously viewed channel after viewing and then closing an archived channel.
- - Fixed an issue where a quick double tap on switch of Channel Info created and extra on/off state.
- - Fixed an issue where iOS long press menu didn't have rounded corners.
-
-## 1.15.1 Release
-- Release Date: December 28, 2018
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
-
- - Mobile App v1.13+ is required for Mattermost Server v5.4+.
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
- 
-### Bug Fixes
- - Fixed an issue preventing some users from logging in using OKTA.
-
-## 1.15.0 Release
-- Release Date: December 16, 2018
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-### Compatibility
-
- - Mobile App v1.13+ is required for Mattermost Server v5.4+.
- - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
-
-### Highlights
- - Added mention and reply mention highlighting.
- - Added a sliding animation for the reaction list.
- - Added support for pinned posts.
- - Added support for jumbo emojis.
- - Added support for interactive dialogs.
- - Improved UI for the long press menu and emoji reaction viewer.
-
-### Improvements
- - Added the ability to include custom headers with requests for custom builds.
- - Push Notifications that are grouped by channels are cleared once the channel is read.
-- Improved auto-reconnect when unable to reach the server.
- - Added support for changing the mobile client status to offline when the app loses connection.
- - Added 'View Members' button to archived channels.
- - Added support on iOS for keeping the postlist in place without scrolling when new content is available.
-
-### Bug Fixes
- - Fixed an issue where clicking on a file did not show downloading progress.
- - Fixed an issue on Android where on fresh install the share extension would not properly show available channels.
- - Fixed an issue where recently archived channels remained in in: autocomplete when they had been archived.
- - Fixed an issue where text should render when no actual custom emoji matched the named emoji pattern.
- - Fixed an issue on iOS where text got cut-off after replying to a message.
- - Fixed an issue where search modifier for channels was showing Direct Messages without usernames.
- - Fixed an issue where "Close Channel" did not work properly when viewing two archived channels in a row.
- - Fixed an issue with "Critical Error" screen when trying to upload certain file types from "+" to the left of message input box.
-
-## 1.14.0 Release
-- Release Date: November 16, 2018
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
-
-**Compatibility Note: Mobile App v1.13+ is required for Mattermost Server v5.4+**
-
-### Bug Fixes
-- Fixed an issue where the Android app did not allow establishing a network connection with any server that used a self-signed certificate that had the CA certificate user installed on the device.
-- Removed "Copy Post" option on long-press message menu for posts without text.
-- Fixed an issue where the "Search Results" header was not fully scrolled to top on search "from:username".
-- Fixed an issue where channel names truncated at fewer characters than necessary.
-- Fixed an issue where the same uploaded photo generated a different file size.
-- Fixed an issue where the "(you)" was not displayed to the right of a user's name in the channel drawer when a user opened a Direct Message channel with themself.
-- Fixed an issue where a dark theme set from webapp broke mobile display.
-- Fixed an issue where channel drawer transition sometimes lagged.
-- Fixed an issue where sending photos to Mattermost created large files.
-- Fixed an issue where the apps showed "Select a Team" screen when opened.
-- Fixed an issue where at-mention, emoji, and slash command autocompletes had a double top border.
-- Fixed an issue where the drawer was unable to close when showing the team list.
-- Fixed an issue where team sidebar showed + sign even without more teams to join.
-
-
-## 1.13.1 Release
-- Release Date: October 18, 2018
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported
-
-**Compatibility Note: Mobile App v1.13+ is required for Mattermost Server v5.4+**
-
-### Bug Fixes
-- Fixed an issue preventing some users from authenticating using OKTA
-
-## v1.13.0 Release
-- Release Date: October 16, 2018
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported
-
-**Compatibility Note: Mobile App v1.13+ is required for Mattermost Server v5.4+**
-
-### Highlights
-
-#### View Emoji Reactions
-- Hold down on any emoji reaction to see who reacted to the post.
-
-#### Hashtags
-- Added support for searching for hashtags in posts.
-
-#### Dropdown menus
-- Added support for dropdown menus in message attachments.
-
-### Improvements
-- Added support for iPhone XR, XS and XS Max.
-- Added support for nicknames on user profile.
-- On servers 5.4+, added support for searching in direct and group message channels using the "in:" modifier.
-- Channel autocomplete now gets closed if multiple tildes are typed.
-- Added a draft icon in sidebar and channel switcher for channels with unsent messages.
-- Users are now redirected to the archived channel view (rather than to Town Square) when a channel is archived.
-- When closing an archived channel, users are now returned to the previously viewed channel.
-
-### Bug Fixes
-- Refactored postlist to include Android Pie fixes and smoother scrolling.
-- Fixed an issue where deactivated users were not marked as such in "Jump To" search.
-- Fixed an issue where users got a permission error when trying to open a file from within the image preview screen.
-- Fixed an issue where session expiry notifications were not being sent on Android.
-- Fixed an issue where post attachments failed to upload.
-- Fixed an issue where the "DM More..." list cut off user info.
-- Fixed an issue where the user would briefly see a system message when loading a reply thread.
-- Fixed an issue where the error message was incorrectly formatted if the login method was set to email/password and the user tried to log in with SAML.
-- Fixed an issue on Android where the keyboard sometimes overlapped the bottom of the post textbox.
-- Fixed an issue where there was no option to take video via "+" > "Take Photo or Video" on iOS.
-
-## v1.12.0 Release
-- Release Date: September 16, 2018
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported
-
-### Highlights
-
-#### Search Date Filters
-- Search for messages before, on, or after a specified date.
-
-### Improvements
-- Added notification support for Android O and P.
-
-### Bug Fixes
-- Fixed an issue where Okta was not able to login in some deployments.
-- Fixed an issue where messages in Direct Message channels did not show when clicking "Jump To".
-- Fixed an issue where `Show More` on a post with a message attachment displayed a blank where content should have been.
-- Prevent downloading of files when disallowed in the System Console.
-- Fixed an issue where users could not click on attachment filenames to open them.
-- Fixed an issue where email notification settings did not save from mobile.
-- Fixed an issue where the share extension allowed users to select and attempt to share content to channels that had been archived.
-- Fixed an issue where reacting to an existing emoji in an archived channel was allowed.
-- Fixed an issue where archived channels sometimes remained in the drawer.
-- Fixed an issue where deactivated users were not marked as such in Direct Message search.
-
-
-## v1.11.0 Release
-- Release Date: August 16, 2018
-- Server Versions Supported: Server v4.10+ is required, Self-Signed SSL Certificates are not supported
-
-### Highlights
-
-#### Searching Archived Channels
-- Added ability to search for archived channels. Requires Mattermost server v5.2 or later.
-
-#### Deep Linking
-- Added the ability for custom builds to open Mattermost links directly in the app rather than the default mobile browser. Learn more in our [documentation](https://docs.mattermost.com/mobile/mobile-faq.html#how-do-i-configure-deep-linking)
-
-### Improvements
-- Added profile pop-up to combined system messages.
-- Force re-entering SSO auth credentials after logout.
-- Added consecutive posts by the same user.
-- Added a loading indicator when user info is still loading in the left-hand side.
-
-### Bug Fixes
-- Fixed an issue where Android devices showed an incorrect timestamp.
-- Fixed an issue on Android where the app did not get sent to the background when pressing the hardware back button in the channel screen.
-- Fixed an issue with video playback when the filename had spaces.
-- Fixed an issue where the app crashed when playing YouTube videos.
-- Fixed an issue with session expiration notification.
-- Fixed an issue with sharing files from Google Drive in Android Share Extension.
-- Fixed an issue on Android where replying to a push notification sometimes went to the wrong channel.
-- Fixed an issue where the previous server URL was present on the input textbox before changing the screen to Login.
-- Fixed an issue where user menu was not translated correctly.
-- Fixed an issue where some field lengths in Account Settings didn't match the desktop app.
-- Fixed an issue where long URLs for embedded images in message attachments got cut off and didn't render.
-- Fixed an issue where link preview images were not cropped properly.
-- Fixed an issue where long usernames didn't wrap properly in the Account Settings menu.
-- Fixed an issue where DMs would not open if users were using "Jump To".
-- Fixed an issue where no message was displayed after removing a user from a channel with join/leave messages disabled.
-
-## v1.10.0 Release
-- Release Date: July 16, 2018
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Highlights
-
-#### Channel drawer performance
-- Android devices will notice significant performance improvements when opening and closing the channel drawer.
-
-#### Channel loading performance
-- Improved channel loading performance as post are retrieved with every push notification
-
-#### Announcement banner improvements
-- Markdown now renders when announcement banners are expanded
-- When enabled by the System Admin, users can now dismiss announcement banners until their next session
-
-### Improvements
-
- - Combined consecutive messages from the same user.
- - Added experimental support for certificate-based authentication (CBA) for iOS to identify a user or a device before granting access to Mattermost. See [documentation](https://docs.mattermost.com/deployment/certificate-based-authentication.html) to learn more.
- - Added support for the experimental automatic direct message replies feature.
- - Added support for the experimental timezone feature.
- - Changed post textbox to not be a connected component.
- - Allow connecting to mattermost instances hosted at subpaths.
- - Added support for starting YouTube videos at a given time.
- - Added support for keeping messages if slash command fails.
-
-### Bug Fixes
-
- - Fixed an issue where the unread badge background was always white.
- - Fixed an issue where a username repeated in system message if user was added to a channel more than once.
- - Fixed an issue where Android Sharing from Microsoft apps failed.
- - Fixed an issue where YouTube crashed the app if link did not have a time set.
- - Fixed an issue where System Admins did not see all teams available to join on mobile.
- - Fixed an issue where users were unable to share from Files app.
- - Fixed an issue where viewing a non-existent permalink didn't show an error message.
- - Fixed an issue where jumping to a channel search did not bold unread channels.
- - Fixed an issue with being able to add own user to a Group Message channel.
- - Fixed an issue with not being able to reply from a push notification on iOS.
- - Fixed an issue where the app did not display Brazilian language.
- 
-## 1.9.3 Release
-- Release Date: July 04, 2018
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Bug Fixes
-
-- Fixed multiple issues causing app crashes
-- Fixed an issue on iOS devices with typing non-english characters in the post input box
-
-## 1.9.2 Release
-- Release Date: June 27, 2018
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Bug Fixes
-
-- Fixed an issue where attached videos did not play for the poster
-- Fixed an issue where "Jump to recent messages" from the permalink view did not direct the user to the bottom of the channel
-- Fixed an issue where post comments did not identify which parent post they belonged to
-- Fixed multiple issues with typing non-english characters in the post input box
-- Fixed multiple issues causing random app crashes
-- Fixed an issue where files from the Android Files app failed to upload
-- Fixed an issue where the iOS share extension crashed when switching the team or channel
-- Fixed an issue where files from the Microsoft app failed to upload
-- Fixed an issue on Android devices where sharing files changed the file extension of the attachment
-
-## 1.9.1 Release
-- Release Date: June 23, 2018
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Bug Fixes
-- Fixed an issue with typing lag on Android devices
-- Fixed an issue causing users to be logged out after upgrading to v1.9.0
-- Fixed an issue where the ``in:`` and ``from:`` modifiers were not being added to the search field
-
-## v1.9.0 Release
-- Release Date: June 16, 2018
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Highlights
-
-#### Improved first load time on Android
- - Significantly decreased first load time on Android devices from cold start.
- 
-#### iOS Files app support
-- Added support for attaching files from the iOS Files app from within Mattermost.
-
-#### Improved styling of push notification
-- Improved the layout of message content, channel name and sender name in push notifications.
-
-### Improvements
-
- - Combined join/leave system messages.
- - Added splash screen and channel loader improvements.
- - Removed the desktop notification duration setting.
- - Added cache team icon and set background to always be white if using a PNG file.
- - Added whitelabel for icons and splash screen.
-
-### Bug Fixes
-
- - Fixed an issue where other user's display name did not render in combined system messages after joining the channel.
- - Fixed an issue where posts incorrectly had "Commented on Someone's message" above them.
- - Fixed an issue where deleting a post or its parent in permalink view left permalink view blank.
- - Fixed an issue where "User is typing" message cut was off.
- - Fixed an issue where `More New Messages Above` appeared at the top of new channel on joining.
- - Fixed an issue where a user was not directed to Town Square when leaving a channel.
- - Fixed an issue where long post were not collapsed on Android.
- - Fixed an issue where a user's name was initially shown as "someone" when opening a direct message with the user.
- - Fixed an issue where an error was received when trying to change the team or channel from the share extension.
- - Fixed an issue where switching to a newly created channel from a push notification redirected a user to Town Square.
- - Fixed an issue where a public channel made private did not disappear automatically from clients not part of the channel.
-
-## v1.8.0 Release
-- Release Date: April 27, 2018
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Highlights
-
-#### Image performance
-- Images are now downloaded and stored locally for better performance
-
-#### Flagged Posts and Recent Mentions
-- Access all your flagged posts and recent mentions from the buttons in the sidebar
-
-#### Muted Channels
-- Added support for Muted Channels released with Mattermost server v4.9 
-
-### Improvements
-- Date separators now appear between each posts in the search view
-- Deactivated users are now filtered out of the channel members lists
-- Direct Messages user list is now sorted by username first
-- Added the option to Direct Message yourself from your user profile screen
-- Improved performance on the post list
-- Improved matching and display when searching for users in the Direct Message user list
-
-### Bug Fixes
-- Fixed an issue where emoji reactions could be added from the search view but did not appear
-- Fixed an issue causing the app to crash when trying to share content from a custom keyboard
-- Fixed an issue where team names were being sorted based on letter case
-- Fixed an issue where username would not be inserted to the post draft when using experimental configuration settings
-- Fixed an issue with nested bullet lists being cut off in the user interface
-- Fixed an issue where private channels were listed in the public channels section of the channel autocomplete list
-- Fixed an issue where a profile images could not be updated from the app
-
 ## v1.7.1 Release
 - Release Date: April 3, 2018
 - Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported

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/).

ImagePickerModule.java

@@ -0,0 +1,729 @@
+package com.imagepicker;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.MediaStore;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.StyleRes;
+import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
+import android.util.Base64;
+import android.util.Patterns;
+import android.webkit.MimeTypeMap;
+import android.content.pm.PackageManager;
+
+import com.facebook.react.ReactActivity;
+import com.facebook.react.bridge.ActivityEventListener;
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+import com.imagepicker.media.ImageConfig;
+import com.imagepicker.permissions.PermissionUtils;
+import com.imagepicker.permissions.OnImagePickerPermissionsCallback;
+import com.imagepicker.utils.MediaUtils.ReadExifResult;
+import com.imagepicker.utils.RealPathUtil;
+import com.imagepicker.utils.UI;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.ref.WeakReference;
+import java.util.List;
+
+import com.facebook.react.modules.core.PermissionListener;
+import com.facebook.react.modules.core.PermissionAwareActivity;
+
+import static com.imagepicker.utils.MediaUtils.*;
+import static com.imagepicker.utils.MediaUtils.createNewFile;
+import static com.imagepicker.utils.MediaUtils.getResizedImage;
+
+public class ImagePickerModule extends ReactContextBaseJavaModule
+        implements ActivityEventListener
+{
+
+  public static final int REQUEST_LAUNCH_IMAGE_CAPTURE    = 13001;
+  public static final int REQUEST_LAUNCH_IMAGE_LIBRARY    = 13002;
+  public static final int REQUEST_LAUNCH_VIDEO_LIBRARY    = 13003;
+  public static final int REQUEST_LAUNCH_VIDEO_CAPTURE    = 13004;
+  public static final int REQUEST_PERMISSIONS_FOR_CAMERA  = 14001;
+  public static final int REQUEST_PERMISSIONS_FOR_LIBRARY = 14002;
+
+  private final ReactApplicationContext reactContext;
+  private final int dialogThemeId;
+
+  protected Callback callback;
+  private ReadableMap options;
+  protected Uri cameraCaptureURI;
+  private Boolean noData = false;
+  private Boolean pickVideo = false;
+  private ImageConfig imageConfig = new ImageConfig(null, null, 0, 0, 100, 0, false);
+
+  @Deprecated
+  private int videoQuality = 1;
+
+  @Deprecated
+  private int videoDurationLimit = 0;
+
+  private ResponseHelper responseHelper = new ResponseHelper();
+  private PermissionListener listener = new PermissionListener()
+  {
+    public boolean onRequestPermissionsResult(final int requestCode,
+                                              @NonNull final String[] permissions,
+                                              @NonNull final int[] grantResults)
+    {
+      boolean permissionsGranted = true;
+      for (int i = 0; i < permissions.length; i++)
+      {
+        final boolean granted = grantResults[i] == PackageManager.PERMISSION_GRANTED;
+        permissionsGranted = permissionsGranted && granted;
+      }
+
+      if (callback == null || options == null)
+      {
+        return false;
+      }
+
+      if (!permissionsGranted)
+      {
+        responseHelper.invokeError(callback, "Permissions weren't granted");
+        return false;
+      }
+
+      switch (requestCode)
+      {
+        case REQUEST_PERMISSIONS_FOR_CAMERA:
+          launchCamera(options, callback);
+          break;
+
+        case REQUEST_PERMISSIONS_FOR_LIBRARY:
+          launchImageLibrary(options, callback);
+          break;
+
+      }
+      return true;
+    }
+  };
+
+  public ImagePickerModule(ReactApplicationContext reactContext,
+                           @StyleRes final int dialogThemeId)
+  {
+    super(reactContext);
+
+    this.dialogThemeId = dialogThemeId;
+    this.reactContext = reactContext;
+    this.reactContext.addActivityEventListener(this);
+  }
+
+  @Override
+  public String getName() {
+    return "ImagePickerManager";
+  }
+
+  @ReactMethod
+  public void showImagePicker(final ReadableMap options, final Callback callback) {
+    Activity currentActivity = getCurrentActivity();
+
+    if (currentActivity == null)
+    {
+      responseHelper.invokeError(callback, "can't find current Activity");
+      return;
+    }
+
+    this.callback = callback;
+    this.options = options;
+    imageConfig = new ImageConfig(null, null, 0, 0, 100, 0, false);
+
+    final AlertDialog dialog = UI.chooseDialog(this, options, new UI.OnAction()
+    {
+      @Override
+      public void onTakePhoto(@NonNull final ImagePickerModule module)
+      {
+        if (module == null)
+        {
+          return;
+        }
+        module.launchCamera();
+      }
+
+      @Override
+      public void onUseLibrary(@NonNull final ImagePickerModule module)
+      {
+        if (module == null)
+        {
+          return;
+        }
+        module.launchImageLibrary();
+      }
+
+      @Override
+      public void onCancel(@NonNull final ImagePickerModule module)
+      {
+        if (module == null)
+        {
+          return;
+        }
+        module.doOnCancel();
+      }
+
+      @Override
+      public void onCustomButton(@NonNull final ImagePickerModule module,
+                                 @NonNull final String action)
+      {
+        if (module == null)
+        {
+          return;
+        }
+        module.invokeCustomButton(action);
+      }
+    });
+    dialog.show();
+  }
+
+  public void doOnCancel()
+  {
+    if (this.callback != null) {
+      responseHelper.invokeCancel(this.callback);
+    }
+  }
+
+  public void launchCamera()
+  {
+    this.launchCamera(this.options, this.callback);
+  }
+
+  // NOTE: Currently not reentrant / doesn't support concurrent requests
+  @ReactMethod
+  public void launchCamera(final ReadableMap options, final Callback callback)
+  {
+    if (!isCameraAvailable())
+    {
+      responseHelper.invokeError(callback, "Camera not available");
+      return;
+    }
+
+    final Activity currentActivity = getCurrentActivity();
+    if (currentActivity == null)
+    {
+      responseHelper.invokeError(callback, "can't find current Activity");
+      return;
+    }
+
+    this.callback = callback;
+    this.options = options;
+
+    if (!permissionsCheck(currentActivity, callback, REQUEST_PERMISSIONS_FOR_CAMERA))
+    {
+      return;
+    }
+
+    parseOptions(this.options);
+
+    int requestCode;
+    Intent cameraIntent;
+
+    if (pickVideo)
+    {
+      requestCode = REQUEST_LAUNCH_VIDEO_CAPTURE;
+      cameraIntent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
+      cameraIntent.putExtra(MediaStore.EXTRA_VIDEO_QUALITY, videoQuality);
+      if (videoDurationLimit > 0)
+      {
+        cameraIntent.putExtra(MediaStore.EXTRA_DURATION_LIMIT, videoDurationLimit);
+      }
+    }
+    else
+    {
+      requestCode = REQUEST_LAUNCH_IMAGE_CAPTURE;
+      cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+
+      final File original = createNewFile(reactContext, this.options, false);
+      imageConfig = imageConfig.withOriginalFile(original);
+
+      if (imageConfig.original != null) {
+        cameraCaptureURI = RealPathUtil.compatUriFromFile(reactContext, imageConfig.original);
+      }else {
+        responseHelper.invokeError(callback, "Couldn't get file path for photo");
+        return;
+      }
+      if (cameraCaptureURI == null)
+      {
+        responseHelper.invokeError(callback, "Couldn't get file path for photo");
+        return;
+      }
+      cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, cameraCaptureURI);
+    }
+
+    if (cameraIntent.resolveActivity(reactContext.getPackageManager()) == null)
+    {
+      responseHelper.invokeError(callback, "Cannot launch camera");
+      return;
+    }
+
+    // Workaround for Android bug.
+    // grantUriPermission also needed for KITKAT,
+    // see https://code.google.com/p/android/issues/detail?id=76683
+    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
+      List<ResolveInfo> resInfoList = reactContext.getPackageManager().queryIntentActivities(cameraIntent, PackageManager.MATCH_DEFAULT_ONLY);
+      for (ResolveInfo resolveInfo : resInfoList) {
+        String packageName = resolveInfo.activityInfo.packageName;
+        reactContext.grantUriPermission(packageName, cameraCaptureURI, Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+      }
+    }
+
+    try
+    {
+      currentActivity.startActivityForResult(cameraIntent, requestCode);
+    }
+    catch (ActivityNotFoundException e)
+    {
+      e.printStackTrace();
+      responseHelper.invokeError(callback, "Cannot launch camera");
+    }
+  }
+
+  public void launchImageLibrary()
+  {
+    this.launchImageLibrary(this.options, this.callback);
+  }
+  // NOTE: Currently not reentrant / doesn't support concurrent requests
+  @ReactMethod
+  public void launchImageLibrary(final ReadableMap options, final Callback callback)
+  {
+    final Activity currentActivity = getCurrentActivity();
+    if (currentActivity == null) {
+      responseHelper.invokeError(callback, "can't find current Activity");
+      return;
+    }
+
+    this.options = options;
+    this.callback = callback;
+
+    if (!permissionsCheck(currentActivity, callback, REQUEST_PERMISSIONS_FOR_LIBRARY))
+    {
+      return;
+    }
+
+    parseOptions(this.options);
+
+    int requestCode;
+    Intent libraryIntent;
+    if (pickVideo)
+    {
+      requestCode = REQUEST_LAUNCH_VIDEO_LIBRARY;
+      libraryIntent = new Intent(Intent.ACTION_PICK);
+      libraryIntent.setType("video/*");
+    }
+    else
+    {
+      requestCode = REQUEST_LAUNCH_IMAGE_LIBRARY;
+      libraryIntent = new Intent(Intent.ACTION_PICK,
+              MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+    }
+
+    if (libraryIntent.resolveActivity(reactContext.getPackageManager()) == null)
+    {
+      responseHelper.invokeError(callback, "Cannot launch photo library");
+      return;
+    }
+
+    try
+    {
+      currentActivity.startActivityForResult(libraryIntent, requestCode);
+    }
+    catch (ActivityNotFoundException e)
+    {
+      e.printStackTrace();
+      responseHelper.invokeError(callback, "Cannot launch photo library");
+    }
+  }
+
+  @Override
+  public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
+    //robustness code
+    if (passResult(requestCode))
+    {
+      return;
+    }
+
+    responseHelper.cleanResponse();
+
+    // user cancel
+    if (resultCode != Activity.RESULT_OK)
+    {
+      removeUselessFiles(requestCode, imageConfig);
+      responseHelper.invokeCancel(callback);
+      callback = null;
+      return;
+    }
+
+    Uri uri = null;
+    switch (requestCode)
+    {
+      case REQUEST_LAUNCH_IMAGE_CAPTURE:
+        uri = cameraCaptureURI;
+        break;
+
+      case REQUEST_LAUNCH_IMAGE_LIBRARY:
+        uri = data.getData();
+        String realPath = getRealPathFromURI(uri);
+        final boolean isUrl = !TextUtils.isEmpty(realPath) &&
+                Patterns.WEB_URL.matcher(realPath).matches();
+        if (realPath == null || isUrl)
+        {
+          try
+          {
+            File file = createFileFromURI(uri);
+            realPath = file.getAbsolutePath();
+            uri = Uri.fromFile(file);
+          }
+          catch (Exception e)
+          {
+            // image not in cache
+            responseHelper.putString("error", "Could not read photo");
+            responseHelper.putString("uri", uri.toString());
+            responseHelper.invokeResponse(callback);
+            callback = null;
+            return;
+          }
+        }
+        imageConfig = imageConfig.withOriginalFile(new File(realPath));
+        break;
+
+      case REQUEST_LAUNCH_VIDEO_LIBRARY:
+        responseHelper.putString("uri", data.getData().toString());
+        responseHelper.putString("path", getRealPathFromURI(data.getData()));
+        responseHelper.invokeResponse(callback);
+        callback = null;
+        return;
+
+      case REQUEST_LAUNCH_VIDEO_CAPTURE:
+        final String path = getRealPathFromURI(data.getData());
+        responseHelper.putString("uri", data.getData().toString());
+        responseHelper.putString("path", path);
+        fileScan(reactContext, path);
+        responseHelper.invokeResponse(callback);
+        callback = null;
+        return;
+    }
+
+    final ReadExifResult result = readExifInterface(responseHelper, imageConfig);
+
+    if (result.error != null)
+    {
+      removeUselessFiles(requestCode, imageConfig);
+      responseHelper.invokeError(callback, result.error.getMessage());
+      callback = null;
+      return;
+    }
+
+    BitmapFactory.Options options = new BitmapFactory.Options();
+    options.inJustDecodeBounds = true;
+    BitmapFactory.decodeFile(imageConfig.original.getAbsolutePath(), options);
+    int initialWidth = options.outWidth;
+    int initialHeight = options.outHeight;
+    updatedResultResponse(uri, imageConfig.original.getAbsolutePath());
+
+    // don't create a new file if contraint are respected
+    if (imageConfig.useOriginal(initialWidth, initialHeight, result.currentRotation))
+    {
+      responseHelper.putInt("width", initialWidth);
+      responseHelper.putInt("height", initialHeight);
+      fileScan(reactContext, imageConfig.original.getAbsolutePath());
+    }
+    else
+    {
+      imageConfig = getResizedImage(reactContext, this.options, imageConfig, initialWidth, initialHeight, requestCode);
+      if (imageConfig.resized == null)
+      {
+        removeUselessFiles(requestCode, imageConfig);
+        responseHelper.putString("error", "Can't resize the image");
+      }
+      else
+      {
+        uri = Uri.fromFile(imageConfig.resized);
+        BitmapFactory.decodeFile(imageConfig.resized.getAbsolutePath(), options);
+        responseHelper.putInt("width", options.outWidth);
+        responseHelper.putInt("height", options.outHeight);
+
+        updatedResultResponse(uri, imageConfig.resized.getAbsolutePath());
+        fileScan(reactContext, imageConfig.resized.getAbsolutePath());
+      }
+    }
+
+    if (imageConfig.saveToCameraRoll && requestCode == REQUEST_LAUNCH_IMAGE_CAPTURE)
+    {
+      final RolloutPhotoResult rolloutResult = rolloutPhotoFromCamera(imageConfig);
+
+      if (rolloutResult.error == null)
+      {
+        imageConfig = rolloutResult.imageConfig;
+        uri = Uri.fromFile(imageConfig.getActualFile());
+        updatedResultResponse(uri, imageConfig.getActualFile().getAbsolutePath());
+      }
+      else
+      {
+        removeUselessFiles(requestCode, imageConfig);
+        final String errorMessage = new StringBuilder("Error moving image to camera roll: ")
+                .append(rolloutResult.error.getMessage()).toString();
+        responseHelper.putString("error", errorMessage);
+        return;
+      }
+    }
+
+    responseHelper.invokeResponse(callback);
+    callback = null;
+    this.options = null;
+  }
+
+  public void invokeCustomButton(@NonNull final String action)
+  {
+    responseHelper.invokeCustomButton(this.callback, action);
+  }
+
+  @Override
+  public void onNewIntent(Intent intent) { }
+
+  public Context getContext()
+  {
+    return getReactApplicationContext();
+  }
+
+  public @StyleRes int getDialogThemeId()
+  {
+    return this.dialogThemeId;
+  }
+
+  public @NonNull Activity getActivity()
+  {
+    return getCurrentActivity();
+  }
+
+
+  private boolean passResult(int requestCode)
+  {
+    return callback == null || (cameraCaptureURI == null && requestCode == REQUEST_LAUNCH_IMAGE_CAPTURE)
+            || (requestCode != REQUEST_LAUNCH_IMAGE_CAPTURE && requestCode != REQUEST_LAUNCH_IMAGE_LIBRARY
+            && requestCode != REQUEST_LAUNCH_VIDEO_LIBRARY && requestCode != REQUEST_LAUNCH_VIDEO_CAPTURE);
+  }
+
+  private void updatedResultResponse(@Nullable final Uri uri,
+                                     @NonNull final String path)
+  {
+    responseHelper.putString("uri", uri.toString());
+    responseHelper.putString("path", path);
+
+    if (!noData) {
+      responseHelper.putString("data", getBase64StringFromFile(path));
+    }
+
+    putExtraFileInfo(path, responseHelper);
+  }
+
+  private boolean permissionsCheck(@NonNull final Activity activity,
+                                   @NonNull final Callback callback,
+                                   @NonNull final int requestCode)
+  {
+    final int writePermission = ActivityCompat
+            .checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+    final int cameraPermission = ActivityCompat
+            .checkSelfPermission(activity, Manifest.permission.CAMERA);
+
+    final boolean permissionsGrated = writePermission == PackageManager.PERMISSION_GRANTED &&
+            cameraPermission == PackageManager.PERMISSION_GRANTED;
+
+    if (!permissionsGrated)
+    {
+      final Boolean dontAskAgain = ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) && ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.CAMERA);
+
+      if (dontAskAgain)
+      {
+        final AlertDialog dialog = PermissionUtils
+                .explainingDialog(this, options, new PermissionUtils.OnExplainingPermissionCallback()
+                {
+                  @Override
+                  public void onCancel(WeakReference<ImagePickerModule> moduleInstance,
+                                       DialogInterface dialogInterface)
+                  {
+                    final ImagePickerModule module = moduleInstance.get();
+                    if (module == null)
+                    {
+                      return;
+                    }
+                    module.doOnCancel();
+                  }
+
+                  @Override
+                  public void onReTry(WeakReference<ImagePickerModule> moduleInstance,
+                                      DialogInterface dialogInterface)
+                  {
+                    final ImagePickerModule module = moduleInstance.get();
+                    if (module == null)
+                    {
+                      return;
+                    }
+                    Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                    Uri uri = Uri.fromParts("package", module.getContext().getPackageName(), null);
+                    intent.setData(uri);
+                    final Activity innerActivity = module.getActivity();
+                    if (innerActivity == null)
+                    {
+                      return;
+                    }
+                    innerActivity.startActivityForResult(intent, 1);
+                  }
+                });
+        if (dialog != null) {
+          dialog.show();
+        }
+        return false;
+      }
+      else
+      {
+        String[] PERMISSIONS = {Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA};
+        if (activity instanceof ReactActivity)
+        {
+          ((ReactActivity) activity).requestPermissions(PERMISSIONS, requestCode, listener);
+        }
+        else if (activity instanceof OnImagePickerPermissionsCallback)
+        {
+          ((OnImagePickerPermissionsCallback) activity).setPermissionListener(listener);
+          ActivityCompat.requestPermissions(activity, PERMISSIONS, requestCode);
+        }
+        else if (activity instanceof PermissionAwareActivity) {
+          ((PermissionAwareActivity) activity).requestPermissions(PERMISSIONS, requestCode, listener);
+        }
+        else
+        {
+          final String errorDescription = new StringBuilder(activity.getClass().getSimpleName())
+                  .append(" must implement ")
+                  .append(OnImagePickerPermissionsCallback.class.getSimpleName())
+                  .append(PermissionAwareActivity.class.getSimpleName())
+                  .toString();
+          throw new UnsupportedOperationException(errorDescription);
+        }
+        return false;
+      }
+    }
+    return true;
+  }
+
+  private boolean isCameraAvailable() {
+    return reactContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA)
+            || reactContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
+  }
+
+  private @NonNull String getRealPathFromURI(@NonNull final Uri uri) {
+    return RealPathUtil.getRealPathFromURI(reactContext, uri);
+  }
+
+  /**
+   * Create a file from uri to allow image picking of image in disk cache
+   * (Exemple: facebook image, google image etc..)
+   *
+   * @doc =>
+   * https://github.com/nostra13/Android-Universal-Image-Loader#load--display-task-flow
+   *
+   * @param uri
+   * @return File
+   * @throws Exception
+   */
+  private File createFileFromURI(Uri uri) throws Exception {
+    File file = new File(reactContext.getExternalCacheDir(), "photo-" + uri.getLastPathSegment());
+    InputStream input = reactContext.getContentResolver().openInputStream(uri);
+    OutputStream output = new FileOutputStream(file);
+
+    try {
+      byte[] buffer = new byte[4 * 1024];
+      int read;
+      while ((read = input.read(buffer)) != -1) {
+        output.write(buffer, 0, read);
+      }
+      output.flush();
+    } finally {
+      output.close();
+      input.close();
+    }
+
+    return file;
+  }
+
+  private String getBase64StringFromFile(String absoluteFilePath) {
+    InputStream inputStream = null;
+    try {
+      inputStream = new FileInputStream(new File(absoluteFilePath));
+    } catch (FileNotFoundException e) {
+      e.printStackTrace();
+    }
+
+    byte[] bytes;
+    byte[] buffer = new byte[8192];
+    int bytesRead;
+    ByteArrayOutputStream output = new ByteArrayOutputStream();
+    try {
+      while ((bytesRead = inputStream.read(buffer)) != -1) {
+        output.write(buffer, 0, bytesRead);
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    bytes = output.toByteArray();
+    return Base64.encodeToString(bytes, Base64.NO_WRAP);
+  }
+
+  private void putExtraFileInfo(@NonNull final String path,
+                                @NonNull final ResponseHelper responseHelper)
+  {
+    // size && filename
+    try {
+      File f = new File(path);
+      responseHelper.putDouble("fileSize", f.length());
+      responseHelper.putString("fileName", f.getName());
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+
+    // type
+    String extension = MimeTypeMap.getFileExtensionFromUrl(path);
+    if (extension != null) {
+      responseHelper.putString("type", MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension));
+    }
+  }
+
+  private void parseOptions(final ReadableMap options) {
+    noData = false;
+    if (options.hasKey("noData")) {
+      noData = options.getBoolean("noData");
+    }
+    imageConfig = imageConfig.updateFromOptions(options);
+    pickVideo = false;
+    if (options.hasKey("mediaType") && options.getString("mediaType").equals("video")) {
+      pickVideo = true;
+    }
+    videoQuality = 1;
+    if (options.hasKey("videoQuality") && options.getString("videoQuality").equals("low")) {
+      videoQuality = 0;
+    }
+    videoDurationLimit = 0;
+    if (options.hasKey("durationLimit")) {
+      videoDurationLimit = options.getInt("durationLimit");
+    }
+  }
+}

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2015-present Mattermost, Inc. 
+Copyright 2016 Mattermost, Inc. 
 
                                  Apache License
                            Version 2.0, January 2004

Makefile

@@ -1,19 +1,16 @@
-.PHONY: pre-run pre-build clean
+.PHONY: pre-run 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: build-ios build-android unsigned-ios unsigned-android
 .PHONY: test help
 
 POD := $(shell which pod 2> /dev/null)
 OS := $(shell sh -c 'uname -s 2>/dev/null')
 BASE_ASSETS = $(shell find assets/base -type d) $(shell find assets/base -type f -name '*')
 OVERRIDE_ASSETS = $(shell find assets/override -type d 2> /dev/null) $(shell find assets/override -type f -name '*' 2> /dev/null)
-MM_UTILITIES_DIR = ../mattermost-utilities
 
-node_modules: package.json
+.npminstall: package.json
 	@if ! [ $(shell which npm 2> /dev/null) ]; then \
 		echo "npm is not installed https://npmjs.com"; \
 		exit 1; \
@@ -22,14 +19,7 @@ node_modules: package.json
 	@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
+	@touch $@
 
 .podinstall:
 ifeq ($(OS), Darwin)
@@ -53,30 +43,31 @@ dist/assets: $(BASE_ASSETS) $(OVERRIDE_ASSETS)
 	@echo "Generating app assets"
 	@node scripts/make-dist-assets.js
 
-pre-run: | node_modules .podinstall dist/assets ## Installs dependencies and assets
+pre-run: | .npminstall .podinstall dist/assets ## Installs dependencies and assets
 
-pre-build: | npm-ci .podinstall dist/assets ## Install dependencies and assets before building
-
-check-style: node_modules ## Runs eslint
+check-style: .npminstall ## Runs eslint
 	@echo Checking for style guide compliance
 	@npm run check
 
 clean: ## Cleans dependencies, previous builds and temp files
 	@echo Cleaning started
 
-	@rm -f .podinstall
-	@rm -rf ios/Pods
 	@rm -rf node_modules
+	@rm -f .npminstall
+	@rm -f .podinstall
 	@rm -rf dist
 	@rm -rf ios/build
+	@rm -rf ios/Pods
 	@rm -rf android/app/build
 
 	@echo Cleanup finished
 
 post-install:
-	@./node_modules/.bin/patch-package
-	@./node_modules/.bin/jetify
-
+	@./node_modules/.bin/remotedev-debugger --hostname localhost --port 5678 --injectserver
+	@# Must remove the .babelrc for 0.42.0 to work correctly
+	@# Need to copy custom ImagePickerModule.java that implements correct permission checks for android
+	@rm node_modules/react-native-image-picker/android/src/main/java/com/imagepicker/ImagePickerModule.java
+	@cp ./ImagePickerModule.java node_modules/react-native-image-picker/android/src/main/java/com/imagepicker
 	@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
@@ -84,12 +75,30 @@ post-install:
 	@sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-messageformat/package.json
 	@sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-relativeformat/package.json
 	@sed -i'' -e 's|"./locale-data/complete.js": false|"./locale-data/complete.js": "./locale-data/complete.js"|g' node_modules/intl/package.json
+	@sed -i'' -e 's|auto("auto", Configuration.ORIENTATION_UNDEFINED, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);|auto("auto", Configuration.ORIENTATION_UNDEFINED, ActivityInfo.SCREEN_ORIENTATION_FULL_USER);|g' node_modules/react-native-navigation/android/app/src/main/java/com/reactnativenavigation/params/Orientation.java
+	@sed -i'' -e "s|super.onBackPressed();|this.moveTaskToBack(true);|g" node_modules/react-native-navigation/android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java
+	@if [ $(shell grep "const Platform" node_modules/react-native/Libraries/Lists/VirtualizedList.js | grep -civ grep) -eq 0 ]; then \
+		sed $ -i'' -e "s|const ReactNative = require('ReactNative');|const ReactNative = require('ReactNative');`echo $\\\\\\r;`const Platform = require('Platform');|g" node_modules/react-native/Libraries/Lists/VirtualizedList.js; \
+	fi
+	@sed -i'' -e 's|transform: \[{scaleY: -1}\],|...Platform.select({android: {transform: \[{perspective: 1}, {scaleY: -1}\]}, ios: {transform: \[{scaleY: -1}\]}}),|g' node_modules/react-native/Libraries/Lists/VirtualizedList.js
+	@cd ./node_modules/mattermost-redux && npm run build
 
 start: | pre-run ## Starts the React Native packager server
-	$(call 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; \
+	else \
+		echo React Native packager server already running; \
+	fi
 
 stop: ## Stops the React Native packager server
-	$(call 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
 
 check-device-ios:
 	@if ! [ $(shell which xcodebuild) ]; then \
@@ -127,9 +136,9 @@ prepare-android-build:
 run: run-ios ## alias for run-ios
 
 run-ios: | check-device-ios pre-run ## Runs the app on an iOS simulator
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
+	@if [ $(shell ps -e | 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; \
+		node ./node_modules/react-native/local-cli/cli.js start & echo Running iOS app in development; \
 		if [ ! -z "${SIMULATOR}" ]; then \
 			react-native run-ios --simulator="${SIMULATOR}"; \
 		else \
@@ -146,10 +155,10 @@ run-ios: | check-device-ios pre-run ## Runs the app on an iOS simulator
 	fi
 
 run-android: | check-device-android pre-run prepare-android-build ## Runs the app on an Android emulator or dev device
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
+	@if [ $(shell ps -e | 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 \
+    	node ./node_modules/react-native/local-cli/cli.js 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; \
@@ -164,91 +173,61 @@ run-android: | check-device-android pre-run prepare-android-build ## Runs the ap
 		fi; \
     fi
 
-build: | stop pre-build check-style i18n-extract-ci ## Builds the app for Android & iOS
-	$(call start_packager)
-	@echo "Building App"
-	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane build
-	$(call stop_packager)
-
-
-build-ios: | stop pre-build check-style i18n-extract-ci ## Builds the iOS app
-	$(call start_packager)
+build-ios: | pre-run check-style ## Creates an iOS build
+ifneq ($(IOS_APP_GROUP),)
+	@mkdir -p assets/override
+	@echo "{\n\t\"AppGroupId\": \"$$IOS_APP_GROUP\"\n}" > assets/override/config.json
+endif
+	@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 & echo; \
+	fi
 	@echo "Building iOS app"
 	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane ios build
-	$(call stop_packager)
+	@ps -e | grep -i "cli.js start" | grep -iv grep | awk '{print $$1}' | xargs kill -9
+	@rm -rf assets/override
 
-build-android: | stop pre-build check-style i18n-extract-ci prepare-android-build ## Build the Android app
-	$(call start_packager)
+build-android: | pre-run check-style prepare-android-build ## Creates an Android build
+	@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 & echo; \
+	fi
 	@echo "Building Android app"
 	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane android build
-	$(call stop_packager)
+	@ps -e | grep -i "cli.js start" | grep -iv grep | awk '{print $$1}' | xargs kill -9
 
-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"
+unsigned-ios: pre-run check-style
+	@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 & echo; \
+	fi
+	@echo "Building unsigned iOS app"
+ifneq ($(IOS_APP_GROUP),)
+	@mkdir -p assets/override
+	@echo "{\n\t\"AppGroupId\": \"$$IOS_APP_GROUP\"\n}" > assets/override/config.json
+endif
 	@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 .
+	@cd ios/ && xcodebuild -workspace Mattermost.xcworkspace/ -scheme Mattermost -sdk iphoneos -configuration Relase -parallelizeTargets -resultBundlePath ../build-ios/result -derivedDataPath ../build-ios/ CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+	@cd build-ios/ && mkdir -p Payload && cp -R Build/Products/Release-iphoneos/Mattermost.app Payload/ && zip -r Mattermost-unsigned.ipa Payload/
+	@mv build-ios/Mattermost-unsigned.ipa .
 	@rm -rf build-ios/
-	@cd fastlane && bundle exec fastlane upload_file_to_s3 file:Mattermost-simulator-x86_64.app.zip os_type:iOS
-	$(call stop_packager)
+	@rm -rf assets/override
+	@ps -e | grep -i "cli.js start" | grep -iv grep | awk '{print $$1}' | xargs kill -9
 
-unsigned-android: stop pre-build check-style prepare-android-build ## Build an unsigned version of the Android app
+unsigned-android: pre-run check-style prepare-android-build
+	@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 & echo; \
+    fi
+	@echo "Building unsigned Android app"
 	@cd fastlane && NODE_ENV=production bundle exec fastlane android unsigned
+	@mv android/app/build/outputs/apk/app-unsigned-unsigned.apk ./Mattermost-unsigned.apk
+	@ps -e | grep -i "cli.js start" | grep -iv grep | awk '{print $$1}' | xargs kill -9
 
 test: | pre-run check-style ## Runs tests
 	@npm test
 
-build-pr: | can-build-pr stop pre-build check-style i18n-extract-ci ## Build a PR from the mattermost-mobile repo
-	$(call start_packager)
-	@echo "Building App from PR ${PR_ID}"
-	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane build_pr pr:PR-${PR_ID}
-	$(call stop_packager)
-
-can-build-pr:
-	@if [ -z ${PR_ID} ]; then \
-		echo a PR number needs to be specified; \
-		exit 1; \
-	fi
-
-i18n-extract: ## Extract strings for translation from the source code
-	npm run mmjstool -- i18n extract-mobile
-
-i18n-extract-ci:
-	mkdir -p tmp
-	cp assets/base/i18n/en.json tmp/en.json
-	mkdir -p tmp/fake-webapp-dir/i18n/
-	echo '{}' > tmp/fake-webapp-dir/i18n/en.json
-	npm run mmjstool -- i18n extract-mobile --webapp-dir tmp/fake-webapp-dir --mobile-dir .
-	diff tmp/en.json assets/base/i18n/en.json
-	rm -rf tmp
-
 ## Help documentation https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
-define start_packager
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
-		echo Starting React Native packager server; \
-		npm start & echo; \
-	else \
-		echo React Native packager server already running; \
-	fi
-endef
-
-define stop_packager
-	@echo Stopping React Native packager server
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 1 ]; then \
-		ps -ef | grep -i "cli.js start" | grep -iv grep | awk '{print $$2}' | xargs kill -9; \
-		echo React Native packager server stopped; \
-	else \
-		echo No React Native packager server running; \
-	fi
-endef

PULL_REQUEST_TEMPLATE.md

@@ -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).]

README.md

@@ -1,17 +1,16 @@
 # 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).
+**Supported iOS versions:** 9.3+
+**Supported Android versions:** 5.0+
 
-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/). 
+Mattermost is an open source Slack-alternative used by thousands of companies around the world in 11 languages. Learn more at [https://about.mattermost.com](https://about.mattermost.com).
+
+You can download our apps from the [App Store](https://about.mattermost.com/mattermost-ios-app/) or [Google Play Store](https://about.mattermost.com/mattermost-android-app/), or build them yourself. 
 
 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,26 +18,22 @@ 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
 
 
@@ -49,13 +44,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)!
 

android/app/BUCK

@@ -45,13 +45,13 @@ android_library(
 
 android_build_config(
     name = "build_config",
-    package = "com.mattermost.rnbeta",
+    package = "com.mattermost-mobile",
 )
 
 android_resource(
-    name = "res",
-    package = "com.mattermost.rnbeta",
-    res = "src/main/res",
+  name = "res",
+  res = "src/main/res",
+  package = "com.mattermost.rnbeta",
 )
 
 android_binary(

android/app/build.gradle

@@ -73,9 +73,7 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-    entryFile: "index.js",
-    bundleConfig: "metro.config.js",
-    enableHermes: false,
+    entryFile: "index.js"
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
@@ -87,7 +85,7 @@ if (System.getenv("SENTRY_ENABLED") == "true") {
         flavorAware: false
     ]
 
-    apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
+    apply from: "../../node_modules/react-native-sentry/sentry.gradle"
 }
 
 /**
@@ -105,46 +103,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 258
-        versionName "1.26.2"
-        multiDexEnabled = true
+        minSdkVersion 21
+        targetSdkVersion 23
+        versionCode 101
+        versionName "1.8.0"
+        multiDexEnabled true
         ndk {
-            abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
+            abiFilters "armeabi-v7a", "x86"
         }
 
     }
@@ -163,7 +134,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 {
@@ -179,7 +150,6 @@ android {
         unsigned.initWith(buildTypes.release)
         unsigned {
             signingConfig null
-            matchingFallbacks = ['release']
         }
     }
     // applicationVariants are e.g. debug, release
@@ -187,7 +157,7 @@ android {
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3, "x86_64": 4]
+            def versionCodes = ["armeabi-v7a":1, "x86":2]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
@@ -195,86 +165,41 @@ 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 project(':react-native-doc-viewer')
+    compile project(':react-native-video')
+    compile fileTree(dir: "libs", include: ["*.jar"])
+    compile "com.android.support:appcompat-v7:25.0.1"
+    compile 'com.android.support:percent:25.3.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;
     }
+    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')
+    compile project(':react-native-youtube')
+    compile project(':react-native-sentry')
+    compile project(':react-native-exception-handler')
+    compile project(':react-native-fetch-blob')
 
-    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'
+    compile 'com.facebook.fresco:animated-base-support:1.3.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 'com.facebook.fresco:animated-gif:1.3.0'
+    compile 'com.facebook.fresco:animated-webp:1.3.0'
+    compile  'com.facebook.fresco:webpsupport:1.3.0'
 }
 
 // Run this once to be able to run the application with BUCK
@@ -283,5 +208,3 @@ task copyDownloadableDepsToLibs(type: Copy) {
     from configurations.compile
     into 'libs'
 }
-
-apply plugin: 'com.google.gms.google-services'

android/app/google-services.json

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

android/app/proguard-rules.pro

@@ -8,3 +8,63 @@
 #   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.**
+
+# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
+# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
+-dontwarn android.text.StaticLayout
+
+# 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.**

android/app/src/debug/AndroidManifest.xml

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

android/app/src/main/AndroidManifest.xml

@@ -1,36 +1,45 @@
 <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" />
@@ -41,25 +50,25 @@
       <service android:name=".NotificationDismissService"
                 android:enabled="true"
                 android:exported="false" />
-      <receiver android:name=".NotificationReplyBroadcastReceiver"
+      <service android:name=".NotificationReplyService"
                android:enabled="true"
                android:exported="false" />
         <activity
                 android:name="com.reactnativenavigation.controllers.NavigationActivity"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-                android:resizeableActivity="true"/>
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"/>
         <activity
+                android:noHistory="true"
+                android:excludeFromRecents="true"
                 android:name="com.mattermost.share.ShareActivity"
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
                 android:label="@string/app_name"
                 android:screenOrientation="portrait"
-                android:theme="@style/AppTheme"
-                android:taskAffinity="com.mattermost.share">
+                android:theme="@style/AppTheme">
             <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-->
+                //  for sharing
                 <data android:mimeType="*/*" />
             </intent-filter>
         </activity>

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;
-    }
-}

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;
-    }
-}

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) {
-
-    }
-}

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

@@ -1,16 +1,10 @@
 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;
@@ -19,155 +13,99 @@ import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Build;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.RemoteInput;
 import android.provider.Settings.System;
-import androidx.annotation.Nullable;
-import android.util.Log;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+import java.lang.reflect.Field;
 
 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 android.util.Log;
 
 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 LinkedHashMap<String,Integer> channelIdToNotificationCount = new LinkedHashMap<String,Integer>();
+    private static LinkedHashMap<String,List<Bundle>> channelIdToNotification = new LinkedHashMap<String,List<Bundle>>();
     private static AppLifecycleFacade lifecycleFacade;
     private static Context context;
-    private static int badgeCount = 0;
 
     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, String channelId) {
         if (notificationId != -1) {
-            Integer count = channelIdToNotificationCount.get(channelId);
-            if (count == null) {
-                count = -1;
-            }
-
             channelIdToNotificationCount.remove(channelId);
             channelIdToNotification.remove(channelId);
-
-            if (mContext != null) {
-                final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+            if (context != null) {
+                final NotificationManager notificationManager = (NotificationManager) context.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();
+    public static void clearNotification(Context mContext, int notificationId, String channelId) {
+        if (notificationId != -1) {
+            channelIdToNotificationCount.remove(channelId);
+            channelIdToNotification.remove(channelId);
+            if (mContext != null) {
+                final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+                notificationManager.cancel(notificationId);
+            }
         }
     }
 
     @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"));
-                }
+            Object bundleArray = channelIdToNotification.get(channelId);
+            List list = null;
+            if (bundleArray == null) {
+                list = Collections.synchronizedList(new ArrayList(0));
+            } else {
+                list = Collections.synchronizedList((List)bundleArray);
+            }
+            synchronized (list) {
                 list.add(0, 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,249 +118,160 @@ public class CustomPushNotification extends PushNotification {
         channelIdToNotificationCount.remove(channelId);
         channelIdToNotification.remove(channelId);
         digestNotification();
+        clearAllNotifications();
+    }
+
+    @Override
+    protected void postNotification(int id, Notification notification) {
+        boolean force = false;
+        Bundle bundle = notification.extras;
+        if (bundle != null) {
+            force = bundle.getBoolean("localTest");
+        }
+
+        if (!mAppLifecycleFacade.isAppVisible() || force) {
+            super.postNotification(id, notification);
+        }
     }
 
     @Override
     protected Notification.Builder getNotificationBuilder(PendingIntent intent) {
-        // 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";
+        NotificationPreferences notificationPreferences = NotificationPreferences.getInstance(mContext);
 
-        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 = new Notification.Builder(mContext);
+        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;
-
         String channelId = bundle.getString("channel_id");
-        List<Bundle> bundleArray = channelIdToNotification.get(channelId);
-        if (bundleArray != null) {
-            bundleList = new ArrayList<Bundle>(bundleArray);
-        } else {
-            bundleList = new ArrayList<Bundle>();
-            bundleList.add(bundle);
+        String postId = bundle.getString("post_id");
+        int notificationId = channelId != null ? channelId.hashCode() : MESSAGE_NOTIFICATION_ID;
+        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");
+
+        Bundle b = bundle.getBundle("userInfo");
+        if (b != null) {
+            notification.addExtras(b);
         }
 
-        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";
+        int smallIconResId;
+        int largeIconResId;
+
+        if (smallIcon != null) {
+            smallIconResId = res.getIdentifier(smallIcon, "mipmap", packageName);
+        } else {
+            smallIconResId = res.getIdentifier("ic_notification", "mipmap", packageName);
+        }
+
+        if (smallIconResId == 0) {
+            smallIconResId = res.getIdentifier("ic_launcher", "mipmap", packageName);
+
+            if (smallIconResId == 0) {
+                smallIconResId = android.R.drawable.ic_dialog_info;
             }
-            Bundle userInfoBundle = data.getBundle("userInfo");
-            String senderName = getSenderName(data);
-            if (userInfoBundle != null) {
-                boolean localPushNotificationTest = userInfoBundle.getBoolean("localTest");
-                if (localPushNotificationTest) {
-                    senderName = "Test";
+        }
+
+        if (largeIcon != null) {
+            largeIconResId = res.getIdentifier(largeIcon, "mipmap", packageName);
+        } else {
+            largeIconResId = res.getIdentifier("ic_launcher", "mipmap", packageName);
+        }
+
+        if (numberString != null) {
+            ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), Integer.parseInt(numberString));
+        }
+
+        int numMessages = getMessageCountInChannel(channelId);
+
+        notification
+                .setContentIntent(intent)
+                .setGroupSummary(true)
+                .setSmallIcon(smallIconResId)
+                .setVisibility(Notification.VISIBILITY_PRIVATE)
+                .setPriority(Notification.PRIORITY_HIGH)
+                .setAutoCancel(true);
+
+        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();
+            List<Bundle> bundleArray = channelIdToNotification.get(channelId);
+            List<Bundle> list;
+            if (bundleArray != null) {
+                list = new ArrayList<Bundle>(bundleArray);
+            } else {
+                list = new ArrayList<Bundle>();
+            }
+
+            for (Bundle data : list) {
+                String msg = data.getString("message");
+                if (msg != message) {
+                    style.addLine(data.getString("message"));
                 }
             }
 
-            if (conversationTitle == null || !android.text.TextUtils.isEmpty(senderName.trim())) {
-                message = removeSenderNameFromMessage(message, senderName);
-            }
-
-            long timestamp = data.getLong("time");
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-                messagingStyle.addMessage(message, timestamp, senderName);
-            } else {
-                Person sender = new Person.Builder()
-                    .setKey(senderId)
-                    .setName(senderName)
-                    .build();
-                messagingStyle.addMessage(message, timestamp, sender);
-            }
-        }
-    }
-
-    private void setNotificationChannel(Notification.Builder notification, Bundle bundle) {
-        // If Android Oreo or above we need to register a channel
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
+            style.setBigContentTitle(message)
+                    .setSummaryText(String.format("+%d more", (numMessages - 1)));
+            notification.setStyle(style)
+                    .setContentTitle(summaryTitle);
         }
 
-        NotificationChannel notificationChannel = mHighImportanceChannel;
+        // 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);
 
-        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);
+            notification.setGroup(GROUP_KEY_MESSAGES);
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && postId != null) {
+            Intent replyIntent = new Intent(mContext, NotificationReplyService.class);
+            replyIntent.setAction(KEY_TEXT_REPLY);
+            replyIntent.putExtra(NOTIFICATION_ID, notificationId);
+            replyIntent.putExtra("pushNotification", bundle);
+            PendingIntent replyPendingIntent = PendingIntent.getService(mContext, 103, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+            RemoteInput remoteInput = new RemoteInput.Builder(KEY_TEXT_REPLY)
+                    .setLabel("Reply")
+                    .build();
+
+            Notification.Action replyAction = new Notification.Action.Builder(
+                    R.drawable.ic_notif_action_reply, "Reply", replyPendingIntent)
+                    .addRemoteInput(remoteInput)
+                    .setAllowGeneratedReplies(true)
+                    .build();
+
+            notification
+                    .setShowWhen(true)
+                    .addAction(replyAction);
+        }
+
+        Bitmap largeIconBitmap = BitmapFactory.decodeResource(res, largeIconResId);
+        if (largeIconResId != 0 && (largeIcon != null || Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)) {
+            notification.setLargeIcon(largeIconBitmap);
+        }
+
+        if (subText != null) {
+            notification.setSubText(subText);
         }
-    }
 
-    private void setNotificationSound(Notification.Builder notification, NotificationPreferences notificationPreferences) {
         String soundUri = notificationPreferences.getNotificationSound();
         if (soundUri != null) {
             if (soundUri != "none") {
@@ -432,120 +281,45 @@ public class CustomPushNotification extends PushNotification {
             Uri defaultUri = System.DEFAULT_NOTIFICATION_URI;
             notification.setSound(defaultUri, AudioManager.STREAM_NOTIFICATION);
         }
-    }
 
-    private void setNotificationVibrate(Notification.Builder notification, NotificationPreferences notificationPreferences) {
         boolean vibrate = notificationPreferences.getShouldVibrate();
         if (vibrate) {
-            // Use the system default for vibration
+            // use the system default for vibration
             notification.setDefaults(Notification.DEFAULT_VIBRATE);
         }
-    }
 
-    private void setNotificationBlink(Notification.Builder notification, NotificationPreferences notificationPreferences) {
         boolean blink = notificationPreferences.getShouldBlink();
         if (blink) {
             notification.setLights(Color.CYAN, 500, 500);
         }
-    }
 
-    private void setNotificationDeleteIntent(Notification.Builder notification, int notificationId) {
-        // Let's add a delete intent when the notification is dismissed
-        Intent delIntent = new Intent(mContext, NotificationDismissService.class);
-        delIntent.putExtra(NOTIFICATION_ID, notificationId);
-        PendingIntent deleteIntent = NotificationIntentAdapter.createPendingNotificationIntent(mContext, delIntent, mNotificationProps);
-        notification.setDeleteIntent(deleteIntent);
-    }
-
-    private void addNotificationReplyAction(Notification.Builder notification, int notificationId, Bundle bundle) {
-        String postId = bundle.getString("post_id");
-        if (postId == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            return;
-        }
-
-        Intent replyIntent = new Intent(mContext, NotificationReplyBroadcastReceiver.class);
-        replyIntent.setAction(KEY_TEXT_REPLY);
-        replyIntent.putExtra(NOTIFICATION_ID, notificationId);
-        replyIntent.putExtra("pushNotification", bundle);
-
-        PendingIntent replyPendingIntent = PendingIntent.getBroadcast(
-            mContext,
-            notificationId,
-            replyIntent,
-            PendingIntent.FLAG_UPDATE_CURRENT);
-
-        RemoteInput remoteInput = new RemoteInput.Builder(KEY_TEXT_REPLY)
-            .setLabel("Reply")
-            .build();
-
-        int icon = R.drawable.ic_notif_action_reply;
-        CharSequence title = "Reply";
-        Notification.Action replyAction = new Notification.Action.Builder(icon, title, replyPendingIntent)
-            .addRemoteInput(remoteInput)
-            .setAllowGeneratedReplies(true)
-            .build();
-
-        notification
-            .setShowWhen(true)
-            .addAction(replyAction);
+        return notification;
     }
 
     private void notifyReceivedToJS() {
         mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_EVENT_NAME, mNotificationProps.asBundle(), mAppLifecycleFacade.getRunningReactContext());
     }
 
+    public static Integer getMessageCountInChannel(String channelId) {
+        Object objCount = channelIdToNotificationCount.get(channelId);
+        if (objCount != null) {
+            return (Integer)objCount;
+        }
+
+        return 1;
+    }
+
     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);
     }
 }

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();
-    }
-}

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

@@ -1,14 +1,31 @@
 package com.mattermost.rnbeta;
 
 import android.os.Bundle;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;
+import com.reactnativenavigation.controllers.SplashActivity;
 
-import com.reactnativenavigation.NavigationActivity;
-
-public class MainActivity extends NavigationActivity {
+public class MainActivity extends SplashActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.launch_screen);
+
+        /**
+         * Reference: https://stackoverflow.com/questions/7944338/resume-last-activity-when-launcher-icon-is-clicked
+         * 1. Open app from launcher/appDrawer
+         * 2. Go home
+         * 3. Send notification and open
+         * 4. It creates a new Activity and Destroys the old
+         * 5. Causing an unnecessary app restart
+         * 6. This solution short-circuits the restart
+         */
+        if (!isTaskRoot()) {
+            finish();
+            return;
+        }
+    }
+
+    @Override
+    public int getSplashLayout() {
+        return R.layout.launch_screen;
     }
 }

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

@@ -1,98 +1,47 @@
 package com.mattermost.rnbeta;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import com.mattermost.share.SharePackage;
+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.reactnativecommunity.webview.RNCWebViewPackage;
+import com.facebook.react.ReactApplication;
+import com.reactlibrary.RNReactNativeDocViewerPackage;
 import com.brentvatne.react.ReactVideoPackage;
-import com.BV.LinearGradient.LinearGradientPackage;
 import com.horcrux.svg.SvgPackage;
-import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
+import com.inprogress.reactnativeyoutube.ReactNativeYouTube;
+import io.sentry.RNSentryPackage;
+import com.masteratul.exceptionhandler.ReactNativeExceptionHandlerPackage;
+import com.RNFetchBlob.RNFetchBlobPackage;
+import com.gantix.JailMonkey.JailMonkeyPackage;
+import io.tradle.react.LocalAuthPackage;
+import com.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.imagepicker.ImagePickerPackage;
+import com.gnet.bottomsheet.RNBottomSheetPackage;
+import com.learnium.RNDeviceInfo.RNDeviceInfo;
+import com.psykar.cookiemanager.CookieManagerPackage;
+import com.oblador.vectoricons.VectorIconsPackage;
+import com.BV.LinearGradient.LinearGradientPackage;
+import com.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,117 +54,50 @@ 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 OrientationPackage(),
+            new RNNotificationsPackage(this),
+            new LocalAuthPackage(),
+            new JailMonkeyPackage(),
+            new RNFetchBlobPackage(),
+            new MattermostPackage(this),
+            new RNSentryPackage(this),
+            new ReactNativeExceptionHandlerPackage(),
+            new ReactNativeYouTube(),
             new ReactVideoPackage(),
-            new RNGestureHandlerPackage(),
-            new RNPasteableTextInputPackage()
+            new RNReactNativeDocViewerPackage(),
+            new SharePackage()
     );
   }
 
+  @Override
+  public String getJSMainModuleName() {
+    return "index";
+  }
+
   @Override
   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
+  public boolean clearHostOnActivityDestroy() {
+    // This solves the issue where the splash screen does not go away
+    // after the app is killed by the OS cause of memory or a long time in the background
+    return false;
   }
 
   @Override
@@ -223,91 +105,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);
-          }
-        }
-      }
-    });
-  }
 }

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);
-    }
-}

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;
-    }
 }

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

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

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

@@ -11,7 +11,7 @@ import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
 public class NotificationDismissService extends IntentService {
     private Context mContext;
     public NotificationDismissService() {
-            super("notificationDismissService");
+        super("notificationDismissService");
     }
 
     @Override

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

@@ -1,15 +1,12 @@
 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;
@@ -108,29 +105,4 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
     public void setShouldBlink(boolean blink) {
         mNotificationPreference.setShouldBlink(blink);
     }
-
-    @ReactMethod
-    public void getDeliveredNotifications(final Promise promise) {
-        Context context = mApplication.getApplicationContext();
-        final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        StatusBarNotification[] statusBarNotifications = notificationManager.getActiveNotifications();
-        WritableArray result = Arguments.createArray();
-        for (StatusBarNotification sbn:statusBarNotifications) {
-            WritableMap map = Arguments.createMap();
-            Notification n = sbn.getNotification();
-            Bundle bundle = n.extras;
-            int identifier = sbn.getId();
-            String channelId = bundle.getString("channel_id");
-            map.putInt("identifier", identifier);
-            map.putString("channel_id", channelId);
-            result.pushMap(map);
-        }
-        promise.resolve(result);
-    }
-
-    @ReactMethod
-    public void removeDeliveredNotifications(int identifier, String channelId) {
-        Context context = mApplication.getApplicationContext();
-        CustomPushNotification.clearNotification(context, identifier, channelId);
-    }
 }

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

@@ -1,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;
-    }
-}

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

@@ -0,0 +1,53 @@
+package com.mattermost.rnbeta;
+
+import android.content.Context;
+import android.content.Intent;
+import android.app.NotificationManager;
+import android.app.RemoteInput;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import com.facebook.react.HeadlessJsTaskService;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.jstasks.HeadlessJsTaskConfig;
+
+
+import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
+
+public class NotificationReplyService extends HeadlessJsTaskService {
+    private Context mContext;
+
+    @Override
+    protected @Nullable HeadlessJsTaskConfig getTaskConfig(Intent intent) {
+        mContext = getApplicationContext();
+        if (CustomPushNotification.KEY_TEXT_REPLY.equals(intent.getAction())) {
+            CharSequence message = getReplyMessage(intent);
+
+            Bundle bundle = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
+            String channelId = bundle.getString("channel_id");
+            bundle.putCharSequence("text", message);
+            bundle.putInt("msg_count", CustomPushNotification.getMessageCountInChannel(channelId));
+
+            int notificationId = intent.getIntExtra(CustomPushNotification.NOTIFICATION_ID, -1);
+            CustomPushNotification.clearNotification(mContext, notificationId, channelId);
+
+            Log.i("ReactNative", "Replying service");
+            return new HeadlessJsTaskConfig(
+                    "notificationReplied",
+                    Arguments.fromBundle(bundle),
+                    5000);
+
+        }
+
+        return null;
+    }
+
+    private CharSequence getReplyMessage(Intent intent) {
+        Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
+        if (remoteInput != null) {
+            return remoteInput.getCharSequence(CustomPushNotification.KEY_TEXT_REPLY);
+        }
+        return null;
+    }
+}

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

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

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

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

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

@@ -1,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();
-    }
-}

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

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

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

@@ -1,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
-                );
-    }
-}

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

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

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

@@ -1,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;
-    }
-}

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

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

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

@@ -1,42 +0,0 @@
-package com.mattermost.rnbeta;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.uimanager.UIManagerModule;
-import com.facebook.react.uimanager.UIBlock;
-import com.facebook.react.uimanager.NativeViewHierarchyManager;
-import android.content.Context;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-
-public class RNTextInputResetModule extends ReactContextBaseJavaModule {
-
-  private final ReactApplicationContext reactContext;
-
-  public RNTextInputResetModule(ReactApplicationContext reactContext) {
-    super(reactContext);
-    this.reactContext = reactContext;
-  }
-
-  @Override
-  public String getName() {
-    return "RNTextInputReset";
-  }
-
-  // https://github.com/facebook/react-native/pull/12462#issuecomment-298812731
-  @ReactMethod
-  public void resetKeyboardInput(final int reactTagToReset) {
-      UIManagerModule uiManager = getReactApplicationContext().getNativeModule(UIManagerModule.class);
-      uiManager.addUIBlock(new UIBlock() {
-          @Override
-          public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
-              InputMethodManager imm = (InputMethodManager) getReactApplicationContext().getBaseContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-              if (imm != null) {
-                  View viewToReset = nativeViewHierarchyManager.resolveView(reactTagToReset);
-                  imm.restartInput(viewToReset);
-              }
-          }
-      });
-  }
-}

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

@@ -1,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());
-            }
-        }
-    }
-}

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

@@ -6,13 +6,9 @@ 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.*;
@@ -40,17 +36,10 @@ public class RealPathUtil {
                 // 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;
-                    }
-                }
+                final Uri contentUri = ContentUris.withAppendedId(
+                        Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+
+                return getDataColumn(context, contentUri, null, null);
             } else if (isMediaDocument(uri)) {
                 // MediaProvider
 
@@ -74,15 +63,23 @@ public class RealPathUtil {
 
                 return getDataColumn(context, contentUri, selection, selectionArgs);
             }
-        }
-
-        if ("content".equalsIgnoreCase(uri.getScheme())) {
+        } else if ("content".equalsIgnoreCase(uri.getScheme())) {
             // MediaStore (and general)
 
             if (isGooglePhotosUri(uri)) {
                 return uri.getLastPathSegment();
             }
 
+            try {
+                String path = getDataColumn(context, uri, null, null);
+
+                if (path != null) {
+                    return path;
+                }
+            } catch (Exception e) {
+                // do nothing and try to get a temp file
+            }
+
             // Try save to tmp file, and return tmp file path
             return getPathFromSavingTempFile(context, uri);
         } else if ("file".equalsIgnoreCase(uri.getScheme())) {
@@ -94,33 +91,14 @@ public class RealPathUtil {
 
     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();
-            }
-
-
+            String fileName = uri.getLastPathSegment();
             File cacheDir = new File(context.getCacheDir(), "mmShare");
             if (!cacheDir.exists()) {
                 cacheDir.mkdirs();
             }
 
-            String mimeType = getMimeType(uri.getPath());
-            tmpFile = new File(cacheDir, fileName);
-            tmpFile.createNewFile();
+            tmpFile = File.createTempFile("tmp", fileName, cacheDir);
 
             ParcelFileDescriptor pfd = context.getContentResolver().openFileDescriptor(uri, "r");
 
@@ -204,15 +182,6 @@ public class RealPathUtil {
         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()) {

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

@@ -1,20 +1,13 @@
 package com.mattermost.share;
 
+import android.content.Intent;
 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;
-    }
 }

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

@@ -2,6 +2,7 @@ package com.mattermost.share;
 
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
@@ -9,25 +10,23 @@ 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 android.util.Log;
 
+import android.graphics.Bitmap;
+import java.io.InputStream;
 import java.io.File;
 import java.util.ArrayList;
-
-import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 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;
@@ -38,11 +37,8 @@ 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) {
+    public ShareModule(ReactApplicationContext reactContext) {
         super(reactContext);
-        mApplication = application;
     }
     private File tempFolder;
 
@@ -63,24 +59,12 @@ public class ShareModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @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();
-        }
+        getCurrentActivity().finish();
 
-        if (data != null && data.hasKey("url")) {
+        if (data != null) {
             ReadableArray files = data.getArray("files");
             String serverUrl = data.getString("url");
             String token = data.getString("token");
@@ -105,23 +89,6 @@ public class ShareModule extends ReactContextBaseJavaModule {
         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();
@@ -148,19 +115,10 @@ public class ShareModule extends ReactContextBaseJavaModule {
                 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);
-                }
+                text = "file://" + RealPathUtil.getRealPathFromURI(currentActivity, uri);
+                map.putString("value", text);
+                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) {
@@ -168,18 +126,7 @@ public class ShareModule extends ReactContextBaseJavaModule {
                     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);
+                    map.putString("type", RealPathUtil.getMimeType(filePath));
                     items.pushMap(map);
                 }
             }

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

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

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

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

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

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

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

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