Use commonmark & patch it instead of a fork (#5498 )

Bump Version to 1.45.1 and Build to 364 (#5558 )
* Bump app build number to 364 * Bump app version number to 1.45.1
2021-07-20 12:25:15 -04:00 · 2021-07-20 12:06:45 -04:00 · 2021-07-20 12:00:11 -04:00 · 2021-07-20 11:47:15 -04:00 · 2021-07-13 09:44:16 +02:00 · 2021-07-12 20:07:30 -04:00
1698 changed files with 73897 additions and 75328 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,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 +24,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

@@ -286,6 +286,14 @@ jobs:
          name: Post results to Mattermost
          command: go run ../security-automation-config/dependency-check/post_results.go

+  build-android-beta:
+    executor: android
+    steps:
+      - build-android
+      - persist
+      - save:
+          filename: "*.apk"
+
  build-android-release:
    executor: android
    steps:
@@ -325,6 +333,14 @@ jobs:
      - save:
          filename: "*.apk"

+  build-ios-beta:
+    executor: ios
+    steps:
+      - build-ios
+      - persist
+      - save:
+          filename: "*.ipa"
+
  build-ios-release:
    executor: ios
    steps:
@@ -400,6 +416,16 @@ jobs:
          target: android
          file: "*.apk"

+  deploy-android-beta:
+    executor:
+      name: android
+      resource_class: medium
+    steps:
+      - deploy-to-store:
+          task: "Deploy to Google Play"
+          target: android
+          file: "*.apk"
+
  deploy-ios-release:
    executor: ios
    steps:
@@ -408,6 +434,14 @@ jobs:
          target: ios
          file: "*.ipa"

+  deploy-ios-beta:
+    executor: ios
+    steps:
+      - deploy-to-store:
+          task: "Deploy to TestFlight"
+          target: ios
+          file: "*.ipa"
+
  github-release:
    executor:
      name: android
@@ -451,6 +485,27 @@ workflows:
                - /^build-android-\d+$/
                - /^build-android-release-\d+$/

+      - build-android-beta:
+          context: mattermost-mobile-android-beta
+          requires:
+            - test
+          filters:
+            branches:
+              only:
+                - /^build-\d+$/
+                - /^build-android-\d+$/
+                - /^build-android-beta-\d+$/
+      - deploy-android-beta:
+          context: mattermost-mobile-android-beta
+          requires:
+            - build-android-beta
+          filters:
+            branches:
+              only:
+                - /^build-\d+$/
+                - /^build-android-\d+$/
+                - /^build-android-beta-\d+$/
+
      - build-ios-release:
          context: mattermost-mobile-ios-release
          requires:
@@ -472,6 +527,27 @@ workflows:
                - /^build-ios-\d+$/
                - /^build-ios-release-\d+$/

+      - build-ios-beta:
+          context: mattermost-mobile-ios-beta
+          requires:
+            - test
+          filters:
+            branches:
+              only:
+                - /^build-\d+$/
+                - /^build-ios-\d+$/
+                - /^build-ios-beta-\d+$/
+      - deploy-ios-beta:
+          context: mattermost-mobile-ios-beta
+          requires:
+            - build-ios-beta
+          filters:
+            branches:
+              only:
+                - /^build-\d+$/
+                - /^build-ios-\d+$/
+                - /^build-ios-beta-\d+$/
+
      - build-android-pr:
          context: mattermost-mobile-android-pr
          requires:
@@ -514,6 +590,7 @@ workflows:
              only:
                - /^build-\d+$/
                - /^build-ios-\d+$/
+                - /^build-ios-beta-\d+$/
                - /^build-ios-sim-\d+$/
                
      - github-release:
@@ -525,4 +602,4 @@ workflows:
            tags:
              only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
            branches:
-              only: unsigned
+              only: unsigned
--- a/.env
+++ b/.env
@@ -1,3 +1,2 @@
 STORYBOOK_PORT=
 STORYBOOK_HOST=
-RUNNING_E2E=
--- a/.eslintrc.json
+++ b/.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)/**",
-            "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": [
    {
--- a/.flowconfig
+++ b/.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.162.0
+^0.137.0
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,12 +1,12 @@
-Per Mattermost guidelines, GitHub issues are for bug reports: <https://handbook.mattermost.com/contributors/contributors/ways-to-contribute>.
+Per Mattermost guidelines, GitHub issues are for bug reports: <http://www.mattermost.org/filing-issues/>.

-For troubleshooting see: https://forum.mattermost.com/.
-For feature proposals see: https://www.mattermost.com/feature-ideas/
+For troubleshooting see: http://forum.mattermost.org/.
+For feature proposals see: http://www.mattermost.org/feature-requests/

 If you've found a bug--something appears unintentional--please follow these steps:

 1. Confirm you’re filing a new issue. [Search existing tickets in Jira](https://mattermost.atlassian.net/jira/software/c/projects/MM/issues/) to ensure that the ticket does not already exist.
-2. Confirm your issue does not involve security. Otherwise, please see our [Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
+2. Confirm your issue does not involve security. Otherwise, please see our [Responsible Disclosure Policy](https://about.mattermost.com/report-security-issue/).
 3. [File a new issue](https://github.com/mattermost/mattermost-mobile/issues/new) using the format below. Mattermost will confirm steps to reproduce and file in Jira, or ask for more details if there is trouble reproducing it. If there's already an existing bug in Jira, it will be linked back to the GitHub issue so you can track when it gets fixed.

 #### Summary
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.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) -->
--- a/.github/codeql/codeql-config.yml
+++ b/.github/codeql/codeql-config.yml
@@ -1,13 +0,0 @@
-name: "CodeQL config"
-
-query-filters:
-  - exclude:
-      problem.severity:
-        - warning
-        - recommendation
-  - exclude:
-      id: js/insecure-randomness
-
-paths-ignore:
-  - test
-  - '**/*.test.*'
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -9,13 +9,8 @@ on:
  schedule:
    - cron: '0 0 * * 0'

-permissions:
-  contents: read
-
 jobs:
  analyze:
-    permissions:
-      security-events: write
    name: Analyze
    runs-on: ubuntu-latest

@@ -23,20 +18,26 @@ jobs:
      fail-fast: false
      matrix:
        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2

+    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v1
      with:
        languages: ${{ matrix.language }}
-        config-file: ./.github/codeql/codeql-config.yml
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main

-    # Autobuild attempts to build any compiled languages
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v1

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -1,55 +0,0 @@
-name: Scorecards supply-chain security
-on:
-  # Only the default branch is supported.
-  branch_protection_rule:
-  schedule:
-    - cron: '22 14 * * 1'
-  push:
-    branches: [ master ]
-
-# Declare default permissions as read only.
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecards analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      actions: read
-      contents: read
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@c8416b0b2bf627c349ca92fc8e3de51a64b005cf # v1.0.2
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # Read-only PAT token. To create it,
-          # follow the steps in https://github.com/ossf/scorecard-action#pat-token-creation.
-          repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
-          # Publish the results to enable scorecard badges. For more details, see
-          # https://github.com/ossf/scorecard-action#publishing-results.
-          # For private repositories, `publish_results` will automatically be set to `false`,
-          # regardless of the value entered here.
-          publish_results: true
-
-      # Upload the results as artifacts (optional).
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # v1.0.26
-        with:
-          sarif_file: results.sarif
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ env.d.ts

 # Xcode
 #
-ios/build/*
+build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -30,7 +30,6 @@ DerivedData
 *.hmap
 *.ipa
 *.apk
-*.aab
 *.xcuserstate
 project.xcworkspace
 ios/Pods
@@ -42,11 +41,7 @@ ios/Pods
 .gradle
 local.properties
 *.iml
-*.hprof
-.cxx/
 android/app/bin
-android/app/build
-android/build
 .settings
 .project
 .classpath
@@ -107,8 +102,3 @@ detox/detox_pixel_4_xl_api_30

 #editor-settings
 .vscode
-.scannerwork
-
-# Notice.txt generation
-!build/notice-file
-
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-Submit feature requests to https://www.mattermost.com/feature-ideas/. File non-security related bugs here in the following format: 
+Submit feature requests to http://www.mattermost.org/feature-requests/. File non-security related bugs here in the following format: 

 #### Summary
 Issue in one concise sentence.
--- a/NOTICE.txt
+++ b/NOTICE.txt
--- a/README.md
+++ b/README.md
@@ -1,17 +1,14 @@
-# Note: development on this repository has primarily moved to the `main` branch
-This `master`(now `v1`) branch is mostly in maintenance mode while we're working to getting our "v2" (code named "gekidou") to the GA stage. To contribute check out the [main](https://github.com/mattermost/mattermost-mobile/tree/main) branch in this repository.
+# Mattermost Mobile

-# Mattermost Mobile App
-[![Mattermost](https://user-images.githubusercontent.com/7205829/136108314-75cd2e1f-4147-4cfa-a16c-9b3b0313ea25.png)](https://mattermost.com)
-
- **Minimum Server versions:** Current ESR version (6.3.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). 

--- a/SECURITY.md
+++ b/SECURITY.md
@@ -17,7 +17,7 @@ Security updates

 Mattermost has a mandatory upgrade policy, and updates are only provided for the latest release. Critical updates are delivered as dot releases. Details on security updates are announced 30 days after the availability of the update.

-For more details about the security content of past releases, see the [Security Updates](https://mattermost.com/security-updates/) page on the Mattermost website. For timely notifications about new security updates, subscribe to the [Security Bulletins Mailing List](https://mattermost.com/security-updates/#sign-up).
+For more details about the security content of past releases, see the [Security Updates](https://mattermost.com/security-updates/) page on the Mattermost website. For timely notifications about new security updates, subscribe to the [Security Bulletins Mailing List](https://about.mattermost.com/security-bulletin).

 Contributing to this policy
 ---------------------------
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -113,26 +113,27 @@ def jscFlavor = 'org.webkit:android-jsc-intl:+'
 /**
 * Whether to enable the Hermes VM.
 *
- * This should be set on project.ext.react and that value will be read here. If it is not set
+ * This should be set on project.ext.react and mirrored here.  If it is not set
 * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
 * and the benefits of using Hermes will therefore be sharply reduced.
 */
 def enableHermes = project.ext.react.get("enableHermes", false);

-/**
- * 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
-        versionCode 436
-        versionName "1.56.0"
+        missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
+        versionCode 364
+        versionName "1.45.1"
        multiDexEnabled = true
        testBuildType System.getProperty('testBuildType', 'debug')
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -164,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 {
@@ -199,11 +195,6 @@ android {
        pickFirst '**/*.so'
    }

