Bump app build number to 418 (#6564 ) (#6565 )

(cherry picked from commit 6119ac46e1) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
[MM-38103] initialize select fields with the value (#5640 ) (#6548 )
2022-08-11 09:06:35 -04:00 · 2022-08-04 16:59:35 -04:00 · 2022-08-04 09:41:32 -04:00 · 2022-08-03 13:59:43 -04:00 · 2022-08-02 10:38:52 -04:00
12 changed files with 74 additions and 44 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -131,8 +131,8 @@ android {
        applicationId "com.mattermost.rnbeta"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 410
-        versionName "1.54.0"
+        versionCode 418
+        versionName "1.55.0"
        multiDexEnabled = true
        testBuildType System.getProperty('testBuildType', 'debug')
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
--- a/android/app/src/main/java/com/mattermost/share/ShareModule.java
+++ b/android/app/src/main/java/com/mattermost/share/ShareModule.java
@@ -167,6 +167,11 @@ 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/app/mattermost.js
+++ b/app/mattermost.js
@@ -140,18 +140,16 @@ export function componentDidDisappearListener({componentId}) {

    if (componentId === 'MainSidebar') {
        EventEmitter.emit(NavigationTypes.MAIN_SIDEBAR_DID_CLOSE);
-    }
-
-    if (componentId === THREAD) {
-        if (EphemeralStore.hasModalsOpened()) {
-            for (const modal of EphemeralStore.navigationModalStack) {
-                const enableSwipe = {
-                    modal: {
-                        swipeToDismiss: true,
-                    },
-                };
-                Navigation.mergeOptions(modal, enableSwipe);
-            }
+    } else if (componentId === 'SettingsSidebar') {
+        EventEmitter.emit(NavigationTypes.CLOSE_SETTINGS_SIDEBAR);
+    } else if (componentId === THREAD && EphemeralStore.hasModalsOpened()) {
+        for (const modal of EphemeralStore.navigationModalStack) {
+            const enableSwipe = {
+                modal: {
+                    swipeToDismiss: true,
+                },
+            };
+            Navigation.mergeOptions(modal, enableSwipe);
        }
    }
 }
--- a/app/screens/apps_form/apps_form_field.tsx
+++ b/app/screens/apps_form/apps_form_field.tsx
@@ -52,7 +52,34 @@ export default class AppsFormField extends React.PureComponent<Props, State> {
    constructor(props: Props) {
        super(props);

-        this.state = {};
+        let selected;
+        switch (props.field.type) {
+        case AppFieldTypes.STATIC_SELECT:
+        case AppFieldTypes.DYNAMIC_SELECT:
+        case AppFieldTypes.USER:
+        case AppFieldTypes.CHANNEL: {
+            const value = props.value as AppSelectOption[] | AppSelectOption | null;
+            if (value) {
+                if (Array.isArray(value)) {
+                    selected = value.map((option) => {
+                        return {
+                            text: option.label,
+                            value: option.value,
+                        };
+                    });
+                } else {
+                    selected = {
+                        text: value.label,
+                        value: value.value,
+                    };
+                }
+            }
+        }
+        }
+
+        this.state = {
+            selected,
+        };
    }

    handleAutocompleteSelect = (selected: DialogOption) => {
--- a/app/store/ephemeral_store.js
+++ b/app/store/ephemeral_store.js
@@ -41,7 +41,7 @@ class EphemeralStore {

    addToNavigationComponentIdStack = (componentId) => {
        const index = this.navigationComponentIdStack.indexOf(componentId);
-        if (index > 0) {
+        if (index >= 0) {
            this.navigationComponentIdStack.slice(index, 1);
        }

--- a/fastlane/Gemfile.lock
+++ b/fastlane/Gemfile.lock
@@ -8,20 +8,20 @@ GEM
    artifactory (3.0.15)
    atomos (0.1.3)
    aws-eventstream (1.2.0)
-    aws-partitions (1.602.0)
-    aws-sdk-core (3.131.2)
+    aws-partitions (1.614.0)
+    aws-sdk-core (3.131.5)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.525.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.57.0)
+    aws-sdk-kms (1.58.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-s3 (1.114.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.1)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    claide (1.1.0)
@@ -34,9 +34,9 @@ GEM
      rake (>= 12.0.0, < 14.0.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
    emoji_regex (3.2.3)
-    excon (0.92.3)
+    excon (0.92.4)
    faraday (1.10.0)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
@@ -66,7 +66,7 @@ GEM
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
    fastimage (2.2.6)
-    fastlane (2.207.0)
+    fastlane (2.208.0)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -111,8 +111,8 @@ GEM
    fastlane-plugin-find_replace_string (0.1.0)
    fastlane-plugin-versioning_android (0.1.0)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.23.0)
-      google-apis-core (>= 0.6, < 2.a)
+    google-apis-androidpublisher_v3 (0.25.0)
+      google-apis-core (>= 0.7, < 2.a)
    google-apis-core (0.7.0)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
@@ -122,23 +122,23 @@ GEM
      retriable (>= 2.0, < 4.a)
      rexml
      webrick
-    google-apis-iamcredentials_v1 (0.12.0)
-      google-apis-core (>= 0.6, < 2.a)
-    google-apis-playcustomapp_v1 (0.9.0)
-      google-apis-core (>= 0.6, < 2.a)
-    google-apis-storage_v1 (0.16.0)
-      google-apis-core (>= 0.6, < 2.a)
+    google-apis-iamcredentials_v1 (0.13.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-playcustomapp_v1 (0.10.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-storage_v1 (0.17.0)
+      google-apis-core (>= 0.7, < 2.a)
    google-cloud-core (1.6.0)
      google-cloud-env (~> 1.0)
      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
      faraday (>= 0.17.3, < 3.0)
    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.37.0)
+    google-cloud-storage (1.38.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.17.0)
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
@@ -164,7 +164,7 @@ GEM
    multipart-post (2.0.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
-    nokogiri (1.13.6)
+    nokogiri (1.13.8)
      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
    optparse (0.1.1)
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -911,7 +911,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 410;
+				CURRENT_PROJECT_VERSION = 418;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
@@ -953,7 +953,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 410;
+				CURRENT_PROJECT_VERSION = 418;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
--- a/ios/Mattermost/Info.plist
+++ b/ios/Mattermost/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.54.0</string>
+	<string>1.55.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>410</string>
+	<string>418</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
--- a/ios/MattermostShare/Info.plist
+++ b/ios/MattermostShare/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.54.0</string>
+	<string>1.55.0</string>
 	<key>CFBundleVersion</key>
-	<string>410</string>
+	<string>418</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
--- a/ios/NotificationService/Info.plist
+++ b/ios/NotificationService/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.54.0</string>
+	<string>1.55.0</string>
 	<key>CFBundleVersion</key>
-	<string>410</string>
+	<string>418</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "mattermost-mobile",
-  "version": "1.54.0",
+  "version": "1.55.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mattermost-mobile",
-  "version": "1.54.0",
+  "version": "1.55.0",
  "description": "Mattermost Mobile with React Native",
  "repository": "git@github.com:mattermost/mattermost-mobile.git",
  "author": "Mattermost, Inc.",
Author	SHA1	Message	Date
Mattermost Build	cbee2449e2	Bump app build number to 418 (#6564 ) (#6565 ) (cherry picked from commit `6119ac46e1`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2022-08-11 09:06:35 -04:00
Mattermost Build	5bbf11ce33	[MM-38103] initialize select fields with the value (#5640 ) (#6548 )	2022-08-04 16:59:35 -04:00
Mattermost Build	8e26b4b2b5	[MM-41749] Fixed SettingsSidebar component added back to navigation stack (#6503 ) (#6545 ) Co-authored-by: Jean-Paul Manuel <jean-paulm@yoyowallet.com> (cherry picked from commit `8cbf57781b`) Co-authored-by: Jean-Paul Manuel <jpmastermind@gmail.com>	2022-08-04 09:41:32 -04:00
Mattermost Build	19be35c343	Bump version to 1.55.0 and build to 416 (#6538 ) (#6539 ) * Bump app version number to 1.55.0 * Bump app build number to 416 (cherry picked from commit `c4620963fa`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2022-08-03 13:59:43 -04:00
Mattermost Build	5c79b5152e	Accept text shared with image on Android (#6324 ) (#6533 ) (cherry picked from commit `cd4dc9528b`) Co-authored-by: t0mm0 <dev@onairsoftware.co.uk>	2022-08-02 10:38:52 -04:00