translations PR 20170905 (#882)

* Fix search and search preview

* Add "in:" and "from:" search modifiers

.babelrc

@@ -0,0 +1,11 @@
+{
+  "presets": [ "react-native" ],
+  "plugins": [
+    ["module-resolver", {
+      "root": ["./src", "."],
+      "alias": {
+        "assets": "./dist/assets"
+      }
+    }]
+  ]
+}

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

.flowconfig

@@ -1,70 +1,58 @@
 [ignore]
-; We fork some components by platform
+
+# We fork some components by platform.
 .*/*[.]android.js
 
-; Ignore "BUCK" generated dirs
+# Ignore templates with `@flow` in header
+.*/local-cli/generator.*
+
+# Ignore malformed json
+.*/node_modules/y18n/test/.*\.json
+
+# Ignore the website subdir
+<PROJECT_ROOT>/website/.*
+
+# Ignore BUCK generated dirs
 <PROJECT_ROOT>/\.buckd/
 
-; Ignore unexpected extra "@providesModule"
-.*/node_modules/.*/node_modules/fbjs/.*
+# Ignore unexpected extra @providesModule
+.*/node_modules/commoner/test/source/widget/share.js
 
-; 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
+# 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
-.*/Libraries/polyfills/.*
-
-; Ignore metro
-.*/node_modules/metro/.*
+.*/Libraries/react-native/ReactNative.js
+.*/node_modules/jest-runtime/build/__tests__/.*
 
 [include]
 
 [libs]
 node_modules/react-native/Libraries/react-native/react-native-interface.js
-node_modules/react-native/flow/
-node_modules/react-native/flow-github/
+node_modules/react-native/flow
+flow/
 
 [options]
-emoji=true
-
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
 module.system=haste
-module.system.haste.use_name_reducers=true
-# get basename
-module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
-# strip .js or .js.flow suffix
-module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
-# strip .ios suffix
-module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
-module.system.haste.paths.blacklist=.*/__tests__/.*
-module.system.haste.paths.blacklist=.*/__mocks__/.*
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
+
+esproposal.class_static_fields=enable
+esproposal.class_instance_fields=enable
+
+experimental.strict_type_args=true
 
 munge_underscores=true
 
+module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
 module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
 
-module.file_ext=.js
-module.file_ext=.jsx
-module.file_ext=.json
-module.file_ext=.native.js
-
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
-suppress_type=$FlowFixMeProps
-suppress_type=$FlowFixMeState
+suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-2]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-2]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
-suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
+
+unsafe.enable_getters_and_setters=true
 
 [version]
-^0.78.0
+^0.32.0

.gitignore

@@ -1,8 +1,5 @@
 assets/override
 dist
-*.zip
-server.PID
-mattermost.keystore
 
 # OSX
 #
@@ -20,7 +17,6 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
-xcshareddata
 *.xccheckout
 *.moved-aside
 DerivedData
@@ -29,28 +25,29 @@ DerivedData
 *.apk
 *.xcuserstate
 project.xcworkspace
-xcshareddata/
 
-# Android/IntelliJ
+# Android/IJ
 #
+*.iml
 .idea
 .gradle
 local.properties
-*.iml
 
 # node.js
 #
 node_modules/
 npm-debug.log
 .npminstall
-yarn-error.log
+
+# yarn
+#
 .yarninstall
 
 # BUCK
 buck-out/
 \.buckd/
 android/app/libs
-*.keystore
+android/keystores/debug.keystore
 
 # Vim
 [._]*.s[a-w][a-z]
@@ -61,32 +58,13 @@ Session.vim
 *~
 tags
 
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/
-
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
-fastlane/.env
 fastlane/report.xml
+*.zip
+server.PID
+mattermost.keystore
 
 # Sentry
 android/sentry.properties
-ios/sentry.properties
 
 # Testing
 .nyc_output
-
-# Pods
-.podinstall
-ios/Pods/
-
-# Bundle artifact
-*.jsbundle
-
-#editor-settings
-.vscode

CHANGELOG.md

@@ -1,577 +1,9 @@
 # Mattermost Mobile Apps Changelog
 