-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
-
 }

 repositories {
@@ -239,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'
@@ -278,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'
 }

--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -8,6 +8,6 @@
        android:usesCleartextTraffic="true"
        tools:targetApi="28"
        tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
    </application>
-</manifest>
+</manifest>
--- a/android/app/src/main/AndroidManifest.xml
+++ b/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"
@@ -33,12 +29,10 @@
      <activity
        android:name=".MainActivity"
        android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
        android:windowSoftInputMode="adjustResize"
        android:launchMode="singleTask"
-        android:taskAffinity=""
-        android:exported="true"
-        >
+        android:taskAffinity="">
        <intent-filter>
            <action android:name="android.intent.action.MAIN" />
            <category android:name="android.intent.category.LAUNCHER" />
@@ -74,9 +68,7 @@
                android:screenOrientation="portrait"
                android:theme="@style/AppTheme"
                android:taskAffinity="com.mattermost.share"
-                android:launchMode="singleInstance"
-                android:exported="true"
-        >
+                android:launchMode="singleInstance">
            <intent-filter>
                <action android:name="android.intent.action.SEND" />
                <action android:name="android.intent.action.SEND_MULTIPLE" />
@@ -86,13 +78,5 @@
            </intent-filter>
        </activity>
    </application>
-    <queries>
-      <intent>
-        <action android:name="com.google.android.youtube.api.service.START" />
-      </intent>
-      <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:mimeType="*/*" />
-        </intent>
-    </queries>
-</manifest>
+
+</manifest>
--- a/android/app/src/main/assets/fonts/compass-icons.ttf
+++ b/android/app/src/main/assets/fonts/compass-icons.ttf
--- a/android/app/src/main/java/com/mattermost/rnbeta/CustomMMKVJSIModulePackage.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomMMKVJSIModulePackage.java
@@ -8,11 +8,13 @@ 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();
    }
