Bump app build number to 356 (#5385) (#5386)

(cherry picked from commit f47f872b1a)

Co-authored-by: Miguel Alatzar <migbot@users.noreply.github.com>

.circleci/config.yml

@@ -1,7 +1,6 @@
 version: 2.1
 orbs:
   owasp: entur/owasp@0.0.10
-  node: circleci/node@4.5.1
 
 executors:
   android:
@@ -14,7 +13,7 @@ executors:
       NODE_ENV: production
       BABEL_ENV: production
     docker:
-      - image: circleci/android:api-30-node
+      - image: circleci/android:api-29-node
     working_directory: ~/mattermost-mobile
     resource_class: <<parameters.resource_class>>
 
@@ -24,7 +23,7 @@ executors:
       NODE_ENV: production
       BABEL_ENV: production
     macos:
-      xcode: "13.0.0"
+      xcode: "12.1.0"
     working_directory: ~/mattermost-mobile
     shell: /bin/bash --login -o pipefail
 
@@ -92,15 +91,12 @@ commands:
   npm-dependencies:
     description: "Get JavaScript dependencies"
     steps:
-      - node/install:
-          node-version: '16.2.0'
-          install-npm: false
       - restore_cache:
           name: Restore npm cache
           key: v2-npm-{{ checksum "package.json" }}-{{ arch }}
       - run:
           name: Getting JavaScript dependencies
-          command: NODE_ENV=development npm ci --ignore-scripts
+          command: NODE_ENV=development npm install --ignore-scripts
       - save_cache:
           name: Save npm cache
           key: v2-npm-{{ checksum "package.json" }}-{{ arch }}
@@ -591,7 +587,6 @@ workflows:
                 - /^build-\d+$/
                 - /^build-ios-\d+$/
                 - /^build-ios-beta-\d+$/
-                - /^build-ios-sim-\d+$/
                 
       - github-release:
           context: mattermost-mobile-unsigned

.eslintrc.json

@@ -7,8 +7,7 @@
   "parser": "@typescript-eslint/parser",
   "plugins": [
     "@typescript-eslint",
-    "mattermost",
-    "import"
+    "mattermost"
   ],
   "settings": {
     "react": {
@@ -48,39 +47,7 @@
     "@typescript-eslint/no-use-before-define": 0,
     "@typescript-eslint/no-var-requires": 0,
     "@typescript-eslint/explicit-function-return-type": 0,
-    "@typescript-eslint/explicit-module-boundary-types": "off",
-    "@typescript-eslint/member-delimiter-style": 2,
-    "import/order": [
-      2,
-      {
-        "groups": ["builtin", "external", "parent", "sibling", "index", "type"],
-        "newlines-between": "always",
-        "pathGroups": [
-          {
-            "pattern": "@(@react-native-async-storage|@react-native-community|@react-native-cookies|@react-navigation|@rudderstack|@sentry|@testing-library|@storybook)/**",
-            "group": "external",
-            "position": "before"
-          },
-          {
-            "pattern": "@{**,*/**}",
-            "group": "external",
-            "position": "after"
-          },
-          {
-            "pattern": "app/**",
-            "group": "parent",
-            "position": "before"
-          }
-        ],
-        "alphabetize": {
-          "order": "asc",
-          "caseInsensitive": true
-        },
-        "pathGroupsExcludedImportTypes": ["type"]
-      }
-    ],
-    "no-shadow": "off",
-    "@typescript-eslint/no-shadow": "error"
+    "@typescript-eslint/explicit-module-boundary-types": "off"
   },
   "overrides": [
     {

.flowconfig

@@ -23,9 +23,10 @@ node_modules/react-native/flow/
 [options]
 emoji=true
 
-exact_by_default=true
+esproposal.optional_chaining=enable
+esproposal.nullish_coalescing=enable
 
-format.bracket_spacing=false
+exact_by_default=true
 
 module.file_ext=.js
 module.file_ext=.json
@@ -63,4 +64,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.158.0
+^0.137.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -26,7 +26,6 @@ Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fie
 - [ ] Added or updated unit tests (required for all new features)
 - [ ] Has UI changes
 - [ ] Includes text changes and localization file updates
-- [ ] Have tested against the 5 core themes to ensure consistency between them.
 
 #### Device Information
 This PR was tested on: <!-- Device name(s), OS version(s) -->

.gitignore

@@ -95,7 +95,6 @@ coverage
 mattermost-license.txt
 *.mattermost-license
 detox/artifacts
-detox/detox_pixel_4_xl_api_30
 
 # Bundle artifact
 *.jsbundle

NOTICE.txt

@@ -43,41 +43,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 
-## @mattermost/react-native-paste-input
-
-This product contains '@mattermost/react-native-paste-input' by Mattermost.
-
-React Native TextInput component have functionality to capture text input from a user by using the soft and hardware keyboards but lacks the ability to restrict copy & paste options as well as allwing pasting different files formats copied from other apps, like images & videos from the Photos gallery app.
-
-* HOMEPAGE:
-  * https://github.com/mattermost/react-native-paste-input
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) 2020 Elias Nahum
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
 ## @react-native-community/async-storage
 
 This product contains 'async-storage' by Krzysztof Borowy.
@@ -183,29 +148,6 @@ SOFTWARE.
 
 ---
 
-## @react-native-community/datetimepicker
-
-This product contains '@react-native-community/datetimepicker' by React Native Community.
-
-React Native date & time picker component for iOS, Android and Windows.
-
-* HOMEPAGE:
-  * https://github.com/react-native-datetimepicker/datetimepicker
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) 2019 React Native Community
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
 ## @react-native-community/masked-view
 
 This product contains '@react-native-community/masked-view' by React Native Community.
@@ -567,29 +509,6 @@ SOFTWARE.
 
 ---
 
-## @types/redux-mock-store
-
-This product contains '@types/redux-mock-store' by Redux.
-
-A mock store for testing Redux async action creators and middleware. The mock store will create an array of dispatched actions which serve as an action log for tests.
-
-* HOMEPAGE:
-  * https://github.com/reduxjs/redux-mock-store
-
-* LICENSE: MIT
-
-The MIT License (MIT)
-
-Copyright (c) 2017 Arnaud Benard
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
 ## analytics-react-native
 
 This product contains a modified version of 'analytics-react-native' by Segment.
@@ -611,66 +530,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---
 
-## array.prototype.flat
-
-This product contains a modified version of 'array.prototype.flat' by ECMAScript Shims.
-
-An ES2019 spec-compliant Array.prototype.flat shim/polyfill/replacement that works as far down as ES3.
-
-* HOMEPAGE:
-  * https://github.com/es-shims/Array.prototype.flat
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) 2017 ECMAScript Shims
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-## base-64
-
-This product contains a modified version of 'base-64' by Dan Kogai.
-
-Yet another Base64 transcoder.
-
-* HOMEPAGE:
-  * https://github.com/dankogai/js-base64
-
-* LICENSE: BSD 3-Clause "New" or "Revised" License
-
-Copyright (c) 2014, Dan Kogai All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-Neither the name of {{{project}}} nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
 ## commonmark
 
 This product contains a modified version of 'commonmark' by John MacFarlane.
@@ -2628,38 +2487,28 @@ SOFTWARE.
 
 ---
 
-## react-native-startup-time
+## react-native-status-bar-size
 
-This product contains 'react-native-startup-time' by doomsower.
+This product contains 'react-native-status-bar-size' by Brent Vatne.
 
-This module helps you to measure your app launch time.
+Watch and respond to changes in the iOS status bar height
 
 * HOMEPAGE:
-  * https://github.com/doomsower/react-native-startup-time
+  * https://github.com/jgkim/react-native-status-bar-size#readme
 
 * LICENSE: MIT
 
-The MIT License (MIT)
+Note: An original license file for this dependency is not available. We determined the type of license based on the package registry entry for this project. The following text has been prepared using a template from the SPDX Workgroup (https://spdx.org) for this type of license.
 
-Copyright (c) 2019 Konstantin Kuznetsov
+MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Copyright (c) 2019 Brent Vatne
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 

README.md

@@ -1,14 +1,14 @@
-# Mattermost Mobile App
-[![Mattermost](https://user-images.githubusercontent.com/7205829/136108314-75cd2e1f-4147-4cfa-a16c-9b3b0313ea25.png)](https://mattermost.com)
+# Mattermost Mobile
 
-- **Minimum Server versions:** Current ESR version (5.37.0)
-- **Supported iOS versions:** 12.1+
+- **Minimum Server versions:** Current ESR version (5.31.3)
+- **Supported iOS versions:** 11+
 - **Supported Android versions:** 7.0+
 
+Mattermost is an open source Slack-alternative used by thousands of companies around the world in 14 languages. Learn more at [https://about.mattermost.com](https://about.mattermost.com).
 
-[Mattermost](https://mattermost.com) is an open source platform for secure collaboration across the entire software development lifecycle. This repo is for the mobile app that runs on Android and iOS. 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 [build them yourself](https://developers.mattermost.com/contribute/mobile/build-your-own/). 
 
-New features are released monthly - check the [changelog](https://github.com/mattermost/mattermost-mobile/blob/master/CHANGELOG.md) for currently-supported features! 
+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). 
 

android/app/build.gradle

@@ -119,21 +119,21 @@ def jscFlavor = 'org.webkit:android-jsc-intl:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
-/**
- * Architectures to build native code for in debug.
- */
-def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
-        versionCode 382
-        versionName "1.48.2"
+        versionCode 356
+        versionName "1.43.0"
         multiDexEnabled = true
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -165,11 +165,6 @@ android {
         debug {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            if (nativeArchitectures) {
-                ndk {
-                    abiFilters nativeArchitectures.split(',')
-                }
-            }
         }
         unsigned.initWith(buildTypes.release)
         unsigned {
@@ -235,7 +230,7 @@ dependencies {
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.fbjni'
+      exclude group:'com.facebook.fbjni'
     }
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.flipper'
@@ -274,7 +269,7 @@ dependencies {
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.implementation
+    from configurations.compile
     into 'libs'
 }
 

android/app/src/main/AndroidManifest.xml

@@ -9,10 +9,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
       android:name=".MainApplication"
@@ -35,8 +31,7 @@
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:windowSoftInputMode="adjustResize"
-        android:launchMode="singleTask"
-        android:taskAffinity="">
+        android:launchMode="singleTask">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
@@ -82,9 +77,5 @@
             </intent-filter>
         </activity>
     </application>
-    <queries>
-      <intent>
-        <action android:name="com.google.android.youtube.api.service.START" />
-      </intent>
-    </queries>
+
 </manifest>

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

@@ -1,21 +0,0 @@
-package com.mattermost.rnbeta;
-
-import com.facebook.react.bridge.JSIModulePackage;
-import com.facebook.react.bridge.JSIModuleSpec;
-import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.ReactApplicationContext;
-import java.util.Collections;
-import java.util.List;
-
-import com.swmansion.reanimated.ReanimatedJSIModulePackage;
-import com.ammarahmed.mmkv.RNMMKVModule;
-
-public class CustomMMKVJSIModulePackage extends ReanimatedJSIModulePackage {
-    @Override
-    public List<JSIModuleSpec> getJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext) {
-        super.getJSIModules(reactApplicationContext, jsContext);
-        reactApplicationContext.getNativeModule(RNMMKVModule.class).installLib(jsContext, reactApplicationContext.getFilesDir().getAbsolutePath() + "/mmkv");
-
-        return Collections.emptyList();
-    }
-}

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

@@ -1,159 +1,114 @@
 package com.mattermost.rnbeta;
 
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.Person;
+import android.app.Person.Builder;
+import android.app.RemoteInput;
+import android.content.Intent;
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
+import android.content.pm.ApplicationInfo;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.media.AudioManager;
+import android.media.RingtoneManager;
+import android.net.Uri;
 import android.os.Bundle;
-import android.service.notification.StatusBarNotification;
-import android.util.Log;
-
+import android.os.Build;
+import android.provider.Settings.System;
 import androidx.annotation.Nullable;
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
-
+import android.util.Log;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import com.wix.reactnativenotifications.core.notification.PushNotification;
+import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
 import com.wix.reactnativenotifications.core.AppLaunchHelper;
 import com.wix.reactnativenotifications.core.AppLifecycleFacade;
 import com.wix.reactnativenotifications.core.JsIOHelper;
+
 import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_NAME;
 
 import com.mattermost.react_native_interface.ResolvePromise;
-
-import org.json.JSONObject;
+import com.facebook.react.bridge.WritableMap;
 
 public class CustomPushNotification extends PushNotification {
-    private static final String PUSH_NOTIFICATIONS = "PUSH_NOTIFICATIONS";
-    private static final String VERSION_PREFERENCE = "VERSION_PREFERENCE";
+    public static final int MESSAGE_NOTIFICATION_ID = 435345;
+    public static final String GROUP_KEY_MESSAGES = "mm_group_key_messages";
+    public static final String NOTIFICATION_ID = "notificationId";
+    public static final String KEY_TEXT_REPLY = "CAN_REPLY";
+    public static final String NOTIFICATION_REPLIED_EVENT_NAME = "notificationReplied";
+
     private static final String PUSH_TYPE_MESSAGE = "message";
     private static final String PUSH_TYPE_CLEAR = "clear";
     private static final String PUSH_TYPE_SESSION = "session";
-    private static final String NOTIFICATIONS_IN_CHANNEL = "notificationsInChannel";
+    private static final String PUSH_TYPE_UPDATE_BADGE = "update_badge";
+
+    private NotificationChannel mHighImportanceChannel;
+    private NotificationChannel mMinImportanceChannel;
+
+    private static Map<String, Integer> channelIdToNotificationCount = new HashMap<String, Integer>();
+    private static Map<String, List<Bundle>> channelIdToNotification = new HashMap<String, List<Bundle>>();
+    private static AppLifecycleFacade lifecycleFacade;
+    private static Context context;
+    private static int badgeCount = 0;
 
     public CustomPushNotification(Context context, Bundle bundle, AppLifecycleFacade appLifecycleFacade, AppLaunchHelper appLaunchHelper, JsIOHelper jsIoHelper) {
         super(context, bundle, appLifecycleFacade, appLaunchHelper, jsIoHelper);
-        CustomPushNotificationHelper.createNotificationChannels(context);
+        this.context = context;
+        createNotificationChannels();
+    }
 
-        try {
-            PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
-            String version = String.valueOf(pInfo.versionCode);
-            String storedVersion = null;
-            SharedPreferences pSharedPref = context.getSharedPreferences(VERSION_PREFERENCE, Context.MODE_PRIVATE);
-            if (pSharedPref != null) {
-                storedVersion = pSharedPref.getString("Version", "");
+    public static void clearNotification(Context mContext, int notificationId, String channelId) {
+        if (notificationId != -1) {
+            Integer count = channelIdToNotificationCount.get(channelId);
+            if (count == null) {
+                count = -1;
             }
 
-            if (!version.equals(storedVersion)) {
-                if (pSharedPref != null) {
-                    SharedPreferences.Editor editor = pSharedPref.edit();
-                    editor.putString("Version", version);
-                    editor.apply();
+            channelIdToNotificationCount.remove(channelId);
+            channelIdToNotification.remove(channelId);
+
+            if (mContext != null) {
+                final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+                notificationManager.cancel(notificationId);
+
+                if (count != -1) {
+                    int total = CustomPushNotification.badgeCount - count;
+                    int badgeCount = total < 0 ? 0 : total;
+                    CustomPushNotification.badgeCount = badgeCount;
                 }
-
-                Map<String, Map<String, JSONObject>> inputMap = new HashMap<>();
-                saveNotificationsMap(context, inputMap);
             }
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
         }
     }
 
-    public static void cancelNotification(Context context, String channelId, String rootId, Integer notificationId, Boolean isCRTEnabled) {
-        if (!android.text.TextUtils.isEmpty(channelId)) {
-            final String notificationIdStr = notificationId.toString();
-            final Boolean isThreadNotification = isCRTEnabled && !android.text.TextUtils.isEmpty(rootId);
-            final String groupId = isThreadNotification ? rootId : channelId;
-            Map<String, Map<String, JSONObject>> notificationsInChannel = loadNotificationsMap(context);
-            Map<String, JSONObject> notifications = notificationsInChannel.get(groupId);
-            if (notifications == null) {
-                return;
-            }
-            final NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
-            notificationManager.cancel(notificationId);
-            notifications.remove(notificationIdStr);
-            final StatusBarNotification[] statusNotifications = notificationManager.getActiveNotifications();
-            boolean hasMore = false;
-            for (final StatusBarNotification status : statusNotifications) {
-                Bundle bundle = status.getNotification().extras;
-                if (isThreadNotification) {
-                    hasMore = bundle.getString("root_id").equals(rootId);
-                } else if (isCRTEnabled) {
-                    hasMore = !bundle.getString("root_id").equals(rootId);
-                } else {
-                    hasMore = bundle.getString("channel_id").equals(channelId);
-                }
-                if (hasMore) {
-                    break;
-                }
-            }
-
-            if (!hasMore) {
-                notificationsInChannel.remove(groupId);
-            } else {
-                notificationsInChannel.put(groupId, notifications);
-            }
-            saveNotificationsMap(context, notificationsInChannel);
-        }
-    }
-
-    public static void clearChannelNotifications(Context context, String channelId, String rootId, Boolean isCRTEnabled) {
-        if (!android.text.TextUtils.isEmpty(channelId)) {
-            final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
-
-            // rootId is available only when CRT is enabled & clearing the thread
-            final boolean isClearThread = isCRTEnabled && !android.text.TextUtils.isEmpty(rootId);
-            
-            Map<String, Map<String, JSONObject>> notificationsInChannel = loadNotificationsMap(context);
-            String groupId = isClearThread ? rootId : channelId;
-            Map<String, JSONObject> notifications = notificationsInChannel.get(groupId);
-
-            if (notifications == null) {
-                return;
-            }
-
-            notificationsInChannel.remove(groupId);
-            saveNotificationsMap(context, notificationsInChannel);
-            notifications.forEach(
-                    (notificationIdStr, post) -> notificationManager.cancel(Integer.valueOf(notificationIdStr))
-            );
-        }
-    }
-
-    public static void clearAllNotifications(Context context) {
-        if (context != null) {
-            Map<String, Map<String, JSONObject>> notificationsInChannel = loadNotificationsMap(context);
-            notificationsInChannel.clear();
-            saveNotificationsMap(context, notificationsInChannel);
-            final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
+    public static void clearAllNotifications(Context mContext) {
+        channelIdToNotificationCount.clear();
+        channelIdToNotification.clear();
+        if (mContext != null) {
+            final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
             notificationManager.cancelAll();
         }
     }
 
     @Override
-    public void onReceived() {
+    public void onReceived() throws InvalidNotificationException {
         final Bundle initialData = mNotificationProps.asBundle();
         final String type = initialData.getString("type");
         final String ackId = initialData.getString("ack_id");
         final String postId = initialData.getString("post_id");
         final String channelId = initialData.getString("channel_id");
-        final String rootId = initialData.getString("root_id");
-        final boolean isCRTEnabled = initialData.getString("is_crt_enabled") != null && initialData.getString("is_crt_enabled").equals("true");
-        final boolean isIdLoaded = initialData.getString("id_loaded") != null && initialData.getString("id_loaded").equals("true");
-        int notificationId = CustomPushNotificationHelper.MESSAGE_NOTIFICATION_ID;
-        if (postId != null) {
-            notificationId = postId.hashCode();
-        } else if (channelId != null) {
-            notificationId = channelId.hashCode();
-        }
+        final boolean isIdLoaded = initialData.getString("id_loaded") != null ? initialData.getString("id_loaded").equals("true") : false;
+        int notificationId = MESSAGE_NOTIFICATION_ID;
 
         if (ackId != null) {
             notificationReceiptDelivery(ackId, postId, type, isIdLoaded, new ResolvePromise() {
@@ -172,58 +127,49 @@ public class CustomPushNotification extends PushNotification {
             });
         }
 
-        switch (type) {
-            case PUSH_TYPE_MESSAGE:
-            case PUSH_TYPE_SESSION:
-                if (!mAppLifecycleFacade.isAppVisible()) {
-                    boolean createSummary = type.equals(PUSH_TYPE_MESSAGE);
+        // notificationReceiptDelivery can override mNotificationProps
+        // so we fetch the bundle again
+        final Bundle data = mNotificationProps.asBundle();
 
-                    if (type.equals(PUSH_TYPE_MESSAGE)) {
-                        if (channelId != null) {
-                            try {
+        if (channelId != null) {
+            notificationId = channelId.hashCode();
 
-                                JSONObject post = new JSONObject();
-                                if (!android.text.TextUtils.isEmpty(rootId)) {
-                                    post.put("root_id", rootId);
-                                }
-                                if (!android.text.TextUtils.isEmpty(postId)) {
-                                    post.put("post_id", postId);
-                                }
-
-                                final Boolean isThreadNotification = isCRTEnabled && post.has("root_id");
-                                final String groupId = isThreadNotification ? rootId : channelId;
-                                
-                                Map<String, Map<String, JSONObject>> notificationsInChannel = loadNotificationsMap(mContext);
-                                Map<String, JSONObject> notifications = notificationsInChannel.get(groupId);
-                                if (notifications == null) {
-                                    notifications = Collections.synchronizedMap(new HashMap<String, JSONObject>());
-                                }
-
-                                if (notifications.size() > 0) {
-                                    createSummary = false;
-                                }
-    
-                                notifications.put(String.valueOf(notificationId),  post);
-        
-                                if (createSummary) {
-                                    // Add the summary notification id as well
-                                    notifications.put(String.valueOf(notificationId + 1), new JSONObject());
-                                }
-    
-                                notificationsInChannel.put(groupId, notifications);
-                                saveNotificationsMap(mContext, notificationsInChannel);
-                            } catch(Exception e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    }
-
-                    buildNotification(notificationId, createSummary);
+            synchronized (channelIdToNotificationCount) {
+                Integer count = channelIdToNotificationCount.get(channelId);
+                if (count == null) {
+                    count = 0;
                 }
-                break;
-            case PUSH_TYPE_CLEAR:
-                clearChannelNotifications(mContext, channelId, rootId, isCRTEnabled);
-                break;
+
+                count += 1;
+
+                channelIdToNotificationCount.put(channelId, count);
+            }
+
+            synchronized (channelIdToNotification) {
+                List<Bundle> list = channelIdToNotification.get(channelId);
+                if (list == null) {
+                    list = Collections.synchronizedList(new ArrayList(0));
+                }
+
+                if (PUSH_TYPE_MESSAGE.equals(type)) {
+                    String senderName = getSenderName(data);
+                    data.putLong("time", new Date().getTime());
+                    data.putString("sender_name", senderName);
+                    data.putString("sender_id", data.getString("sender_id"));
+                }
+                list.add(0, data);
+                channelIdToNotification.put(channelId, list);
+            }
+        }
+
+        switch(type) {
+        case PUSH_TYPE_MESSAGE:
+        case PUSH_TYPE_SESSION:
+            super.postNotification(notificationId);
+            break;
+        case PUSH_TYPE_CLEAR:
+            cancelNotification(data, notificationId);
+            break;
         }
 
         if (mAppLifecycleFacade.isReactInitialized()) {
@@ -233,101 +179,389 @@ public class CustomPushNotification extends PushNotification {
 
     @Override
     public void onOpened() {
-        digestNotification();
-
         Bundle data = mNotificationProps.asBundle();
         final String channelId = data.getString("channel_id");
-        final String rootId = data.getString("root_id");
-        final Boolean isCRTEnabled = data.getBoolean("is_crt_enabled");
-
         if (channelId != null) {
-            clearChannelNotifications(mContext, channelId, rootId, isCRTEnabled);
+            channelIdToNotificationCount.remove(channelId);
+            channelIdToNotification.remove(channelId);
         }
-    }
-
-    private void buildNotification(Integer notificationId, boolean createSummary) {
-        final PendingIntent pendingIntent = super.getCTAPendingIntent();
-        final Notification notification = buildNotification(pendingIntent);
-        if (createSummary) {
-            final Notification summary = getNotificationSummaryBuilder(pendingIntent).build();
-            super.postNotification(summary, notificationId + 1);
-        }
-        super.postNotification(notification, notificationId);
+        digestNotification();
     }
 
     @Override
-    protected NotificationCompat.Builder getNotificationBuilder(PendingIntent intent) {
+    protected Notification.Builder getNotificationBuilder(PendingIntent intent) {
+        // First, get a builder initialized with defaults from the core class.
+        final Notification.Builder notification = new Notification.Builder(mContext);
+
         Bundle bundle = mNotificationProps.asBundle();
-        return CustomPushNotificationHelper.createNotificationBuilder(mContext, intent, bundle, false);
+
+        addNotificationExtras(notification, bundle);
+        setNotificationIcons(notification, bundle);
+        setNotificationMessagingStyle(notification, bundle);
+        setNotificationChannel(notification, bundle);
+        setNotificationBadgeIconType(notification);
+
+        NotificationPreferences notificationPreferences = NotificationPreferences.getInstance(mContext);
+        setNotificationSound(notification, notificationPreferences);
+        setNotificationVibrate(notification, notificationPreferences);
+        setNotificationBlink(notification, notificationPreferences);
+
+        String channelId = bundle.getString("channel_id");
+        int notificationId = channelId != null ? channelId.hashCode() : MESSAGE_NOTIFICATION_ID;
+        setNotificationNumber(notification, channelId);
+        setNotificationDeleteIntent(notification, notificationId);
+        addNotificationReplyAction(notification, notificationId, bundle);
+
+        notification
+            .setContentIntent(intent)
+            .setVisibility(Notification.VISIBILITY_PRIVATE)
+            .setPriority(Notification.PRIORITY_HIGH)
+            .setAutoCancel(true);
+
+        return notification;
     }
 
-    protected NotificationCompat.Builder getNotificationSummaryBuilder(PendingIntent intent) {
-        Bundle bundle = mNotificationProps.asBundle();
-        return CustomPushNotificationHelper.createNotificationBuilder(mContext, intent, bundle, true);
+    private void addNotificationExtras(Notification.Builder notification, Bundle bundle) {
+        Bundle userInfoBundle = bundle.getBundle("userInfo");
+        if (userInfoBundle == null) {
+            userInfoBundle = new Bundle();
+        }
+
+        String channelId = bundle.getString("channel_id");
+        if (channelId != null) {
+            userInfoBundle.putString("channel_id", channelId);
+        }
+
+        notification.addExtras(userInfoBundle);
     }
 
-    private void notificationReceiptDelivery(String ackId, String postId, String type, boolean isIdLoaded, ResolvePromise promise) {
-        ReceiptDelivery.send(mContext, ackId, postId, type, isIdLoaded, promise);
+    private void setNotificationIcons(Notification.Builder notification, Bundle bundle) {
+        String smallIcon = bundle.getString("smallIcon");
+        String largeIcon = bundle.getString("largeIcon");
+
+        int smallIconResId = getSmallIconResourceId(smallIcon);
+        notification.setSmallIcon(smallIconResId);
+
+        int largeIconResId = getLargeIconResourceId(largeIcon);
+        final Resources res = mContext.getResources();
+        Bitmap largeIconBitmap = BitmapFactory.decodeResource(res, largeIconResId);
+        if (largeIconResId != 0 && (largeIconBitmap != null || Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)) {
+            notification.setLargeIcon(largeIconBitmap);
+        }
+    }
+
+    private int getSmallIconResourceId(String iconName) {
+        if (iconName == null) {
+            iconName = "ic_notification";
+        }
+
+        int resourceId = getIconResourceId(iconName);
+
+        if (resourceId == 0) {
+            iconName = "ic_launcher";
+            resourceId = getIconResourceId(iconName);
+
+            if (resourceId == 0) {
+                resourceId = android.R.drawable.ic_dialog_info;
+            }
+        }
+
+        return resourceId;
+    }
+
+    private int getLargeIconResourceId(String iconName) {
+        if (iconName == null) {
+            iconName = "ic_launcher";
+        }
+
+        return getIconResourceId(iconName);
+    }
+
+    private int getIconResourceId(String iconName) {
+        final Resources res = mContext.getResources();
+        String packageName = mContext.getPackageName();
+        String defType = "mipmap";
+
+        return res.getIdentifier(iconName, defType, packageName);
+    }
+
+    private void setNotificationNumber(Notification.Builder notification, String channelId) {
+        Integer number = channelIdToNotificationCount.get(channelId);
+        if (number == null) {
+            number = 0;
+        }
+        notification.setNumber(number);
+    }
+
+    private void setNotificationMessagingStyle(Notification.Builder notification, Bundle bundle) {
+        Notification.MessagingStyle messagingStyle = getMessagingStyle(bundle);
+        notification.setStyle(messagingStyle);
+    }
+
+    private Notification.MessagingStyle getMessagingStyle(Bundle bundle) {
+        Notification.MessagingStyle messagingStyle;
+        String senderId = bundle.getString("sender_id");
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P || senderId == null) {
+            messagingStyle = new Notification.MessagingStyle("");
+        } else {
+            Person sender = new Person.Builder()
+                .setKey(senderId)
+                .setName("")
+                .build();
+            messagingStyle = new Notification.MessagingStyle(sender);
+        }
+
+        String conversationTitle = getConversationTitle(bundle);
+        setMessagingStyleConversationTitle(messagingStyle, conversationTitle, bundle);
+        addMessagingStyleMessages(messagingStyle, conversationTitle, bundle);
+
+        return messagingStyle;
+    }
+
+    private String getConversationTitle(Bundle bundle) {
+        String title = null;
+
+        String version = bundle.getString("version");
+        if (version != null && version.equals("v2")) {
+            title = bundle.getString("channel_name");
+        } else {
+            title = bundle.getString("title");
+        }
+
+        if (android.text.TextUtils.isEmpty(title)) {
+            ApplicationInfo appInfo = mContext.getApplicationInfo();
+            title = mContext.getPackageManager().getApplicationLabel(appInfo).toString();
+        }
+
+        return title;
+    }
+
+    private void setMessagingStyleConversationTitle(Notification.MessagingStyle messagingStyle, String conversationTitle, Bundle bundle) {
+        String channelName = getConversationTitle(bundle);
+        String senderName = bundle.getString("sender_name");
+        if (android.text.TextUtils.isEmpty(senderName)) {
+            senderName = getSenderName(bundle);
+        }
+
+        if (conversationTitle != null && (!conversationTitle.startsWith("@") || channelName != senderName)) {
+            messagingStyle.setConversationTitle(conversationTitle);
+        }
+    }
+
+    private void addMessagingStyleMessages(Notification.MessagingStyle messagingStyle, String conversationTitle, Bundle bundle) {
+        List<Bundle> bundleList;
+
+        String channelId = bundle.getString("channel_id");
+        List<Bundle> bundleArray = channelIdToNotification.get(channelId);
+        if (bundleArray != null) {
+            bundleList = new ArrayList<Bundle>(bundleArray);
+        } else {
+            bundleList = new ArrayList<Bundle>();
+            bundleList.add(bundle);
+        }
+
+        int bundleCount = bundleList.size() - 1;
+        for (int i = bundleCount; i >= 0; i--) {
+            Bundle data = bundleList.get(i);
+            String message = data.getString("message", data.getString("body"));
+            String senderId = data.getString("sender_id");
+            if (senderId == null) {
+                senderId = "sender_id";
+            }
+            Bundle userInfoBundle = data.getBundle("userInfo");
+            String senderName = getSenderName(data);
+            if (userInfoBundle != null) {
+                boolean localPushNotificationTest = userInfoBundle.getBoolean("test");
+                if (localPushNotificationTest) {
+                    senderName = "Test";
+                }
+            }
+
+            if (conversationTitle == null || !android.text.TextUtils.isEmpty(senderName.trim())) {
+                message = removeSenderNameFromMessage(message, senderName);
+            }
+
+            long timestamp = data.getLong("time");
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+                messagingStyle.addMessage(message, timestamp, senderName);
+            } else {
+                Person sender = new Person.Builder()
+                    .setKey(senderId)
+                    .setName(senderName)
+                    .build();
+                messagingStyle.addMessage(message, timestamp, sender);
+            }
+        }
+    }
+
+    private void setNotificationChannel(Notification.Builder notification, Bundle bundle) {
+        // If Android Oreo or above we need to register a channel
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return;
+        }
+
+        NotificationChannel notificationChannel = mHighImportanceChannel;
+
+        boolean testNotification = false;
+        boolean localNotification = false;
+        Bundle userInfoBundle = bundle.getBundle("userInfo");
+        if (userInfoBundle != null) {
+            testNotification = userInfoBundle.getBoolean("test");
+            localNotification = userInfoBundle.getBoolean("local");
+        }
+
+        if (mAppLifecycleFacade.isAppVisible() && !testNotification && !localNotification) {
+            notificationChannel = mMinImportanceChannel;
+        }
+
+        notification.setChannelId(notificationChannel.getId());
+    }
+
+    private void setNotificationBadgeIconType(Notification.Builder notification) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            notification.setBadgeIconType(Notification.BADGE_ICON_SMALL);
+        }
+    }
+
+    private void setNotificationGroup(Notification.Builder notification) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            notification
+                .setGroup(GROUP_KEY_MESSAGES)
+                .setGroupSummary(true);
+        }
+    }
+
+    private void setNotificationSound(Notification.Builder notification, NotificationPreferences notificationPreferences) {
+        String soundUri = notificationPreferences.getNotificationSound();
+        if (soundUri != null) {
+            if (soundUri != "none") {
+                notification.setSound(Uri.parse(soundUri), AudioManager.STREAM_NOTIFICATION);
+            }
+        } else {
+            Uri defaultUri = System.DEFAULT_NOTIFICATION_URI;
+            notification.setSound(defaultUri, AudioManager.STREAM_NOTIFICATION);
+        }
+    }
+
+    private void setNotificationVibrate(Notification.Builder notification, NotificationPreferences notificationPreferences) {
+        boolean vibrate = notificationPreferences.getShouldVibrate();
+        if (vibrate) {
+            // Use the system default for vibration
+            notification.setDefaults(Notification.DEFAULT_VIBRATE);
+        }
+    }
+
+    private void setNotificationBlink(Notification.Builder notification, NotificationPreferences notificationPreferences) {
+        boolean blink = notificationPreferences.getShouldBlink();
+        if (blink) {
+            notification.setLights(Color.CYAN, 500, 500);
+        }
+    }
+
+    private void setNotificationDeleteIntent(Notification.Builder notification, int notificationId) {
+        // Let's add a delete intent when the notification is dismissed
+        Intent delIntent = new Intent(mContext, NotificationDismissService.class);
+        delIntent.putExtra(NOTIFICATION_ID, notificationId);
+        PendingIntent deleteIntent = NotificationIntentAdapter.createPendingNotificationIntent(mContext, delIntent, mNotificationProps);
+        notification.setDeleteIntent(deleteIntent);
+    }
+
+    private void addNotificationReplyAction(Notification.Builder notification, int notificationId, Bundle bundle) {
+        String postId = bundle.getString("post_id");
+
+        if (android.text.TextUtils.isEmpty(postId) || Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            return;
+        }
+
+        Intent replyIntent = new Intent(mContext, NotificationReplyBroadcastReceiver.class);
+        replyIntent.setAction(KEY_TEXT_REPLY);
+        replyIntent.putExtra(NOTIFICATION_ID, notificationId);
+        replyIntent.putExtra("pushNotification", bundle);
+
+        PendingIntent replyPendingIntent = PendingIntent.getBroadcast(
+            mContext,
+            notificationId,
+            replyIntent,
+            PendingIntent.FLAG_UPDATE_CURRENT);
+
+        RemoteInput remoteInput = new RemoteInput.Builder(KEY_TEXT_REPLY)
+            .setLabel("Reply")
+            .build();
+
+        int icon = R.drawable.ic_notif_action_reply;
+        CharSequence title = "Reply";
+        Notification.Action replyAction = new Notification.Action.Builder(icon, title, replyPendingIntent)
+            .addRemoteInput(remoteInput)
+            .setAllowGeneratedReplies(true)
+            .build();
+
+        notification
+            .setShowWhen(true)
+            .addAction(replyAction);
     }
 
     private void notifyReceivedToJS() {
         mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_EVENT_NAME, mNotificationProps.asBundle(), mAppLifecycleFacade.getRunningReactContext());
     }
 
-    private static void saveNotificationsMap(Context context, Map<String, Map<String, JSONObject>> inputMap) {
-        SharedPreferences pSharedPref = context.getSharedPreferences(PUSH_NOTIFICATIONS, Context.MODE_PRIVATE);
-        if (pSharedPref != null && context != null) {
-            JSONObject json = new JSONObject(inputMap);
-            String jsonString = json.toString();
-            SharedPreferences.Editor editor = pSharedPref.edit();
-            editor.remove(NOTIFICATIONS_IN_CHANNEL).commit();
-            editor.putString(NOTIFICATIONS_IN_CHANNEL, jsonString);
-            editor.commit();
-        }
+    private void cancelNotification(Bundle data, int notificationId) {
+        final String channelId = data.getString("channel_id");
+        final String badge = data.getString("badge");
+
+        CustomPushNotification.badgeCount = Integer.parseInt(badge);
+        CustomPushNotification.clearNotification(mContext.getApplicationContext(), notificationId, channelId);
     }
 
-    /**
-     * Map Structure
-     * 
-     * {
-     *     channel_id1 | thread_id1: {
-     *         notification_id1: {
-     *             post_id: 'p1',
-     *             root_id: 'r1',
-     *         }
-     *     }
-     * }
-     *
-     */
-    private static Map<String, Map<String, JSONObject>> loadNotificationsMap(Context context) {
-        Map<String, Map<String, JSONObject>> outputMap = new HashMap<>();
-        if (context != null) {
-            SharedPreferences pSharedPref = context.getSharedPreferences(PUSH_NOTIFICATIONS, Context.MODE_PRIVATE);
-            try {
-                if (pSharedPref != null) {
-                    String jsonString = pSharedPref.getString(NOTIFICATIONS_IN_CHANNEL, (new JSONObject()).toString());
-                    JSONObject json = new JSONObject(jsonString);
+    private String getSenderName(Bundle bundle) {
+        String senderName = bundle.getString("sender_name");
+        if (senderName != null) {
+            return senderName;
+        }
 
-                    // Can be a channel_id or thread_id
-                    Iterator<String> groupIdsItr = json.keys();
-                    while (groupIdsItr.hasNext()) {
-                        String groupId = groupIdsItr.next();
-                        JSONObject notificationsJSONObj = json.getJSONObject(groupId);
-                        Map<String, JSONObject> notifications = new HashMap<>();
-                        Iterator<String> notificationIdKeys = notificationsJSONObj.keys();
-                        while(notificationIdKeys.hasNext()) {
-                            String notificationId = notificationIdKeys.next();
-                            JSONObject post = notificationsJSONObj.getJSONObject(notificationId);
-                            notifications.put(notificationId, post);
-                        }
-                        outputMap.put(groupId, notifications);
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
+        String channelName = bundle.getString("channel_name");
+        if (channelName != null && channelName.startsWith("@")) {
+            return channelName;
+        }
+
+        String message = bundle.getString("message");
+        if (message != null) {
+            String name = message.split(":")[0];
+            if (name != message) {
+                return name;
             }
         }
 
-        return outputMap;
+        return getConversationTitle(bundle);
+    }
+
+    private String removeSenderNameFromMessage(String message, String senderName) {
+        Integer index = message.indexOf(senderName);
+        if (index == 0) {
+            message = message.substring(senderName.length());
+        }
+
+        return message.replaceFirst(": ", "").trim();
+    }
+
+    private void notificationReceiptDelivery(String ackId, String postId, String type, boolean isIdLoaded, ResolvePromise promise) {
+        ReceiptDelivery.send(context, ackId, postId, type, isIdLoaded, promise);
+    }
+
+    private void createNotificationChannels() {
+        // Notification channels are not supported in Android Nougat and below
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return;
+        }
+
+        final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+
+        mHighImportanceChannel = new NotificationChannel("channel_01", "High Importance", NotificationManager.IMPORTANCE_HIGH);
+        mHighImportanceChannel.setShowBadge(true);
+        notificationManager.createNotificationChannel(mHighImportanceChannel);
+
+        mMinImportanceChannel = new NotificationChannel("channel_02", "Min Importance", NotificationManager.IMPORTANCE_MIN);
+        mMinImportanceChannel.setShowBadge(true);
+        notificationManager.createNotificationChannel(mMinImportanceChannel);
     }
 }

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

@@ -4,6 +4,10 @@ import android.content.Context;
 
 import com.wix.reactnativenotifications.core.AppLaunchHelper;
 import com.wix.reactnativenotifications.core.notificationdrawer.PushNotificationsDrawer;
+import com.wix.reactnativenotifications.core.notificationdrawer.IPushNotificationsDrawer;
+import com.wix.reactnativenotifications.core.notificationdrawer.INotificationsDrawerApplication;
+
+import static com.wix.reactnativenotifications.Defs.LOGTAG;
 
 public class CustomPushNotificationDrawer extends PushNotificationsDrawer {
     final protected Context mContext;

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

@@ -1,471 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
-import androidx.core.app.Person;
-import androidx.core.app.RemoteInput;
-import androidx.core.graphics.drawable.IconCompat;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
-import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
-import com.wix.reactnativenotifications.core.notification.PushNotificationProps;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.Objects;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-public class CustomPushNotificationHelper {
-    public static final String CHANNEL_HIGH_IMPORTANCE_ID = "channel_01";
-    public static final String CHANNEL_MIN_IMPORTANCE_ID = "channel_02";
-    public static final String KEY_TEXT_REPLY = "CAN_REPLY";
-    public static final int MESSAGE_NOTIFICATION_ID = 435345;
-    public static final String NOTIFICATION_ID = "notificationId";
-
-    private static NotificationChannel mHighImportanceChannel;
-    private static NotificationChannel mMinImportanceChannel;
-
-    private static void addMessagingStyleMessages(Context context, NotificationCompat.MessagingStyle messagingStyle, String conversationTitle, Bundle bundle) {
-        String message = bundle.getString("message", bundle.getString("body"));
-        String senderId = bundle.getString("sender_id");
-        if (senderId == null) {
-            senderId = "sender_id";
-        }
-        Bundle userInfoBundle = bundle.getBundle("userInfo");
-        String senderName = getSenderName(bundle);
-        if (userInfoBundle != null) {
-            boolean localPushNotificationTest = userInfoBundle.getBoolean("test");
-            if (localPushNotificationTest) {
-                senderName = "Test";
-            }
-        }
-
-        if (conversationTitle == null || !android.text.TextUtils.isEmpty(senderName.trim())) {
-            message = removeSenderNameFromMessage(message, senderName);
-        }
-
-        long timestamp = new Date().getTime();
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            messagingStyle.addMessage(message, timestamp, senderName);
-        } else {
-            Person.Builder sender = new Person.Builder()
-                    .setKey(senderId)
-                    .setName(senderName);
-
-            try {
-                Bitmap avatar = userAvatar(context, senderId);
-                if (avatar != null) {
-                    sender.setIcon(IconCompat.createWithBitmap(avatar));
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            messagingStyle.addMessage(message, timestamp, sender.build());
-        }
-    }
-
-    private static void addNotificationExtras(NotificationCompat.Builder notification, Bundle bundle) {
-        Bundle userInfoBundle = bundle.getBundle("userInfo");
-        if (userInfoBundle == null) {
-            userInfoBundle = new Bundle();
-        }
-
-        String postId = bundle.getString("post_id");
-        if (postId != null) {
-            userInfoBundle.putString("post_id", postId);
-        }
-
-        String rootId = bundle.getString("root_id");
-        if (rootId != null) {
-            userInfoBundle.putString("root_id", rootId);
-        }
-
-        String channelId = bundle.getString("channel_id");
-        if (channelId != null) {
-            userInfoBundle.putString("channel_id", channelId);
-        }
-
-        notification.addExtras(userInfoBundle);
-    }
-
-    private static void addNotificationReplyAction(Context context, NotificationCompat.Builder notification, Bundle bundle, int notificationId) {
-        String postId = bundle.getString("post_id");
-
-        if (android.text.TextUtils.isEmpty(postId)) {
-            return;
-        }
-
-        Intent replyIntent = new Intent(context, NotificationReplyBroadcastReceiver.class);
-        replyIntent.setAction(KEY_TEXT_REPLY);
-        replyIntent.putExtra(NOTIFICATION_ID, notificationId);
-        replyIntent.putExtra("pushNotification", bundle);
-
-        PendingIntent replyPendingIntent = PendingIntent.getBroadcast(
-                context,
-                notificationId,
-                replyIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-
-        RemoteInput remoteInput = new RemoteInput.Builder(KEY_TEXT_REPLY)
-                .setLabel("Reply")
-                .build();
-
-        int icon = R.drawable.ic_notif_action_reply;
-        CharSequence title = "Reply";
-        NotificationCompat.Action replyAction = new NotificationCompat.Action.Builder(icon, title, replyPendingIntent)
-                .addRemoteInput(remoteInput)
-                .setAllowGeneratedReplies(true)
-                .build();
-
-        notification
-                .setShowWhen(true)
-                .addAction(replyAction);
-    }
-
-    public static NotificationCompat.Builder createNotificationBuilder(Context context, PendingIntent intent, Bundle bundle, boolean createSummary) {
-        final NotificationCompat.Builder notification = new NotificationCompat.Builder(context, CHANNEL_HIGH_IMPORTANCE_ID);
-
-        String channelId = bundle.getString("channel_id");
-        String postId = bundle.getString("post_id");
-        String rootId = bundle.getString("root_id");
-        int notificationId = postId != null ? postId.hashCode() : MESSAGE_NOTIFICATION_ID;
-        NotificationPreferences notificationPreferences = NotificationPreferences.getInstance(context);
-        
-        Boolean is_crt_enabled = bundle.getString("is_crt_enabled") != null && bundle.getString("is_crt_enabled").equals("true");
-        String groupId = is_crt_enabled && !android.text.TextUtils.isEmpty(rootId) ? rootId : channelId;
-
-        addNotificationExtras(notification, bundle);
-        setNotificationIcons(context, notification, bundle);
-        setNotificationMessagingStyle(context, notification, bundle);
-        setNotificationGroup(notification, groupId, createSummary);
-        setNotificationBadgeType(notification);
-        setNotificationSound(notification, notificationPreferences);
-        setNotificationVibrate(notification, notificationPreferences);
-        setNotificationBlink(notification, notificationPreferences);
-
-        setNotificationChannel(notification, bundle);
-        setNotificationDeleteIntent(context, notification, bundle, notificationId);
-        addNotificationReplyAction(context, notification, bundle, notificationId);
-
-        notification
-                .setContentIntent(intent)
-                .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
-                .setPriority(Notification.PRIORITY_HIGH)
-                .setCategory(Notification.CATEGORY_MESSAGE)
-                .setAutoCancel(true);
-
-        return notification;
-    }
-
-    public static void createNotificationChannels(Context context) {
-        // Notification channels are not supported in Android Nougat and below
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
-        }
-
-        final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
-
-        if (mHighImportanceChannel == null) {
-            mHighImportanceChannel = new NotificationChannel(CHANNEL_HIGH_IMPORTANCE_ID, "High Importance", NotificationManager.IMPORTANCE_HIGH);
-            mHighImportanceChannel.setShowBadge(true);
-            notificationManager.createNotificationChannel(mHighImportanceChannel);
-        }
-
-        if (mMinImportanceChannel == null) {
-            mMinImportanceChannel = new NotificationChannel(CHANNEL_MIN_IMPORTANCE_ID, "Min Importance", NotificationManager.IMPORTANCE_MIN);
-            mMinImportanceChannel.setShowBadge(true);
-            notificationManager.createNotificationChannel(mMinImportanceChannel);
-        }
-    }
-
-    private static Bitmap getCircleBitmap(Bitmap bitmap) {
-        final Bitmap output = Bitmap.createBitmap(bitmap.getWidth(),
-                bitmap.getHeight(), Bitmap.Config.ARGB_8888);
-        final Canvas canvas = new Canvas(output);
-
-        final int color = Color.RED;
-        final Paint paint = new Paint();
-        final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
-        final RectF rectF = new RectF(rect);
-
-        paint.setAntiAlias(true);
-        canvas.drawARGB(0, 0, 0, 0);
-        paint.setColor(color);
-        canvas.drawOval(rectF, paint);
-
-        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-        canvas.drawBitmap(bitmap, rect, rect, paint);
-
-        bitmap.recycle();
-
-        return output;
-    }
-
-    private static String getConversationTitle(Bundle bundle) {
-        String title = bundle.getString("channel_name");
-
-        if (android.text.TextUtils.isEmpty(title)) {
-            title = bundle.getString("sender_name");
-        }
-
-        return title;
-    }
-
-    private static int getIconResourceId(Context context, String iconName) {
-        final Resources res = context.getResources();
-        String packageName = context.getPackageName();
-        String defType = "mipmap";
-
-        return res.getIdentifier(iconName, defType, packageName);
-    }
-
-    private static NotificationCompat.MessagingStyle getMessagingStyle(Context context, Bundle bundle) {
-        NotificationCompat.MessagingStyle messagingStyle;
-        String senderId = "me";
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            messagingStyle = new NotificationCompat.MessagingStyle("Me");
-        } else {
-            Person.Builder sender = new Person.Builder()
-                    .setKey(senderId)
-                    .setName("Me");
-
-            try {
-                Bitmap avatar = userAvatar(context, "me");
-                if (avatar != null) {
-                    sender.setIcon(IconCompat.createWithBitmap(avatar));
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            messagingStyle = new NotificationCompat.MessagingStyle(sender.build());
-        }
-
-        String conversationTitle = getConversationTitle(bundle);
-        setMessagingStyleConversationTitle(messagingStyle, conversationTitle, bundle);
-        addMessagingStyleMessages(context, messagingStyle, conversationTitle, bundle);
-
-        return messagingStyle;
-    }
-
-    private static String getSenderName(Bundle bundle) {
-        String senderName = bundle.getString("sender_name");
-        if (senderName != null) {
-            return senderName;
-        }
-
-        String channelName = bundle.getString("channel_name");
-        if (channelName != null && channelName.startsWith("@")) {
-            return channelName;
-        }
-
-        String message = bundle.getString("message");
-        if (message != null) {
-            String name = message.split(":")[0];
-            if (!name.equals(message)) {
-                return name;
-            }
-        }
-
-        return getConversationTitle(bundle);
-    }
-
-    public static int getSmallIconResourceId(Context context, String iconName) {
-        if (iconName == null) {
-            iconName = "ic_notification";
-        }
-
-        int resourceId = getIconResourceId(context, iconName);
-
-        if (resourceId == 0) {
-            iconName = "ic_launcher";
-            resourceId = getIconResourceId(context, iconName);
-
-            if (resourceId == 0) {
-                resourceId = android.R.drawable.ic_dialog_info;
-            }
-        }
-
-        return resourceId;
-    }
-
-    private static String removeSenderNameFromMessage(String message, String senderName) {
-        int index = message.indexOf(senderName);
-        if (index == 0) {
-            message = message.substring(senderName.length());
-        }
-
-        return message.replaceFirst(": ", "").trim();
-    }
-
-    private static void setMessagingStyleConversationTitle(NotificationCompat.MessagingStyle messagingStyle, String conversationTitle, Bundle bundle) {
-        String channelName = getConversationTitle(bundle);
-        String senderName = bundle.getString("sender_name");
-        if (TextUtils.isEmpty(senderName)) {
-            senderName = getSenderName(bundle);
-        }
-
-        if (conversationTitle != null && !channelName.equals(senderName)) {
-            messagingStyle.setConversationTitle(conversationTitle);
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                messagingStyle.setGroupConversation(true);
-            }
-        }
-    }
-
-    private static void setNotificationBadgeType(NotificationCompat.Builder notification) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            notification.setBadgeIconType(NotificationCompat.BADGE_ICON_LARGE);
-        }
-    }
-
-    private static void setNotificationBlink(NotificationCompat.Builder notification, NotificationPreferences notificationPreferences) {
-        boolean blink = notificationPreferences.getShouldBlink();
-        if (blink) {
-            notification.setLights(Color.CYAN, 500, 500);
-        }
-    }
-
-    private static void setNotificationChannel(NotificationCompat.Builder notification, Bundle bundle) {
-        // If Android Oreo or above we need to register a channel
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
-        }
-
-        NotificationChannel notificationChannel = mHighImportanceChannel;
-
-        boolean testNotification = false;
-        boolean localNotification = false;
-        Bundle userInfoBundle = bundle.getBundle("userInfo");
-        if (userInfoBundle != null) {
-            testNotification = userInfoBundle.getBoolean("test");
-            localNotification = userInfoBundle.getBoolean("local");
-        }
-
-        if (testNotification || localNotification) {
-            notificationChannel = mMinImportanceChannel;
-        }
-
-        notification.setChannelId(notificationChannel.getId());
-    }
-
-    private static void setNotificationDeleteIntent(Context context, NotificationCompat.Builder notification, Bundle bundle, int notificationId) {
-        // Let's add a delete intent when the notification is dismissed
-        Intent delIntent = new Intent(context, NotificationDismissService.class);
-        PushNotificationProps notificationProps = new PushNotificationProps(bundle);
-        delIntent.putExtra(NOTIFICATION_ID, notificationId);
-        PendingIntent deleteIntent = NotificationIntentAdapter.createPendingNotificationIntent(context, delIntent, notificationProps);
-        notification.setDeleteIntent(deleteIntent);
-    }
-
-    private static void setNotificationMessagingStyle(Context context, NotificationCompat.Builder notification, Bundle bundle) {
-        NotificationCompat.MessagingStyle messagingStyle = getMessagingStyle(context, bundle);
-        notification.setStyle(messagingStyle);
-    }
-
-    private static void setNotificationGroup(NotificationCompat.Builder notification, String channelId, boolean setAsSummary) {
-        notification.setGroup(channelId);
-
-        if (setAsSummary) {
-            // if this is the first notification for the channel then set as summary, otherwise skip
-            notification.setGroupSummary(true);
-        }
-    }
-
-    private static void setNotificationIcons(Context context, NotificationCompat.Builder notification, Bundle bundle) {
-        String smallIcon = bundle.getString("smallIcon");
-        String channelName = getConversationTitle(bundle);
-        String senderName = bundle.getString("sender_name");
-
-        int smallIconResId = getSmallIconResourceId(context, smallIcon);
-        notification.setSmallIcon(smallIconResId);
-
-        if (channelName.equals(senderName)) {
-            try {
-                String senderId = bundle.getString("sender_id");
-                Bitmap avatar = userAvatar(context, senderId);
-                if (avatar != null) {
-                    notification.setLargeIcon(avatar);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static void setNotificationSound(NotificationCompat.Builder notification, NotificationPreferences notificationPreferences) {
-        String soundUri = notificationPreferences.getNotificationSound();
-        if (soundUri != null) {
-            if (!soundUri.equals("none")) {
-                notification.setSound(Uri.parse(soundUri));
-            }
-        } else {
-            Uri defaultUri = Settings.System.DEFAULT_NOTIFICATION_URI;
-            notification.setSound(defaultUri);
-        }
-    }
-
-    private static void setNotificationVibrate(NotificationCompat.Builder notification, NotificationPreferences notificationPreferences) {
-        boolean vibrate = notificationPreferences.getShouldVibrate();
-        if (vibrate) {
-            // Use the system default for vibration
-            notification.setDefaults(Notification.DEFAULT_VIBRATE);
-        }
-    }
-
-    private static Bitmap userAvatar(Context context, final String userId) throws IOException {
-        final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
-        final ReadableMap credentials = MattermostCredentialsHelper.getCredentialsSync(reactApplicationContext);
-        final String serverUrl = credentials.getString("serverUrl");
-        final String token = credentials.getString("token");
-
-
-        final OkHttpClient client = new OkHttpClient();
-        final String url = String.format("%s/api/v4/users/%s/image", serverUrl, userId);
-        Request request = new Request.Builder()
-                .header("Authorization", String.format("Bearer %s", token))
-                .url(url)
-                .build();
-        Response response = client.newCall(request).execute();
-        if (response.code() == 200) {
-            assert response.body() != null;
-            byte[] bytes = response.body().bytes();
-            Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
-
-            Log.i("ReactNative", String.format("Fetch profile %s", url));
-            return getCircleBitmap(bitmap);
-        }
-
-        return null;
-    }
-}

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

@@ -1,8 +1,6 @@
 package com.mattermost.rnbeta;
 
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import android.view.KeyEvent;
 import android.content.res.Configuration;
@@ -21,7 +19,7 @@ public class MainActivity extends NavigationActivity {
     }
 
     @Override
-    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+    public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
         if (newConfig.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO) {
@@ -44,7 +42,7 @@ public class MainActivity extends NavigationActivity {
             return true;
         }
         return super.dispatchKeyEvent(event);
-    }
+    };
 
     private void setHWKeyboardConnected() {
         HWKeyboardConnected = getResources().getConfiguration().keyboard == Configuration.KEYBOARD_QWERTY;

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

@@ -1,9 +1,11 @@
 package com.mattermost.rnbeta;
 
+import androidx.annotation.Nullable;
 import android.content.Context;
 import android.content.RestrictionsManager;
 import android.os.Bundle;
 import android.util.Log;
+import java.lang.reflect.InvocationTargetException;
 import java.io.File;
 import java.util.HashMap;
 import java.util.List;
@@ -28,20 +30,30 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMarker;
+import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.soloader.SoLoader;
 
-import com.facebook.react.bridge.JSIModulePackage;
-
-
 public class MainApplication extends NavigationApplication implements INotificationsApplication, INotificationsDrawerApplication {
   public static MainApplication instance;
 
   public Boolean sharedExtensionIsOpened = false;
 
+  public long APP_START_TIME;
+
+  public long RELOAD;
+  public long CONTENT_APPEARED;
+
+  public long PROCESS_PACKAGES_START;
+  public long PROCESS_PACKAGES_END;
+
   private Bundle mManagedConfig = null;
 
 private final ReactNativeHost mReactNativeHost =
@@ -53,10 +65,12 @@ private final ReactNativeHost mReactNativeHost =
 
     @Override
     protected List<ReactPackage> getPackages() {
+      @SuppressWarnings("UnnecessaryLocalVariable")
       List<ReactPackage> packages = new PackageList(this).getPackages();
-      // Packages that cannot be auto linked yet can be added manually here, for example:
+      // Packages that cannot be autolinked yet can be added manually here, for example:
       // packages.add(new MyReactNativePackage());
       packages.add(new RNNotificationsPackage(MainApplication.this));
+      packages.add(new RNPasteableTextInputPackage());
       packages.add(
         new TurboReactPackage() {
               @Override
@@ -77,13 +91,16 @@ private final ReactNativeHost mReactNativeHost =
 
               @Override
               public ReactModuleInfoProvider getReactModuleInfoProvider() {
-                return () -> {
-                  Map<String, ReactModuleInfo> map = new HashMap<>();
-                  map.put("MattermostManaged", new ReactModuleInfo("MattermostManaged", "com.mattermost.rnbeta.MattermostManagedModule", false, false, false, false, false));
-                  map.put("MattermostShare", new ReactModuleInfo("MattermostShare", "com.mattermost.share.ShareModule", false, false, true, false, false));
-                  map.put("NotificationPreferences", new ReactModuleInfo("NotificationPreferences", "com.mattermost.rnbeta.NotificationPreferencesModule", false, false, false, false, false));
-                  map.put("RNTextInputReset", new ReactModuleInfo("RNTextInputReset", "com.mattermost.rnbeta.RNTextInputResetModule", false, false, false, false, false));
-                  return map;
+                return new ReactModuleInfoProvider() {
+                  @Override
+                  public Map<String, ReactModuleInfo> getReactModuleInfos() {
+                    Map<String, ReactModuleInfo> map = new HashMap<>();
+                    map.put("MattermostManaged", new ReactModuleInfo("MattermostManaged", "com.mattermost.rnbeta.MattermostManagedModule", false, false, false, false, false));
+                    map.put("MattermostShare", new ReactModuleInfo("MattermostShare", "com.mattermost.share.ShareModule", false, false, true, false, false));
+                    map.put("NotificationPreferences", new ReactModuleInfo("NotificationPreferences", "com.mattermost.rnbeta.NotificationPreferencesModule", false, false, false, false, false));
+                    map.put("RNTextInputReset", new ReactModuleInfo("RNTextInputReset", "com.mattermost.rnbeta.RNTextInputResetModule", false, false, false, false, false));
+                    return map;
+                  }
                 };
               }
             }
@@ -96,11 +113,6 @@ private final ReactNativeHost mReactNativeHost =
     protected String getJSMainModuleName() {
       return "index";
     }
-
-    @Override
-    protected JSIModulePackage getJSIModulePackage() {
-      return (JSIModulePackage) new CustomMMKVJSIModulePackage();
-    }
   };
 
   @Override
@@ -120,6 +132,9 @@ private final ReactNativeHost mReactNativeHost =
 
     SoLoader.init(this, /* native exopackage */ false);
     initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+
+    // Uncomment to listen to react markers for build that has telemetry enabled
+    // addReactMarkerListener();
   }
 
   @Override
@@ -154,6 +169,7 @@ private final ReactNativeHost mReactNativeHost =
               (RestrictionsManager) ctx.getSystemService(Context.RESTRICTIONS_SERVICE);
 
       mManagedConfig = myRestrictionsMgr.getApplicationRestrictions();
+      myRestrictionsMgr = null;
 
       if (mManagedConfig!= null && mManagedConfig.size() > 0) {
         return mManagedConfig;
@@ -179,12 +195,44 @@ private final ReactNativeHost mReactNativeHost =
     return null;
   }
 
+  private void addReactMarkerListener() {
+    ReactMarker.addListener(new ReactMarker.MarkerListener() {
+      @Override
+      public void logMarker(ReactMarkerConstants name, @Nullable String tag, int instanceKey) {
+        if (name.toString() == ReactMarkerConstants.RELOAD.toString()) {
+          APP_START_TIME = System.currentTimeMillis();
+          RELOAD = System.currentTimeMillis();
+        } else if (name.toString() == ReactMarkerConstants.PROCESS_PACKAGES_START.toString()) {
+          PROCESS_PACKAGES_START = System.currentTimeMillis();
+        } else if (name.toString() == ReactMarkerConstants.PROCESS_PACKAGES_END.toString()) {
+          PROCESS_PACKAGES_END = System.currentTimeMillis();
+        } else if (name.toString() == ReactMarkerConstants.CONTENT_APPEARED.toString()) {
+          CONTENT_APPEARED = System.currentTimeMillis();
+          ReactContext ctx = getRunningReactContext();
+
+          if (ctx != null) {
+            WritableMap map = Arguments.createMap();
+
+            map.putDouble("appReload", RELOAD);
+            map.putDouble("appContentAppeared", CONTENT_APPEARED);
+
+            map.putDouble("processPackagesStart", PROCESS_PACKAGES_START);
+            map.putDouble("processPackagesEnd", PROCESS_PACKAGES_END);
+
+            ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).
+                    emit("nativeMetrics", map);
+          }
+        }
+      }
+    });
+  }
+
   /**
    * Loads Flipper in React Native templates. Call this in the onCreate method with something like
    * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
    *
-   * @param context application context
-   * @param reactInstanceManager instance of React
+   * @param context
+   * @param reactInstanceManager
    */
   private static void initializeFlipper(
       Context context, ReactInstanceManager reactInstanceManager) {
@@ -194,11 +242,17 @@ private final ReactNativeHost mReactNativeHost =
          We use reflection here to pick up the class that initializes Flipper,
         since Flipper library is not available in release mode
         */
-        Class<?> aClass = Class.forName("com.rn.ReactNativeFlipper");
+        Class<?> aClass = Class.forName("com.rndiffapp.ReactNativeFlipper");
         aClass
             .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
             .invoke(null, context, reactInstanceManager);
-      } catch (Exception e) {
+      } catch (ClassNotFoundException e) {
+        e.printStackTrace();
+      } catch (NoSuchMethodException e) {
+        e.printStackTrace();
+      } catch (IllegalAccessException e) {
+        e.printStackTrace();
+      } catch (InvocationTargetException e) {
         e.printStackTrace();
       }
     }

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

@@ -1,14 +1,12 @@
 package com.mattermost.rnbeta;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.content.Context;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.oblador.keychain.KeychainModule;
 
@@ -19,16 +17,19 @@ import com.mattermost.react_native_interface.KeysReadableArray;
 public class MattermostCredentialsHelper {
     static final String CURRENT_SERVER_URL = "@currentServerUrl";
     static KeychainModule keychainModule;
+    static AsyncStorageHelper asyncStorage;
 
     public static void getCredentialsForCurrentServer(ReactApplicationContext context, ResolvePromise promise) {
-        final ArrayList<String> keys = new ArrayList<>(1);
+        final ArrayList<String> keys = new ArrayList<String>(1);
         keys.add(CURRENT_SERVER_URL);
 
         if (keychainModule == null) {
             keychainModule = new KeychainModule(context);
         }
 
-        AsyncStorageHelper asyncStorage = new AsyncStorageHelper(context);
+        if (asyncStorage == null) {
+            asyncStorage = new AsyncStorageHelper(context);
+        }
         KeysReadableArray asyncStorageKeys = new KeysReadableArray() {
             @Override
             public int size() {
@@ -36,7 +37,6 @@ public class MattermostCredentialsHelper {
             }
 
             @Override
-            @NonNull
             public String getString(int index) {
                 return keys.get(index);
             }
@@ -54,32 +54,4 @@ public class MattermostCredentialsHelper {
 
         keychainModule.getGenericPasswordForOptions(options, promise);
     }
-
-    public static ReadableMap getCredentialsSync(ReactApplicationContext context) {
-        final String[] serverUrl = new String[1];
-        final String[] token = new String[1];
-        MattermostCredentialsHelper.getCredentialsForCurrentServer(context, new ResolvePromise() {
-            @Override
-            public void resolve(@Nullable Object value) {
-                WritableMap map = (WritableMap) value;
-                if (map != null) {
-                    token[0] = map.getString("password");
-                    serverUrl[0] = map.getString("service");
-                    assert serverUrl[0] != null;
-                    if (serverUrl[0].isEmpty()) {
-                        String[] credentials = token[0].split(",[ ]*");
-                        if (credentials.length == 2) {
-                            token[0] = credentials[0];
-                            serverUrl[0] = credentials[1];
-                        }
-                    }
-                }
-            }
-        });
-        final WritableMap result = Arguments.createMap();
-        result.putString("serverUrl", serverUrl[0]);
-        result.putString("token", token[0]);
-
-        return result;
-    }
 }

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

@@ -1,6 +1,7 @@
 package com.mattermost.rnbeta;
 
 import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -11,12 +12,10 @@ import android.view.WindowManager.LayoutParams;
 import android.util.ArraySet;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-
-import java.util.Objects;
 import java.util.Set;
 
 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;
@@ -66,7 +65,6 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule implemen
     }
 
     @Override
-    @NonNull
     public String getName() {
         return "MattermostManaged";
     }
@@ -94,7 +92,7 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule implemen
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         getReactApplicationContext().startActivity(intent);
 
-        Objects.requireNonNull(getCurrentActivity()).finish();
+        getCurrentActivity().finish();
         System.exit(0);
     }
 
@@ -113,7 +111,7 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule implemen
 
     @ReactMethod
     public void quitApp() {
-        Objects.requireNonNull(getCurrentActivity()).finish();
+        getCurrentActivity().finish();
         System.exit(0);
     }
 
@@ -165,7 +163,6 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule implemen
             blurAppScreen = Boolean.parseBoolean(config.getString("blurApplicationScreen"));
         }
 
-        assert activity != null;
         if (blurAppScreen) {
             activity.getWindow().setFlags(LayoutParams.FLAG_SECURE, LayoutParams.FLAG_SECURE);
         } else {
@@ -197,7 +194,7 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule implemen
         if(one.size() != two.size())
             return false;
 
-        Set<String> setOne = new ArraySet<>();
+        Set<String> setOne = new ArraySet<String>();
         setOne.addAll(one.keySet());
         setOne.addAll(two.keySet());
         Object valueOne;

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

@@ -9,27 +9,18 @@ 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) {
-        final Context context = getApplicationContext();
-        final Bundle bundle = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
-        final String channelId = bundle.getString("channel_id");
-        final String postId = bundle.getString("post_id");
-        final String rootId = bundle.getString("root_id");
-        final Boolean isCRTEnabled = bundle.getString("is_crt_enabled") != null && bundle.getString("is_crt_enabled").equals("true");
-
-        int notificationId = CustomPushNotificationHelper.MESSAGE_NOTIFICATION_ID;
-        if (postId != null) {
-            notificationId = postId.hashCode();
-        } else if (channelId != null) {
-            notificationId = channelId.hashCode();
-        }
-
-        CustomPushNotification.cancelNotification(context, channelId, rootId, notificationId, isCRTEnabled);
+        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

@@ -10,7 +10,8 @@ public class NotificationPreferences {
     public final String SOUND_PREF = "NotificationSound";
     public final String VIBRATE_PREF = "NotificationVibrate";
     public final String BLINK_PREF = "NotificationLights";
-    private final SharedPreferences mSharedPreferences;
+
+    private SharedPreferences mSharedPreferences;
 
     private NotificationPreferences(Context context) {
         mSharedPreferences = context.getSharedPreferences(SHARED_NAME, Context.MODE_PRIVATE);
@@ -39,18 +40,18 @@ public class NotificationPreferences {
     public void setNotificationSound(String soundUri) {
         SharedPreferences.Editor editor = mSharedPreferences.edit();
         editor.putString(SOUND_PREF, soundUri);
-        editor.apply();
+        editor.commit();
     }
 
     public void setShouldVibrate(boolean vibrate) {
         SharedPreferences.Editor editor = mSharedPreferences.edit();
         editor.putBoolean(VIBRATE_PREF, vibrate);
-        editor.apply();
+        editor.commit();
     }
 
     public void setShouldBlink(boolean blink) {
         SharedPreferences.Editor editor = mSharedPreferences.edit();
         editor.putBoolean(BLINK_PREF, blink);
-        editor.apply();
+        editor.commit();
     }
 }

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

@@ -1,5 +1,6 @@
 package com.mattermost.rnbeta;
 
+import android.app.Application;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.content.Context;
@@ -10,10 +11,10 @@ import android.os.Bundle;
 import android.net.Uri;
 import android.service.notification.StatusBarNotification;
 
-import androidx.annotation.NonNull;
-
 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;
@@ -23,12 +24,13 @@ import com.facebook.react.bridge.WritableMap;
 public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
     private static NotificationPreferencesModule instance;
     private final MainApplication mApplication;
-    private final NotificationPreferences mNotificationPreference;
+    private NotificationPreferences mNotificationPreference;
 
     private NotificationPreferencesModule(MainApplication application, ReactApplicationContext reactContext) {
         super(reactContext);
         mApplication = application;
-        mNotificationPreference = NotificationPreferences.getInstance(reactContext);
+        Context context = mApplication.getApplicationContext();
+        mNotificationPreference = NotificationPreferences.getInstance(context);
     }
 
     public static NotificationPreferencesModule getInstance(MainApplication application, ReactApplicationContext reactContext) {
@@ -44,7 +46,6 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
     }
 
     @Override
-    @NonNull
     public String getName() {
         return "NotificationPreferences";
     }
@@ -52,7 +53,7 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
     @ReactMethod
     public void getPreferences(final Promise promise) {
         try {
-            final Context context = mApplication.getApplicationContext();
+            Context context = mApplication.getApplicationContext();
             RingtoneManager manager = new RingtoneManager(context);
             manager.setType(RingtoneManager.TYPE_NOTIFICATION);
             Cursor cursor = manager.getCursor();
@@ -87,7 +88,7 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void previewSound(String url) {
-        final Context context = mApplication.getApplicationContext();
+        Context context = mApplication.getApplicationContext();
         Uri uri = Uri.parse(url);
         Ringtone r = RingtoneManager.getRingtone(context, uri);
         r.play();
@@ -110,7 +111,7 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void getDeliveredNotifications(final Promise promise) {
-        final Context context = mApplication.getApplicationContext();
+        Context context = mApplication.getApplicationContext();
         final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         StatusBarNotification[] statusBarNotifications = notificationManager.getActiveNotifications();
         WritableArray result = Arguments.createArray();
@@ -118,11 +119,9 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
             WritableMap map = Arguments.createMap();
             Notification n = sbn.getNotification();
             Bundle bundle = n.extras;
-            String postId = bundle.getString("post_id");
-            map.putString("post_id", postId);
-            String rootId = bundle.getString("root_id");
-            map.putString("root_id", rootId);
+            int identifier = sbn.getId();
             String channelId = bundle.getString("channel_id");
+            map.putInt("identifier", identifier);
             map.putString("channel_id", channelId);
             result.pushMap(map);
         }
@@ -130,9 +129,8 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void removeDeliveredNotifications(String channelId, String rootId, Boolean isCRTEnabled) {
-        final Context context = mApplication.getApplicationContext();
-        CustomPushNotification.clearChannelNotifications(context, channelId, rootId, isCRTEnabled);
+    public void removeDeliveredNotifications(int identifier, String channelId) {
+        Context context = mApplication.getApplicationContext();
+        CustomPushNotification.clearNotification(context, identifier, channelId);
     }
-
 }

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

@@ -1,21 +1,18 @@
 package com.mattermost.rnbeta;
 
 import android.app.Notification;
-import android.app.PendingIntent;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.RemoteInput;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Build;
 import android.os.Bundle;
+import androidx.annotation.Nullable;
 import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
-import androidx.core.app.Person;
-
 import java.io.IOException;
-import java.util.Objects;
 
 import okhttp3.Call;
 import okhttp3.MediaType;
@@ -27,17 +24,16 @@ import okhttp3.Response;
 import org.json.JSONObject;
 import org.json.JSONException;
 
-import com.facebook.react.bridge.ReadableMap;
+import com.mattermost.react_native_interface.ResolvePromise;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.WritableMap;
 
 import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
-import com.wix.reactnativenotifications.core.ProxyService;
-import com.wix.reactnativenotifications.core.notification.PushNotificationProps;
 
 public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
     private Context mContext;
     private Bundle bundle;
-    private NotificationManagerCompat notificationManager;
+    private NotificationManager notificationManager;
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -49,13 +45,28 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
 
             mContext = context;
             bundle = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
-            notificationManager = NotificationManagerCompat.from(context);
+            notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
             final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
-            final int notificationId = intent.getIntExtra(CustomPushNotificationHelper.NOTIFICATION_ID, -1);
+            final int notificationId = intent.getIntExtra(CustomPushNotification.NOTIFICATION_ID, -1);
 
-            ReadableMap results = MattermostCredentialsHelper.getCredentialsSync(reactApplicationContext);
-            replyToMessage(results.getString("serverUrl"), results.getString("token"), notificationId, message);
+
+            MattermostCredentialsHelper.getCredentialsForCurrentServer(reactApplicationContext, new ResolvePromise() {
+                @Override
+                public void resolve(@Nullable Object value) {
+                    if (value instanceof Boolean && !(Boolean)value) {
+                        return;
+                    }
+
+                    WritableMap map = (WritableMap) value;
+                    if (map != null) {
+                        String token = map.getString("password");
+                        String serverUrl = map.getString("service");
+
+                        replyToMessage(serverUrl, token, notificationId, message);
+                    }
+                }
+            });
         }
     }
 
@@ -68,7 +79,7 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
         }
 
         if (token == null || serverUrl == null) {
-            onReplyFailed(notificationId);
+            onReplyFailed(notificationManager, notificationId, channelId);
             return;
         }
 
@@ -89,20 +100,19 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
 
         client.newCall(request).enqueue(new okhttp3.Callback() {
             @Override
-            public void onFailure(@NonNull Call call, @NonNull IOException e) {
+            public void onFailure(Call call, IOException e) {
                 Log.i("ReactNative", String.format("Reply FAILED exception %s", e.getMessage()));
-                onReplyFailed(notificationId);
+                onReplyFailed(notificationManager, notificationId, channelId);
             }
 
             @Override
-            public void onResponse(@NonNull Call call, @NonNull final Response response) throws IOException {
+            public void onResponse(Call call, final Response response) throws IOException {
                 if (response.isSuccessful()) {
-                    onReplySuccess(notificationId, message);
+                    onReplySuccess(notificationManager, notificationId, channelId);
                     Log.i("ReactNative", "Reply SUCCESS");
                 } else {
-                    assert response.body() != null;
-                    Log.i("ReactNative", String.format("Reply FAILED status %s BODY %s", response.code(), Objects.requireNonNull(response.body()).string()));
-                    onReplyFailed(notificationId);
+                    Log.i("ReactNative", String.format("Reply FAILED status %s BODY %s", response.code(), response.body().string()));
+                    onReplyFailed(notificationManager, notificationId, channelId);
                 }
             }
         });
@@ -120,31 +130,37 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
         }
     }
 
-    protected void onReplyFailed(int notificationId) {
-        recreateNotification(notificationId, "Message failed to send.");
-    }
+    protected void onReplyFailed(NotificationManager notificationManager, int notificationId, String channelId) {
+        String CHANNEL_ID = "Reply job";
+        Resources res = mContext.getResources();
+        String packageName = mContext.getPackageName();
+        int smallIconResId = res.getIdentifier("ic_notification", "mipmap", packageName);
 
-    protected void onReplySuccess(int notificationId, final CharSequence message) {
-        recreateNotification(notificationId, message);
-    }
+        Bundle userInfoBundle = new Bundle();
+        userInfoBundle.putString("channel_id", channelId);
 
-    private void recreateNotification(int notificationId, final CharSequence message) {
-        final Intent cta = new Intent(mContext, ProxyService.class);
-        final PushNotificationProps notificationProps = new PushNotificationProps(bundle);
-        final PendingIntent pendingIntent = NotificationIntentAdapter.createPendingNotificationIntent(mContext, cta, notificationProps);
-        NotificationCompat.Builder builder = CustomPushNotificationHelper.createNotificationBuilder(mContext, pendingIntent, bundle, false);
-        Notification notification =  builder.build();
-        NotificationCompat.MessagingStyle messagingStyle = NotificationCompat.MessagingStyle.extractMessagingStyleFromNotification(notification);
-        assert messagingStyle != null;
-        messagingStyle.addMessage(message, System.currentTimeMillis(), (Person)null);
-        notification = builder.setStyle(messagingStyle).build();
+        NotificationChannel channel = new NotificationChannel(CHANNEL_ID, CHANNEL_ID, NotificationManager.IMPORTANCE_LOW);
+        notificationManager.createNotificationChannel(channel);
+        Notification notification =
+                new Notification.Builder(mContext, CHANNEL_ID)
+                        .setContentTitle("Message failed to send.")
+                        .setSmallIcon(smallIconResId)
+                        .addExtras(userInfoBundle)
+                        .build();
+
+        CustomPushNotification.clearNotification(mContext, notificationId, channelId);
         notificationManager.notify(notificationId, notification);
     }
 
+    protected void onReplySuccess(NotificationManager notificationManager, int notificationId, String channelId) {
+        notificationManager.cancel(notificationId);
+        CustomPushNotification.clearNotification(mContext, notificationId, channelId);
+    }
+
     private CharSequence getReplyMessage(Intent intent) {
         Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
         if (remoteInput != null) {
-            return remoteInput.getCharSequence(CustomPushNotificationHelper.KEY_TEXT_REPLY);
+            return remoteInput.getCharSequence(CustomPushNotification.KEY_TEXT_REPLY);
         }
         return null;
     }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -4,19 +4,22 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.UIBlock;
+import com.facebook.react.uimanager.NativeViewHierarchyManager;
 import android.content.Context;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
-import androidx.annotation.NonNull;
-
 public class RNTextInputResetModule extends ReactContextBaseJavaModule {
+
+  private final ReactApplicationContext reactContext;
+
   public RNTextInputResetModule(ReactApplicationContext reactContext) {
     super(reactContext);
+    this.reactContext = reactContext;
   }
 
   @Override
-  @NonNull
   public String getName() {
     return "RNTextInputReset";
   }
@@ -25,13 +28,15 @@ public class RNTextInputResetModule extends ReactContextBaseJavaModule {
   @ReactMethod
   public void resetKeyboardInput(final int reactTagToReset) {
       UIManagerModule uiManager = getReactApplicationContext().getNativeModule(UIManagerModule.class);
-      assert uiManager != null;
-      uiManager.addUIBlock(nativeViewHierarchyManager -> {
-          InputMethodManager imm = (InputMethodManager) getReactApplicationContext().getBaseContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-          if (imm != null) {
-              View viewToReset = nativeViewHierarchyManager.resolveView(reactTagToReset);
-              imm.restartInput(viewToReset);
+      uiManager.addUIBlock(new UIBlock() {
+          @Override
+          public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
+              InputMethodManager imm = (InputMethodManager) getReactApplicationContext().getBaseContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+              if (imm != null) {
+                  View viewToReset = nativeViewHierarchyManager.resolveView(reactTagToReset);
+                  imm.restartInput(viewToReset);
+              }
           }
       });
   }
-}
+}

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

@@ -1,10 +1,12 @@
 package com.mattermost.rnbeta;
 
 import android.content.Context;
+import androidx.annotation.Nullable;
 import android.os.Bundle;
 import android.util.Log;
 import java.lang.System;
 
+import okhttp3.Call;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -16,21 +18,43 @@ import org.json.JSONObject;
 import org.json.JSONException;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.Arguments;
 
 import com.mattermost.react_native_interface.ResolvePromise;
 
 public class ReceiptDelivery {
-    private static final int[] FIBONACCI_BACKOFF = new int[] { 0, 1, 2, 3, 5, 8 };
+    static final String CURRENT_SERVER_URL = "@currentServerUrl";
+
+    private static final int[] FIBONACCI_BACKOFFS = new int[] { 0, 1, 2, 3, 5, 8 };
 
     public static void send(Context context, final String ackId, final String postId, final String type, final boolean isIdLoaded, ResolvePromise promise) {
         final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
-        final ReadableMap credentials = MattermostCredentialsHelper.getCredentialsSync(reactApplicationContext);
-        final String serverUrl = credentials.getString("serverUrl");
-        final String token = credentials.getString("token");
 
-        Log.i("ReactNative", String.format("Send receipt delivery ACK=%s TYPE=%s to URL=%s with ID-LOADED=%s", ackId, type, serverUrl, isIdLoaded));
-        execute(serverUrl, postId, token, ackId, type, isIdLoaded, promise);
+        MattermostCredentialsHelper.getCredentialsForCurrentServer(reactApplicationContext, new ResolvePromise() {
+            @Override
+            public void resolve(@Nullable Object value) {
+                if (value instanceof Boolean && !(Boolean)value) {
+                    return;
+                }
+
+                WritableMap map = (WritableMap) value;
+                if (map != null) {
+                    String token = map.getString("password");
+                    String serverUrl = map.getString("service");
+                    if (serverUrl.isEmpty()) {
+                        String[] credentials = token.split(",[ ]*");
+                        if (credentials.length == 2) {
+                            token = credentials[0];
+                            serverUrl = credentials[1];
+                        }
+                    }
+
+                    Log.i("ReactNative", String.format("Send receipt delivery ACK=%s TYPE=%s to URL=%s with ID-LOADED=%s", ackId, type, serverUrl, isIdLoaded));
+                    execute(serverUrl, postId, token, ackId, type, isIdLoaded, promise);
+                }
+            }
+        });
     }
 
     protected static void execute(String serverUrl, String postId, String token, String ackId, String type, boolean isIdLoaded, ResolvePromise promise) {
@@ -60,7 +84,6 @@ public class ReceiptDelivery {
             return;
         }
 
-        assert serverUrl != null;
         final HttpUrl url = HttpUrl.parse(
             String.format("%s/api/v4/notifications/ack", serverUrl.replaceAll("/$", "")));
         if (url != null) {
@@ -81,7 +104,6 @@ public class ReceiptDelivery {
     private static void makeServerRequest(OkHttpClient client, Request request, Boolean isIdLoaded, int reRequestCount, ResolvePromise promise) {
         try {
             Response response = client.newCall(request).execute();
-            assert response.body() != null;
             String responseBody = response.body().string();
             if (response.code() != 200) {
                 switch (response.code()) {
@@ -107,8 +129,9 @@ public class ReceiptDelivery {
 
             JSONObject jsonResponse = new JSONObject(responseBody);
             Bundle bundle = new Bundle();
-            String[] keys = new String[]{"post_id", "root_id", "category", "message", "team_id", "channel_id", "channel_name", "type", "sender_id", "sender_name", "version"};
-            for (String key : keys) {
+            String keys[] = new String[]{"post_id", "category", "message", "team_id", "channel_id", "channel_name", "type", "sender_id", "sender_name", "version"};
+            for (int i = 0; i < keys.length; i++) {
+                String key = keys[i];
                 if (jsonResponse.has(key)) {
                     bundle.putString(key, jsonResponse.getString(key));
                 }
@@ -119,14 +142,12 @@ public class ReceiptDelivery {
             if (isIdLoaded) {
                 try {
                     reRequestCount++;
-                    if (reRequestCount < FIBONACCI_BACKOFF.length) {
-                        Log.i("ReactNative", "Retry attempt " + reRequestCount + " with backoff delay: " + FIBONACCI_BACKOFF[reRequestCount] + " seconds");
-                        Thread.sleep(FIBONACCI_BACKOFF[reRequestCount] * 1000);
-                        makeServerRequest(client, request, true, reRequestCount, promise);
+                    if (reRequestCount < FIBONACCI_BACKOFFS.length) {
+                        Log.i("ReactNative", "Retry attempt " + reRequestCount + " with backoff delay: " + FIBONACCI_BACKOFFS[reRequestCount] + " seconds");
+                        Thread.sleep(FIBONACCI_BACKOFFS[reRequestCount] * 1000);
+                        makeServerRequest(client, request, isIdLoaded, reRequestCount, promise);
                     }
-                } catch(InterruptedException ie) {
-                    // nothing to do
-                }
+                } catch(InterruptedException ie) {}    
             }
 
             promise.reject("Receipt delivery failure", e.toString());

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

@@ -3,9 +3,11 @@ 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;
@@ -13,18 +15,18 @@ import android.util.Log;
 import android.text.TextUtils;
 
 import android.os.ParcelFileDescriptor;
-
 import java.io.*;
 import java.nio.channels.FileChannel;
-import java.util.Objects;
 
 // 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 (DocumentsContract.isDocumentUri(context, uri)) {
+        if (isKitKatOrNewer && DocumentsContract.isDocumentUri(context, uri)) {
             // ExternalStorageProvider
             if (isExternalStorageDocument(uri)) {
                 final String docId = DocumentsContract.getDocumentId(uri);
@@ -109,7 +111,6 @@ public class RealPathUtil {
             int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
             returnCursor.moveToFirst();
             fileName = sanitizeFilename(returnCursor.getString(nameIndex));
-            returnCursor.close();
 
         } catch (Exception e) {
             // just continue to get the filename with the last segment of the path
@@ -117,7 +118,7 @@ public class RealPathUtil {
 
         try {
             if (TextUtils.isEmpty(fileName)) {
-                fileName = sanitizeFilename(uri.getLastPathSegment().trim());
+                fileName = sanitizeFilename(uri.getLastPathSegment().toString().trim());
             }
 
 
@@ -126,6 +127,7 @@ public class RealPathUtil {
                 cacheDir.mkdirs();
             }
 
+            String mimeType = getMimeType(uri.getPath());
             tmpFile = new File(cacheDir, fileName);
             tmpFile.createNewFile();
 
@@ -232,7 +234,7 @@ public class RealPathUtil {
 
     private static void deleteRecursive(File fileOrDirectory) {
         if (fileOrDirectory.isDirectory())
-            for (File child : Objects.requireNonNull(fileOrDirectory.listFiles()))
+            for (File child : fileOrDirectory.listFiles())
                 deleteRecursive(child);
 
         fileOrDirectory.delete();

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

@@ -1,32 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/splashscreen_bg"
-    android:orientation="vertical">
+    android:background="#ffffff"
+    android:gravity="center_horizontal"
+    tools:context=".SplashScreenActivity">
 
     <ImageView
-        android:id="@+id/splashBackgroundImage"
+        android:id="@+id/imgLogo"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:src="@drawable/splash_background"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/splashIcon"
-        android:layout_width="96dp"
-        android:layout_height="96dp"
-        android:contentDescription="@string/app_name"
-        android:src="@drawable/splash"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:adjustViewBounds="true"
+        android:src="@drawable/splash" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

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

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

@@ -2,5 +2,4 @@
 <resources>
     <color name="white">#FFFFFF</color>
     <color name="transparent">#00000000</color>
-    <color name="splashscreen_bg">#FFFFFF</color>
-</resources>
+</resources>

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

@@ -3,8 +3,8 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="android:windowBackground">@color/splashscreen_bg</item>
-
+        <item name="android:windowBackground">@android:color/transparent</item>
+        
     </style>
 
 </resources>

android/build.gradle

@@ -2,15 +2,15 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "30.0.2"
+        buildToolsVersion = "29.0.3"
         minSdkVersion = 24
-        compileSdkVersion = 30
-        targetSdkVersion = 30
+        compileSdkVersion = 29
+        targetSdkVersion = 29
         supportLibVersion = "28.0.0"
-        kotlinVersion = "1.5.30"
+        kotlinVersion = "1.3.61"
         firebaseVersion = "21.0.0"
         RNNKotlinVersion = kotlinVersion
-        ndkVersion = "21.4.7075529"
+        ndkVersion = "21.1.6352462"
  
     }
     repositories {
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath 'com.google.gms:google-services:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
@@ -29,6 +29,19 @@ buildscript {
     }
 }
 
+subprojects {
+    afterEvaluate {
+        android {
+            compileSdkVersion rootProject.ext.compileSdkVersion
+            buildToolsVersion rootProject.ext.buildToolsVersion
+            defaultConfig {
+                minSdkVersion rootProject.ext.minSdkVersion
+                targetSdkVersion rootProject.ext.targetSdkVersion
+            }
+        }
+    }
+}
+
 allprojects {
     repositories {
         google()
@@ -52,6 +65,9 @@ allprojects {
         maven {
             url "https://www.jitpack.io"
         }
+        maven { 
+            url ("https://dl.bintray.com/rudderstack/rudderstack")
+        }
         maven {
             url "$rootDir/../node_modules/detox/Detox-android"
         }

android/gradle.properties

@@ -30,4 +30,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.99.0
+FLIPPER_VERSION=0.75.1

android/gradle/wrapper/gradle-wrapper.properties

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

app/actions/apps.ts

@@ -1,17 +1,25 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {sendEphemeralPost} from '@actions/views/post';
 import {Client4} from '@client/rest';
-import {AppCallTypes, AppCallResponseTypes} from '@mm-redux/constants/apps';
+
 import {ActionFunc, DispatchFunc} from '@mm-redux/types/actions';
-import {AppCallResponse, AppCallRequest, AppCallType, AppContext} from '@mm-redux/types/apps';
-import {CommandArgs} from '@mm-redux/types/integrations';
+import {AppCallResponse, AppForm, AppCallRequest, AppCallType, AppContext} from '@mm-redux/types/apps';
 import {Post} from '@mm-redux/types/posts';
-import {cleanForm, makeCallErrorResponse} from '@utils/apps';
+
+import {AppCallTypes, AppCallResponseTypes} from '@mm-redux/constants/apps';
+import {handleGotoLocation} from '@mm-redux/actions/integrations';
+import {showModal} from './navigation';
+import {Theme} from '@mm-redux/types/preferences';
+import CompassIcon from '@components/compass_icon';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
+import EphemeralStore from '@store/ephemeral_store';
+import {makeCallErrorResponse} from '@utils/apps';
+import {sendEphemeralPost} from '@actions/views/post';
+import {CommandArgs} from '@mm-redux/types/integrations';
 
 export function doAppCall<Res=unknown>(call: AppCallRequest, type: AppCallType, intl: any): ActionFunc {
-    return async () => {
+    return async (dispatch, getState) => {
         try {
             const res = await Client4.executeAppCall(call, type) as AppCallResponse<Res>;
             const responseType = res.type || AppCallResponseTypes.OK;
@@ -30,7 +38,10 @@ export function doAppCall<Res=unknown>(call: AppCallRequest, type: AppCallType,
                     return {error: makeCallErrorResponse(errMsg)};
                 }
 
-                cleanForm(res.form);
+                const screen = EphemeralStore.getNavigationTopComponentId();
+                if (type === AppCallTypes.SUBMIT && screen !== 'AppForm') {
+                    showAppForm(res.form, call, getTheme(getState()));
+                }
 
                 return {data: res};
             }
@@ -51,6 +62,8 @@ export function doAppCall<Res=unknown>(call: AppCallRequest, type: AppCallType,
                     return {error: makeCallErrorResponse(errMsg)};
                 }
 
+                dispatch(handleGotoLocation(res.navigate_to_url, intl));
+
                 return {data: res};
             default: {
                 const errMsg = intl.formatMessage({
@@ -72,6 +85,41 @@ export function doAppCall<Res=unknown>(call: AppCallRequest, type: AppCallType,
     };
 }
 
+const showAppForm = async (form: AppForm, call: AppCallRequest, theme: Theme) => {
+    const closeButton = await CompassIcon.getImageSource('close', 24, theme.sidebarHeaderTextColor);
+
+    let submitButtons = [{
+        id: 'submit-form',
+        showAsAction: 'always',
+        text: 'Submit',
+    }];
+    if (form.submit_buttons) {
+        const options = form.fields.find((f) => f.name === form.submit_buttons)?.options;
+        const newButtons = options?.map((o) => {
+            return {
+                id: 'submit-form_' + o.value,
+                showAsAction: 'always',
+                text: o.label,
+            };
+        });
+        if (newButtons && newButtons.length > 0) {
+            submitButtons = newButtons;
+        }
+    }
+    const options = {
+        topBar: {
+            leftButtons: [{
+                id: 'close-dialog',
+                icon: closeButton,
+            }],
+            rightButtons: submitButtons,
+        },
+    };
+
+    const passProps = {form, call};
+    showModal('AppForm', form.title, passProps, options);
+};
+
 export function postEphemeralCallResponseForPost(response: AppCallResponse, message: string, post: Post): ActionFunc {
     return (dispatch: DispatchFunc) => {
         return dispatch(sendEphemeralPost(

app/actions/device/index.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {DeviceTypes} from '@constants';
+import {DeviceTypes} from 'app/constants';
 
 export function connection(isOnline) {
     return async (dispatch, getState) => {
@@ -15,6 +15,13 @@ export function connection(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,
@@ -44,4 +51,5 @@ export default {
     setDeviceDimensions,
     setDeviceOrientation,
     setDeviceAsTablet,
+    setStatusBarHeight,
 };

app/actions/helpers/channels.test.js

@@ -4,8 +4,10 @@
 /* eslint-disable no-import-assign */
 
 import {Client4} from '@client/rest';
-import {PreferenceTypes} from '@mm-redux/action_types';
+
 import {Preferences} from '@mm-redux/constants';
+import {PreferenceTypes} from '@mm-redux/action_types';
+
 import * as CommonSelectors from '@mm-redux/selectors/entities/common';
 import * as PreferenceSelectors from '@mm-redux/selectors/entities/preferences';
 import * as PreferenceUtils from '@mm-redux/utils/preference_utils';

app/actions/helpers/channels.ts

@@ -1,21 +1,23 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {Client4} from '@client/rest';
 import {ChannelTypes, PreferenceTypes, RoleTypes, UserTypes} from '@mm-redux/action_types';
+import {Client4} from '@client/rest';
 import {General, Preferences} from '@mm-redux/constants';
 import {getCurrentChannelId, getRedirectChannelNameForTeam, getChannelsNameMapInTeam} from '@mm-redux/selectors/entities/channels';
 import {getConfig} from '@mm-redux/selectors/entities/general';
 import {getMyPreferences} from '@mm-redux/selectors/entities/preferences';
 import {getCurrentUserId, getUsers, getUserIdsInChannels} from '@mm-redux/selectors/entities/users';
+import {getChannelByName as selectChannelByName, getUserIdFromChannelName, isAutoClosed} from '@mm-redux/utils/channel_utils';
+import {getPreferenceKey} from '@mm-redux/utils/preference_utils';
+
 import {ActionResult, GenericAction} from '@mm-redux/types/actions';
 import {Channel, ChannelMembership} from '@mm-redux/types/channels';
 import {PreferenceType} from '@mm-redux/types/preferences';
 import {GlobalState} from '@mm-redux/types/store';
 import {UserProfile} from '@mm-redux/types/users';
 import {RelationOneToMany} from '@mm-redux/types/utilities';
-import {getChannelByName as selectChannelByName, getUserIdFromChannelName, isAutoClosed} from '@mm-redux/utils/channel_utils';
-import {getPreferenceKey} from '@mm-redux/utils/preference_utils';
+
 import {isDirectChannelVisible, isGroupChannelVisible} from '@utils/channels';
 import {buildPreference} from '@utils/preferences';
 
@@ -118,7 +120,7 @@ export async function fetchMyChannelMember(channelId: string) {
     }
 }
 
-export function markChannelAsUnread(state: GlobalState, teamId: string, channelId: string, mentions: Array<string>, isRoot = false): Array<GenericAction> {
+export function markChannelAsUnread(state: GlobalState, teamId: string, channelId: string, mentions: Array<string>): Array<GenericAction> {
     const {myMembers} = state.entities.channels;
     const {currentUserId} = state.entities.users;
 
@@ -127,7 +129,6 @@ export function markChannelAsUnread(state: GlobalState, teamId: string, channelI
         data: {
             channelId,
             amount: 1,
-            amountRoot: isRoot ? 1 : 0,
         },
     }, {
         type: ChannelTypes.INCREMENT_UNREAD_MSG_COUNT,
@@ -135,7 +136,6 @@ export function markChannelAsUnread(state: GlobalState, teamId: string, channelI
             teamId,
             channelId,
             amount: 1,
-            amountRoot: isRoot ? 1 : 0,
             onlyMentions: myMembers[channelId] && myMembers[channelId].notify_props &&
                 myMembers[channelId].notify_props.mark_unread === General.MENTION,
         },
@@ -148,7 +148,6 @@ export function markChannelAsUnread(state: GlobalState, teamId: string, channelI
                 teamId,
                 channelId,
                 amount: 1,
-                amountRoot: isRoot ? 1 : 0,
             },
         });
     }
@@ -328,8 +327,7 @@ function fetchDirectMessageProfileIfNeeded(state: GlobalState, channel: Channel,
     const otherUserId = getUserIdFromChannelName(currentUserId, channel.name);
     const otherUser = users[otherUserId];
     const dmVisible = isDirectChannelVisible(currentUserId, myPreferences, channel);
-    const {serverVersion} = state.entities.general;
-    const dmAutoClosed = isAutoClosed(config, myPreferences, channel, channel.last_post_at, otherUser ? otherUser.delete_at : 0, currentChannelId, undefined, serverVersion);
+    const dmAutoClosed = isAutoClosed(config, myPreferences, channel, channel.last_post_at, otherUser ? otherUser.delete_at : 0, currentChannelId);
     const member = channelMembers.find((cm) => cm.channel_id === channel.id);
     const dmIsUnread = member ? member.mention_count > 0 : false;
     const dmFetchProfile = dmIsUnread || (dmVisible && !dmAutoClosed);
@@ -356,9 +354,7 @@ function fetchGroupMessageProfilesIfNeeded(state: GlobalState, channel: Channel,
     const myPreferences = getMyPreferences(state);
     const config = getConfig(state);
     const gmVisible = isGroupChannelVisible(myPreferences, channel);
-    const {serverVersion} = state.entities.general;
-    const currentChannelId = getCurrentChannelId(state);
-    const gmAutoClosed = isAutoClosed(config, myPreferences, channel, channel.last_post_at, 0, currentChannelId, undefined, serverVersion);
+    const gmAutoClosed = isAutoClosed(config, myPreferences, channel, channel.last_post_at, 0);
     const channelMember = channelMembers.find((cm) => cm.channel_id === channel.id);
     let hasMentions = false;
     let isUnread = false;

app/actions/navigation/index.js

@@ -1,16 +1,15 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import merge from 'deepmerge';
 import {Keyboard, Platform} from 'react-native';
 import {Navigation} from 'react-native-navigation';
+import merge from 'deepmerge';
 
-import CompassIcon from '@components/compass_icon';
-import {DeviceTypes, NavigationTypes} from '@constants';
-import {CHANNEL} from '@constants/screen';
 import {Preferences} from '@mm-redux/constants';
 import {getTheme} from '@mm-redux/selectors/entities/preferences';
 import EventEmmiter from '@mm-redux/utils/event_emitter';
+
+import {DeviceTypes, NavigationTypes} from '@constants';
 import EphemeralStore from '@store/ephemeral_store';
 import Store from '@store/store';
 
@@ -34,8 +33,8 @@ export function resetToChannel(passProps = {}) {
     const stack = {
         children: [{
             component: {
-                id: CHANNEL,
-                name: CHANNEL,
+                id: NavigationTypes.CHANNEL_SCREEN,
+                name: NavigationTypes.CHANNEL_SCREEN,
                 passProps,
                 options: {
                     layout: {
@@ -92,7 +91,7 @@ export function resetToChannel(passProps = {}) {
 }
 
 export function resetToSelectServer(allowOtherServers) {
-    const theme = Preferences.THEMES.denim;
+    const theme = Preferences.THEMES.default;
 
     EphemeralStore.clearNavigationComponents();
 
@@ -292,51 +291,8 @@ export function showModal(name, title, passProps = {}, options = {}) {
 }
 
 export function showModalOverCurrentContext(name, passProps = {}, options = {}) {
-    const title = passProps.title || '';
-
-    let animations;
-    switch (Platform.OS) {
-    case 'android':
-        animations = {
-            showModal: {
-                waitForRender: true,
-                alpha: {
-                    from: 0,
-                    to: 1,
-                    duration: 250,
-                },
-            },
-            dismissModal: {
-                alpha: {
-                    from: 1,
-                    to: 0,
-                    duration: 250,
-                },
-            },
-        };
-        break;
-    default:
-        animations = {
-            showModal: {
-                enter: {
-                    enabled: false,
-                },
-                exit: {
-                    enabled: false,
-                },
-            },
-            dismissModal: {
-                enter: {
-                    enabled: false,
-                },
-                exit: {
-                    enabled: false,
-                },
-            },
-        };
-        break;
-    }
-
+    const title = '';
+    const animationsEnabled = (Platform.OS === 'android').toString();
     const defaultOptions = {
         modalPresentationStyle: 'overCurrentContext',
         layout: {
@@ -347,7 +303,25 @@ export function showModalOverCurrentContext(name, passProps = {}, options = {})
             visible: false,
             height: 0,
         },
-        animations,
+        animations: {
+            showModal: {
+                waitForRender: true,
+                enabled: animationsEnabled,
+                alpha: {
+                    from: 0,
+                    to: 1,
+                    duration: 250,
+                },
+            },
+            dismissModal: {
+                enabled: animationsEnabled,
+                alpha: {
+                    from: 1,
+                    to: 0,
+                    duration: 250,
+                },
+            },
+        },
     };
     const mergeOptions = merge(defaultOptions, options);
 
@@ -373,40 +347,12 @@ export function showSearchModal(initialValue = '') {
     showModal(name, title, passProps, options);
 }
 
-export const showAppForm = async (form, call, theme) => {
-    const closeButton = await CompassIcon.getImageSource('close', 24, theme.sidebarHeaderTextColor);
-
-    let submitButtons;
-    const customSubmitButtons = form.submit_buttons && form.fields.find((f) => f.name === form.submit_buttons)?.options;
-
-    if (!customSubmitButtons?.length) {
-        submitButtons = [{
-            id: 'submit-form',
-            showAsAction: 'always',
-            text: 'Submit',
-        }];
-    }
-
-    const options = {
-        topBar: {
-            leftButtons: [{
-                id: 'close-dialog',
-                icon: closeButton,
-            }],
-            rightButtons: submitButtons,
-        },
-    };
-
-    const passProps = {form, call};
-    showModal('AppForm', form.title, passProps, options);
-};
-
 export async function dismissModal(options = {}) {
     if (!EphemeralStore.hasModalsOpened()) {
         return;
     }
 
-    const componentId = options.componentId || EphemeralStore.getNavigationTopComponentId();
+    const componentId = EphemeralStore.getNavigationTopComponentId();
 
     try {
         await Navigation.dismissModal(componentId, options);
@@ -417,20 +363,17 @@ export async function dismissModal(options = {}) {
     }
 }
 
-export async function dismissAllModals(options) {
+export async function dismissAllModals(options = {}) {
     if (!EphemeralStore.hasModalsOpened()) {
         return;
     }
 
-    if (Platform.OS === 'ios') {
-        const modals = [...EphemeralStore.navigationModalStack];
-        for await (const modal of modals) {
-            await Navigation.dismissModal(modal, options);
-            EphemeralStore.removeNavigationModal(modal);
-        }
-    } else {
+    try {
         await Navigation.dismissAllModals(options);
         EphemeralStore.clearNavigationModals();
+    } catch (error) {
+        // RNN returns a promise rejection if there are no modals to
+        // dismiss. We'll do nothing in this case.
     }
 }
 
@@ -457,13 +400,6 @@ export function showOverlay(name, passProps, options = {}) {
         overlay: {
             interceptTouchOutside: false,
         },
-        ...Platform.select({
-            android: {
-                statusBar: {
-                    drawBehind: true,
-                },
-            },
-        }),
     };
 
     Navigation.showOverlay({
@@ -505,7 +441,7 @@ export function closeMainSideMenu() {
     }
 
     Keyboard.dismiss();
-    Navigation.mergeOptions(CHANNEL, {
+    Navigation.mergeOptions(NavigationTypes.CHANNEL_SCREEN, {
         sideMenu: {
             left: {visible: false},
         },
@@ -517,7 +453,7 @@ export function enableMainSideMenu(enabled, visible = true) {
         return;
     }
 
-    Navigation.mergeOptions(CHANNEL, {
+    Navigation.mergeOptions(NavigationTypes.CHANNEL_SCREEN, {
         sideMenu: {
             left: {enabled, visible},
         },
@@ -530,7 +466,7 @@ export function openSettingsSideMenu() {
     }
 
     Keyboard.dismiss();
-    Navigation.mergeOptions(CHANNEL, {
+    Navigation.mergeOptions(NavigationTypes.CHANNEL_SCREEN, {
         sideMenu: {
             right: {visible: true},
         },
@@ -543,7 +479,7 @@ export function closeSettingsSideMenu() {
     }
 
     Keyboard.dismiss();
-    Navigation.mergeOptions(CHANNEL, {
+    Navigation.mergeOptions(NavigationTypes.CHANNEL_SCREEN, {
         sideMenu: {
             right: {visible: false},
         },

app/actions/navigation/index.test.js

@@ -1,59 +1,45 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import merge from 'deepmerge';
 import {Platform} from 'react-native';
 import {Navigation} from 'react-native-navigation';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
+import merge from 'deepmerge';
+
+import EventEmitter from '@mm-redux/utils/event_emitter';
 
 import * as NavigationActions from '@actions/navigation';
-import {NavigationTypes} from '@constants';
 import Preferences from '@mm-redux/constants/preferences';
-import EventEmitter from '@mm-redux/utils/event_emitter';
 import EphemeralStore from '@store/ephemeral_store';
 import intitialState from '@store/initial_state';
 import Store from '@store/store';
+import {NavigationTypes} from '@constants';
 
 jest.unmock('@actions/navigation');
+jest.mock('@store/ephemeral_store', () => ({
+    getNavigationTopComponentId: jest.fn(),
+    clearNavigationComponents: jest.fn(),
+    addNavigationModal: jest.fn(),
+    hasModalsOpened: jest.fn().mockReturnValue(true),
+}));
+
 const mockStore = configureMockStore([thunk]);
 const store = mockStore(intitialState);
 Store.redux = store;
 
-// Mock EphemeralStore add/remove modal
-const add = EphemeralStore.addNavigationModal;
-const remove = EphemeralStore.removeNavigationModal;
-EphemeralStore.removeNavigationModal = (componentId) => {
-    remove(componentId);
-    EphemeralStore.removeNavigationComponentId(componentId);
-};
-
-EphemeralStore.addNavigationModal = (componentId) => {
-    add(componentId);
-    EphemeralStore.addNavigationComponentId(componentId);
-};
-
 describe('@actions/navigation', () => {
     const topComponentId = 'top-component-id';
     const name = 'name';
     const title = 'title';
-    const theme = Preferences.THEMES.denim;
+    const theme = Preferences.THEMES.default;
     const passProps = {
         testProp: 'prop',
     };
     const options = {
         testOption: 'test',
     };
-
-    beforeEach(() => {
-        EphemeralStore.clearNavigationComponents();
-        EphemeralStore.clearNavigationModals();
-
-        // mock that we have a root screen
-        EphemeralStore.addNavigationComponentId(topComponentId);
-    });
-
-    // EphemeralStore.getNavigationTopComponentId.mockReturnValue(topComponentId);
+    EphemeralStore.getNavigationTopComponentId.mockReturnValue(topComponentId);
 
     test('resetToChannel should call Navigation.setRoot', () => {
         const setRoot = jest.spyOn(Navigation, 'setRoot');
@@ -300,6 +286,7 @@ describe('@actions/navigation', () => {
     test('showModalOverCurrentContext should call Navigation.showModal', () => {
         const showModal = jest.spyOn(Navigation, 'showModal');
 
+        const animationsEnabled = (Platform.OS === 'android').toString();
         const showModalOverCurrentContextTitle = '';
         const showModalOverCurrentContextOptions = {
             modalPresentationStyle: 'overCurrentContext',
@@ -313,19 +300,20 @@ describe('@actions/navigation', () => {
             },
             animations: {
                 showModal: {
-                    enter: {
-                        enabled: false,
-                    },
-                    exit: {
-                        enabled: false,
+                    waitForRender: true,
+                    enabled: animationsEnabled,
+                    alpha: {
+                        from: 0,
+                        to: 1,
+                        duration: 250,
                     },
                 },
                 dismissModal: {
-                    enter: {
-                        enabled: false,
-                    },
-                    exit: {
-                        enabled: false,
+                    enabled: animationsEnabled,
+                    alpha: {
+                        from: 1,
+                        to: 0,
+                        duration: 250,
                     },
                 },
             },
@@ -437,20 +425,15 @@ describe('@actions/navigation', () => {
     test('dismissModal should call Navigation.dismissModal', async () => {
         const dismissModal = jest.spyOn(Navigation, 'dismissModal');
 
-        NavigationActions.showModal('First', 'First Modal', passProps, options);
-
         await NavigationActions.dismissModal(options);
-        expect(dismissModal).toHaveBeenCalledWith('First', options);
+        expect(dismissModal).toHaveBeenCalledWith(topComponentId, options);
     });
 
     test('dismissAllModals should call Navigation.dismissAllModals', async () => {
-        const dismissModal = jest.spyOn(Navigation, 'dismissModal');
-
-        NavigationActions.showModal('First', 'First Modal', passProps, options);
-        NavigationActions.showModal('Second', 'Second Modal', passProps, options);
+        const dismissAllModals = jest.spyOn(Navigation, 'dismissAllModals');
 
         await NavigationActions.dismissAllModals(options);
-        expect(dismissModal).toHaveBeenCalledTimes(2);
+        expect(dismissAllModals).toHaveBeenCalledWith(options);
     });
 
     test('mergeNavigationOptions should call Navigation.mergeOptions', () => {
@@ -510,15 +493,12 @@ describe('@actions/navigation', () => {
     });
 
     test('dismissAllModalsAndPopToRoot should call Navigation.dismissAllModals, Navigation.popToRoot, and emit event', async () => {
-        const dismissModal = jest.spyOn(Navigation, 'dismissModal');
+        const dismissAllModals = jest.spyOn(Navigation, 'dismissAllModals');
         const popToRoot = jest.spyOn(Navigation, 'popToRoot');
         EventEmitter.emit = jest.fn();
 
-        NavigationActions.showModal('First', 'First Modal', passProps, options);
-        NavigationActions.showModal('Second', 'Second Modal', passProps, options);
-
         await NavigationActions.dismissAllModalsAndPopToRoot();
-        expect(dismissModal).toHaveBeenCalledTimes(2);
+        expect(dismissAllModals).toHaveBeenCalled();
         expect(popToRoot).toHaveBeenCalledWith(topComponentId);
         expect(EventEmitter.emit).toHaveBeenCalledWith(NavigationTypes.NAVIGATION_DISMISS_AND_POP_TO_ROOT);
     });

app/actions/views/announcement.js

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

app/actions/views/channel.js

@@ -1,18 +1,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-/* eslint-disable max-lines */
-
 import {batchActions} from 'redux-batched-actions';
 
-import {lastChannelIdForTeam, loadSidebarDirectMessagesProfiles} from '@actions/helpers/channels';
-import {getPosts, getPostsBefore, getPostsSince, loadUnreadChannelPosts} from '@actions/views/post';
-import {Client4} from '@client/rest';
-import {ViewTypes} from '@constants';
-import {INSERT_TO_COMMENT, INSERT_TO_DRAFT} from '@constants/post_draft';
+import {ViewTypes} from 'app/constants';
+
 import {ChannelTypes, RoleTypes, GroupTypes} from '@mm-redux/action_types';
-import {fetchAppBindings} from '@mm-redux/actions/apps';
-import {fetchMyCategories} from '@mm-redux/actions/channel_categories';
 import {
     fetchMyChannelsAndMembers,
     getChannelByName,
@@ -20,8 +13,12 @@ import {
     leaveChannel as serviceLeaveChannel,
 } from '@mm-redux/actions/channels';
 import {savePreferences} from '@mm-redux/actions/preferences';
+import {getLicense} from '@mm-redux/selectors/entities/general';
 import {addUserToTeam, getTeamByName, removeUserFromTeam, selectTeam} from '@mm-redux/actions/teams';
+import {Client4} from '@client/rest';
 import {General, Preferences} from '@mm-redux/constants';
+import {getPostIdsInChannel} from '@mm-redux/selectors/entities/posts';
+import {isMinimumServerVersion} from '@mm-redux/utils/helpers';
 import {
     getCurrentChannelId,
     getRedirectChannelNameForTeam,
@@ -29,22 +26,21 @@ import {
     getMyChannelMemberships,
     isManuallyUnread,
 } from '@mm-redux/selectors/entities/channels';
-import {getLicense} from '@mm-redux/selectors/entities/general';
-import {getPostIdsInChannel} from '@mm-redux/selectors/entities/posts';
-import {isCollapsedThreadsEnabled} from '@mm-redux/selectors/entities/preferences';
-import {getTeamByName as selectTeamByName, getCurrentTeam, getTeamMemberships} from '@mm-redux/selectors/entities/teams';
 import {getCurrentUserId} from '@mm-redux/selectors/entities/users';
+import {getTeamByName as selectTeamByName, getCurrentTeam, getTeamMemberships} from '@mm-redux/selectors/entities/teams';
+
 import {getChannelByName as selectChannelByName, getChannelsIdForTeam} from '@mm-redux/utils/channel_utils';
 import EventEmitter from '@mm-redux/utils/event_emitter';
+
+import {lastChannelIdForTeam, loadSidebarDirectMessagesProfiles} from '@actions/helpers/channels';
+import {getPosts, getPostsBefore, getPostsSince, loadUnreadChannelPosts} from '@actions/views/post';
+import {INSERT_TO_COMMENT, INSERT_TO_DRAFT} from '@constants/post_draft';
 import {getChannelReachable} from '@selectors/channel';
-import {getViewingGlobalThreads} from '@selectors/threads';
-import telemetry, {PERF_MARKERS} from '@telemetry';
-import {appsEnabled} from '@utils/apps';
-import {shouldShowLegacySidebar} from '@utils/categories';
+import telemetry from '@telemetry';
 import {isDirectChannelVisible, isGroupChannelVisible, getChannelSinceValue, privateChannelJoinPrompt} from '@utils/channels';
 import {isPendingPost} from '@utils/general';
-
-import {handleNotViewingGlobalThreadsScreen} from './threads';
+import {fetchAppBindings} from '@mm-redux/actions/apps';
+import {appsEnabled} from '@utils/apps';
 
 const MAX_RETRIES = 3;
 
@@ -128,11 +124,9 @@ export function fetchPostActionWithRetry(action, maxTries = MAX_RETRIES) {
 export function selectInitialChannel(teamId) {
     return (dispatch, getState) => {
         const state = getState();
-        const collapsedThreadsEnabled = isCollapsedThreadsEnabled(state);
-        if (!collapsedThreadsEnabled || (collapsedThreadsEnabled && !getViewingGlobalThreads(state))) {
-            const channelId = lastChannelIdForTeam(state, teamId);
-            dispatch(handleSelectChannel(channelId));
-        }
+        const channelId = lastChannelIdForTeam(state, teamId);
+
+        dispatch(handleSelectChannel(channelId));
     };
 }
 
@@ -200,14 +194,6 @@ export function handleSelectChannel(channelId) {
         const member = myMembers[channelId];
 
         if (channel) {
-            let markerExtra;
-            if (channel.display_name) {
-                markerExtra = `Channel: ${channel.display_name}`;
-            } else {
-                markerExtra = `Channel: ${channel.type === General.DM_CHANNEL ? 'Direct Channel' : channel.name}`;
-            }
-
-            telemetry.start([PERF_MARKERS.CHANNEL_RENDER], Date.now(), [markerExtra]);
             dispatch(loadPostsIfNecessaryWithRetry(channelId));
 
             let previousChannelId = null;
@@ -225,9 +211,6 @@ export function handleSelectChannel(channelId) {
                     teamId: channel.team_id || currentTeamId,
                 },
             });
-            if (getViewingGlobalThreads(state)) {
-                actions.push(handleNotViewingGlobalThreadsScreen());
-            }
 
             dispatch(batchActions(actions, 'BATCH_SWITCH_CHANNEL'));
 
@@ -256,7 +239,7 @@ export function handleSelectChannelByName(channelName, teamName, errorHandler, i
         // Fallback to API response error, if any.
         if (teamError) {
             if (errorHandler) {
-                errorHandler(intl);
+                errorHandler();
             }
             return {error: teamError};
         }
@@ -385,12 +368,11 @@ export function markAsViewedAndReadBatch(state, channelId, prevChannelId = '', m
 
         if (channel) {
             const unreadMessageCount = channel.total_msg_count - member.msg_count;
-            const unreadMessageCountRoot = channel.total_msg_count_root - member.msg_count_root;
             actions.push({
                 type: ChannelTypes.SET_UNREAD_MSG_COUNT,
                 data: {
                     channelId,
-                    count: isCollapsedThreadsEnabled(state) ? unreadMessageCountRoot : unreadMessageCount,
+                    count: unreadMessageCount,
                 },
             }, {
                 type: ChannelTypes.DECREMENT_UNREAD_MSG_COUNT,
@@ -398,7 +380,6 @@ export function markAsViewedAndReadBatch(state, channelId, prevChannelId = '', m
                     teamId: channel.team_id,
                     channelId,
                     amount: unreadMessageCount,
-                    amountRoot: unreadMessageCountRoot,
                 },
             }, {
                 type: ChannelTypes.DECREMENT_UNREAD_MENTION_COUNT,
@@ -406,7 +387,6 @@ export function markAsViewedAndReadBatch(state, channelId, prevChannelId = '', m
                     teamId: channel.team_id,
                     channelId,
                     amount: member.mention_count,
-                    amountRoot: member.mention_count_root,
                 },
             });
         }
@@ -427,7 +407,6 @@ export function markAsViewedAndReadBatch(state, channelId, prevChannelId = '', m
                     teamId: prevChannel.team_id,
                     channelId: prevChannelId,
                     amount: prevChannel.total_msg_count - prevMember.msg_count,
-                    amountRoot: prevChannel.total_msg_count_root - prevMember.msg_count_root,
                 },
             }, {
                 type: ChannelTypes.DECREMENT_UNREAD_MENTION_COUNT,
@@ -435,7 +414,6 @@ export function markAsViewedAndReadBatch(state, channelId, prevChannelId = '', m
                     teamId: prevChannel.team_id,
                     channelId: prevChannelId,
                     amount: prevMember.mention_count,
-                    amountRoot: prevMember.mention_count_root,
                 },
             });
         }
@@ -517,7 +495,16 @@ export function closeGMChannel(channel) {
 
 export function refreshChannelWithRetry(channelId) {
     return async (dispatch) => {
-        return dispatch(fetchPostActionWithRetry(getPosts(channelId)));
+        dispatch(setChannelRefreshing(true));
+        const posts = await dispatch(fetchPostActionWithRetry(getPosts(channelId)));
+        const actions = [setChannelRefreshing(false)];
+
+        if (posts) {
+            actions.push(setChannelRetryFailed(false));
+        }
+
+        dispatch(batchActions(actions, 'BATCH_REEFRESH_CHANNEL'));
+        return posts;
     };
 }
 
@@ -544,6 +531,12 @@ export function leaveChannel(channel, reset = false) {
 }
 
 export function setChannelLoading(loading = true) {
+    if (loading) {
+        telemetry.start(['channel:loading']);
+    } else {
+        telemetry.end(['channel:loading']);
+    }
+
     return {
         type: ViewTypes.SET_CHANNEL_LOADER,
         loading,
@@ -592,6 +585,9 @@ export function increasePostVisibility(channelId, postId) {
             return true;
         }
 
+        telemetry.reset();
+        telemetry.start(['posts:loading']);
+
         dispatch({
             type: ViewTypes.LOADING_POSTS,
             data: true,
@@ -622,6 +618,8 @@ export function increasePostVisibility(channelId, postId) {
         }
 
         dispatch(batchActions(actions, 'BATCH_LOAD_MORE_POSTS'));
+        telemetry.end(['posts:loading']);
+        telemetry.save();
 
         return hasMorePost;
     };
@@ -640,10 +638,11 @@ function loadGroupData(isReconnect = false) {
         const actions = [];
         const team = getCurrentTeam(state);
         const currentUserId = getCurrentUserId(state);
+        const serverVersion = state.entities.general.serverVersion;
         const license = getLicense(state);
         const hasLicense = license?.IsLicensed === 'true' && license?.LDAPGroups === 'true';
 
-        if (hasLicense && team) {
+        if (hasLicense && team && isMinimumServerVersion(serverVersion, 5, 24)) {
             for (let i = 0; i <= MAX_RETRIES; i++) {
                 try {
                     if (team.group_constrained) {
@@ -747,10 +746,6 @@ export function loadChannelsForTeam(teamId, skipDispatch = false, isReconnect =
                 }
             }
 
-            if (!shouldShowLegacySidebar(state)) {
-                await dispatch(fetchMyCategories(teamId));
-            }
-
             if (data.channels) {
                 actions.push({
                     type: ChannelTypes.RECEIVED_MY_CHANNELS_WITH_MEMBERS,

app/actions/views/channel.test.js

@@ -4,13 +4,14 @@
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
+import testHelper from 'test/test_helper';
+
 import * as ChannelActions from '@actions/views/channel';
 import {ViewTypes} from '@constants';
 import {ChannelTypes} from '@mm-redux/action_types';
-import {General} from '@mm-redux/constants';
 import postReducer from '@mm-redux/reducers/entities/posts';
 import initialState from '@store/initial_state';
-import testHelper from '@test/test_helper';
+import {General} from '@mm-redux/constants';
 
 const {
     handleSelectChannel,
@@ -166,12 +167,6 @@ describe('Actions.Views.Channel', () => {
                     [currentTeamId]: {},
                 },
             },
-            general: {
-                config: {
-                    EnableLegacySidebar: 'true',
-                },
-                serverVersion: '5.12.0',
-            },
         },
     };
 
@@ -180,7 +175,7 @@ describe('Actions.Views.Channel', () => {
     channelSelectors.getCurrentChannelId = jest.fn(() => currentChannelId);
     channelSelectors.getMyChannelMember = jest.fn(() => ({data: {member: {}}}));
 
-    const appChannelSelectors = require('@selectors/channel');
+    const appChannelSelectors = require('app/selectors/channel');
     const getChannelReachableOriginal = appChannelSelectors.getChannelReachable;
     appChannelSelectors.getChannelReachable = jest.fn(() => true);
 

app/actions/views/client_upgrade.js

@@ -0,0 +1,10 @@
+// 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.ts

@@ -3,16 +3,18 @@
 
 import {intlShape} from 'react-intl';
 
-import {doAppCall, postEphemeralCallResponseForCommandArgs} from '@actions/apps';
-import {AppCommandParser} from '@components/autocomplete/slash_suggestion/app_command_parser/app_command_parser';
 import {IntegrationTypes} from '@mm-redux/action_types';
 import {executeCommand as executeCommandService} from '@mm-redux/actions/integrations';
-import {AppCallResponseTypes, AppCallTypes} from '@mm-redux/constants/apps';
 import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams';
+import {AppCallResponseTypes, AppCallTypes} from '@mm-redux/constants/apps';
 import {DispatchFunc, GetStateFunc, ActionFunc} from '@mm-redux/types/actions';
-import {AppCallResponse} from '@mm-redux/types/apps';
 import {CommandArgs} from '@mm-redux/types/integrations';
+
+import {AppCommandParser} from '@components/autocomplete/slash_suggestion/app_command_parser/app_command_parser';
+
+import {doAppCall, postEphemeralCallResponseForCommandArgs} from '@actions/apps';
 import {appsEnabled} from '@utils/apps';
+import {AppCallResponse} from '@mm-redux/types/apps';
 
 export function executeCommand(message: string, channelId: string, rootId: string, intl: typeof intlShape): ActionFunc {
     return async (dispatch: DispatchFunc, getState: GetStateFunc) => {
@@ -24,6 +26,7 @@ export function executeCommand(message: string, channelId: string, rootId: strin
             channel_id: channelId,
             team_id: teamId,
             root_id: rootId,
+            parent_id: rootId,
         };
 
         let msg = message;
@@ -39,7 +42,7 @@ export function executeCommand(message: string, channelId: string, rootId: strin
 
         const appsAreEnabled = appsEnabled(state);
         if (appsAreEnabled) {
-            const parser = new AppCommandParser({dispatch, getState}, intl, args.channel_id, args.team_id, args.root_id);
+            const parser = new AppCommandParser({dispatch, getState}, intl, args.channel_id, args.root_id);
             if (parser.isAppCommand(msg)) {
                 const {call, errorMessage} = await parser.composeCallFromCommand(msg);
                 const createErrorMessage = (errMessage: string) => {
@@ -66,14 +69,8 @@ export function executeCommand(message: string, channelId: string, rootId: strin
                     }
                     return {data: {}};
                 case AppCallResponseTypes.FORM:
-                    return {data: {
-                        form: callResp.form,
-                        call,
-                    }};
                 case AppCallResponseTypes.NAVIGATE:
-                    return {data: {
-                        goto_location: callResp.navigate_to_url,
-                    }};
+                    return {data: {}};
                 default:
                     return createErrorMessage(intl.formatMessage({
                         id: 'apps.error.responses.unknown_type',