-## 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
-
-### Combatibility
-
- - 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
-
-### Combatibility
-
- - 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
-
-### Combatibility
-
- - 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
-
-**Combatibility 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
-
-**Combatibility 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
-
-**Combatibility 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
-
-### Bug Fixes
-- Fixed an issue where the iOS share extension sometimes crashed the Mattermost app
-- Fixed an issue preventing Markdown tables from rendering with some international characters 
-
-## v1.7.0 Release
-- Release Date: March 26, 2018
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Highlights
-
-#### iOS File Sharing
-- Share files and images from other applications as attached files in Mattermost
-
-#### Markdown Tables
-- Tables created using markdown formatting can now be viewed in the app
-
-#### Permalinks
-- Permalinks now open in the app instead of launching a browser window 
-
-### Improvements
-- Increased the tappable area of various icons for improved usability
-- Announcement banners now display in the app
-- Added "+" button to add emoji reactions to a post
-- Minor performance improvements for app launch time
-- Text files can now be viewed in the app
-- Support for email autolinking into the app
-
-### Bugs
-- Fixed an issue causing some devices to hang at the splash screen on app launch
-- Fixed an issue causing some letters to be hidden in the Android search input box
-- Fixed an issue causing some Direct Message channels to show date stamps below the most recent message
-- Fixed an issue where users weren't able to join open teams they've never been a member of
-- Fixed an issue so double tapping buttons can no longer cause UI issues
-- Fixed an issue where changing the channel display name wasn't being updated in the UI appropriately
-- Fixed an issue where searhing for public channels sometimes showed no results
-- Fixed an issue where the post menu could remain open while scrolling in the post list
-- Fixed an issue where the system message to add users to a channel was missing the execution link
-- Fixed an issue where bulleted lists cut off text if nested deeper than two levels
-- Fixed an issue where logging into an account that is not on any team freezes the app
-- Fixed an issue on iOS causing the app to crash when taking a photo then attaching it to a post
-
-## v1.6.1 Release
-- Release Date: February 13, 2018
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Bug Fixes
-- Fixed an issue preventing the app from going to the correct channel when opened from a push notification
-- Fixed an issue on Android devices where the app could sometimes freeze on the launch screen
-- Fixed an issue on Samsung devices causing extra letters to be insterted when typing to filter user lists
-
-## v1.6.0 Release
-- Release Date: February 6, 2018
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Highlights
-
-#### Android File Sharing
-- Share files and images from other applications as attached files in Mattermost 
-
-### Improvements
-- Added a right drawer to access settings, edit profile information, change online status and logout
-- Added support for opening a Direct Message channel with yourself
-
-### Bugs
-- Fixed a number of issues causing crashes on Android devices
-- Fixed an issue with auto capitalization on Android keyboards
-- Fixed an issue where the GitLab SSO login button sometimes didn't appear
-- Fixed an issue with link previews not appearing on some accounts
-- Fixed an issue where logging out of the app didn't clear the notification badge on the homescreen icon
-- Fixed an issue where interactive message buttons would not wrap to a new line
-- Fixed an issue where the keyboard would sometimes overlap the text input box
-- Fixed an issue where the Direct Message channel wouldn't open from the profile page
-- Fixed an issue where posts would sometimes overlap
-- Fixed an issue where the app sometimes hangs on logout
-
-## v1.5.3 Release
-- Release Date: February 1, 2018
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-- Fixed a login issue when connecting to servers running a Data Retention policy 
-
-## v1.5.2 Release
-- Release Date: January 12, 2018
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Bug Fixes
-- Fixed an issue causing some Android devices to crash on launch
-- Fixed an issue with the app occasionally crashing when receiving push notifications in a new channel 
-- Channel footer area is now refreshed when switching between Group and Direct Message channels
-- Fixed an issue on some Android devices so Mattermost verifies it has permissions to access ringtones
-- Fixed an issue where the text box overlapped the keyboard on some iOS devices using multiple keyboard layouts
-- Fixed an issue with video uploads on Android devices
-- Fixed an issue with GIF uploads on iOS devices
-- Fixed an issue with the mention badge flickering on the channel drawer icon when there were over 10 unread mentions
-- Fixed an issue with the app occasionally freezing when requesting the RefreshToken
-
-## v1.5.1 Release
-
-- Release Date: December 7, 2017
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Bug Fixes
-- Fixed an issue with the upgrade app screen showing with a transparent background
-- Fixed an issue with clearing or replying to notifications sometimes crashing the app on Android
-- Fixed an issue with the app sometimes crashing due to a missing function in the swiping control
-
-## v1.5 Release 
-
-- Release Date: December 6, 2017
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Highlights 
-
-#### File Viewer
-- Preview videos, RTF,  PDFs, Word, Excel, and Powerpoint files 
-
-#### iPhone X Compatibility
-- Added support for iPhone X
-
-#### Slash Commands
-- Added support for using custom slash commands
-- Added support for built-in slash commands /away, /online, /offline, /dnd, /header, /purpose, /kick, /me, /shrug
-
-### Improvements
-- In iOS, 3D touch can now be used to peek into a channel to view the contents, and quickly mark it as read
-- Markdown images in posts now render 
-- Copy posts, URLs, and code blocks
-- Opening a channel with Unread messages takes you to the "New Messages" indicator 
-- Support for data retention, interactive message buttons, and viewing Do Not Disturb statuses depending on the server version
-- (Edited) indicator now shows up beside edited posts 
-- Added a "Recently Used" section for emoji reactions
-
-### Bug Fixes 
-- Android notifications now follow the default system setting for vibration 
-- Fixed app crashing when opening notification settings on Android 
-- Fixed an issue where the "Proceed" button on sign in screen stopped working after pressing logout multiple times
-- HEIC images posted from iPhones now get converted to JPEG before uploading
-
-## v1.4.1 Release
-
-Release Date: Nov 15, 2017
-Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Bug Fixes
-
-- Fixed network detection issue causing some people to be unable to access the app
-- Fixed issue with lag when pressing send button 
-- Fixed app crash when opening notification settings
-- Fixed various other bugs to reduce app crashes
-
-## v1.4 Release 
-
-- Release Date: November 6, 2017
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Highlights 
-
-#### Performance improvements
-- Various performance improvements to decrease channel load times 
-
-### Bug Fixes
-- Fixed issue with Android app sometimes showing a white screen when re-opening the app
-- Fixed an issue with orientation lock not working on Android 
-
-## v1.3 Release 
-
-- Release Date: October 5, 2017
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Highlights 
-
-#### Tablet Support (Beta) 
-- Added support for landscape view, so the app may be used on tablets
-- Note: Tablet support is in beta, and further improvements are planned for a later date
-
-#### Link Previews 
-- Added support for image, GIF, and youtube link previews
-
-#### Notifications
-- Android: Added the ability to set light, vibrate, and sound settings
-- Android: Improved notification stacking so most recent notification shows first 
-- Updated the design for Notification settings to improve usability 
-- Added the ability to reply from a push notification without opening the app (requires Android v7.0+, iOS 10+) 
-- Increased speed when opening app from a push notification
-
-#### Download Files 
-- Added the ability to download all files on Android and images on iOS
-
-### Improvements
-- Using `+` shortcut for emoji reactions is now supported 
-- Improved emoji formatting (alignment and rendering of non-square aspect ratios)
-- Added support for error tracking with Sentry
-- Only show the "Connecting..." bar after two connection attempts 
-
-### Bug Fixes
-- Fixed link rendering not working in certain cases
-- Fixed theme color issue with status bar on Android
-
-## v1.2 Release
-
-- Release Date: September 5, 2017 
-- Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificates are not supported
-
-### Highlights 
-
-#### AppConfig Support for EMM solutions
-- Added [AppConfig](https://www.appconfig.org/) support, to make it easier to integrate with a variety of EMM solutions
-
-#### Code block viewer
-- Tap on a code block to open a viewer for easier reading 
-
-### Improvements
-- Updated formatting for markdown lists and code blocks
-- Updated formatting for `in:` and `from:` search autocomplete 
-
-### Emoji Picker for Emoji Reactions
-- Added an emoji picker for selecting a reaction 
-
-### Bug Fixes
-- Fixed issue where if only LDAP and GitLab login were enabled, LDAP did not show up on the login page
-- Fixed issue with 3 digit mention count UI in channel drawer
-
-### Known Issues
-- Using `+:emoji:` to react to a message is not yet supported 
-
 ## v1.1 Release
 
 - Release Date: August 2017 
-- Server Versions Supported: Server v3.10+ is required, Self-Signed SSL Certificates are not supported
+- Server Versions Supported: Server v3.10+ is required, Self-Signed SSL Certificates are not yet supported
 
 ### Highlights 
 
@@ -625,7 +57,7 @@ Server Versions Supported: Server v4.0+ is required, Self-Signed SSL Certificate
 ## v1.0 Release 
 
 - Release Date: July 10, 2017 
-- Server Versions Supported: Server v3.8+ is required, Self-Signed SSL Certificates are not supported
+- Server Versions Supported: Server v3.8+ is required, Self-Signed SSL Certificates are not yet supported
 
 ### Highlights 
 

CONTRIBUTING.md

@@ -1,6 +1,8 @@
 # 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
 

Jenkinsfile

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

LICENSE.txt

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

Makefile

@@ -1,260 +1,163 @@
-.PHONY: pre-run pre-build clean
-.PHONY: check-style
-.PHONY: start stop
-.PHONY: run run-ios run-android
-.PHONY: build build-ios build-android unsigned-ios unsigned-android
-.PHONY: build-pr can-build-pr prepare-pr
-.PHONY: test help
+.PHONY: run run-ios run-android check-style test clean post-install start stop
+.PHONY: check-ios-target build-ios
+.PHONY: check-android-target prepare-android-build build-android
+.PHONY: start-packager stop-packager
+
+ios_target := $(filter-out build-ios,$(MAKECMDGOALS))
+android_target := $(filter-out build-android,$(MAKECMDGOALS))
+
+.yarninstall: package.json
+	@if ! [ $(shell command -v yarn 2> /dev/null) ]; then \
+		echo "yarn is not installed https://yarnpkg.com"; \
+		exit 1; \
+	fi
+
+	@echo Getting dependencies using yarn
+
+	yarn install --pure-lockfile
+
+	touch $@
 
-POD := $(shell which pod 2> /dev/null)
-OS := $(shell sh -c 'uname -s 2>/dev/null')
 BASE_ASSETS = $(shell find assets/base -type d) $(shell find assets/base -type f -name '*')
 OVERRIDE_ASSETS = $(shell find assets/override -type d 2> /dev/null) $(shell find assets/override -type f -name '*' 2> /dev/null)
-MM_UTILITIES_DIR = ../mattermost-utilities
-
-node_modules: package.json
-	@if ! [ $(shell which npm 2> /dev/null) ]; then \
-		echo "npm is not installed https://npmjs.com"; \
-		exit 1; \
-	fi
-
-	@echo Getting Javascript dependencies
-	@npm install
-
-npm-ci: package.json
-	@if ! [ $(shell which npm 2> /dev/null) ]; then \
-		echo "npm is not installed https://npmjs.com"; \
-		exit 1; \
-	fi
-
-	@echo Getting Javascript dependencies
-	@npm ci
-
-.podinstall:
-ifeq ($(OS), Darwin)
-ifdef POD
-	@echo Getting Cocoapods dependencies;
-	@cd ios && pod install;
-else
-	@echo "Cocoapods is not installed https://cocoapods.org/"
-	@exit 1
-endif
-endif
-	@touch $@
-
 dist/assets: $(BASE_ASSETS) $(OVERRIDE_ASSETS)
-	@mkdir -p dist
+
+	mkdir -p dist
 
 	@if [ -e dist/assets ] ; then \
 		rm -rf dist/assets; \
 	fi
 
-	@echo "Generating app assets"
-	@node scripts/make-dist-assets.js
+	node scripts/make-dist-assets.js
 
-pre-run: | node_modules .podinstall dist/assets ## Installs dependencies and assets
+pre-run: .yarninstall dist/assets
 
-pre-build: | npm-ci .podinstall dist/assets ## Install dependencies and assets before building
+run: run-ios
 
-check-style: node_modules ## Runs eslint
-	@echo Checking for style guide compliance
-	@npm run check
+start: | pre-run start-packager
 
-clean: ## Cleans dependencies, previous builds and temp files
-	@echo Cleaning started
+stop: stop-packager
 
-	@rm -rf node_modules
-	@rm -f .podinstall
-	@rm -rf dist
-	@rm -rf ios/build
-	@rm -rf ios/Pods
-	@rm -rf android/app/build
-
-	@echo Cleanup finished
-
-post-install:
-	@# Need to copy custom RNDocumentPicker.m that implements direct access to the document picker in iOS
-	@cp ./native_modules/RNDocumentPicker.m node_modules/react-native-document-picker/ios/RNDocumentPicker/RNDocumentPicker.m
-
-	@rm -f node_modules/intl/.babelrc
-	@# Hack to get react-intl and its dependencies to work with react-native
-	@# Based off of https://github.com/este/este/blob/master/gulp/native-fix.js
-	@sed -i'' -e 's|"./locale-data/index.js": false|"./locale-data/index.js": "./locale-data/index.js"|g' node_modules/react-intl/package.json
-	@sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-messageformat/package.json
-	@sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-relativeformat/package.json
-	@sed -i'' -e 's|"./locale-data/complete.js": false|"./locale-data/complete.js": "./locale-data/complete.js"|g' node_modules/intl/package.json
-	@sed -i'' -e "s|super.onBackPressed();|this.moveTaskToBack(true);|g" node_modules/react-native-navigation/android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java
-	@sed -i'' -e "s|compile 'com.facebook.react:react-native:0.17.+'|compile 'com.facebook.react:react-native:+'|g" node_modules/react-native-bottom-sheet/android/build.gradle
-	@if [ $(shell grep "const Platform" node_modules/react-native/Libraries/Lists/VirtualizedList.js | grep -civ grep) -eq 0 ]; then \
-		sed $ -i'' -e "s|const ReactNative = require('ReactNative');|const ReactNative = require('ReactNative');`echo $\\\\\\r;`const Platform = require('Platform');|g" node_modules/react-native/Libraries/Lists/VirtualizedList.js; \
-	fi
-	@sed -i'' -e 's|transform: \[{scaleY: -1}\],|...Platform.select({android: {transform: \[{perspective: 1}, {scaleY: -1}\]}, ios: {transform: \[{scaleY: -1}\]}}),|g' node_modules/react-native/Libraries/Lists/VirtualizedList.js
-
-start: | pre-run ## Starts the React Native packager server
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
-		echo Starting React Native packager server; \
-		npm start; \
-	else \
-		echo React Native packager server already running; \
-	fi
-
-stop: ## Stops the React Native packager server
-	@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 \
+run-ios: | start
+	@if ! [ $(shell command -v xcodebuild) ]; then \
 		echo "xcode is not installed"; \
 		exit 1; \
 	fi
-	@if ! [ $(shell which watchman) ]; then \
+	@if ! [ $(shell command -v watchman) ]; then \
 		echo "watchman is not installed"; \
 		exit 1; \
 	fi
 
-check-device-android:
+	@echo Running iOS app in development
+
+	npm run run-ios
+	open -a Simulator
+
+run-android: | start prepare-android-build
 	@if ! [ $(ANDROID_HOME) ]; then \
 		echo "ANDROID_HOME is not set"; \
 		exit 1; \
 	fi
-	@if ! [ $(shell which adb 2> /dev/null) ]; then \
+	@if ! [ $(shell command -v adb 2> /dev/null) ]; then \
 		echo "adb is not installed"; \
 		exit 1; \
 	fi
-
-	@echo "Connect your Android device or open the emulator"
-	@adb wait-for-device
-
-	@if ! [ $(shell which watchman 2> /dev/null) ]; then \
+    ifneq ($(shell adb get-state),device)
+		echo "no android device or emulator is running"
+		exit 1;
+    endif
+	@if ! [ $(shell command -v watchman 2> /dev/null) ]; then \
 		echo "watchman is not installed"; \
 		exit 1; \
 	fi
 
+	@echo Running Android app in development
+
+	npm run run-android
+
+test: pre-run
+	npm test
+
+check-style: .yarninstall
+	@echo Checking for style guide compliance
+
+	npm run check
+
+clean:
+	@echo Cleaning app
+
+	yarn cache clean
+	rm -rf node_modules
+	rm -f .yarninstall
+	rm -rf dist
+	rm -rf ios/build
+	rm -rf android/app/build
+
+post-install:
+	./node_modules/.bin/remotedev-debugger --hostname localhost --port 5678 --injectserver
+	@# Must remove the .babelrc for 0.42.0 to work correctly
+	rm -f node_modules/intl/.babelrc
+	@# Hack to get react-intl and its dependencies to work with react-native
+	@# Based off of https://github.com/este/este/blob/master/gulp/native-fix.js
+	sed -i'' -e 's|"./locale-data/index.js": false|"./locale-data/index.js": "./locale-data/index.js"|g' node_modules/react-intl/package.json
+	sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-messageformat/package.json
+	sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-relativeformat/package.json
+	sed -i'' -e 's|"./locale-data/complete.js": false|"./locale-data/complete.js": "./locale-data/complete.js"|g' node_modules/intl/package.json
+
+start-packager:
+	@if [ $(shell ps -e | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
+		echo Starting React Native packager server; \
+		node ./node_modules/react-native/local-cli/cli.js start --reset-cache & echo $$! > server.PID; \
+	else \
+		echo React Native packager server already running; \
+		ps -e | grep -i "cli.js start" | grep -v grep | awk '{print $$1}' > server.PID; \
+	fi
+
+stop-packager:
+	@echo Stopping React Native packager server
+	@if [ -e "server.PID" ] ; then \
+		kill -9 `cat server.PID` && rm server.PID; \
+	fi
+
+check-ios-target:
+ifneq ($(ios_target), $(filter $(ios_target), dev beta release))
+	@echo "Try running make build-ios TARGET\nWhere TARGET is one of dev, beta or release"
+	@exit 1
+endif
+
+do-build-ios:
+	@echo "Building ios $(ios_target) app"
+	@cd fastlane && NODE_ENV=production bundle exec fastlane ios $(ios_target)
+
+
+build-ios: | check-ios-target pre-run check-style start-packager do-build-ios stop-packager
+
+check-android-target:
+ifneq ($(android_target), $(filter $(android_target), dev alpha release))
+	@echo "Try running make build-android TARGET\nWhere TARGET is one of dev, beta or release"
+	@exit 1
+endif
+
 prepare-android-build:
 	@rm -rf ./node_modules/react-native/local-cli/templates/HelloWorld
 	@rm -rf ./node_modules/react-native-linear-gradient/Examples/
 	@rm -rf ./node_modules/react-native-orientation/demo/
+	@cd android && ./gradlew clean
 
-run: run-ios ## alias for run-ios
+do-build-android:
+	@echo "Building android $(android_target) app"
+	@cd fastlane && NODE_ENV=production bundle exec fastlane android $(android_target)
 
-run-ios: | check-device-ios pre-run ## Runs the app on an iOS simulator
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
-		echo Starting React Native packager server; \
-		npm start & echo Running iOS app in development; \
-		if [ ! -z "${SIMULATOR}" ]; then \
-			react-native run-ios --simulator="${SIMULATOR}"; \
-		else \
-			react-native run-ios; \
-		fi; \
-		wait; \
-	else \
-		echo Running iOS app in development; \
-		if [ ! -z "${SIMULATOR}" ]; then \
-			react-native run-ios --simulator="${SIMULATOR}"; \
-		else \
-			react-native run-ios; \
-		fi; \
-	fi
+build-android: | check-android-target pre-run check-style start-packager prepare-android-build do-build-android stop-packager
 
-run-android: | check-device-android pre-run prepare-android-build ## Runs the app on an Android emulator or dev device
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
-        echo Starting React Native packager server; \
-    	npm start & echo Running Android app in development; \
-    	if [ ! -z ${VARIANT} ]; then \
-    		react-native run-android --no-packager --variant=${VARIANT}; \
-    	else \
-    		react-native run-android --no-packager; \
-    	fi; \
-    	wait; \
-    else \
-    	echo Running Android app in development; \
-        if [ ! -z ${VARIANT} ]; then \
-			react-native run-android --no-packager --variant=${VARIANT}; \
-		else \
-			react-native run-android --no-packager; \
-		fi; \
-    fi
+alpha:
+	@:
 
-build: | stop pre-build check-style ## Builds the app for Android & iOS
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
-		echo Starting React Native packager server; \
-		npm start & echo; \
-	fi
-	@echo "Building App"
-	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane build
-	@ps -ef | grep -i "cli.js start" | grep -iv grep | awk '{print $$2}' | xargs kill -9
+dev:
+	@:
 
+beta:
+	@:
 
-build-ios: | stop pre-build check-style ## Builds the iOS app
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
-		echo Starting React Native packager server; \
-		npm start & echo; \
-	fi
-	@echo "Building iOS app"
-	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane ios build
-	@ps -ef | grep -i "cli.js start" | grep -iv grep | awk '{print $$2}' | xargs kill -9
-
-build-android: | stop pre-build check-style prepare-android-build ## Build the Android app
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
-		echo Starting React Native packager server; \
-		npm start & echo; \
-	fi
-	@echo "Building Android app"
-	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane android build
-	@ps -ef | grep -i "cli.js start" | grep -iv grep | awk '{print $$2}' | xargs kill -9
-
-unsigned-ios: stop pre-build check-style ## Build an unsigned version of the iOS app
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
-		echo Starting React Native packager server; \
-		npm start & echo; \
-	fi
-	@echo "Building unsigned iOS app"
-	@cd fastlane && NODE_ENV=production bundle exec fastlane ios unsigned
-	@mkdir -p build-ios
-	@cd ios/ && xcodebuild -workspace Mattermost.xcworkspace/ -scheme Mattermost -sdk iphoneos -configuration 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/
-	@ps -ef | grep -i "cli.js start" | grep -iv grep | awk '{print $$2}' | xargs kill -9
-
-unsigned-android: stop pre-build check-style prepare-android-build ## Build an unsigned version of the Android app
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
-		echo Starting React Native packager server; \
-		npm start & echo; \
-    fi
-	@echo "Building unsigned Android app"
-	@cd fastlane && NODE_ENV=production bundle exec fastlane android unsigned
-	@mv android/app/build/outputs/apk/unsigned/app-unsigned-unsigned.apk ./Mattermost-unsigned.apk
-	@ps -ef | grep -i "cli.js start" | grep -iv grep | awk '{print $$2}' | xargs kill -9
-
-test: | pre-run check-style ## Runs tests
-	@npm test
-
-build-pr: | can-build-pr stop pre-build check-style ## Build a PR from the mattermost-mobile repo
-	@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
-		echo Starting React Native packager server; \
-		npm start & echo; \
-	fi
-	@echo "Building App from PR ${PR_ID}"
-	@cd fastlane && BABEL_ENV=production NODE_ENV=production bundle exec fastlane build_pr pr:PR-${PR_ID}
-	@ps -ef | grep -i "cli.js start" | grep -iv grep | awk '{print $$2}' | xargs kill -9
-
-can-build-pr:
-	@if [ -z ${PR_ID} ]; then \
-		echo a PR number needs to be specified; \
-		exit 1; \
-	fi
-
-i18n-extract: ## Extract strings for translation from the source code
-	@[[ -d $(MM_UTILITIES_DIR) ]] || echo "You must clone github.com/mattermost/mattermost-utilities repo in .. to use this command"
-	@[[ -d $(MM_UTILITIES_DIR) ]] && cd $(MM_UTILITIES_DIR) && npm install && npm run babel && node mmjstool/build/index.js i18n extract-mobile
-
-
-## Help documentation https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
-help:
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+release:
+	@:

README.md

@@ -1,17 +1,13 @@
 # Mattermost Mobile
 
-- **Supported Server versions:** 4.10+
-- **Supported iOS versions:** 10.3+
-- **Supported Android versions:** 7.0+
+**Supported Server Versions:** 4.0+
 
-Mattermost is an open source Slack-alternative used by thousands of companies around the world in 14 languages. Learn more at [https://about.mattermost.com](https://about.mattermost.com).
+Mattermost is an open source Slack-alternative used by thousands of companies around the world in 11 languages. Learn more at https://mattermost.com.
 
-You can download our apps from the [App Store](https://about.mattermost.com/mattermost-ios-app/) or [Google Play Store](https://about.mattermost.com/mattermost-android-app/), or [build them yourself](https://developers.mattermost.com/contribute/mobile/build-your-own/). 
+You can download our apps from the [App Store](https://about.mattermost.com/mattermost-ios-app/) or [Google Play Store](https://about.mattermost.com/mattermost-android-app/), or package them yourself. 
 
 We plan on releasing monthly updates with new features - check the [changelog](https://github.com/mattermost/mattermost-mobile/blob/master/CHANGELOG.md) for what features are currently supported! 
 
-**Important:** If you self-compile the Mattermost Mobile apps you also need to deploy your own [Mattermost Push Notification Service](https://github.com/mattermost/mattermost-push-proxy/releases). 
-
 # How to Contribute
 
 ### Testing
@@ -21,7 +17,7 @@ To help with testing app updates before they're released, you can:
 1. Sign up to be a beta tester
   - [Android](https://play.google.com/apps/testing/com.mattermost.rnbeta)
   - [iOS](https://mattermost-fastlane.herokuapp.com/)
-2. Install the `Mattermost Beta` app. New updates in the Beta app are released periodically. You will receive a notification when the new updates are available.
+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
@@ -32,12 +28,89 @@ To help with testing app updates before they're released, you can:
 
 ### Contribute Code 
 
-1. Look in [GitHub issues](https://github.com/mattermost/mattermost-server/issues) for issues marked as [Help Wanted]
+1. Look in [GitHub issues](https://github.com/mattermost/mattermost-mobile/issues) for issues marked as [Help Wanted]
 2. Comment to let people know you’re working on it
-3. Follow [these instructions](https://developers.mattermost.com/contribute/mobile/developer-setup/) to set up your developer environment
+3. Follow [these instructions](https://docs.mattermost.com/developer/mobile-developer-setup.html) to set up your developer environment
 4. Join the [Native Mobile Apps channel](https://pre-release.mattermost.com/core/channels/native-mobile-apps) on our team site to ask questions
 
+# Installing Dependencies
 
+Follow the [React Native Getting Started Guide](https://facebook.github.io/react-native/docs/getting-started.html) for detailed instructions on setting up your local machine for development.
+
+# Detailed configuration:
+
+## Mac
+
+- General requirements
+
+    - XCode 8.3
+    - Install required packages using homebrew:
+      ```bash
+      $ brew install watchman
+      $ brew install yarn
+      ```
+	  
+- Clone repository and configure:
+    ```bash
+    $ git clone git@github.com:mattermost/mattermost-mobile.git
+    $ cd mattermost-mobile
+    $ npm install
+    $ npm install -g react-native-cli
+    ```
+
+- Run application
+    ```bash
+    $ make run
+    ```
+
+- Stop the packager server
+    ```bash
+    $ make stop
+    ```
+## Linux:
+
+- General requiriments:
+
+  - JDK 7 or greater
+  - Android SDK
+  - Virtualbox
+  - An Android emulator: Genymotion or Android emulator. If using genymotion ensure that it uses existing adb tools (Settings: "Use custom Android SDK Tools")
+  - Install watchman (do this globally):
+      ```bash
+      $ git clone https://github.com/facebook/watchman.git
+      $ cd watchman
+      $ git checkout master
+      $ ./autogen.sh
+      $ ./configure make
+      $ sudo make install
+      ```
+      Configure your kernel to accept a lot of file watches, using a command like:
+      ```bash
+      $ sudo sysctl -w fs.inotify.max_user_watches=1048576
+      ```
+
+- Clone repository and configure:
+    ```bash
+    $ git clone git@github.com:mattermost/mattermost-mobile.git
+    $ cd mattermost-mobile
+    $ npm install
+    $ npm install -g react-native-cli
+    ```
+
+  - You can create a file named `assets/override/config.json` and add the url to the Mattermost server that you will use to develop:
+    `{
+       "DefaultServerUrl": "https://pre-release.mattermost.com"
+    }`
+
+    To use a local Mattermost server you will need to configure the "DefaultServerUrl" depending on the emulator you will use:
+      * IOs:        "DefaultServerUrl": "http://localhost:8065"
+      * Android:    "DefaultServerUrl": "http://10.0.2.2:3000"
+      * Genymotion: "DefaultServerUrl": "http://10.0.3.2:8065"
+
+- Run application
+  - Start emulator
+  - Start react packager: `$ react-native start`
+  - Run in emulator: `$ react-native run-android`
 
 # Frequently Asked Questions
 
@@ -45,13 +118,13 @@ To help with testing app updates before they're released, you can:
 
 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

@@ -1,3 +1,5 @@
+import re
+
 # To learn about Buck see [Docs](https://buckbuild.com/).
 # To run your application with Buck:
 # - install Buck
@@ -9,9 +11,8 @@
 #
 
 lib_deps = []
-
 for jarfile in glob(['libs/*.jar']):
-  name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
+  name = 'jars__' + re.sub(r'^.*/([^/]+)\.jar$', r'\1', jarfile)
   lib_deps.append(':' + name)
   prebuilt_jar(
     name = name,
@@ -19,7 +20,7 @@ for jarfile in glob(['libs/*.jar']):
   )
 
 for aarfile in glob(['libs/*.aar']):
-  name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
+  name = 'aars__' + re.sub(r'^.*/([^/]+)\.aar$', r'\1', aarfile)
   lib_deps.append(':' + name)
   android_prebuilt_aar(
     name = name,
@@ -27,39 +28,39 @@ for aarfile in glob(['libs/*.aar']):
   )
 
 android_library(
-    name = "all-libs",
-    exported_deps = lib_deps,
+  name = 'all-libs',
+  exported_deps = lib_deps
 )
 
 android_library(
-    name = "app-code",
-    srcs = glob([
-        "src/main/java/**/*.java",
-    ]),
-    deps = [
-        ":all-libs",
-        ":build_config",
-        ":res",
-    ],
+  name = 'app-code',
+  srcs = glob([
+    'src/main/java/**/*.java',
+  ]),
+  deps = [
+    ':all-libs',
+    ':build_config',
+    ':res',
+  ],
 )
 
 android_build_config(
-    name = "build_config",
-    package = "com.mattermost.rnbeta",
+  name = 'build_config',
+  package = 'com.mattermost.rnbeta',
 )
 
 android_resource(
-    name = "res",
-    package = "com.mattermost.rnbeta",
-    res = "src/main/res",
+  name = 'res',
+  res = 'src/main/res',
+  package = 'com.mattermost.rnbeta',
 )
 
 android_binary(
-    name = "app",
-    keystore = "//android/keystores:debug",
-    manifest = "src/main/AndroidManifest.xml",
-    package_type = "debug",
-    deps = [
-        ":app-code",
-    ],
+  name = 'app',
+  package_type = 'debug',
+  manifest = 'src/main/AndroidManifest.xml',
+  keystore = '//android/keystores:debug',
+  deps = [
+    ':app-code',
+  ],
 )

android/app/build.gradle

@@ -33,13 +33,6 @@ import com.android.build.OutputFile
  *   // bundleInPaidRelease: true,
  *   // bundleInBeta: true,
  *
- *   // whether to disable dev mode in custom build variants (by default only disabled in release)
- *   // for example: to disable dev mode in the staging build type (if configured)
- *   devDisabledInStaging: true,
- *   // The configuration property can be in the following formats
- *   //         'devDisabledIn${productFlavor}${buildType}'
- *   //         'devDisabledIn${buildType}'
- *
  *   // the root of your project, i.e. where "package.json" lives
  *   root: "../../",
  *
@@ -65,31 +58,16 @@ import com.android.build.OutputFile
  *   inputExcludes: ["android/**", "ios/**"],
  *
  *   // override which node gets called and with what additional arguments
- *   nodeExecutableAndArgs: ["node"],
+ *   nodeExecutableAndArgs: ["node"]
  *
  *   // supply additional arguments to the packager
  *   extraPackagerArgs: []
  * ]
  */
 
-project.ext.react = [
-    entryFile: "index.js",
-    bundleCommand: "ram-bundle",
-    bundleConfig: "packager-config.js"
-]
-
 apply from: "../../node_modules/react-native/react.gradle"
 apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
 
-if (System.getenv("SENTRY_ENABLED") == "true") {
-    project.ext.sentryCli = [
-        logLevel: "error",
-        flavorAware: false
-    ]
-
-    apply from: "../../node_modules/react-native-sentry/sentry.gradle"
-}
-
 /**
  * Set this to true to create two separate APKs instead of one:
  *   - An APK that only works on ARM devices
@@ -106,16 +84,16 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"
 
     defaultConfig {
         applicationId "com.mattermost.rnbeta"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 176
-        versionName "1.16.1"
-        multiDexEnabled = true
+        minSdkVersion 16
+        targetSdkVersion 23
+        versionCode 49
+        versionName "1.2.0"
+        multiDexEnabled true
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
@@ -149,11 +127,6 @@ android {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
-        unsigned.initWith(buildTypes.release)
-        unsigned {
-            signingConfig null
-            matchingFallbacks = ['debug', 'release']
-        }
     }
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
@@ -170,60 +143,25 @@ android {
     }
 }
 
-repositories {
-    maven {
-        url 'https://maven.google.com'
-    }
-}
-
-configurations.all {
-    resolutionStrategy {
-        eachDependency { DependencyResolveDetails details ->
-            if (details.requested.name == 'android-jsc') {
-                details.useTarget group: details.requested.group, name: 'android-jsc-intl', version: 'r236355'
-            }
-            if (details.requested.name == 'play-services-gcm') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '16.0.0'
-            }
-        }
-    }
-}
-
 dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:percent:27.1.1'
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation project(':react-native-document-picker')
-    implementation project(':react-native-keychain')
-    implementation project(':react-native-doc-viewer')
-    implementation project(':react-native-video')
-    implementation project(':react-native-navigation')
-    implementation project(':react-native-image-picker')
-    implementation project(':react-native-bottom-sheet')
-    implementation project(':react-native-device-info')
-    implementation project(':reactnativenotifications')
-    implementation project(':react-native-cookies')
-    implementation project(':react-native-linear-gradient')
-    implementation project(':react-native-vector-icons')
-    implementation project(':react-native-svg')
-    implementation project(':react-native-local-auth')
-    implementation project(':jail-monkey')
-    implementation project(':react-native-youtube')
-    implementation project(':react-native-sentry')
-    implementation project(':react-native-exception-handler')
-    implementation project(':rn-fetch-blob')
-    implementation project(':react-native-recyclerview-list')
-    implementation project(':react-native-webview')
-    implementation project(':react-native-gesture-handler')
-
-    // For animated GIF support
-    implementation 'com.facebook.fresco:fresco:1.10.0'
-    implementation 'com.facebook.fresco:animated-gif:1.10.0'
-    // For WebP support, including animated WebP
-    implementation 'com.facebook.fresco:animated-webp:1.10.0'
-    implementation  'com.facebook.fresco:webpsupport:1.10.0'
+    compile fileTree(dir: "libs", include: ["*.jar"])
+    compile "com.android.support:appcompat-v7:25.0.1"
+    compile "com.facebook.react:react-native:+"  // From node_modules
+    compile project(':react-native-navigation')
+    compile project(':react-native-image-picker')
+    compile project(':react-native-orientation')
+    compile project(':react-native-bottom-sheet')
+    compile ('com.google.android.gms:play-services-gcm:9.4.0') {
+        force = true;
+    }
+    compile project(':react-native-device-info')
+    compile project(':reactnativenotifications')
+    compile project(':react-native-cookies')
+    compile project(':react-native-linear-gradient')
+    compile project(':react-native-vector-icons')
+    compile project(':react-native-svg')
+    compile project(':react-native-local-auth')
+    compile project(':jail-monkey')
 }
 
 // Run this once to be able to run the application with BUCK

android/app/proguard-rules.pro

@@ -15,3 +15,52 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Disabling obfuscation is useful if you collect stack traces from production crashes
+# (unless you are using a system that supports de-obfuscate the stack traces).
+-dontobfuscate
+
+# React Native
+
+# Keep our interfaces so they can be used by other ProGuard rules.
+# See http://sourceforge.net/p/proguard/bugs/466/
+-keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
+-keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
+-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
+
+# Do not strip any method/class that is annotated with @DoNotStrip
+-keep @com.facebook.proguard.annotations.DoNotStrip class *
+-keep @com.facebook.common.internal.DoNotStrip class *
+-keepclassmembers class * {
+    @com.facebook.proguard.annotations.DoNotStrip *;
+    @com.facebook.common.internal.DoNotStrip *;
+}
+
+-keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
+  void set*(***);
+  *** get*();
+}
+
+-keep class * extends com.facebook.react.bridge.JavaScriptModule { *; }
+-keep class * extends com.facebook.react.bridge.NativeModule { *; }
+-keepclassmembers,includedescriptorclasses class * { native <methods>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.UIProp <fields>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactProp <methods>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
+
+-dontwarn com.facebook.react.**
+
+# okhttp
+
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+
+# okio
+
+-keep class sun.misc.Unsafe { *; }
+-dontwarn java.nio.file.*
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn okio.**

android/app/src/main/AndroidManifest.xml

@@ -1,62 +1,51 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mattermost.rnbeta">
+    package="com.mattermost.rnbeta"
+    android:versionCode="1"
+    android:versionName="1.0">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <permission
+            android:name="${applicationId}.permission.C2D_MESSAGE"
+            android:protectionLevel="signature" />
+    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission 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="true"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
       android:theme="@style/AppTheme"
-      android:networkSecurityConfig="@xml/network_security_config"
     >
         <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:windowSoftInputMode="adjustResize"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-        android:windowSoftInputMode="adjustResize">
+      >
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
-            <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
         </intent-filter>
       </activity>
       <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-      <service android:name=".NotificationDismissService"
-                android:enabled="true"
-                android:exported="false" />
-      <service android:name=".NotificationReplyService"
-               android:enabled="true"
-               android:exported="false" />
-        <activity
-                android:name="com.reactnativenavigation.controllers.NavigationActivity"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"/>
-        <activity
-                android:name="com.mattermost.share.ShareActivity"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-                android:label="@string/app_name"
-                android:screenOrientation="portrait"
-                android:theme="@style/AppTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                //  for sharing
-                <data android:mimeType="*/*" />
-            </intent-filter>
-        </activity>
+      <receiver android:name=".NotificationDismissReceiver" />
     </application>
 
 </manifest>

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,38 +0,0 @@
-package com.mattermost.react_native_interface;
-
-import com.facebook.react.bridge.Promise;
-
-/**
- * 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, Throwable e) {
-
-    }
-
-    @Override
-    public void reject(String code, String message, Throwable e) {
-
-    }
-
-    @Override
-    public void reject(String message) {
-
-    }
-
-    @Override
-    public void reject(Throwable reason) {
-
-    }
-}

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

@@ -1,38 +1,25 @@
 package com.mattermost.rnbeta;
 
 import android.app.PendingIntent;
-import android.app.NotificationChannel;
 import android.content.Intent;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.pm.ApplicationInfo;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.media.AudioManager;
-import android.media.RingtoneManager;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Build;
 import android.app.Notification;
 import android.app.NotificationManager;
-import android.app.RemoteInput;
-import android.provider.Settings.System;
 import java.util.LinkedHashMap;
-import java.util.Collections;
 import java.util.ArrayList;
-import java.util.List;
-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;
 
 public class CustomPushNotification extends PushNotification {
@@ -40,53 +27,18 @@ 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 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;
+    private static LinkedHashMap<String,ArrayList<Bundle>> channelIdToNotification = new LinkedHashMap<String,ArrayList<Bundle>>();
 
     public CustomPushNotification(Context context, Bundle bundle, AppLifecycleFacade appLifecycleFacade, AppLaunchHelper appLaunchHelper, JsIOHelper jsIoHelper) {
         super(context, bundle, appLifecycleFacade, appLaunchHelper, jsIoHelper);
-        this.context = context;
     }
 
-    public static void clearNotification(Context mContext, int notificationId, String channelId) {
+    public static void clearNotification(int notificationId) {
         if (notificationId != -1) {
-           Object objCount = channelIdToNotificationCount.get(channelId);
-            Integer count = -1;
-
-            if (objCount != null) {
-                count = (Integer)objCount;
-            }
-
+            String channelId = String.valueOf(notificationId);
             channelIdToNotificationCount.remove(channelId);
             channelIdToNotification.remove(channelId);
-
-            if (mContext != null) {
-                final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-                notificationManager.cancel(notificationId);
-
-                if (count != -1) {
-                    int total = CustomPushNotification.badgeCount - count;
-                    int badgeCount = total < 0 ? 0 : total;
-                    ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), badgeCount);
-                    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();
-            ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), 0);
         }
     }
 
@@ -106,16 +58,14 @@ public class CustomPushNotification extends PushNotification {
             channelIdToNotificationCount.put(channelId, count);
 
             Object bundleArray = channelIdToNotification.get(channelId);
-            List list = null;
+            ArrayList list = null;
             if (bundleArray == null) {
-                list = Collections.synchronizedList(new ArrayList(0));
+                list = new ArrayList();
             } else {
-                list = Collections.synchronizedList((List)bundleArray);
-            }
-            synchronized (list) {
-                list.add(0, data);
-                channelIdToNotification.put(channelId, list);
+                list = (ArrayList)bundleArray;
             }
+            list.add(data);
+            channelIdToNotification.put(channelId, list);
         }
 
         if ("clear".equals(type)) {
@@ -134,17 +84,12 @@ 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) {
+        if (!mAppLifecycleFacade.isAppVisible()) {
             super.postNotification(id, notification);
         }
     }
@@ -153,52 +98,24 @@ public class CustomPushNotification extends PushNotification {
     protected Notification.Builder getNotificationBuilder(PendingIntent intent) {
         final Resources res = mContext.getResources();
         String packageName = mContext.getPackageName();
-        NotificationPreferences notificationPreferences = NotificationPreferences.getInstance(mContext);
-
-        String CHANNEL_ID = "channel_01";
-        String CHANNEL_NAME = "Mattermost notifications";
 
         // First, get a builder initialized with defaults from the core class.
-        final Notification.Builder notification = new Notification.Builder(mContext);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel(CHANNEL_ID,
-                    CHANNEL_NAME,
-                    NotificationManager.IMPORTANCE_HIGH);
-            final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-            notificationManager.createNotificationChannel(channel);
-            notification.setChannelId(CHANNEL_ID);
-        }
+        final Notification.Builder notification = super.getNotificationBuilder(intent);
         Bundle bundle = mNotificationProps.asBundle();
-        String version = bundle.getString("version");
-
-        String title = null;
-        if (version != null && version.equals("v2")) {
-            title = bundle.getString("channel_name");
-        } else {
-            title = bundle.getString("title");
-        }
-
-        if (android.text.TextUtils.isEmpty(title)) {
+        String title = bundle.getString("title");
+        if (title == null) {
             ApplicationInfo appInfo = mContext.getApplicationInfo();
             title = mContext.getPackageManager().getApplicationLabel(appInfo).toString();
         }
 
+        int notificationId = bundle.getString("channel_id").hashCode();
         String channelId = bundle.getString("channel_id");
-        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) {
-            b = new Bundle();
-        }
-        b.putString("channel_id", channelId);
-        notification.addExtras(b);
-
         int smallIconResId;
         int largeIconResId;
 
@@ -223,19 +140,20 @@ public class CustomPushNotification extends PushNotification {
         }
 
         if (numberString != null) {
-            CustomPushNotification.badgeCount = Integer.parseInt(numberString);
-            ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), CustomPushNotification.badgeCount);
+            ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), Integer.parseInt(numberString));
         }
 
-        int numMessages = getMessageCountInChannel(channelId);
+        int numMessages = 0;
+        Object objCount = channelIdToNotificationCount.get(channelId);
+        if (objCount != null) {
+            numMessages = (Integer)objCount;
+        }
 
         notification
-                .setContentIntent(intent)
                 .setGroupSummary(true)
                 .setSmallIcon(smallIconResId)
                 .setVisibility(Notification.VISIBILITY_PRIVATE)
-                .setPriority(Notification.PRIORITY_HIGH)
-                .setAutoCancel(true);
+                .setPriority(Notification.PRIORITY_HIGH);
 
         if (numMessages == 1) {
             notification
@@ -244,85 +162,30 @@ public class CustomPushNotification extends PushNotification {
                     .setStyle(new Notification.BigTextStyle()
                             .bigText(message));
         } else {
-            String summaryTitle = null;
-
-            if (version != null && version.equals("v2")) {
-                summaryTitle = String.format("(%d) %s", numMessages, title);
-            } else {
-                summaryTitle = String.format("%s (%d)", title, numMessages);
-            }
+            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>();
+            ArrayList<Bundle> list = (ArrayList<Bundle>) channelIdToNotification.get(channelId);
+            for (Bundle data : list){
+                style.addLine(data.getString("message"));
             }
 
-            if (version != null && version.equals("v2")) {
-                style.addLine(message);
-            }
-
-            for (Bundle data : list) {
-                String msg = data.getString("message");
-                if (msg != message) {
-                    style.addLine(data.getString("message"));
-                }
-            }
-
-            if (version != null && version.equals("v2")) {
-                notification
-                        .setContentTitle(summaryTitle)
-                        .setContentText(message)
-                        .setStyle(style);
-            } else {
-                style.setBigContentTitle(message)
-                        .setSummaryText(String.format("+%d more", (numMessages - 1)));
-                notification.setStyle(style)
-                        .setContentTitle(summaryTitle);
-            }
+            style.setBigContentTitle(title);
+            notification.setStyle(style)
+                    .setContentTitle(summaryTitle);
+//                    .setNumber(numMessages);
         }
 
         // Let's add a delete intent when the notification is dismissed
-        Intent delIntent = new Intent(mContext, NotificationDismissService.class);
+        Intent delIntent = new Intent(mContext, NotificationDismissReceiver.class);
         delIntent.putExtra(NOTIFICATION_ID, notificationId);
-        PendingIntent deleteIntent = NotificationIntentAdapter.createPendingNotificationIntent(mContext, delIntent, mNotificationProps);
+        PendingIntent deleteIntent = PendingIntent.getBroadcast(mContext, 0, delIntent, 0);
         notification.setDeleteIntent(deleteIntent);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             notification.setGroup(GROUP_KEY_MESSAGES);
         }
 
-        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;
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                replyPendingIntent = PendingIntent.getForegroundService(mContext, notificationId, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-            } else {
-                replyPendingIntent = PendingIntent.getService(mContext, notificationId, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-            }
-
-            RemoteInput remoteInput = new RemoteInput.Builder(KEY_TEXT_REPLY)
-                    .setLabel("Reply")
-                    .build();
-
-            Notification.Action replyAction = new Notification.Action.Builder(
-                    R.drawable.ic_notif_action_reply, "Reply", replyPendingIntent)
-                    .addRemoteInput(remoteInput)
-                    .setAllowGeneratedReplies(true)
-                    .build();
-
-            notification
-                    .setShowWhen(true)
-                    .addAction(replyAction);
-        }
-
         Bitmap largeIconBitmap = BitmapFactory.decodeResource(res, largeIconResId);
         if (largeIconResId != 0 && (largeIcon != null || Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)) {
             notification.setLargeIcon(largeIconBitmap);
@@ -332,27 +195,6 @@ public class CustomPushNotification extends PushNotification {
             notification.setSubText(subText);
         }
 
-        String soundUri = notificationPreferences.getNotificationSound();
-        if (soundUri != null) {
-            if (soundUri != "none") {
-                notification.setSound(Uri.parse(soundUri), AudioManager.STREAM_NOTIFICATION);
-            }
-        } else {
-            Uri defaultUri = System.DEFAULT_NOTIFICATION_URI;
-            notification.setSound(defaultUri, AudioManager.STREAM_NOTIFICATION);
-        }
-
-        boolean vibrate = notificationPreferences.getShouldVibrate();
-        if (vibrate) {
-            // use the system default for vibration
-            notification.setDefaults(Notification.DEFAULT_VIBRATE);
-        }
-
-        boolean blink = notificationPreferences.getShouldBlink();
-        if (blink) {
-            notification.setLights(Color.CYAN, 500, 500);
-        }
-
         return notification;
     }
 
@@ -360,22 +202,17 @@ public class CustomPushNotification extends PushNotification {
         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 numberString = data.getString("badge");
 
-        CustomPushNotification.badgeCount = Integer.parseInt(numberString);
-        CustomPushNotification.clearNotification(mContext.getApplicationContext(), notificationId, channelId);
+        String numberString = data.getString("badge");
+        if (numberString != null) {
+            ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), Integer.parseInt(numberString));
+        }
 
-        ApplicationBadgeHelper.instance.setApplicationIconBadgeNumber(mContext.getApplicationContext(), CustomPushNotification.badgeCount);
+        channelIdToNotificationCount.remove(channelId);
+        channelIdToNotification.remove(channelId);
+        final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+        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 com.wix.reactnativenotifications.helpers.PushNotificationHelper;
-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/InitializationModule.java

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

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

@@ -1,31 +1,63 @@
 package com.mattermost.rnbeta;
 
-import android.os.Bundle;
-import android.support.annotation.Nullable;
 import com.reactnativenavigation.controllers.SplashActivity;
 
-public class MainActivity extends SplashActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+import java.lang.ref.WeakReference;
 
-        /**
-         * 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;
-        }
+import android.content.Context;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.graphics.Color;
+import android.widget.TextView;
+import android.view.ViewGroup.LayoutParams;
+import android.view.Gravity;
+import android.util.TypedValue;
+
+public class MainActivity extends SplashActivity {
+
+    private static ImageView imageView;
+    private static WeakReference<MainActivity> wr_activity;
+    protected static MainActivity getActivity() {
+        return wr_activity.get();
     }
 
+    /**
+     * Returns the name of the main component registered from JavaScript.
+     * This is used to schedule rendering of the component.
+     */
+    // @Override
+    // protected String getMainComponentName() {
+    //     return "Mattermost";
+    // }
+
     @Override
-    public int getSplashLayout() {
-        return R.layout.launch_screen;
+    public LinearLayout createSplashLayout() {
+        wr_activity = new WeakReference<>(this);
+        LayoutParams layoutParams = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        Context context = getActivity();
+        final int drawableId = getImageId();
+
+        NotificationsLifecycleFacade.getInstance().LoadManagedConfig(getActivity());
+
+        imageView = new ImageView(context);
+        imageView.setImageResource(drawableId);
+
+        imageView.setLayoutParams(layoutParams);
+        imageView.setScaleType(ImageView.ScaleType.CENTER);
+
+        LinearLayout view = new LinearLayout(this);
+        view.setBackgroundColor(Color.parseColor("#FFFFFF"));
+        view.setGravity(Gravity.CENTER);
+        view.addView(imageView);
+
+        return view;
+    }
+
+    private static int getImageId() {
+        int drawableId = getActivity().getResources().getIdentifier("splash", "drawable", getActivity().getClass().getPackage().getName());
+        if (drawableId == 0) {
+            drawableId = getActivity().getResources().getIdentifier("splash", "drawable", getActivity().getPackageName());
+        }
+        return drawableId;
     }
 }

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

@@ -1,32 +1,17 @@
 package com.mattermost.rnbeta;
 
-import com.mattermost.share.SharePackage;
-import com.mattermost.share.RealPathUtil;
-
-import android.app.Activity;
+import android.app.Application;
 import android.support.annotation.NonNull;
 import android.content.Context;
 import android.os.Bundle;
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
 
-import com.reactnativedocumentpicker.ReactNativeDocumentPicker;
-import com.oblador.keychain.KeychainPackage;
-import com.reactlibrary.RNReactNativeDocViewerPackage;
-import com.brentvatne.react.ReactVideoPackage;
-import com.horcrux.svg.SvgPackage;
-import com.inprogress.reactnativeyoutube.ReactNativeYouTube;
-import io.sentry.RNSentryPackage;
-import com.masteratul.exceptionhandler.ReactNativeExceptionHandlerPackage;
-import com.RNFetchBlob.RNFetchBlobPackage;
+import com.facebook.react.ReactApplication;
 import com.gantix.JailMonkey.JailMonkeyPackage;
 import io.tradle.react.LocalAuthPackage;
-import com.github.godness84.RNRecyclerViewList.RNRecyclerviewListPackage;
-import com.reactnativecommunity.webview.RNCWebViewPackage;
-import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
-
+import com.facebook.react.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;
@@ -34,23 +19,22 @@ import com.gnet.bottomsheet.RNBottomSheetPackage;
 import com.learnium.RNDeviceInfo.RNDeviceInfo;
 import com.psykar.cookiemanager.CookieManagerPackage;
 import com.oblador.vectoricons.VectorIconsPackage;
+import com.horcrux.svg.SvgPackage;
 import com.BV.LinearGradient.LinearGradientPackage;
+import com.github.yamill.orientation.OrientationPackage;
 import com.reactnativenavigation.NavigationApplication;
 import com.wix.reactnativenotifications.RNNotificationsPackage;
 import com.wix.reactnativenotifications.core.notification.INotificationsApplication;
 import com.wix.reactnativenotifications.core.notification.IPushNotification;
-import com.wix.reactnativenotifications.core.notificationdrawer.IPushNotificationsDrawer;
-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 android.util.Log;
+import java.util.Arrays;
+import java.util.List;
 
-public class MainApplication extends NavigationApplication implements INotificationsApplication, INotificationsDrawerApplication {
+public class MainApplication extends NavigationApplication implements INotificationsApplication {
   public NotificationsLifecycleFacade notificationsLifecycleFacade;
-  public Boolean sharedExtensionIsOpened = false;
-  public Boolean replyFromPushNotification = false;
 
   @Override
   public boolean isDebug() {
@@ -70,41 +54,18 @@ public class MainApplication extends NavigationApplication implements INotificat
             new VectorIconsPackage(),
             new SvgPackage(),
             new LinearGradientPackage(),
+            new OrientationPackage(),
             new RNNotificationsPackage(this),
             new LocalAuthPackage(),
             new JailMonkeyPackage(),
-            new RNFetchBlobPackage(),
-            new MattermostPackage(this),
-            new RNSentryPackage(),
-            new ReactNativeExceptionHandlerPackage(),
-            new ReactNativeYouTube(),
-            new ReactVideoPackage(),
-            new RNReactNativeDocViewerPackage(),
-            new ReactNativeDocumentPicker(),
-            new SharePackage(this),
-            new KeychainPackage(),
-            new InitializationPackage(this),
-            new RNRecyclerviewListPackage(),
-            new RNCWebViewPackage(),
-            new RNGestureHandlerPackage()
+            new MattermostManagedPackage()
     );
   }
 
-  @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
@@ -113,13 +74,6 @@ public class MainApplication extends NavigationApplication implements INotificat
     SoLoader.init(this, /* native exopackage */ false);
   }
 
-  @Override
-  public boolean clearHostOnActivityDestroy(Activity activity) {
-    // This solves the issue where the splash screen does not go away
-    // after the app is killed by the OS cause of memory or a long time in the background
-    return false;
-  }
-
   @Override
   public IPushNotification getPushNotification(Context context, Bundle bundle, AppLifecycleFacade defaultFacade, AppLaunchHelper defaultAppLaunchHelper) {
     return new CustomPushNotification(
@@ -130,9 +84,4 @@ public class MainApplication extends NavigationApplication implements INotificat
             new JsIOHelper()
     );
   }
-
-  @Override
-  public IPushNotificationsDrawer getPushNotificationsDrawer(Context context, AppLaunchHelper defaultAppLaunchHelper) {
-    return new CustomPushNotificationDrawer(context, defaultAppLaunchHelper);
-  }
 }

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

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

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

@@ -1,32 +0,0 @@
-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/NotificationDismissReceiver.java

@@ -0,0 +1,14 @@
+package com.mattermost.rnbeta;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.BroadcastReceiver;
+
+
+public class NotificationDismissReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        int notificationId = intent.getIntExtra(CustomPushNotification.NOTIFICATION_ID, -1);
+        CustomPushNotification.clearNotification(notificationId);
+    }
+}

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

@@ -1,26 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.content.Context;
-import android.content.Intent;
-import android.app.IntentService;
-import android.os.Bundle;
-import android.util.Log;
-
-import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
-
-public class NotificationDismissService extends IntentService {
-    private Context mContext;
-    public NotificationDismissService() {
-        super("notificationDismissService");
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        mContext = getApplicationContext();
-        Bundle bundle = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
-        int notificationId = intent.getIntExtra(CustomPushNotification.NOTIFICATION_ID, -1);
-        String channelId = bundle.getString("channel_id");
-        CustomPushNotification.clearNotification(mContext, notificationId, channelId);
-        Log.i("ReactNative", "Dismiss notification");
-    }
-}

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

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

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

@@ -1,136 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.app.Application;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.database.Cursor;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.os.Bundle;
-import android.net.Uri;
-import android.service.notification.StatusBarNotification;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-
-public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
-    private static NotificationPreferencesModule instance;
-    private final MainApplication mApplication;
-    private NotificationPreferences mNotificationPreference;
-
-    private NotificationPreferencesModule(MainApplication application, ReactApplicationContext reactContext) {
-        super(reactContext);
-        mApplication = application;
-        Context context = mApplication.getApplicationContext();
-        mNotificationPreference = NotificationPreferences.getInstance(context);
-    }
-
-    public static NotificationPreferencesModule getInstance(MainApplication application, ReactApplicationContext reactContext) {
-        if (instance == null) {
-            instance = new NotificationPreferencesModule(application, reactContext);
-        }
-
-        return instance;
-    }
-
-    public static NotificationPreferencesModule getInstance() {
-        return instance;
-    }
-
-    @Override
-    public String getName() {
-        return "NotificationPreferences";
-    }
-
-    @ReactMethod
-    public void getPreferences(final Promise promise) {
-        try {
-            Context context = mApplication.getApplicationContext();
-            RingtoneManager manager = new RingtoneManager(context);
-            manager.setType(RingtoneManager.TYPE_NOTIFICATION);
-            Cursor cursor = manager.getCursor();
-
-            WritableMap result = Arguments.createMap();
-            WritableArray sounds = Arguments.createArray();
-            while (cursor.moveToNext()) {
-                String notificationTitle = cursor.getString(RingtoneManager.TITLE_COLUMN_INDEX);
-                String notificationId = cursor.getString(RingtoneManager.ID_COLUMN_INDEX);
-                String notificationUri = cursor.getString(RingtoneManager.URI_COLUMN_INDEX);
-
-                WritableMap map = Arguments.createMap();
-                map.putString("name", notificationTitle);
-                map.putString("uri", (notificationUri + "/" + notificationId));
-                sounds.pushMap(map);
-            }
-
-            Uri defaultUri = RingtoneManager.getActualDefaultRingtoneUri(context, RingtoneManager.TYPE_NOTIFICATION);
-            if (defaultUri != null) {
-                result.putString("defaultUri", Uri.decode(defaultUri.toString()));
-            }
-            result.putString("selectedUri", mNotificationPreference.getNotificationSound());
-            result.putBoolean("shouldVibrate", mNotificationPreference.getShouldVibrate());
-            result.putBoolean("shouldBlink", mNotificationPreference.getShouldBlink());
-            result.putArray("sounds", sounds);
-
-            promise.resolve(result);
-        } catch (Exception e) {
-            promise.reject("no notification sounds found", e);
-        }
-    }
-
-    @ReactMethod
-    public void previewSound(String url) {
-        Context context = mApplication.getApplicationContext();
-        Uri uri = Uri.parse(url);
-        Ringtone r = RingtoneManager.getRingtone(context, uri);
-        r.play();
-    }
-
-    @ReactMethod
-    public void setNotificationSound(String soundUri) {
-        mNotificationPreference.setNotificationSound(soundUri);
-    }
-
-    @ReactMethod
-    public void setShouldVibrate(boolean vibrate) {
-        mNotificationPreference.setShouldVibrate(vibrate);
-    }
-
-    @ReactMethod
-    public void setShouldBlink(boolean blink) {
-        mNotificationPreference.setShouldBlink(blink);
-    }
-
-    @ReactMethod
-    public void getDeliveredNotifications(final Promise promise) {
-        Context context = mApplication.getApplicationContext();
-        final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        StatusBarNotification[] statusBarNotifications = notificationManager.getActiveNotifications();
-        WritableArray result = Arguments.createArray();
-        for (StatusBarNotification sbn:statusBarNotifications) {
-            WritableMap map = Arguments.createMap();
-            Notification n = sbn.getNotification();
-            Bundle bundle = n.extras;
-            int identifier = sbn.getId();
-            String channelId = bundle.getString("channel_id");
-            map.putInt("identifier", identifier);
-            map.putString("channel_id", channelId);
-            result.pushMap(map);
-        }
-        promise.resolve(result);
-    }
-
-    @ReactMethod
-    public void removeDeliveredNotifications(int identifier, String channelId) {
-        Context context = mApplication.getApplicationContext();
-        CustomPushNotification.clearNotification(context, identifier, channelId);
-    }
-}

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

@@ -1,81 +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.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Build;
-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
-    public void onCreate() {
-        super.onCreate();
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            Context mContext = this.getApplicationContext();
-            final Resources res = mContext.getResources();
-            String packageName = mContext.getPackageName();
-            int smallIconResId = res.getIdentifier("ic_notification", "mipmap", packageName);
-            String CHANNEL_ID = "Reply job";
-            NotificationChannel channel = new NotificationChannel(CHANNEL_ID, CHANNEL_ID, NotificationManager.IMPORTANCE_LOW);
-            ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(channel);
-            Notification notification =
-                    new Notification.Builder(mContext, CHANNEL_ID)
-                            .setContentTitle("Replying to message")
-                            .setContentText(packageName)
-                            .setSmallIcon(smallIconResId)
-                            .build();
-            startForeground(1, notification);
-        }
-
-    }
-
-    @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);
-
-            MainApplication app = (MainApplication) this.getApplication();
-            app.replyFromPushNotification = true;
-            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

@@ -1,7 +1,6 @@
 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;
@@ -10,9 +9,7 @@ import android.content.IntentFilter;
 import android.os.Bundle;
 import android.util.Log;
 import android.util.ArraySet;
-import android.view.WindowManager;
 import android.view.WindowManager.LayoutParams;
-import android.content.res.Configuration;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
@@ -40,11 +37,12 @@ public class NotificationsLifecycleFacade extends ActivityCallbacks implements A
 
     private final BroadcastReceiver restrictionsReceiver = new BroadcastReceiver() {
         @Override public void onReceive(Context context, Intent intent) {
-            if (context != null) {
+
+            if (mVisibleActivity != null) {
                 // Get the current configuration bundle
                 RestrictionsManager myRestrictionsMgr =
-                        (RestrictionsManager) context
-                                .getSystemService(Context.RESTRICTIONS_SERVICE);
+                    (RestrictionsManager) mVisibleActivity
+                            .getSystemService(Context.RESTRICTIONS_SERVICE);
                 managedConfig = myRestrictionsMgr.getApplicationRestrictions();
 
                 // Check current configuration settings, change your app's UI and
@@ -66,28 +64,22 @@ public class NotificationsLifecycleFacade extends ActivityCallbacks implements A
     @Override
     public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
         MattermostManagedModule managedModule = MattermostManagedModule.getInstance();
-        if (managedModule != null && managedModule.isBlurAppScreenEnabled() && activity != null) {
+        if (managedModule != null && managedModule.isBlurAppScreenEnabled()) {
             activity.getWindow().setFlags(LayoutParams.FLAG_SECURE,
                     LayoutParams.FLAG_SECURE);
         }
-        if (managedConfig != null && managedConfig.size() > 0 && activity != null) {
+        if (managedConfig!= null && managedConfig.size() > 0) {
             activity.registerReceiver(restrictionsReceiver, restrictionsFilter);
         }
-
-        if (activity != null) {
-            activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
-        }
     }
 
     @Override
     public void onActivityResumed(Activity activity) {
         switchToVisible(activity);
 
-        ReactContext ctx = getRunningReactContext();
-        if (managedConfig != null && managedConfig.size() > 0 && ctx != null) {
-
+        if (managedConfig != null && managedConfig.size() > 0) {
             RestrictionsManager myRestrictionsMgr =
-                    (RestrictionsManager) ctx
+                    (RestrictionsManager) activity
                             .getSystemService(Context.RESTRICTIONS_SERVICE);
 
             Bundle newConfig = myRestrictionsMgr.getApplicationRestrictions();
@@ -151,15 +143,6 @@ public class NotificationsLifecycleFacade extends ActivityCallbacks implements A
         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;
@@ -180,15 +163,13 @@ public class NotificationsLifecycleFacade extends ActivityCallbacks implements A
         }
     }
 
-    public synchronized void LoadManagedConfig(ReactContext ctx) {
-        if (ctx != null) {
-            RestrictionsManager myRestrictionsMgr =
-                    (RestrictionsManager) ctx
-                            .getSystemService(Context.RESTRICTIONS_SERVICE);
+    public synchronized void LoadManagedConfig(Activity activity) {
+        RestrictionsManager myRestrictionsMgr =
+                (RestrictionsManager) activity
+                        .getSystemService(Context.RESTRICTIONS_SERVICE);
 
-            managedConfig = myRestrictionsMgr.getApplicationRestrictions();
-            myRestrictionsMgr = null;
-        }
+        managedConfig = myRestrictionsMgr.getApplicationRestrictions();
+        myRestrictionsMgr = null;
     }
 
     public synchronized Bundle getManagedConfig() {
@@ -196,10 +177,8 @@ public class NotificationsLifecycleFacade extends ActivityCallbacks implements A
             return managedConfig;
         }
 
-        ReactContext ctx = getRunningReactContext();
-
-        if (ctx != null) {
-            LoadManagedConfig(ctx);
+        if (mVisibleActivity != null) {
+            LoadManagedConfig(mVisibleActivity);
             return managedConfig;
         }
 
@@ -208,11 +187,9 @@ public class NotificationsLifecycleFacade extends ActivityCallbacks implements A
 
     public void sendConfigChanged(Bundle config) {
         Object result = Arguments.fromBundle(config);
-        ReactContext ctx = getRunningReactContext();
-        if (ctx != null) {
-            ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).
-                    emit("managedConfigDidChange", result);
-        }
+        getRunningReactContext().
+                getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).
+                emit("managedConfigDidChange", result);
     }
 
     private boolean equalBundles(Bundle one, Bundle two) {

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

@@ -1,233 +0,0 @@
-package com.mattermost.share;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
-import android.provider.OpenableColumns;
-import android.content.ContentUris;
-import android.content.ContentResolver;
-import android.os.Environment;
-import android.webkit.MimeTypeMap;
-import android.util.Log;
-import android.text.TextUtils;
-
-import android.os.ParcelFileDescriptor;
-import java.io.*;
-import java.nio.channels.FileChannel;
-
-// Class based on the steveevers DocumentHelper https://gist.github.com/steveevers/a5af24c226f44bb8fdc3
-
-public class RealPathUtil {
-    public static String getRealPathFromURI(final Context context, final Uri uri) {
-
-        final boolean isKitKatOrNewer = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
-
-        // DocumentProvider
-        if (isKitKatOrNewer && DocumentsContract.isDocumentUri(context, uri)) {
-            // ExternalStorageProvider
-            if (isExternalStorageDocument(uri)) {
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                if ("primary".equalsIgnoreCase(type)) {
-                    return Environment.getExternalStorageDirectory() + "/" + split[1];
-                }
-            } else if (isDownloadsDocument(uri)) {
-                // DownloadsProvider
-
-                final String id = DocumentsContract.getDocumentId(uri);
-                if (!TextUtils.isEmpty(id)) {
-                    if (id.startsWith("raw:")) {
-                        return id.replaceFirst("raw:", "");
-                    }
-                    try {
-                        return getPathFromSavingTempFile(context, uri);
-                    } catch (NumberFormatException e) {
-                        Log.e("ReactNative", "DownloadsProvider unexpected uri " + uri.toString());
-                        return null;
-                    }
-                }
-            } else if (isMediaDocument(uri)) {
-                // MediaProvider
-
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                Uri contentUri = null;
-                if ("image".equals(type)) {
-                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-                } else if ("video".equals(type)) {
-                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
-                } else if ("audio".equals(type)) {
-                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
-                }
-
-                final String selection = "_id=?";
-                final String[] selectionArgs = new String[] {
-                        split[1]
-                };
-
-                return getDataColumn(context, contentUri, selection, selectionArgs);
-            }
-        }
-
-        if ("content".equalsIgnoreCase(uri.getScheme())) {
-            // MediaStore (and general)
-
-            if (isGooglePhotosUri(uri)) {
-                return uri.getLastPathSegment();
-            }
-
-            // Try save to tmp file, and return tmp file path
-            return getPathFromSavingTempFile(context, uri);
-        } else if ("file".equalsIgnoreCase(uri.getScheme())) {
-            return uri.getPath();
-        }
-
-        return null;
-    }
-
-    public static String getPathFromSavingTempFile(Context context, final Uri uri) {
-        File tmpFile;
-        String fileName = null;
-
-        // Try and get the filename from the Uri
-        try {
-            Cursor returnCursor =
-                    context.getContentResolver().query(uri, null, null, null, null);
-            int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-            returnCursor.moveToFirst();
-            fileName = returnCursor.getString(nameIndex);
-        } catch (Exception e) {
-            // just continue to get the filename with the last segment of the path
-        }
-
-        try {
-            if (fileName == null) {
-                fileName = uri.getLastPathSegment().toString().trim();
-            }
-
-
-            File cacheDir = new File(context.getCacheDir(), "mmShare");
-            if (!cacheDir.exists()) {
-                cacheDir.mkdirs();
-            }
-
-            String mimeType = getMimeType(uri.getPath());
-            tmpFile = new File(cacheDir, fileName);
-            tmpFile.createNewFile();
-
-            ParcelFileDescriptor pfd = context.getContentResolver().openFileDescriptor(uri, "r");
-
-            FileChannel src = new FileInputStream(pfd.getFileDescriptor()).getChannel();
-            FileChannel dst = new FileOutputStream(tmpFile).getChannel();
-            dst.transferFrom(src, 0, src.size());
-            src.close();
-            dst.close();
-        } catch (IOException ex) {
-            return null;
-        }
-        return tmpFile.getAbsolutePath();
-    }
-
-    public static String getDataColumn(Context context, Uri uri, String selection,
-                                       String[] selectionArgs) {
-
-        Cursor cursor = null;
-        final String column = "_data";
-        final String[] projection = {
-                column
-        };
-
-        try {
-            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
-                    null);
-            if (cursor != null && cursor.moveToFirst()) {
-                final int index = cursor.getColumnIndexOrThrow(column);
-                return cursor.getString(index);
-            }
-        } finally {
-            if (cursor != null)
-                cursor.close();
-        }
-        return null;
-    }
-
-
-    public static boolean isExternalStorageDocument(Uri uri) {
-        return "com.android.externalstorage.documents".equals(uri.getAuthority());
-    }
-
-    public static boolean isDownloadsDocument(Uri uri) {
-        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
-    }
-
-    public static boolean isMediaDocument(Uri uri) {
-        return "com.android.providers.media.documents".equals(uri.getAuthority());
-    }
-
-    public static boolean isGooglePhotosUri(Uri uri) {
-        return "com.google.android.apps.photos.content".equals(uri.getAuthority());
-    }
-
-    public static String getExtension(String uri) {
-        if (uri == null) {
-            return null;
-        }
-
-        int dot = uri.lastIndexOf(".");
-        if (dot >= 0) {
-            return uri.substring(dot);
-        } else {
-            // No extension.
-            return "";
-        }
-    }
-
-    public static String getMimeType(File file) {
-
-        String extension = getExtension(file.getName());
-
-        if (extension.length() > 0)
-            return MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.substring(1));
-
-        return "application/octet-stream";
-    }
-
-    public static String getMimeType(String filePath) {
-        File file = new File(filePath);
-        return getMimeType(file);
-    }
-
-    public static String getMimeTypeFromUri(final Context context, final Uri uri) {
-        try {
-            ContentResolver cR = context.getContentResolver();
-            return cR.getType(uri);
-        } catch (Exception e) {
-            return "application/octet-stream";
-        }
-    }
-
-    public static void deleteTempFiles(final File dir) {
-        try {
-            if (dir.isDirectory()) {
-                deleteRecursive(dir);
-            }
-        } catch (Exception e) {
-            // do nothing
-        }
-    }
-
-    private static void deleteRecursive(File fileOrDirectory) {
-        if (fileOrDirectory.isDirectory())
-            for (File child : fileOrDirectory.listFiles())
-                deleteRecursive(child);
-
-        fileOrDirectory.delete();
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.mattermost.share;
-
-import android.os.Bundle;
-
-import com.facebook.react.ReactActivity;
-import com.mattermost.rnbeta.MainApplication;
-
-public class ShareActivity extends ReactActivity {
-    @Override
-    protected String getMainComponentName() {
-        return "MattermostShare";
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        MainApplication app = (MainApplication) this.getApplication();
-        app.sharedExtensionIsOpened = true;
-    }
-}

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

@@ -1,252 +0,0 @@
-package com.mattermost.share;
-
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.Arguments;
-import com.mattermost.rnbeta.MainApplication;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import javax.annotation.Nullable;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONException;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-public class ShareModule extends ReactContextBaseJavaModule {
-    private final OkHttpClient client = new OkHttpClient();
-    public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-    private final MainApplication mApplication;
-
-    public ShareModule(MainApplication application, ReactApplicationContext reactContext) {
-        super(reactContext);
-        mApplication = application;
-    }
-    private File tempFolder;
-
-    @Override
-    public String getName() {
-        return "MattermostShare";
-    }
-
-    @ReactMethod
-    public void clear() {
-        Activity currentActivity = getCurrentActivity();
-
-        if (currentActivity != null) {
-            Intent intent = currentActivity.getIntent();
-            intent.setAction("");
-            intent.removeExtra(Intent.EXTRA_TEXT);
-            intent.removeExtra(Intent.EXTRA_STREAM);
-        }
-    }
-
-    @Nullable
-    @Override
-    public Map<String, Object> getConstants() {
-        HashMap<String, Object> constants = new HashMap<>(1);
-        constants.put("isOpened", mApplication.sharedExtensionIsOpened);
-        mApplication.sharedExtensionIsOpened = false;
-        return constants;
-    }
-
-    @ReactMethod
-    public void close(ReadableMap data) {
-        this.clear();
-        getCurrentActivity().finish();
-
-        if (data != null) {
-            ReadableArray files = data.getArray("files");
-            String serverUrl = data.getString("url");
-            String token = data.getString("token");
-            JSONObject postData = buildPostObject(data);
-
-            if (files.size() > 0) {
-                uploadFiles(serverUrl, token, files, postData);
-            } else {
-                try {
-                    post(serverUrl, token, postData);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        RealPathUtil.deleteTempFiles(this.tempFolder);
-    }
-
-    @ReactMethod
-    public void data(Promise promise) {
-        promise.resolve(processIntent());
-    }
-
-    @ReactMethod
-    public void getFilePath(String filePath, Promise promise) {
-        Activity currentActivity = getCurrentActivity();
-        WritableMap map = Arguments.createMap();
-
-        if (currentActivity != null) {
-            Uri uri = Uri.parse(filePath);
-            String path = RealPathUtil.getRealPathFromURI(currentActivity, uri);
-            if (path != null) {
-                String text = "file://" + path;
-                map.putString("filePath", text);
-            }
-        }
-
-        promise.resolve(map);
-    }
-
-    public WritableArray processIntent() {
-        WritableMap map = Arguments.createMap();
-        WritableArray items = Arguments.createArray();
-
-        String text = "";
-        String type = "";
-        String action = "";
-
-        Activity currentActivity = getCurrentActivity();
-
-        if (currentActivity != null) {
-            this.tempFolder = new File(currentActivity.getCacheDir(), "mmShare");
-            Intent intent = currentActivity.getIntent();
-            action = intent.getAction();
-            type = intent.getType();
-            if (type == null) {
-                type = "";
-            }
-
-            if (Intent.ACTION_SEND.equals(action) && "text/plain".equals(type)) {
-                text = intent.getStringExtra(Intent.EXTRA_TEXT);
-                map.putString("value", text);
-                map.putString("type", type);
-                items.pushMap(map);
-            } else if (Intent.ACTION_SEND.equals(action)) {
-                Uri uri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
-                text = "file://" + RealPathUtil.getRealPathFromURI(currentActivity, uri);
-                map.putString("value", text);
-
-                if (type.equals("image/*")) {
-                    type = "image/jpeg";
-                } else if (type.equals("video/*")) {
-                    type = "video/mp4";
-                }
-
-                map.putString("type", type);
-                items.pushMap(map);
-            } else if (Intent.ACTION_SEND_MULTIPLE.equals(action)) {
-                ArrayList<Uri> uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
-                for (Uri uri : uris) {
-                    String filePath = RealPathUtil.getRealPathFromURI(currentActivity, uri);
-                    map = Arguments.createMap();
-                    text = "file://" + filePath;
-                    map.putString("value", text);
-
-                    type = RealPathUtil.getMimeTypeFromUri(currentActivity, uri);
-                    if (type != null) {
-                        if (type.equals("image/*")) {
-                            type = "image/jpeg";
-                        } else if (type.equals("video/*")) {
-                            type = "video/mp4";
-                        }
-                    } else {
-                        type = "application/octet-stream";
-                    }
-                    map.putString("type", type);
-                    items.pushMap(map);
-                }
-            }
-        }
-
-        return items;
-    }
-
-    private JSONObject buildPostObject(ReadableMap data) {
-        JSONObject json = new JSONObject();
-        try {
-            json.put("user_id", data.getString("currentUserId"));
-            json.put("channel_id", data.getString("channelId"));
-            json.put("message", data.getString("value"));
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        return json;
-    }
-
-    private void post(String serverUrl, String token, JSONObject postData) throws IOException {
-        RequestBody body = RequestBody.create(JSON, postData.toString());
-        Request request = new Request.Builder()
-                .header("Authorization", "BEARER " + token)
-                .url(serverUrl + "/api/v4/posts")
-                .post(body)
-                .build();
-        Response response = client.newCall(request).execute();
-    }
-
-    private void uploadFiles(String serverUrl, String token, ReadableArray files, JSONObject postData) {
-        try {
-            MultipartBody.Builder builder = new MultipartBody.Builder()
-                    .setType(MultipartBody.FORM);
-
-            for(int i = 0 ; i < files.size() ; i++) {
-                ReadableMap file = files.getMap(i);
-                String filePath = file.getString("fullPath").replaceFirst("file://", "");
-                File fileInfo = new File(filePath);
-                if (fileInfo.exists()) {
-                    final MediaType MEDIA_TYPE = MediaType.parse(file.getString("mimeType"));
-                    builder.addFormDataPart("files", file.getString("filename"), RequestBody.create(MEDIA_TYPE, fileInfo));
-                }
-            }
-
-            builder.addFormDataPart("channel_id", postData.getString("channel_id"));
-            RequestBody body = builder.build();
-            Request request = new Request.Builder()
-                    .header("Authorization", "BEARER " + token)
-                    .url(serverUrl + "/api/v4/files")
-                    .post(body)
-                    .build();
-
-            try (Response response = client.newCall(request).execute()) {
-                if (response.isSuccessful()) {
-                    String responseData = response.body().string();
-                    JSONObject responseJson = new JSONObject(responseData);
-                    JSONArray fileInfoArray = responseJson.getJSONArray("file_infos");
-                    JSONArray file_ids = new JSONArray();
-                    for(int i = 0 ; i < fileInfoArray.length() ; i++) {
-                        JSONObject fileInfo = fileInfoArray.getJSONObject(i);
-                        file_ids.put(fileInfo.getString("id"));
-                    }
-                    postData.put("file_ids", file_ids);
-                    post(serverUrl, token, postData);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-}

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

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

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

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#ffffff"
-    android:gravity="center_horizontal"
-    tools:context=".SplashScreenActivity">
-
-    <ImageView
-        android:id="@+id/imgLogo"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:adjustViewBounds="true"
-        android:src="@drawable/splash" />
-
-</android.support.percent.PercentRelativeLayout>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="white">#FFFFFF</color>
-</resources>

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

@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <resources>
     <string name="app_name">Mattermost Beta</string>
     <string name="inAppPinCode_title">in-App Pincode</string>

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

@@ -3,6 +3,7 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
+        <item name="android:windowIsTranslucent">true</item>
     </style>
 
 </resources>

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <base-config>
-        <trust-anchors>
-            <!-- Trust preinstalled CAs -->
-            <certificates src="system" />
-            <!-- Additionally trust user added CAs -->
-            <certificates src="user" />
-        </trust-anchors>
-    </base-config>
-</network-security-config>

android/build.gradle

@@ -1,57 +1,25 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext {
-        buildToolsVersion = "27.0.3"
-        minSdkVersion = 24
-        compileSdkVersion = 27
-        targetSdkVersion = 26
-        supportLibVersion = "27.1.1"
-    }
     repositories {
         jcenter()
-        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.google.gms:google-services:3.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.+'
+        classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
-subprojects {
-    afterEvaluate {
-        android {
-            compileSdkVersion rootProject.ext.compileSdkVersion
-            buildToolsVersion rootProject.ext.buildToolsVersion
-            defaultConfig {
-                minSdkVersion rootProject.ext.minSdkVersion
-                targetSdkVersion rootProject.ext.targetSdkVersion
-            }
-        }
-    }
-}
-
 allprojects {
     repositories {
-        google()
         mavenLocal()
         jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
         }
-        maven {
-            // Local Maven repo containing AARs with JSC library built for Android
-            url "$rootDir/../node_modules/jsc-android/dist"
-        }
     }
 }
-
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.4'
-    distributionUrl = distributionUrl.replace("bin", "all")
-}

android/gradle.properties

@@ -11,12 +11,10 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-org.gradle.jvmargs=-Xmx2048M
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-#android.enableAapt2=false
-#android.useDeprecatedNdk=true
+android.useDeprecatedNdk=true

android/gradle/wrapper/gradle-wrapper.properties

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

android/gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 ##############################################################################
 ##
@@ -6,6 +6,47 @@
 ##
 ##############################################################################
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -20,49 +61,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
+cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
+cd "$SAVED" >&-
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -89,7 +90,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -113,7 +114,6 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,19 +154,11 @@ if $cygwin ; then
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
 }
-APP_ARGS=$(save "$@")
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

android/gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,9 +46,10 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windows variants
+@rem Get command-line arguments, handling Windowz variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -59,6 +60,11 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

android/keystores/BUCK

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

android/settings.gradle

@@ -1,22 +1,4 @@
 rootProject.name = 'Mattermost'
-include ':react-native-gesture-handler'
-project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
-include ':react-native-document-picker'
-project(':react-native-document-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-document-picker/android')
-include ':react-native-keychain'
-project(':react-native-keychain').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keychain/android')
-include ':react-native-doc-viewer'
-project(':react-native-doc-viewer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-doc-viewer/android')
-include ':react-native-video'
-project(':react-native-video').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-video/android')
-include ':react-native-youtube'
-project(':react-native-youtube').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-youtube/android')
-include ':react-native-sentry'
-project(':react-native-sentry').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sentry/android')
-include ':react-native-exception-handler'
-project(':react-native-exception-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-exception-handler/android')
-include ':rn-fetch-blob'
-project(':rn-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/rn-fetch-blob/android')
 include ':jail-monkey'
 project(':jail-monkey').projectDir = new File(rootProject.projectDir, '../node_modules/jail-monkey/android')
 include ':react-native-local-auth'
@@ -37,11 +19,9 @@ include ':reactnativenotifications'
 project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android')
 
 include ':app'
-include ':react-native-svg'
-project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
+include ':react-native-orientation'
+project(':react-native-orientation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-orientation/android')
 include ':react-native-linear-gradient'
 project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
-include ':react-native-recyclerview-list'
-project(':react-native-recyclerview-list').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-recyclerview-list/android')
-include ':react-native-webview'
-project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
+include ':react-native-svg'
+project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')

app.json

@@ -1,4 +0,0 @@
-{
-  "name": "Mattermost",
-  "displayName": "Mattermost"
-}

app/actions/device/index.js

@@ -1,57 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {networkStatusChangedAction} from 'redux-offline';
-import {Client4} from 'mattermost-redux/client';
-
-import {DeviceTypes} from 'app/constants';
-
-export function connection(isOnline) {
-    return async (dispatch) => {
-        Client4.setOnline(isOnline);
-        dispatch(networkStatusChangedAction(isOnline));
-        dispatch({
-            type: DeviceTypes.CONNECTION_CHANGED,
-            data: isOnline,
-        });
-    };
-}
-
-export function setStatusBarHeight(height = 20) {
-    return {
-        type: DeviceTypes.STATUSBAR_HEIGHT_CHANGED,
-        data: height,
-    };
-}
-
-export function setDeviceDimensions(height, width) {
-    return {
-        type: DeviceTypes.DEVICE_DIMENSIONS_CHANGED,
-        data: {
-            deviceHeight: height,
-            deviceWidth: width,
-        },
-    };
-}
-
-export function setDeviceOrientation(orientation) {
-    return {
-        type: DeviceTypes.DEVICE_ORIENTATION_CHANGED,
-        data: orientation,
-    };
-}
-
-export function setDeviceAsTablet() {
-    return {
-        type: DeviceTypes.DEVICE_TYPE_CHANGED,
-        data: true,
-    };
-}
-
-export default {
-    connection,
-    setDeviceDimensions,
-    setDeviceOrientation,
-    setDeviceAsTablet,
-    setStatusBarHeight,
-};

app/actions/views/account_notifications.js

@@ -0,0 +1,35 @@
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import {updateMe} from 'mattermost-redux/actions/users';
+import {Preferences} from 'mattermost-redux/constants';
+import {savePreferences} from 'mattermost-redux/actions/preferences';
+
+export function handleUpdateUserNotifyProps(notifyProps) {
+    return async (dispatch, getState) => {
+        const state = getState();
+        const config = state.entities.general.config;
+        const {currentUserId} = state.entities.users;
+
+        const {interval, ...otherProps} = notifyProps;
+
+        const email = notifyProps.email;
+        if (config.EnableEmailBatching === 'true' && email !== 'false') {
+            const emailInterval = [{
+                user_id: notifyProps.user_id,
+                category: Preferences.CATEGORY_NOTIFICATIONS,
+                name: Preferences.EMAIL_INTERVAL,
+                value: interval
+            }];
+
+            savePreferences(currentUserId, emailInterval)(dispatch, getState);
+        }
+
+        const props = {...otherProps, email};
+        try {
+            await updateMe({notify_props: props})(dispatch, getState);
+        } catch (error) {
+            // do nothing
+        }
+    };
+}

app/actions/views/announcement.js

@@ -1,11 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {ViewTypes} from 'app/constants';
-
-export function dismissBanner(text) {
-    return {
-        type: ViewTypes.ANNOUNCEMENT_BANNER,
-        data: text,
-    };
-}

app/actions/views/channel.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
+// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
 
 import {batchActions} from 'redux-batched-actions';
 
@@ -8,57 +8,38 @@ import {ViewTypes} from 'app/constants';
 import {UserTypes} from 'mattermost-redux/action_types';
 import {
     fetchMyChannelsAndMembers,
-    markChannelAsRead,
+    getChannelStats,
     selectChannel,
-    leaveChannel as serviceLeaveChannel,
+    leaveChannel as serviceLeaveChannel
 } from 'mattermost-redux/actions/channels';
-import {getPosts, getPostsBefore, getPostsSince, getPostThread} from 'mattermost-redux/actions/posts';
+import {getPosts, getPostsWithRetry, getPostsBefore, getPostsSinceWithRetry, getPostThread} from 'mattermost-redux/actions/posts';
 import {getFilesForPost} from 'mattermost-redux/actions/files';
-import {savePreferences} from 'mattermost-redux/actions/preferences';
+import {savePreferences, deletePreferences} from 'mattermost-redux/actions/preferences';
 import {getTeamMembersByIds} from 'mattermost-redux/actions/teams';
 import {getProfilesInChannel} from 'mattermost-redux/actions/users';
 import {General, Preferences} from 'mattermost-redux/constants';
-import {getCurrentChannelId} from 'mattermost-redux/selectors/entities/channels';
-import {getTeamByName} from 'mattermost-redux/selectors/entities/teams';
-
 import {
     getChannelByName,
     getDirectChannelName,
     getUserIdFromChannelName,
+    isDirectChannelVisible,
+    isGroupChannelVisible,
     isDirectChannel,
-    isGroupChannel,
+    isGroupChannel
 } from 'mattermost-redux/utils/channel_utils';
-import EventEmitter from 'mattermost-redux/utils/event_emitter';
 import {getLastCreateAt} from 'mattermost-redux/utils/post_utils';
 import {getPreferencesByCategory} from 'mattermost-redux/utils/preference_utils';
 
-import {INSERT_TO_COMMENT, INSERT_TO_DRAFT} from 'app/constants/post_textbox';
-import {isDirectChannelVisible, isGroupChannelVisible} from 'app/utils/channels';
-
-const MAX_POST_TRIES = 3;
-
 export function loadChannelsIfNecessary(teamId) {
     return async (dispatch, getState) => {
         await fetchMyChannelsAndMembers(teamId)(dispatch, getState);
     };
 }
 
-export function loadChannelsByTeamName(teamName) {
-    return async (dispatch, getState) => {
-        const state = getState();
-        const {currentTeamId} = state.entities.teams;
-        const team = getTeamByName(state, teamName);
-
-        if (team && team.id !== currentTeamId) {
-            await dispatch(fetchMyChannelsAndMembers(team.id));
-        }
-    };
-}
-
 export function loadProfilesAndTeamMembersForDMSidebar(teamId) {
     return async (dispatch, getState) => {
         const state = getState();
-        const {currentUserId, profilesInChannel} = state.entities.users;
+        const {currentUserId} = state.entities.users;
         const {channels, myMembers} = state.entities.channels;
         const {myPreferences} = state.entities.preferences;
         const {membersInTeam} = state.entities.teams;
@@ -73,7 +54,7 @@ export function loadProfilesAndTeamMembersForDMSidebar(teamId) {
                 user_id: currentUserId,
                 category: Preferences.CATEGORY_DIRECT_CHANNEL_SHOW,
                 name,
-                value: 'true',
+                value: 'true'
             };
         }
 
@@ -115,8 +96,7 @@ export function loadProfilesAndTeamMembersForDMSidebar(teamId) {
         }
 
         for (const [key, pref] of gmPrefs) {
-            //only load the profiles in channels if we don't already have them
-            if (pref.value === 'true' && !profilesInChannel[key]) {
+            if (pref.value === 'true') {
                 loadProfilesForChannels.push(key);
             }
         }
@@ -144,7 +124,8 @@ export function loadProfilesAndTeamMembersForDMSidebar(teamId) {
             if (channel) {
                 actions.push({
                     type: UserTypes.RECEIVED_PROFILE_IN_CHANNEL,
-                    data: {id: channel.id, user_id: members[i]},
+                    data: {user_id: members[i]},
+                    id: channel.id
                 });
             }
         }
@@ -156,95 +137,32 @@ export function loadProfilesAndTeamMembersForDMSidebar(teamId) {
 }
 
 export function loadPostsIfNecessaryWithRetry(channelId) {
-    return async (dispatch, getState) => {
+    return (dispatch, getState) => {
         const state = getState();
         const {posts, postsInChannel} = state.entities.posts;
+
         const postsIds = postsInChannel[channelId];
-        const actions = [];
 
-        const time = Date.now();
-
-        let loadMorePostsVisible = true;
-        let received;
+        // Get the first page of posts if it appears we haven't gotten it yet, like the webapp
         if (!postsIds || postsIds.length < ViewTypes.POST_VISIBILITY_CHUNK_SIZE) {
-            // Get the first page of posts if it appears we haven't gotten it yet, like the webapp
-            received = await retryGetPostsAction(getPosts(channelId), dispatch, getState);
-
-            if (received) {
-                const count = received.order.length;
-                loadMorePostsVisible = count >= ViewTypes.POST_VISIBILITY_CHUNK_SIZE;
-                actions.push({
-                    type: ViewTypes.SET_INITIAL_POST_COUNT,
-                    data: {
-                        channelId,
-                        count,
-                    },
-                });
-            }
-        } else {
-            const {lastConnectAt} = state.device.websocket;
-            const lastGetPosts = state.views.channel.lastGetPosts[channelId];
-
-            let since;
-            if (lastGetPosts && lastGetPosts < lastConnectAt) {
-                // Since the websocket disconnected, we may have missed some posts since then
-                since = lastGetPosts;
-            } else {
-                // Trust that we've received all posts since the last time the websocket disconnected
-                // so just get any that have changed since the latest one we've received
-                const postsForChannel = postsIds.map((id) => posts[id]);
-                since = getLastCreateAt(postsForChannel);
-            }
-
-            received = await retryGetPostsAction(getPostsSince(channelId, since), dispatch, getState);
-
-            if (received) {
-                const count = received.order.length;
-                loadMorePostsVisible = postsIds.length + count >= ViewTypes.POST_VISIBILITY_CHUNK_SIZE;
-                actions.push({
-                    type: ViewTypes.SET_INITIAL_POST_COUNT,
-                    data: {
-                        channelId,
-                        count: postsIds.length + count,
-                    },
-                });
-            }
+            getPostsWithRetry(channelId)(dispatch, getState);
+            return;
         }
 
-        if (received) {
-            actions.push({
-                type: ViewTypes.RECEIVED_POSTS_FOR_CHANNEL_AT_TIME,
-                channelId,
-                time,
-            });
-        }
+        const postsForChannel = postsIds.map((id) => posts[id]);
+        const latestPostTime = getLastCreateAt(postsForChannel);
 
-        actions.push(setLoadMorePostsVisible(loadMorePostsVisible));
-        dispatch(batchActions(actions));
+        getPostsSinceWithRetry(channelId, latestPostTime)(dispatch, getState);
     };
 }
 
-export async function retryGetPostsAction(action, dispatch, getState, maxTries = MAX_POST_TRIES) {
-    for (let i = 0; i < maxTries; i++) {
-        const {data} = await dispatch(action); // eslint-disable-line no-await-in-loop
-
-        if (data) {
-            dispatch(setChannelRetryFailed(false));
-            return data;
-        }
-    }
-
-    dispatch(setChannelRetryFailed(true));
-    return null;
-}
-
 export function loadFilesForPostIfNecessary(postId) {
     return async (dispatch, getState) => {
         const {files} = getState().entities;
         const fileIdsForPost = files.fileIdsByPostId[postId];
 
-        if (!fileIdsForPost?.length) {
-            await dispatch(getFilesForPost(postId));
+        if (!fileIdsForPost) {
+            await getFilesForPost(postId)(dispatch, getState);
         }
     };
 }
@@ -262,89 +180,36 @@ export function loadThreadIfNecessary(rootId, channelId) {
 }
 
 export function selectInitialChannel(teamId) {
-    return (dispatch, getState) => {
+    return async (dispatch, getState) => {
         const state = getState();
-        const {channels, myMembers} = state.entities.channels;
+        const {channels, currentChannelId, myMembers} = state.entities.channels;
         const {currentUserId} = state.entities.users;
+        const currentChannel = channels[currentChannelId];
         const {myPreferences} = state.entities.preferences;
-        const lastChannelForTeam = state.views.team.lastChannelForTeam[teamId];
-        const lastChannelId = lastChannelForTeam && lastChannelForTeam.length ? lastChannelForTeam[0] : '';
-        const lastChannel = channels[lastChannelId];
 
-        const isDMVisible = lastChannel && lastChannel.type === General.DM_CHANNEL &&
-            isDirectChannelVisible(currentUserId, myPreferences, lastChannel);
+        const isDMVisible = currentChannel && currentChannel.type === General.DM_CHANNEL &&
+            isDirectChannelVisible(currentUserId, myPreferences, currentChannel);
 
-        const isGMVisible = lastChannel && lastChannel.type === General.GM_CHANNEL &&
-            isGroupChannelVisible(myPreferences, lastChannel);
+        const isGMVisible = currentChannel && currentChannel.type === General.GM_CHANNEL &&
+            isGroupChannelVisible(myPreferences, currentChannel);
 
-        if (
-            myMembers[lastChannelId] &&
-            lastChannel &&
-            (lastChannel.team_id === teamId || isDMVisible || isGMVisible)
-        ) {
-            handleSelectChannel(lastChannelId)(dispatch, getState);
-            markChannelAsRead(lastChannelId)(dispatch, getState);
+        if (currentChannel && myMembers[currentChannelId] &&
+            (currentChannel.team_id === teamId || isDMVisible || isGMVisible)) {
+            await handleSelectChannel(currentChannelId)(dispatch, getState);
             return;
         }
 
-        dispatch(selectDefaultChannel(teamId));
-    };
-}
-
-export function selectPenultimateChannel(teamId) {
-    return (dispatch, getState) => {
-        const state = getState();
-        const {channels, myMembers} = state.entities.channels;
-        const {currentUserId} = state.entities.users;
-        const {myPreferences} = state.entities.preferences;
-        const lastChannelForTeam = state.views.team.lastChannelForTeam[teamId];
-        const lastChannelId = lastChannelForTeam && lastChannelForTeam.length > 1 ? lastChannelForTeam[1] : '';
-        const lastChannel = channels[lastChannelId];
-
-        const isDMVisible = lastChannel && lastChannel.type === General.DM_CHANNEL &&
-            isDirectChannelVisible(currentUserId, myPreferences, lastChannel);
-
-        const isGMVisible = lastChannel && lastChannel.type === General.GM_CHANNEL &&
-            isGroupChannelVisible(myPreferences, lastChannel);
-
-        if (
-            myMembers[lastChannelId] &&
-            lastChannel &&
-            lastChannel.delete_at === 0 &&
-            (lastChannel.team_id === teamId || isDMVisible || isGMVisible)
-        ) {
-            dispatch(setChannelLoading(true));
-            dispatch(setChannelDisplayName(lastChannel.display_name));
-            dispatch(handleSelectChannel(lastChannelId));
-            dispatch(markChannelAsRead(lastChannelId));
-            return;
-        }
-
-        dispatch(selectDefaultChannel(teamId));
-    };
-}
-
-export function selectDefaultChannel(teamId) {
-    return (dispatch, getState) => {
-        const channels = getState().entities.channels.channels;
-
         const channel = Object.values(channels).find((c) => c.team_id === teamId && c.name === General.DEFAULT_CHANNEL);
-        let channelId;
         if (channel) {
-            channelId = channel.id;
+            dispatch(setChannelDisplayName(''));
+            await handleSelectChannel(channel.id)(dispatch, getState);
         } else {
             // Handle case when the default channel cannot be found
             // so we need to get the first available channel of the team
             const channelsInTeam = Object.values(channels).filter((c) => c.team_id === teamId);
             const firstChannel = channelsInTeam.length ? channelsInTeam[0].id : {id: ''};
-
-            channelId = firstChannel.id;
-        }
-
-        if (channelId) {
             dispatch(setChannelDisplayName(''));
-            dispatch(handleSelectChannel(channelId));
-            dispatch(markChannelAsRead(channelId));
+            await handleSelectChannel(firstChannel.id)(dispatch, getState);
         }
     };
 }
@@ -353,48 +218,27 @@ export function handleSelectChannel(channelId) {
     return async (dispatch, getState) => {
         const {currentTeamId} = getState().entities.teams;
 
-        dispatch(setLoadMorePostsVisible(true));
-
-        loadPostsIfNecessaryWithRetry(channelId)(dispatch, getState);
+        dispatch({
+            type: ViewTypes.SET_LAST_CHANNEL_FOR_TEAM,
+            teamId: currentTeamId,
+            channelId
+        });
+        getChannelStats(channelId)(dispatch, getState);
         selectChannel(channelId)(dispatch, getState);
-
-        dispatch(batchActions([
-            {
-                type: ViewTypes.SET_INITIAL_POST_VISIBILITY,
-                data: channelId,
-            },
-            setChannelLoading(false),
-            {
-                type: ViewTypes.SET_LAST_CHANNEL_FOR_TEAM,
-                teamId: currentTeamId,
-                channelId,
-            },
-        ]));
     };
 }
 
-export function handlePostDraftChanged(channelId, draft) {
+export function handlePostDraftChanged(channelId, postDraft) {
     return async (dispatch, getState) => {
         dispatch({
             type: ViewTypes.POST_DRAFT_CHANGED,
             channelId,
-            draft,
+            postDraft
         }, getState);
     };
 }
 
-export function insertToDraft(value) {
-    return (dispatch, getState) => {
-        const state = getState();
-        const threadId = state.entities.posts.selectedPostId;
-
-        const insertEvent = threadId ? INSERT_TO_COMMENT : INSERT_TO_DRAFT;
-
-        EventEmitter.emit(insertEvent, value);
-    };
-}
-
-export function toggleDMChannel(otherUserId, visible, channelId) {
+export function toggleDMChannel(otherUserId, visible) {
     return async (dispatch, getState) => {
         const state = getState();
         const {currentUserId} = state.entities.users;
@@ -403,12 +247,7 @@ export function toggleDMChannel(otherUserId, visible, channelId) {
             user_id: currentUserId,
             category: Preferences.CATEGORY_DIRECT_CHANNEL_SHOW,
             name: otherUserId,
-            value: visible,
-        }, {
-            user_id: currentUserId,
-            category: Preferences.CATEGORY_CHANNEL_OPEN_TIME,
-            name: channelId,
-            value: Date.now().toString(),
+            value: visible
         }];
 
         savePreferences(currentUserId, dm)(dispatch, getState);
@@ -424,7 +263,7 @@ export function toggleGMChannel(channelId, visible) {
             user_id: currentUserId,
             category: Preferences.CATEGORY_GROUP_CHANNEL_SHOW,
             name: channelId,
-            value: visible,
+            value: visible
         }];
 
         savePreferences(currentUserId, gm)(dispatch, getState);
@@ -434,10 +273,13 @@ export function toggleGMChannel(channelId, visible) {
 export function closeDMChannel(channel) {
     return async (dispatch, getState) => {
         const state = getState();
-        const currentChannelId = getCurrentChannelId(state);
+
+        if (channel.isFavorite) {
+            unmarkFavorite(channel.id)(dispatch, getState);
+        }
 
         toggleDMChannel(channel.teammate_id, 'false')(dispatch, getState);
-        if (channel.id === currentChannelId) {
+        if (channel.isCurrent) {
             selectInitialChannel(state.entities.teams.currentTeamId)(dispatch, getState);
         }
     };
@@ -446,71 +288,79 @@ export function closeDMChannel(channel) {
 export function closeGMChannel(channel) {
     return async (dispatch, getState) => {
         const state = getState();
-        const currentChannelId = getCurrentChannelId(state);
+
+        if (channel.isFavorite) {
+            unmarkFavorite(channel.id)(dispatch, getState);
+        }
 
         toggleGMChannel(channel.id, 'false')(dispatch, getState);
-        if (channel.id === currentChannelId) {
+        if (channel.isCurrent) {
             selectInitialChannel(state.entities.teams.currentTeamId)(dispatch, getState);
         }
     };
 }
 
-export function refreshChannelWithRetry(channelId) {
+export function markFavorite(channelId) {
     return async (dispatch, getState) => {
-        dispatch(setChannelRefreshing(true));
-        const posts = await retryGetPostsAction(getPosts(channelId), dispatch, getState);
-        dispatch(setChannelRefreshing(false));
-        return posts;
+        const {currentUserId} = getState().entities.users;
+        const fav = [{
+            user_id: currentUserId,
+            category: Preferences.CATEGORY_FAVORITE_CHANNEL,
+            name: channelId,
+            value: 'true'
+        }];
+
+        savePreferences(currentUserId, fav)(dispatch, getState);
+    };
+}
+
+export function unmarkFavorite(channelId) {
+    return async (dispatch, getState) => {
+        const {currentUserId} = getState().entities.users;
+        const fav = [{
+            user_id: currentUserId,
+            category: Preferences.CATEGORY_FAVORITE_CHANNEL,
+            name: channelId
+        }];
+
+        deletePreferences(currentUserId, fav)(dispatch, getState);
+    };
+}
+
+export function refreshChannelWithRetry(channelId) {
+    return (dispatch, getState) => {
+        getPostsWithRetry(channelId)(dispatch, getState);
     };
 }
 
 export function leaveChannel(channel, reset = false) {
     return async (dispatch, getState) => {
-        const state = getState();
-        const {currentChannelId} = state.entities.channels;
-        const {currentTeamId} = state.entities.teams;
-
-        dispatch({
-            type: ViewTypes.REMOVE_LAST_CHANNEL_FOR_TEAM,
-            data: {
-                teamId: currentTeamId,
-                channelId: channel.id,
-            },
-        });
-
-        if (channel.id === currentChannelId || reset) {
-            await dispatch(selectDefaultChannel(currentTeamId));
-        }
-
+        const {currentTeamId} = getState().entities.teams;
         await serviceLeaveChannel(channel.id)(dispatch, getState);
+        if (channel.isCurrent || reset) {
+            await selectInitialChannel(currentTeamId)(dispatch, getState);
+        }
     };
 }
 
 export function setChannelLoading(loading = true) {
     return {
         type: ViewTypes.SET_CHANNEL_LOADER,
-        loading,
+        loading
     };
 }
 
-export function setChannelRefreshing(loading = true) {
+export function setPostTooltipVisible(visible = true) {
     return {
-        type: ViewTypes.SET_CHANNEL_REFRESHING,
-        loading,
-    };
-}
-
-export function setChannelRetryFailed(failed = true) {
-    return {
-        type: ViewTypes.SET_CHANNEL_RETRY_FAILED,
-        failed,
+        type: ViewTypes.POST_TOOLTIP_VISIBLE,
+        visible
     };
 }
 
 export function setChannelDisplayName(displayName) {
     return {
         type: ViewTypes.SET_CHANNEL_DISPLAY_NAME,
-        displayName,
+        displayName
     };
 }
 
@@ -525,80 +375,39 @@ export function increasePostVisibility(channelId, focusedPostId) {
             return true;
         }
 
-        // Check if we already have the posts that we want to show
-        if (!focusedPostId) {
-            const loadedPostCount = state.views.channel.postCountInChannel[channelId] || 0;
-            const desiredPostVisibility = currentPostVisibility + ViewTypes.POST_VISIBILITY_CHUNK_SIZE;
-
-            if (loadedPostCount >= desiredPostVisibility) {
-                // We already have the posts, so we just need to show them
-                dispatch(batchActions([
-                    doIncreasePostVisibility(channelId),
-                    setLoadMorePostsVisible(true),
-                ]));
-
-                return true;
+        dispatch(batchActions([
+            {
+                type: ViewTypes.LOADING_POSTS,
+                data: true,
+                channelId
             }
+        ]));
+
+        const page = Math.floor(currentPostVisibility / ViewTypes.POST_VISIBILITY_CHUNK_SIZE);
+
+        let posts;
+        if (focusedPostId) {
+            posts = await getPostsBefore(channelId, focusedPostId, page, ViewTypes.POST_VISIBILITY_CHUNK_SIZE)(dispatch, getState);
+        } else {
+            posts = await getPosts(channelId, page, ViewTypes.POST_VISIBILITY_CHUNK_SIZE)(dispatch, getState);
+        }
+
+        if (posts) {
+            // make sure to increment the posts visibility
+            // only if we got results
+            dispatch({
+                type: ViewTypes.INCREASE_POST_VISIBILITY,
+                data: channelId,
+                amount: ViewTypes.POST_VISIBILITY_CHUNK_SIZE
+            });
         }
 
         dispatch({
             type: ViewTypes.LOADING_POSTS,
-            data: true,
-            channelId,
+            data: false,
+            channelId
         });
 
-        const pageSize = ViewTypes.POST_VISIBILITY_CHUNK_SIZE;
-        const page = Math.floor(currentPostVisibility / pageSize);
-
-        let result;
-        if (focusedPostId) {
-            result = await retryGetPostsAction(getPostsBefore(channelId, focusedPostId, page, pageSize), dispatch, getState);
-        } else {
-            result = await retryGetPostsAction(getPosts(channelId, page, pageSize), dispatch, getState);
-        }
-
-        const actions = [{
-            type: ViewTypes.LOADING_POSTS,
-            data: false,
-            channelId,
-        }];
-
-        let hasMorePost = false;
-        if (result) {
-            const count = result.order.length;
-            hasMorePost = count >= pageSize;
-
-            actions.push({
-                type: ViewTypes.INCREASE_POST_COUNT,
-                data: {
-                    channelId,
-                    count,
-                },
-            });
-
-            // make sure to increment the posts visibility
-            // only if we got results
-            actions.push(doIncreasePostVisibility(channelId));
-
-            actions.push(setLoadMorePostsVisible(hasMorePost));
-        }
-
-        dispatch(batchActions(actions));
-        return hasMorePost;
-    };
-}
-
-function doIncreasePostVisibility(channelId) {
-    return {
-        type: ViewTypes.INCREASE_POST_VISIBILITY,
-        data: channelId,
-        amount: ViewTypes.POST_VISIBILITY_CHUNK_SIZE,
-    };
-}
-
-function setLoadMorePostsVisible(visible) {
-    return {
-        type: ViewTypes.SET_LOAD_MORE_POSTS_VISIBLE,
-        data: visible,
+        return posts && posts.order.length >= ViewTypes.POST_VISIBILITY_CHUNK_SIZE;
     };
 }

app/actions/views/channel_add_members.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
 
 import {addChannelMember} from 'mattermost-redux/actions/channels';
 
@@ -8,9 +8,9 @@ export function handleAddChannelMembers(channelId, members) {
         try {
             const requests = members.map((m) => dispatch(addChannelMember(channelId, m, getState)));
 
-            return await Promise.all(requests);
+            await Promise.all(requests);
         } catch (error) {
-            return error;
+            // should be handled by global error handling
         }
     };
 }

app/actions/views/channel_members.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
 
 import {removeChannelMember} from 'mattermost-redux/actions/channels';
 
@@ -8,9 +8,9 @@ export function handleRemoveChannelMembers(channelId, members) {
         try {
             const requests = members.map((m) => dispatch(removeChannelMember(channelId, m, getState)));
 
-            return await Promise.all(requests);
+            await Promise.all(requests);
         } catch (error) {
-            return error;
+            // should be handled by global error handling
         }
     };
 }

app/actions/views/client_upgrade.js

@@ -1,10 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {ViewTypes} from 'app/constants';
-
-export function setLastUpgradeCheck() {
-    return {
-        type: ViewTypes.SET_LAST_UPGRADE_CHECK,
-    };
-}

app/actions/views/command.js

@@ -1,39 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {IntegrationTypes} from 'mattermost-redux/action_types';
-import {executeCommand as executeCommandService} from 'mattermost-redux/actions/integrations';
-import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
-
-export function executeCommand(message, channelId, rootId) {
-    return async (dispatch, getState) => {
-        const state = getState();
-
-        const teamId = getCurrentTeamId(state);
-
-        const args = {
-            channel_id: channelId,
-            team_id: teamId,
-            root_id: rootId,
-            parent_id: rootId,
-        };
-
-        let msg = message;
-
-        let cmdLength = msg.indexOf(' ');
-        if (cmdLength < 0) {
-            cmdLength = msg.length;
-        }
-
-        const cmd = msg.substring(0, cmdLength).toLowerCase();
-        msg = cmd + msg.substring(cmdLength, msg.length);
-
-        const {data, error} = await dispatch(executeCommandService(msg, args));
-
-        if (data.trigger_id) {
-            dispatch({type: IntegrationTypes.RECEIVED_DIALOG_TRIGGER_ID, data: data.trigger_id});
-        }
-
-        return {data, error};
-    };
-}

app/actions/views/connection.js

@@ -0,0 +1,13 @@
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import {ViewTypes} from 'app/constants';
+
+export function connection(isOnline) {
+    return async (dispatch, getState) => {
+        dispatch({
+            type: ViewTypes.CONNECTION_CHANGED,
+            data: isOnline
+        }, getState);
+    };
+}

app/actions/views/create_channel.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
 
 import {handleSelectChannel, setChannelDisplayName} from './channel';
 import {createChannel} from 'mattermost-redux/actions/channels';
@@ -12,19 +12,19 @@ export function handleCreateChannel(displayName, purpose, header, type) {
         const state = getState();
         const currentUserId = getCurrentUserId(state);
         const teamId = getCurrentTeamId(state);
-        const channel = {
+        let channel = {
             team_id: teamId,
             name: cleanUpUrlable(displayName),
             display_name: displayName,
             purpose,
             header,
-            type,
+            type
         };
 
-        const {data} = await createChannel(channel, currentUserId)(dispatch, getState);
-        if (data && data.id) {
+        channel = await createChannel(channel, currentUserId)(dispatch, getState);
+        if (channel && channel.id) {
             dispatch(setChannelDisplayName(displayName));
-            handleSelectChannel(data.id)(dispatch, getState);
+            handleSelectChannel(channel.id)(dispatch, getState);
         }
     };
 }

app/actions/views/edit_profile.js

@@ -1,39 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {updateMe, setDefaultProfileImage} from 'mattermost-redux/actions/users';
-
-import {ViewTypes} from 'app/constants';
-
-export function updateUser(user, success, error) {
-    return async (dispatch, getState) => {
-        const result = await updateMe(user)(dispatch, getState);
-        const {data, error: err} = result;
-        if (data && success) {
-            success(data);
-        } else if (err && error) {
-            error({id: err.server_error_id, ...err});
-        }
-        return result;
-    };
-}
-
-export function setProfileImageUri(imageUri = '') {
-    return {
-        type: ViewTypes.SET_PROFILE_IMAGE_URI,
-        imageUri,
-    };
-}
-
-export function removeProfileImage(user) {
-    return async (dispatch) => {
-        const result = await dispatch(setDefaultProfileImage(user));
-        return result;
-    };
-}
-
-export default {
-    updateUser,
-    setProfileImageUri,
-    removeProfileImage,
-};

app/actions/views/emoji.js

@@ -1,44 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {addReaction as serviceAddReaction} from 'mattermost-redux/actions/posts';
-import {getPostIdsInCurrentChannel, makeGetPostIdsForThread} from 'mattermost-redux/selectors/entities/posts';
-
-import {ViewTypes} from 'app/constants';
-
-const getPostIdsForThread = makeGetPostIdsForThread();
-
-export function addReaction(postId, emoji) {
-    return (dispatch) => {
-        dispatch(serviceAddReaction(postId, emoji));
-        dispatch(addRecentEmoji(emoji));
-    };
-}
-
-export function addReactionToLatestPost(emoji, rootId) {
-    return async (dispatch, getState) => {
-        const state = getState();
-        const postIds = rootId ? getPostIdsForThread(state, rootId) : getPostIdsInCurrentChannel(state);
-        const lastPostId = postIds[0];
-
-        dispatch(serviceAddReaction(lastPostId, emoji));
-        dispatch(addRecentEmoji(emoji));
-    };
-}
-
-export function addRecentEmoji(emoji) {
-    return {
-        type: ViewTypes.ADD_RECENT_EMOJI,
-        emoji,
-    };
-}
-
-export function incrementEmojiPickerPage() {
-    return async (dispatch) => {
-        dispatch({
-            type: ViewTypes.INCREMENT_EMOJI_PICKER_PAGE,
-        });
-
-        return {data: true};
-    };
-}

app/actions/views/file_preview.js

@@ -0,0 +1,11 @@
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import {ViewTypes} from 'app/constants';
+
+export function addFileToFetchCache(url) {
+    return {
+        type: ViewTypes.ADD_FILE_TO_FETCH_CACHE,
+        url
+    };
+}

app/actions/views/file_upload.js

@@ -1,55 +1,60 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
 
-import {FileTypes} from 'mattermost-redux/action_types';
+import FormData from 'form-data';
+import {Platform} from 'react-native';
+import {uploadFile} from 'mattermost-redux/actions/files';
+import {lookupMimeType, parseClientIdsFromFormData} from 'mattermost-redux/utils/file_utils';
 
+import {generateId} from 'app/utils/file';
 import {ViewTypes} from 'app/constants';
-import {buildFileUploadData, generateId} from 'app/utils/file';
 
-export function initUploadFiles(files, rootId) {
-    return (dispatch, getState) => {
+export function handleUploadFiles(files, rootId) {
+    return async (dispatch, getState) => {
         const state = getState();
+
         const channelId = state.entities.channels.currentChannelId;
+        const formData = new FormData();
         const clientIds = [];
 
         files.forEach((file) => {
-            const fileData = buildFileUploadData(file);
+            const mimeType = lookupMimeType(file.fileName);
+            const extension = file.fileName.split('.').pop().replace('.', '');
             const clientId = generateId();
 
             clientIds.push({
                 clientId,
-                localPath: fileData.uri,
-                name: fileData.name,
-                type: fileData.type,
-                extension: fileData.extension,
+                localPath: file.uri,
+                name: file.fileName,
+                type: mimeType,
+                extension
             });
+
+            const fileData = {
+                uri: file.uri,
+                name: file.fileName,
+                type: mimeType,
+                extension
+            };
+
+            formData.append('files', fileData);
+            formData.append('channel_id', channelId);
+            formData.append('client_ids', clientId);
         });
 
+        let formBoundary;
+        if (Platform.os === 'ios') {
+            formBoundary = '--mobile.client.file.upload';
+        }
+
         dispatch({
             type: ViewTypes.SET_TEMP_UPLOAD_FILES_FOR_POST_DRAFT,
             clientIds,
             channelId,
-            rootId,
+            rootId
         });
-    };
-}
 
-export function uploadFailed(clientIds, channelId, rootId, error) {
-    return {
-        type: FileTypes.UPLOAD_FILES_FAILURE,
-        clientIds,
-        channelId,
-        rootId,
-        error,
-    };
-}
-
-export function uploadComplete(data, channelId, rootId) {
-    return {
-        type: FileTypes.RECEIVED_UPLOAD_FILES,
-        data,
-        channelId,
-        rootId,
+        await uploadFile(channelId, rootId, parseClientIdsFromFormData(formData), formData, formBoundary)(dispatch, getState);
     };
 }
 
@@ -58,13 +63,31 @@ export function retryFileUpload(file, rootId) {
         const state = getState();
 
         const channelId = state.entities.channels.currentChannelId;
+        const formData = new FormData();
+
+        const fileData = {
+            uri: file.localPath,
+            name: file.name,
+            type: file.type
+        };
+
+        formData.append('files', fileData);
+        formData.append('channel_id', channelId);
+        formData.append('client_ids', file.clientId);
+
+        let formBoundary;
+        if (Platform.os === 'ios') {
+            formBoundary = '--mobile.client.file.upload';
+        }
 
         dispatch({
             type: ViewTypes.RETRY_UPLOAD_FILE_FOR_POST,
             clientId: file.clientId,
             channelId,
-            rootId,
+            rootId
         });
+
+        await uploadFile(channelId, rootId, [file.clientId], formData, formBoundary)(dispatch, getState);
     };
 }
 
@@ -72,15 +95,7 @@ export function handleClearFiles(channelId, rootId) {
     return {
         type: ViewTypes.CLEAR_FILES_FOR_POST_DRAFT,
         channelId,
-        rootId,
-    };
-}
-
-export function handleClearFailedFiles(channelId, rootId) {
-    return {
-        type: ViewTypes.CLEAR_FAILED_FILES_FOR_POST_DRAFT,
-        channelId,
-        rootId,
+        rootId
     };
 }
 
@@ -89,7 +104,7 @@ export function handleRemoveFile(clientId, channelId, rootId) {
         type: ViewTypes.REMOVE_FILE_FROM_POST_DRAFT,
         clientId,
         channelId,
-        rootId,
+        rootId
     };
 }
 
@@ -97,6 +112,6 @@ export function handleRemoveLastFile(channelId, rootId) {
     return {
         type: ViewTypes.REMOVE_LAST_FILE_FROM_POST_DRAFT,
         channelId,
-        rootId,
+        rootId
     };
 }

app/actions/views/load_team.js

@@ -0,0 +1,14 @@
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import {ViewTypes} from 'app/constants';
+
+export function initialize() {
+    return async (dispatch, getState) => {
+        setTimeout(() => {
+            dispatch({
+                type: ViewTypes.APPLICATION_INITIALIZED
+            }, getState);
+        }, 400);
+    };
+}

app/actions/views/login.js

@@ -1,23 +1,15 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {getDataRetentionPolicy} from 'mattermost-redux/actions/general';
+// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
 import {GeneralTypes} from 'mattermost-redux/action_types';
-import {getSessions} from 'mattermost-redux/actions/users';
-import {autoUpdateTimezone} from 'mattermost-redux/actions/timezone';
-import {Client4} from 'mattermost-redux/client';
-import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
-import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
+import {Client, Client4} from 'mattermost-redux/client';
 
 import {ViewTypes} from 'app/constants';
-import {app} from 'app/mattermost';
-import {getDeviceTimezone, isTimezoneEnabled} from 'app/utils/timezone';
 
 export function handleLoginIdChanged(loginId) {
     return async (dispatch, getState) => {
         dispatch({
             type: ViewTypes.LOGIN_ID_CHANGED,
-            loginId,
+            loginId
         }, getState);
     };
 }
@@ -26,42 +18,25 @@ export function handlePasswordChanged(password) {
     return async (dispatch, getState) => {
         dispatch({
             type: ViewTypes.PASSWORD_CHANGED,
-            password,
+            password
         }, getState);
     };
 }
 
 export function handleSuccessfulLogin() {
     return async (dispatch, getState) => {
-        const state = getState();
-        const config = getConfig(state);
-        const license = getLicense(state);
         const token = Client4.getToken();
         const url = Client4.getUrl();
-        const deviceToken = state.entities.general.deviceToken;
-        const currentUserId = getCurrentUserId(state);
-
-        app.setAppCredentials(deviceToken, currentUserId, token, url);
-
-        const enableTimezone = isTimezoneEnabled(state);
-        if (enableTimezone) {
-            dispatch(autoUpdateTimezone(getDeviceTimezone()));
-        }
-
         dispatch({
             type: GeneralTypes.RECEIVED_APP_CREDENTIALS,
             data: {
                 url,
-                token,
-            },
+                token
+            }
         }, getState);
 
-        if (config.DataRetentionEnableMessageDeletion && config.DataRetentionEnableMessageDeletion === 'true' &&
-            license.IsLicensed === 'true' && license.DataRetention === 'true') {
-            getDataRetentionPolicy()(dispatch, getState);
-        } else {
-            dispatch({type: GeneralTypes.RECEIVED_DATA_RETENTION_POLICY, data: {}});
-        }
+        Client.setToken(token);
+        Client.setUrl(url);
 
         return true;
     };
@@ -71,27 +46,18 @@ export function getSession() {
     return async (dispatch, getState) => {
         const state = getState();
         const {currentUserId} = state.entities.users;
-        const {deviceToken} = state.entities.general;
+        const {credentials} = state.entities.general;
+        const token = credentials && credentials.token;
 
-        if (!currentUserId || !deviceToken) {
-            return 0;
+        if (currentUserId && token) {
+            const session = await Client4.getSessions(currentUserId, token);
+            if (Array.isArray(session) && session[0]) {
+                const s = session[0];
+                return s.expires_at;
+            }
         }
 
-        let sessions;
-        try {
-            sessions = await dispatch(getSessions(currentUserId));
-        } catch (e) {
-            console.warn('Failed to get current session', e); // eslint-disable-line no-console
-            return 0;
-        }
-
-        if (!Array.isArray(sessions.data)) {
-            return 0;
-        }
-
-        const session = sessions.data.find((s) => s.device_id === deviceToken);
-
-        return session && session.expires_at ? session.expires_at : 0;
+        return false;
     };
 }
 
@@ -99,5 +65,5 @@ export default {
     handleLoginIdChanged,
     handlePasswordChanged,
     handleSuccessfulLogin,
-    getSession,
+    getSession
 };

app/actions/views/login.test.js

@@ -1,50 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import configureStore from 'redux-mock-store';
-import thunk from 'redux-thunk';
-
-import {ViewTypes} from 'app/constants';
-
-import {
-    handleLoginIdChanged,
-    handlePasswordChanged,
-} from 'app/actions/views/login';
-
-jest.mock('app/mattermost', () => ({
-    app: {
-        setAppCredentials: () => jest.fn(),
-    },
-}));
-
-const mockStore = configureStore([thunk]);
-
-describe('Actions.Views.Login', () => {
-    let store;
-
-    beforeEach(() => {
-        store = mockStore({});
-    });
-
-    test('handleLoginIdChanged', () => {
-        const loginId = 'email@example.com';
-
-        const action = {
-            type: ViewTypes.LOGIN_ID_CHANGED,
-            loginId,
-        };
-        store.dispatch(handleLoginIdChanged(loginId));
-        expect(store.getActions()).toEqual([action]);
-    });
-
-    test('handlePasswordChanged', () => {
-        const password = 'password';
-        const action = {
-            type: ViewTypes.PASSWORD_CHANGED,
-            password,
-        };
-
-        store.dispatch(handlePasswordChanged(password));
-        expect(store.getActions()).toEqual([action]);
-    });
-});

app/actions/views/more_dms.js

@@ -1,34 +1,34 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
 
 import {getDirectChannelName} from 'mattermost-redux/utils/channel_utils';
 import {createDirectChannel, createGroupChannel} from 'mattermost-redux/actions/channels';
 import {getProfilesByIds, getStatusesByIds} from 'mattermost-redux/actions/users';
 import {handleSelectChannel, toggleDMChannel, toggleGMChannel} from 'app/actions/views/channel';
 
-export function makeDirectChannel(otherUserId, switchToChannel = true) {
+export function makeDirectChannel(otherUserId) {
     return async (dispatch, getState) => {
         const state = getState();
         const {currentUserId} = state.entities.users;
         const channelName = getDirectChannelName(currentUserId, otherUserId);
         const {channels, myMembers} = state.entities.channels;
 
-        dispatch(getProfilesByIds([otherUserId]));
-        dispatch(getStatusesByIds([otherUserId]));
+        getProfilesByIds([otherUserId])(dispatch, getState);
+        getStatusesByIds([otherUserId])(dispatch, getState);
 
         let result;
         let channel = Object.values(channels).find((c) => c.name === channelName);
         if (channel && myMembers[channel.id]) {
             result = {data: channel};
 
-            dispatch(toggleDMChannel(otherUserId, 'true', channel.id));
+            toggleDMChannel(otherUserId, 'true')(dispatch, getState);
         } else {
-            result = await dispatch(createDirectChannel(currentUserId, otherUserId));
+            result = await createDirectChannel(currentUserId, otherUserId)(dispatch, getState);
             channel = result.data;
         }
 
-        if (channel && switchToChannel) {
-            dispatch(handleSelectChannel(channel.id));
+        if (channel) {
+            handleSelectChannel(channel.id)(dispatch, getState);
         }
 
         return result;
@@ -40,15 +40,15 @@ export function makeGroupChannel(otherUserIds) {
         const state = getState();
         const {currentUserId} = state.entities.users;
 
-        dispatch(getProfilesByIds(otherUserIds));
-        dispatch(getStatusesByIds(otherUserIds));
+        getProfilesByIds(otherUserIds)(dispatch, getState);
+        getStatusesByIds(otherUserIds)(dispatch, getState);
 
         const result = await createGroupChannel([currentUserId, ...otherUserIds])(dispatch, getState);
         const channel = result.data;
 
         if (channel) {
-            dispatch(toggleGMChannel(channel.id, 'true'));
-            dispatch(handleSelectChannel(channel.id));
+            toggleGMChannel(channel.id, 'true')(dispatch, getState);
+            handleSelectChannel(channel.id)(dispatch, getState);
         }
 
         return result;

app/actions/views/post.js

@@ -1,70 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {Posts} from 'mattermost-redux/constants';
-import {PostTypes} from 'mattermost-redux/action_types';
-import {doPostAction} from 'mattermost-redux/actions/posts';
-
-import {ViewTypes} from 'app/constants';
-
-import {generateId} from 'app/utils/file';
-
-export function sendAddToChannelEphemeralPost(user, addedUsername, message, channelId, postRootId = '') {
-    return async (dispatch) => {
-        const timestamp = Date.now();
-        const post = {
-            id: generateId(),
-            user_id: user.id,
-            channel_id: channelId,
-            message,
-            type: Posts.POST_TYPES.EPHEMERAL_ADD_TO_CHANNEL,
-            create_at: timestamp,
-            update_at: timestamp,
-            root_id: postRootId,
-            parent_id: postRootId,
-            props: {
-                username: user.username,
-                addedUsername,
-            },
-        };
-
-        dispatch({
-            type: PostTypes.RECEIVED_POSTS,
-            data: {
-                order: [],
-                posts: {
-                    [post.id]: post,
-                },
-            },
-            channelId,
-        });
-    };
-}
-
-export function setAutocompleteSelector(dataSource, onSelect, options) {
-    return {
-        type: ViewTypes.SELECTED_ACTION_MENU,
-        data: {
-            dataSource,
-            onSelect,
-            options,
-        },
-    };
-}
-
-export function selectAttachmentMenuAction(postId, actionId, text, value) {
-    return (dispatch) => {
-        dispatch({
-            type: ViewTypes.SUBMIT_ATTACHMENT_MENU_ACTION,
-            postId,
-            data: {
-                [actionId]: {
-                    text,
-                    value,
-                },
-            },
-        });
-
-        dispatch(doPostAction(postId, actionId, value));
-    };
-}