--- a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
@@ -1,20 +1,17 @@
 package com.mattermost.rnbeta;

 import android.app.Notification;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.service.notification.StatusBarNotification;
 import android.util.Log;

 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;

+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -22,7 +19,6 @@ 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;
@@ -30,11 +26,11 @@ import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_

 import com.mattermost.react_native_interface.ResolvePromise;

+import org.json.JSONArray;
 import org.json.JSONObject;

 public class CustomPushNotification extends PushNotification {
    private static final String PUSH_NOTIFICATIONS = "PUSH_NOTIFICATIONS";
-    private static final String VERSION_PREFERENCE = "VERSION_PREFERENCE";
    private static final String PUSH_TYPE_MESSAGE = "message";
    private static final String PUSH_TYPE_CLEAR = "clear";
    private static final String PUSH_TYPE_SESSION = "session";
@@ -43,95 +39,44 @@ public class CustomPushNotification extends PushNotification {
    public CustomPushNotification(Context context, Bundle bundle, AppLifecycleFacade appLifecycleFacade, AppLaunchHelper appLaunchHelper, JsIOHelper jsIoHelper) {
        super(context, bundle, appLifecycleFacade, appLaunchHelper, jsIoHelper);
        CustomPushNotificationHelper.createNotificationChannels(context);
-
-        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", "");
-            }
-
-            if (!version.equals(storedVersion)) {
-                if (pSharedPref != null) {
-                    SharedPreferences.Editor editor = pSharedPref.edit();
-                    editor.putString("Version", version);
-                    editor.apply();
-                }
-
-                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) {
+    public static void cancelNotification(Context context, String channelId, Integer notificationId) {
        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);
+            Map<String, List<Integer>> notificationsInChannel = loadNotificationsMap(context);
+            List<Integer> notifications = notificationsInChannel.get(channelId);
            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);
-            }
+            notifications.remove(notificationId);
            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);
+            notificationManager.cancel(notificationId);
+        }
+    }

-            // 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);
-
+    public static void clearChannelNotifications(Context context, String channelId) {
+        if (!android.text.TextUtils.isEmpty(channelId)) {
+            Map<String, List<Integer>> notificationsInChannel = loadNotificationsMap(context);
+            List<Integer> notifications = notificationsInChannel.get(channelId);
            if (notifications == null) {
                return;
            }

-            notificationsInChannel.remove(groupId);
+            notificationsInChannel.remove(channelId);
            saveNotificationsMap(context, notificationsInChannel);
-            notifications.forEach(
-                    (notificationIdStr, post) -> notificationManager.cancel(Integer.valueOf(notificationIdStr))
-            );
+
+            for (final Integer notificationId : notifications) {
+                final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
+                notificationManager.cancel(notificationId);
+            }
        }
    }

    public static void clearAllNotifications(Context context) {
        if (context != null) {
-            Map<String, Map<String, JSONObject>> notificationsInChannel = loadNotificationsMap(context);
+            Map<String, List<Integer>> notificationsInChannel = loadNotificationsMap(context);
            notificationsInChannel.clear();
            saveNotificationsMap(context, notificationsInChannel);
            final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
@@ -146,8 +91,6 @@ public class CustomPushNotification extends PushNotification {
        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) {
@@ -176,54 +119,38 @@ public class CustomPushNotification extends PushNotification {
        switch (type) {
            case PUSH_TYPE_MESSAGE:
            case PUSH_TYPE_SESSION:
+                boolean createSummary = type.equals(PUSH_TYPE_MESSAGE);
                if (!mAppLifecycleFacade.isAppVisible()) {
-                    boolean createSummary = type.equals(PUSH_TYPE_MESSAGE);
-
                    if (type.equals(PUSH_TYPE_MESSAGE)) {
                        if (channelId != null) {
-                            try {
-
-                                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();
+                            Map<String, List<Integer>> notificationsInChannel = loadNotificationsMap(mContext);
+                            List<Integer> list = notificationsInChannel.get(channelId);
+                            if (list == null) {
+                                list = Collections.synchronizedList(new ArrayList(0));
                            }
+
+                            list.add(0, notificationId);
+                            if (list.size() > 1) {
+                                createSummary = false;
+                            }
+
+                            if (createSummary) {
+                                // Add the summary notification id as well
+                                list.add(0, notificationId + 1);
+                            }
+
+                            notificationsInChannel.put(channelId, list);
+                            saveNotificationsMap(mContext, notificationsInChannel);
                        }
                    }

                    buildNotification(notificationId, createSummary);
+                } else {
+                    notifyReceivedToJS();
                }
                break;
            case PUSH_TYPE_CLEAR:
-                clearChannelNotifications(mContext, channelId, rootId, isCRTEnabled);
+                clearChannelNotifications(mContext, channelId);
                break;
        }

@@ -238,16 +165,24 @@ public class CustomPushNotification extends PushNotification {

        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");
+        final String postId = data.getString("post_id");
+        Integer notificationId = CustomPushNotificationHelper.MESSAGE_NOTIFICATION_ID;
+
+        if (postId != null) {
+            notificationId = postId.hashCode();
+        }

        if (channelId != null) {
-            clearChannelNotifications(mContext, channelId, rootId, isCRTEnabled);
+            Map<String, List<Integer>> notificationsInChannel = loadNotificationsMap(mContext);
+            List<Integer> notifications = notificationsInChannel.get(channelId);
+            notifications.remove(notificationId);
+            saveNotificationsMap(mContext, notificationsInChannel);
+            clearChannelNotifications(mContext, channelId);
        }
    }

    private void buildNotification(Integer notificationId, boolean createSummary) {
-        final PendingIntent pendingIntent = NotificationIntentAdapter.createPendingNotificationIntent(mContext, mNotificationProps);
+        final PendingIntent pendingIntent = super.getCTAPendingIntent();
        final Notification notification = buildNotification(pendingIntent);
        if (createSummary) {
            final Notification summary = getNotificationSummaryBuilder(pendingIntent).build();
@@ -275,7 +210,7 @@ public class CustomPushNotification extends PushNotification {
        mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_EVENT_NAME, mNotificationProps.asBundle(), mAppLifecycleFacade.getRunningReactContext());
    }

-    private static void saveNotificationsMap(Context context, Map<String, Map<String, JSONObject>> inputMap) {
+    private static void saveNotificationsMap(Context context, Map<String, List<Integer>> inputMap) {
        SharedPreferences pSharedPref = context.getSharedPreferences(PUSH_NOTIFICATIONS, Context.MODE_PRIVATE);
        if (pSharedPref != null && context != null) {
            JSONObject json = new JSONObject(inputMap);
@@ -287,41 +222,23 @@ public class CustomPushNotification extends PushNotification {
        }
    }

-    /**
-     * 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<>();
+    private static Map<String, List<Integer>> loadNotificationsMap(Context context) {
+        Map<String, List<Integer>> 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);
-
-                    // 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);
+                    Iterator<String> keysItr = json.keys();
+                    while (keysItr.hasNext()) {
+                        String key = keysItr.next();
+                        JSONArray array = json.getJSONArray(key);
+                        List<Integer> values = new ArrayList<>();
+                        for (int i = 0; i < array.length(); ++i) {
+                            values.add(array.getInt(i));
                        }
-                        outputMap.put(groupId, notifications);
+                        outputMap.put(key, values);
                    }
                }
            } catch (Exception e) {
--- a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotificationHelper.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotificationHelper.java
@@ -1,6 +1,5 @@
 package com.mattermost.rnbeta;

-import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -81,10 +80,7 @@ public class CustomPushNotificationHelper {
                    .setName(senderName);

            try {
-                Bitmap avatar = userAvatar(context, senderId);
-                if (avatar != null) {
-                    sender.setIcon(IconCompat.createWithBitmap(avatar));
-                }
+                sender.setIcon(IconCompat.createWithBitmap(Objects.requireNonNull(userAvatar(context, senderId))));
            } catch (IOException e) {
                e.printStackTrace();
            }
@@ -99,16 +95,6 @@ public class CustomPushNotificationHelper {
            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);
@@ -129,20 +115,11 @@ public class CustomPushNotificationHelper {
        replyIntent.putExtra(NOTIFICATION_ID, notificationId);
        replyIntent.putExtra("pushNotification", bundle);

-        PendingIntent replyPendingIntent;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            replyPendingIntent = PendingIntent.getBroadcast(
-                    context,
-                    notificationId,
-                    replyIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
-        } else {
-            replyPendingIntent = PendingIntent.getBroadcast(
-                    context,
-                    notificationId,
-                    replyIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT);
-        }
+        PendingIntent replyPendingIntent = PendingIntent.getBroadcast(
+                context,
+                notificationId,
+                replyIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT);

        RemoteInput remoteInput = new RemoteInput.Builder(KEY_TEXT_REPLY)
                .setLabel("Reply")
@@ -165,17 +142,13 @@ public class CustomPushNotificationHelper {

        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);
+        setNotificationGroup(notification, channelId, createSummary);
        setNotificationBadgeType(notification);
        setNotificationSound(notification, notificationPreferences);
        setNotificationVibrate(notification, notificationPreferences);
@@ -269,10 +242,7 @@ public class CustomPushNotificationHelper {
                    .setName("Me");

            try {
-                Bitmap avatar = userAvatar(context, "me");
-                if (avatar != null) {
-                    sender.setIcon(IconCompat.createWithBitmap(avatar));
-                }
+                sender.setIcon(IconCompat.createWithBitmap(Objects.requireNonNull(userAvatar(context, "me"))));
            } catch (IOException e) {
                e.printStackTrace();
            }
@@ -391,12 +361,10 @@ public class CustomPushNotificationHelper {

    private static void setNotificationDeleteIntent(Context context, NotificationCompat.Builder notification, Bundle bundle, int notificationId) {
        // Let's add a delete intent when the notification is dismissed
-        final String PUSH_NOTIFICATION_EXTRA_NAME = "pushNotification";
        Intent delIntent = new Intent(context, NotificationDismissService.class);
+        PushNotificationProps notificationProps = new PushNotificationProps(bundle);
        delIntent.putExtra(NOTIFICATION_ID, notificationId);
-        delIntent.putExtra(PUSH_NOTIFICATION_EXTRA_NAME, bundle);
-        @SuppressLint("UnspecifiedImmutableFlag")
-        PendingIntent deleteIntent = PendingIntent.getService(context, (int) System.currentTimeMillis(), delIntent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
+        PendingIntent deleteIntent = NotificationIntentAdapter.createPendingNotificationIntent(context, delIntent, notificationProps);
        notification.setDeleteIntent(deleteIntent);
    }

@@ -425,10 +393,7 @@ public class CustomPushNotificationHelper {
        if (channelName.equals(senderName)) {
            try {
                String senderId = bundle.getString("sender_id");
-                Bitmap avatar = userAvatar(context, senderId);
-                if (avatar != null) {
-                    notification.setLargeIcon(avatar);
-                }
+                notification.setLargeIcon(userAvatar(context, senderId));
            } catch (IOException e) {
                e.printStackTrace();
            }
--- a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
@@ -57,6 +57,7 @@ private final ReactNativeHost mReactNativeHost =
      // Packages that cannot be auto linked 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
--- a/android/app/src/main/java/com/mattermost/rnbeta/NotificationDismissService.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/NotificationDismissService.java
@@ -19,9 +19,6 @@ public class NotificationDismissService extends IntentService {
        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();
@@ -29,7 +26,7 @@ public class NotificationDismissService extends IntentService {
            notificationId = channelId.hashCode();
        }

-        CustomPushNotification.cancelNotification(context, channelId, rootId, notificationId, isCRTEnabled);
+        CustomPushNotification.cancelNotification(context, channelId, notificationId);
        Log.i("ReactNative", "Dismiss notification");
    }
 }
--- a/android/app/src/main/java/com/mattermost/rnbeta/NotificationPreferencesModule.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/NotificationPreferencesModule.java
@@ -118,10 +118,6 @@ 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);
            String channelId = bundle.getString("channel_id");
            map.putString("channel_id", channelId);
            result.pushMap(map);
@@ -130,9 +126,8 @@ public class NotificationPreferencesModule extends ReactContextBaseJavaModule {
    }

    @ReactMethod
-    public void removeDeliveredNotifications(String channelId, String rootId, Boolean isCRTEnabled) {
+    public void removeDeliveredNotifications(String channelId) {
        final Context context = mApplication.getApplicationContext();
-        CustomPushNotification.clearChannelNotifications(context, channelId, rootId, isCRTEnabled);
+        CustomPushNotification.clearChannelNotifications(context, channelId);
    }
-
 }
--- a/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java
@@ -129,8 +129,9 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
    }

    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, notificationProps);
+        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);
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNEditTextOnPasteListener.java
+++ b/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);
+}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableActionCallback.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableActionCallback.java
@@ -0,0 +1,98 @@
+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 final 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");
+            assert copyPasteProtection != null;
+            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();
+    }
+}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableEditText.java
+++ b/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;
+    }
+}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableEditTextOnPasteListener.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableEditTextOnPasteListener.java
@@ -0,0 +1,163 @@
+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.os.Build;
+import android.util.Patterns;
+import android.webkit.MimeTypeMap;
+import android.webkit.URLUtil;
+
+import androidx.annotation.RequiresApi;
+
+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 final 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) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            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
+                );
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    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()) {
+                boolean created = folder.mkdirs();
+                if (!created) {
+                    return null;
+                }
+            }
+
+            Files.move(Paths.get(src), Paths.get(dest));
+        } catch (FileAlreadyExistsException fileError) {
+            // Do nothing and return dest path
+        } catch (Exception err) {
+            return null;
+        }
+
+        return dest;
+    }
+}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableImageFromUrl.java
+++ b/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 final ReactContext mContext;
+    private final String mUri;
+    private final ReactEditText mTarget;
+
+    RNPasteableImageFromUrl(ReactContext context, ReactEditText target, String uri) {
+        mContext = context;
+        mUri = uri;
+        mTarget = target;
+    }
+
+    @Override
+    public void run() {
+        WritableArray images = null;
+        WritableMap error = null;
+
+        try {
+            URL url = new URL(mUri);
+            URLConnection u = url.openConnection();
+
+            // Get type
+            String mimeType = u.getHeaderField("Content-Type");
+            if (!mimeType.startsWith("image")) {
+                return;
+            }
+
+            // Get fileSize
+            long fileSize = Long.parseLong(u.getHeaderField("Content-Length"));
+
+            // Get fileName
+            String contentDisposition = u.getHeaderField("Content-Disposition");
+            int startIndex = contentDisposition.indexOf("filename=\"") + 10;
+            int endIndex = contentDisposition.length() - 1;
+            String fileName = contentDisposition.substring(startIndex, endIndex);
+
+            WritableMap image = Arguments.createMap();
+            image.putString("type", mimeType);
+            image.putDouble("fileSize", fileSize);
+            image.putString("fileName", fileName);
+            image.putString("uri", mUri);
+
+            images = Arguments.createArray();
+            images.pushMap(image);
+
+        } catch (IOException e) {
+            error = Arguments.createMap();
+            error.putString("message", e.getMessage());
+        }
+
+        WritableMap event = Arguments.createMap();
+        event.putArray("data", images);
+        event.putMap("error", error);
+
+        mContext
+                .getJSModule(RCTEventEmitter.class)
+                .receiveEvent(
+                        mTarget.getId(),
+                        "onPaste",
+                        event
+                );
+    }
+}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableTextInputManager.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableTextInputManager.java
@@ -0,0 +1,85 @@
+package com.mattermost.rnbeta;
+
+import androidx.annotation.NonNull;
+import androidx.core.view.inputmethod.EditorInfoCompat;
+import androidx.core.view.inputmethod.InputConnectionCompat;
+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
+    @NonNull
+    public String getName() {
+        return "PasteableTextInputAndroid";
+    }
+
+    @Override
+    @NonNull
+    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 ((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();
+        assert map != null;
+        map.put(
+                "onPaste",
+                MapBuilder.of(
+                    "phasedRegistrationNames",
+                    MapBuilder.of("bubbled", "onPaste")));
+        return map;
+    }
+}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableTextInputPackage.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableTextInputPackage.java
@@ -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()
+        );
+    }
+}
--- a/android/app/src/main/java/com/mattermost/share/ShareModule.java
+++ b/android/app/src/main/java/com/mattermost/share/ShareModule.java
@@ -167,11 +167,6 @@ public class ShareModule extends ReactContextBaseJavaModule {
                    map.putString("type", type);
                    map.putBoolean("isString", false);
                    items.pushMap(map);
-
-                    map = Arguments.createMap();
-                    map.putString("value", extra);
-                    map.putBoolean("isString", true);
-                    items.pushMap(map);
                }
            } else if (Intent.ACTION_SEND_MULTIPLE.equals(action)) {
                ArrayList<Uri> uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
--- a/android/app/src/main/jni/CMakeLists.txt
+++ b/android/app/src/main/jni/CMakeLists.txt
@@ -1,5 +0,0 @@
-cmake_minimum_required(VERSION 3.13)
-# Define the library name here.
-project(rndiffapp_appmodules)
-# This file includes all the necessary to let you build your application with the New Architecture.
-include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake)
--- a/android/app/src/main/jni/MainApplicationModuleProvider.cpp
+++ b/android/app/src/main/jni/MainApplicationModuleProvider.cpp
@@ -1,32 +0,0 @@
-#include "MainApplicationModuleProvider.h"
-
-#include <rncli.h>
-#include <rncore.h>
-
-namespace facebook {
-namespace react {
-
-std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-    const std::string &moduleName,
-    const JavaTurboModule::InitParams &params) {
-  // Here you can provide your own module provider for TurboModules coming from
-  // either your application or from external libraries. The approach to follow
-  // is similar to the following (for a library called `samplelibrary`:
-  //
-  // auto module = samplelibrary_ModuleProvider(moduleName, params);
-  // if (module != nullptr) {
-  //    return module;
-  // }
-  // return rncore_ModuleProvider(moduleName, params);
-
-  // Module providers autolinked by RN CLI
-  auto rncli_module = rncli_ModuleProvider(moduleName, params);
-  if (rncli_module != nullptr) {
-    return rncli_module;
-  }
-
-  return rncore_ModuleProvider(moduleName, params);
-}
-
-} // namespace react
-} // namespace facebook
--- a/android/app/src/main/jni/MainApplicationModuleProvider.h
+++ b/android/app/src/main/jni/MainApplicationModuleProvider.h
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include <ReactCommon/JavaTurboModule.h>
-
-namespace facebook {
-namespace react {
-
-std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-    const std::string &moduleName,
-    const JavaTurboModule::InitParams &params);
-
-} // namespace react
-} // namespace facebook
--- a/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
+++ b/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
@@ -1,45 +0,0 @@
-#include "MainApplicationTurboModuleManagerDelegate.h"
-#include "MainApplicationModuleProvider.h"
-
-namespace facebook {
-namespace react {
-
-jni::local_ref<MainApplicationTurboModuleManagerDelegate::jhybriddata>
-MainApplicationTurboModuleManagerDelegate::initHybrid(
-    jni::alias_ref<jhybridobject>) {
-  return makeCxxInstance();
-}
-
-void MainApplicationTurboModuleManagerDelegate::registerNatives() {
-  registerHybrid({
-      makeNativeMethod(
-          "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid),
-      makeNativeMethod(
-          "canCreateTurboModule",
-          MainApplicationTurboModuleManagerDelegate::canCreateTurboModule),
-  });
-}
-
-std::shared_ptr<TurboModule>
-MainApplicationTurboModuleManagerDelegate::getTurboModule(
-    const std::string &name,
-    const std::shared_ptr<CallInvoker> &jsInvoker) {
-  // Not implemented yet: provide pure-C++ NativeModules here.
-  return nullptr;
-}
-
-std::shared_ptr<TurboModule>
-MainApplicationTurboModuleManagerDelegate::getTurboModule(
-    const std::string &name,
-    const JavaTurboModule::InitParams &params) {
-  return MainApplicationModuleProvider(name, params);
-}
-
-bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
-    const std::string &name) {
-  return getTurboModule(name, nullptr) != nullptr ||
-      getTurboModule(name, {.moduleName = name}) != nullptr;
-}
-
-} // namespace react
-} // namespace facebook
--- a/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
+++ b/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
@@ -1,38 +0,0 @@
-#include <memory>
-#include <string>
-
-#include <ReactCommon/TurboModuleManagerDelegate.h>
-#include <fbjni/fbjni.h>
-
-namespace facebook {
-namespace react {
-
-class MainApplicationTurboModuleManagerDelegate
-    : public jni::HybridClass<
-          MainApplicationTurboModuleManagerDelegate,
-          TurboModuleManagerDelegate> {
- public:
-  // Adapt it to the package you used for your Java class.
-  static constexpr auto kJavaDescriptor =
-      "Lcom/rndiffapp/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";
-
-  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
-
-  static void registerNatives();
-
-  std::shared_ptr<TurboModule> getTurboModule(
-      const std::string &name,
-      const std::shared_ptr<CallInvoker> &jsInvoker) override;
-  std::shared_ptr<TurboModule> getTurboModule(
-      const std::string &name,
-      const JavaTurboModule::InitParams &params) override;
-
-  /**
-   * Test-only method. Allows user to verify whether a TurboModule can be
-   * created by instances of this class.
-   */
-  bool canCreateTurboModule(const std::string &name);
-};
-
-} // namespace react
-} // namespace facebook
--- a/android/app/src/main/jni/MainComponentsRegistry.cpp
+++ b/android/app/src/main/jni/MainComponentsRegistry.cpp
@@ -1,65 +0,0 @@
-#include "MainComponentsRegistry.h"
-
-#include <CoreComponentsRegistry.h>
-#include <fbjni/fbjni.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/components/rncore/ComponentDescriptors.h>
-#include <rncli.h>
-
-namespace facebook {
-namespace react {
-
-MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {}
-
-std::shared_ptr<ComponentDescriptorProviderRegistry const>
-MainComponentsRegistry::sharedProviderRegistry() {
-  auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
-
-  // Autolinked providers registered by RN CLI
-  rncli_registerProviders(providerRegistry);
-
-  // Custom Fabric Components go here. You can register custom
-  // components coming from your App or from 3rd party libraries here.
-  //
-  // providerRegistry->add(concreteComponentDescriptorProvider<
-  //        AocViewerComponentDescriptor>());
-  return providerRegistry;
-}
-
-jni::local_ref<MainComponentsRegistry::jhybriddata>
-MainComponentsRegistry::initHybrid(
-    jni::alias_ref<jclass>,
-    ComponentFactory *delegate) {
-  auto instance = makeCxxInstance(delegate);
-
-  auto buildRegistryFunction =
-      [](EventDispatcher::Weak const &eventDispatcher,
-         ContextContainer::Shared const &contextContainer)
-      -> ComponentDescriptorRegistry::Shared {
-    auto registry = MainComponentsRegistry::sharedProviderRegistry()
-                        ->createComponentDescriptorRegistry(
-                            {eventDispatcher, contextContainer});
-
-    auto mutableRegistry =
-        std::const_pointer_cast<ComponentDescriptorRegistry>(registry);
-
-    mutableRegistry->setFallbackComponentDescriptor(
-        std::make_shared<UnimplementedNativeViewComponentDescriptor>(
-            ComponentDescriptorParameters{
-                eventDispatcher, contextContainer, nullptr}));
-
-    return registry;
-  };
-
-  delegate->buildRegistryFunction = buildRegistryFunction;
-  return instance;
-}
-
-void MainComponentsRegistry::registerNatives() {
-  registerHybrid({
-      makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid),
-  });
-}
-
-} // namespace react
-} // namespace facebook
--- a/android/app/src/main/res/drawable-hdpi/splash.png
+++ b/android/app/src/main/res/drawable-hdpi/splash.png
--- a/android/app/src/main/res/drawable-hdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-hdpi/splash_background.png
--- a/android/app/src/main/res/drawable-mdpi/splash.png
+++ b/android/app/src/main/res/drawable-mdpi/splash.png
--- a/android/app/src/main/res/drawable-mdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-mdpi/splash_background.png
--- a/android/app/src/main/res/drawable-night-hdpi/ic_notif_action_reply.png
+++ b/android/app/src/main/res/drawable-night-hdpi/ic_notif_action_reply.png
--- a/android/app/src/main/res/drawable-night-hdpi/splash.png
+++ b/android/app/src/main/res/drawable-night-hdpi/splash.png
--- a/android/app/src/main/res/drawable-night-hdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-night-hdpi/splash_background.png
--- a/android/app/src/main/res/drawable-night-mdpi/ic_notif_action_reply.png
+++ b/android/app/src/main/res/drawable-night-mdpi/ic_notif_action_reply.png
--- a/android/app/src/main/res/drawable-night-mdpi/splash.png
+++ b/android/app/src/main/res/drawable-night-mdpi/splash.png
--- a/android/app/src/main/res/drawable-night-mdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-night-mdpi/splash_background.png
--- a/android/app/src/main/res/drawable-night-xhdpi/ic_notif_action_reply.png
+++ b/android/app/src/main/res/drawable-night-xhdpi/ic_notif_action_reply.png
--- a/android/app/src/main/res/drawable-night-xhdpi/splash.png
+++ b/android/app/src/main/res/drawable-night-xhdpi/splash.png
--- a/android/app/src/main/res/drawable-night-xhdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-night-xhdpi/splash_background.png
--- a/android/app/src/main/res/drawable-night-xxhdpi/ic_notif_action_reply.png
+++ b/android/app/src/main/res/drawable-night-xxhdpi/ic_notif_action_reply.png
--- a/android/app/src/main/res/drawable-night-xxhdpi/splash.png
+++ b/android/app/src/main/res/drawable-night-xxhdpi/splash.png
--- a/android/app/src/main/res/drawable-night-xxhdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-night-xxhdpi/splash_background.png
--- a/android/app/src/main/res/drawable-night-xxxhdpi/ic_notif_action_reply.png
+++ b/android/app/src/main/res/drawable-night-xxxhdpi/ic_notif_action_reply.png
--- a/android/app/src/main/res/drawable-night-xxxhdpi/splash.png
+++ b/android/app/src/main/res/drawable-night-xxxhdpi/splash.png
--- a/android/app/src/main/res/drawable-night-xxxhdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-night-xxxhdpi/splash_background.png
--- a/android/app/src/main/res/drawable-xhdpi/splash.png
+++ b/android/app/src/main/res/drawable-xhdpi/splash.png
--- a/android/app/src/main/res/drawable-xhdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-xhdpi/splash_background.png
--- a/android/app/src/main/res/drawable-xxhdpi/splash.png
+++ b/android/app/src/main/res/drawable-xxhdpi/splash.png
--- a/android/app/src/main/res/drawable-xxhdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-xxhdpi/splash_background.png
--- a/android/app/src/main/res/drawable-xxxhdpi/splash.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/splash.png
--- a/android/app/src/main/res/drawable-xxxhdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/splash_background.png
--- a/android/app/src/main/res/drawable/rn_edit_text_material.xml
+++ b/android/app/src/main/res/drawable/rn_edit_text_material.xml
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-       android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
-       android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
-       android:insetTop="@dimen/abc_edit_text_inset_top_material"
-       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
-
-    <selector>
-        <!-- 
-          This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
-          The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
-          NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
-
-          <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
-
-          For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
-        -->
-        <item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
-        <item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
-    </selector>
-
-</inset>
--- a/android/app/src/main/res/layout/launch_screen.xml
+++ b/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>
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/android/app/src/main/res/mipmap-hdpi/ic_notification.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_notification.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_notification.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_notification.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_notification.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_notification.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_notification.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_notification.png
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_notification.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_notification.png
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/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>
--- a/android/app/src/main/res/values/colors.xml
+++ b/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>
--- a/android/app/src/main/res/values/styles.xml
+++ b/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:editTextBackground">@drawable/rn_edit_text_material</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        
    </style>

 </resources>
--- a/android/app/src/main/res/xml/file_viewer_provider_paths.xml
+++ b/android/app/src/main/res/xml/file_viewer_provider_paths.xml
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <files-path name="files" path="." />
-    <external-files-path name="external_files" path="." />
-    <external-path name="external" path="." />
-    <cache-path name="cache" path="." />
-    <root-path name="root" path="." /> 
-</paths>
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,25 +2,26 @@

 buildscript {
    ext {
-        buildToolsVersion = "31.0.0"
+        buildToolsVersion = "29.0.3"
        minSdkVersion = 24
-        compileSdkVersion = 31
-        targetSdkVersion = 31
-        supportLibVersion = "31.0.0"
-        kotlinVersion = "1.5.30"
+        compileSdkVersion = 29
+        targetSdkVersion = 29
+        supportLibVersion = "28.0.0"
+        kotlinVersion = "1.3.61"
        firebaseVersion = "21.0.0"
        RNNKotlinVersion = kotlinVersion
-        ndkVersion = "21.4.7075529"
+        ndkVersion = "21.1.6352462"
 
    }
    repositories {
+        jcenter()
        google()
-        mavenCentral()
        mavenLocal()
+        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath 'com.google.gms:google-services:4.3.10'
+        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"

        // NOTE: Do not place your application dependencies here; they belong
@@ -31,9 +32,9 @@ buildscript {
 allprojects {
    repositories {
        google()
-        jcenter()
-        mavenLocal()
        mavenCentral()
+        mavenLocal()
+        jcenter()
        maven {
            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
            url("$rootDir/../node_modules/react-native/android")
@@ -48,16 +49,12 @@ allprojects {
            // prebuilt libv8android.so
            // url("$rootDir/../node_modules/v8-android/dist")
        }
-        mavenCentral {
-            // We don't want to fetch react-native from Maven Central as there are
-            // older versions over there.
-            content {
-                excludeGroup "com.facebook.react"
-            }
-        }
        maven {
            url "https://www.jitpack.io"
        }
+        maven { 
+            url ("https://dl.bintray.com/rudderstack/rudderstack")
+        }
        maven {
            url "$rootDir/../node_modules/detox/Detox-android"
        }
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -9,8 +9,9 @@

 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048M

 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@@ -29,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
--- a/android/gradle/wrapper/gradle-wrapper.jar
+++ b/android/gradle/wrapper/gradle-wrapper.jar
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/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-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/android/gradlew
+++ b/android/gradlew
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh

 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,113 +17,78 @@
 #

 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################

 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null

 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"

 warn () {
    echo "$*"
-} >&2
+}

 die () {
    echo
    echo "$*"
    echo
    exit 1
-} >&2
+}

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
    else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +97,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD=java
+    JAVACMD="java"
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +105,79 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi

-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi

 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`

-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`

-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

 exec "$JAVACMD" "$@"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Elias Nahum	d451cf6bde	Use commonmark & patch it instead of a fork (#5498 )	2021-07-20 12:25:15 -04:00
Elias Nahum	38fa757942	Bump Version to 1.45.1 and Build to 364 (#5558 ) * Bump app build number to 364 * Bump app version number to 1.45.1	2021-07-20 12:06:45 -04:00
Mattermost Build	ad249e9fe4	Fix crash on markdown emoji with hardbreak parser (#5547 ) (#5549 ) (cherry picked from commit `90cce88358`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2021-07-20 12:00:11 -04:00
Mattermost Build	44708f5bba	Properly group Android push notifications by channel (#5548 ) (#5557 ) (cherry picked from commit `ba78bc9d00`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2021-07-20 11:47:15 -04:00
Weblate (bot)	ca308dee84	Translations update from Weblate (#5532 ) * Translated using Weblate (German) Currently translated at 99.7% (707 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/de/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/bg/ Translated using Weblate (Bulgarian) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/bg/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/hu/ Translated using Weblate (Hungarian) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/hu/ Translated using Weblate (Hungarian) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/hu/ Translated using Weblate (Hungarian) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/hu/ * Translated using Weblate (Turkish) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/tr/ * Translated using Weblate (Dutch) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/nl/ * Translated using Weblate (English (Australia)) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/en_AU/ * Translated using Weblate (German) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/de/ Translated using Weblate (German) Currently translated at 99.5% (706 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/de/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/zh_Hans/ * Translated using Weblate (Spanish) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/es/ * Translated using Weblate (Japanese) Currently translated at 100.0% (709 of 709 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ja/ Co-authored-by: jprusch <rs@schaeferbarthold.de> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Markus Hermann <markus.hermann@uni-marburg.de> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Elias Nahum <elias@mattermost.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com>	2021-07-13 09:44:16 +02:00
Mattermost Build	d640a5643d	Bump app build number to 363 (#5537 ) (#5538 ) (cherry picked from commit `d7cd660ab7`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2021-07-12 20:07:30 -04:00
Mattermost Build	da575c7cb1	1.45 Release testing bug fixes (#5529 ) (#5536 ) * MM-36908 display unicode emoji in text field after selecting from autocomple * MM-36935 Fix android crash when ammending search in Sidebar Jump to * MM-36929 & MM-36928 fix notification badge resetting on new notification * MM-36920 Fix android push notification issues * MM-36922 Edit profile image * Fix crash when opening Android test notification (cherry picked from commit `78156ee75b`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2021-07-12 16:13:54 -04:00
Mattermost Build	962a1759a5	MM-36881 Fix scroll perf degradation with pull to refresh enabled (#5525 ) (#5535 ) * Fix scroll perf degradation with pull to refresh enabled * Update app/components/post_list/post_list_refresh_control.tsx Co-authored-by: Anurag Shivarathri <anurag6713@gmail.com> Co-authored-by: Anurag Shivarathri <anurag6713@gmail.com> (cherry picked from commit `58d9c2e9f0`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2021-07-12 16:13:42 -04:00
Mattermost Build	50f616f5d7	MM-36900 Fix mm emoji (#5526 ) (#5528 )	2021-07-10 12:34:26 +02:00
Mattermost Build	1a20677eba	Bump app build number to 362 (#5522 ) (#5523 ) (cherry picked from commit `9fafc3be5b`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2021-07-07 21:25:40 -04:00
Mattermost Build	5b5b7bc620	Bring back refresh control for channels and threads (#5511 ) (#5520 ) (cherry picked from commit `073b836beb`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2021-07-07 13:04:07 -04:00
Mattermost Build	456ab53ecf	Bump Version to 1.45.0 and build to 361 (#5518 ) (#5519 ) * Bump app build number to 361 * Bump app version number to 1.45.0 (cherry picked from commit `6984923a4c`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2021-07-07 12:56:07 -04:00
Mattermost Build	9c87835802	Load other teams you can join when deleting cache (#5516 ) (#5517 ) (cherry picked from commit `883399f13d`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2021-07-07 12:38:03 -04:00
Mattermost Build	11cc2e57f5	MM-36808 fix auto responder posts (#5505 ) (#5515 )	2021-07-07 06:54:31 -04:00
Mattermost Build	ac5914ef15	MM-36745 Fix animation for showModalOverCurrentContext (#5507 ) (#5510 ) (cherry picked from commit `df26a363bc`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2021-07-06 14:31:15 -04:00
Mattermost Build	9c15ae1c5b	use user skin preferences for emoji (#5502 ) (#5509 )	2021-07-06 20:13:23 +02:00