Bump app version number to 1.42.1 (#5343 )

Bump app build number to 354 (#5341 ) (#5342 )
(cherry picked from commit a7e0ee262b) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
2021-04-19 12:04:40 -04:00 · 2021-04-19 11:57:14 -04:00 · 2021-04-19 11:50:57 -04:00
14 changed files with 59 additions and 60 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -132,8 +132,8 @@ android {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
        missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
-        versionCode 353
-        versionName "1.42.0"
+        versionCode 354
+        versionName "1.42.1"
        multiDexEnabled = true
        testBuildType System.getProperty('testBuildType', 'debug')
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
--- a/app/constants/view.js
+++ b/app/constants/view.js
@@ -112,10 +112,10 @@ const ViewTypes = keyMirror({
 });

 const RequiredServer = {
-    FULL_VERSION: 5.31,
+    FULL_VERSION: '5.31.3',
    MAJOR_VERSION: 5,
    MIN_VERSION: 31,
-    PATCH_VERSION: 0,
+    PATCH_VERSION: 3,
 };

 export default {
--- a/app/mm-redux/selectors/entities/teams.ts
+++ b/app/mm-redux/selectors/entities/teams.ts
@@ -110,7 +110,7 @@ export const getMyTeams = reselect.createSelector(
    getTeams,
    getTeamMemberships,
    (teams, members) => {
-        return Object.values(teams).filter((t) => members[t.id] && t.delete_at === 0);
+        return Object.values(teams).filter((t) => t && members[t.id] && t.delete_at === 0);
    },
 );

--- a/app/store/mmkv_adapter.ts
+++ b/app/store/mmkv_adapter.ts
@@ -43,19 +43,16 @@ export default async function getStorage(identifier = 'default') {
        ): Promise<string | Error> => {
            return new Promise((resolve, reject) => {
                checkValidInput(key);
-                MMKV.getString(key, (error: Error, result: string) => {
-                    if (error) {
-                        if (callback) {
-                            callback(error, null);
-                        }
-                        reject(error);
-                        return;
-                    }
-
+                MMKV.getStringAsync(key).then((result: string) => {
                    if (callback) {
                        callback(null, result);
                    }
                    resolve(JSON.parse(result));
+                }).catch((error: Error) => {
+                    if (callback) {
+                        callback(error, null);
+                    }
+                    reject(error);
                });
            });
        },
@@ -67,14 +64,19 @@ export default async function getStorage(identifier = 'default') {
                error: Error | null
            ) => void | null | undefined,
        ): Promise<null | Error> => {
-            return new Promise((resolve) => {
+            return new Promise((resolve, reject) => {
                checkValidInput(key, value);
-                MMKV.setString(key, JSON.stringify(value));
-                if (callback) {
-                    callback(null);
-                }
-
-                resolve(null);
+                MMKV.setStringAsync(key, JSON.stringify(value)).then(() => {
+                    if (callback) {
+                        callback(null);
+                    }
+                    resolve(null);
+                }).catch((error: Error) => {
+                    if (callback) {
+                        callback(error);
+                    }
+                    reject(error);
+                });
            });
        },

--- a/app/utils/supported_server.ts
+++ b/app/utils/supported_server.ts
@@ -36,7 +36,7 @@ function unsupportedServerAdminAlert(formatMessage: FormatMessageType) {
        text: formatMessage({id: 'mobile.server_upgrade.learn_more', defaultMessage: 'Learn More'}),
        style: 'cancel',
        onPress: () => {
-            const url = 'https://mattermost.com/blog/support-for-esr-5-9-has-ended/';
+            const url = 'https://docs.mattermost.com/administration/release-lifecycle.html';
            const onError = () => {
                Alert.alert(
                    formatMessage({
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -912,7 +912,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 353;
+				CURRENT_PROJECT_VERSION = 354;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
@@ -954,7 +954,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 353;
+				CURRENT_PROJECT_VERSION = 354;
 				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.42.0</string>
+	<string>1.42.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>353</string>
+	<string>354</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.42.0</string>
+	<string>1.42.1</string>
 	<key>CFBundleVersion</key>
-	<string>353</string>
+	<string>354</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.42.0</string>
+	<string>1.42.1</string>
 	<key>CFBundleVersion</key>
-	<string>353</string>
+	<string>354</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -246,7 +246,7 @@ PODS:
    - React-Core
  - react-native-local-auth (1.6.0):
    - React
-  - react-native-mmkv-storage (0.5.3):
+  - react-native-mmkv-storage (0.4.4):
    - MMKV (= 1.2.7)
    - React-Core
  - react-native-netinfo (6.0.0):
@@ -683,7 +683,7 @@ SPEC CHECKSUMS:
  react-native-hw-keyboard-event: b517cefb8d5c659a38049c582de85ff43337dc53
  react-native-image-picker: 32d1ad2c0024ca36161ae0d5c2117e2d6c441f11
  react-native-local-auth: 359af242caa1e5c501ac9dfe33b1e238ad8f08c6
-  react-native-mmkv-storage: b8c0ce10551ecf9c270477606aa2cab763011097
+  react-native-mmkv-storage: 5ed53d7c4ac98f1ef184404e781f63a998f98121
  react-native-netinfo: 34f4d7a42f49157f3b45c14217d256bce7dc9682
  react-native-notifications: e914ff49de3b2268cfa1b5e2ad21fd27c36d5b7b
  react-native-passcode-status: 88c4f6e074328bc278bd127646b6c694ad5a530a
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "mattermost-mobile",
-  "version": "1.42.0",
+  "version": "1.42.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -20978,9 +20978,9 @@
      "integrity": "sha512-4Ii7lqiD9iL0LxTWifAiEsDcDPpvos/29fEVkHxgEDD7J5f+NROMkFSFomKgz1Cab1TmN5mau3o8yFmYrPFcnw=="
    },
    "react-native-mmkv-storage": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.5.3.tgz",
-      "integrity": "sha512-6JAD3IYfpdWTiQZWiKSQn4RAjbxVhyziZncvwPY2ToO/o/DiRdW4fce+ZJ755KpfBfG6EcB3is5sX+LXIJqVkA=="
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.4.4.tgz",
+      "integrity": "sha512-NuLKc9C0xLPgteQpieGMGbkNm8A0ma8rzfErQKZbS4KLD2bWQ8c1rZ71JgGBiJrCffpDy1BNZt86DZtPl7djXw=="
    },
    "react-native-modal": {
      "version": "11.7.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mattermost-mobile",
-  "version": "1.42.0",
+  "version": "1.42.1",
  "description": "Mattermost Mobile with React Native",
  "repository": "git@github.com:mattermost/mattermost-mobile.git",
  "author": "Mattermost, Inc.",
@@ -54,7 +54,7 @@
    "react-native-linear-gradient": "2.5.6",
    "react-native-local-auth": "1.6.0",
    "react-native-localize": "2.0.2",
-    "react-native-mmkv-storage": "0.5.3",
+    "react-native-mmkv-storage": "0.4.4",
    "react-native-navigation": "7.11.3",
    "react-native-notifications": "3.4.2",
    "react-native-passcode-status": "1.1.2",
--- a/patches/react-native-mmkv-storage+0.4.4.patch
+++ b/patches/react-native-mmkv-storage+0.4.4.patch
@@ -0,0 +1,19 @@
+diff --git a/node_modules/react-native-mmkv-storage/ios/MMKVStorage.m b/node_modules/react-native-mmkv-storage/ios/MMKVStorage.m
+index 2875bda..8235771 100644
+--- a/node_modules/react-native-mmkv-storage/ios/MMKVStorage.m
+++ b/node_modules/react-native-mmkv-storage/ios/MMKVStorage.m
+@@ -45,10 +45,10 @@ - (id)init
+ {
+     self = [super init];
+     if (self) {
+-         NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
+-         NSString *libraryPath = (NSString *) [paths firstObject];
+-         NSString *rootDir = [libraryPath stringByAppendingPathComponent:@"mmkv"];
+-         [MMKV initializeMMKV:rootDir];
+        NSBundle *bundle = [NSBundle mainBundle];
+        NSString *APP_GROUP_ID = [bundle objectForInfoDictionaryKey:@"AppGroupIdentifier"];
+        NSString *groupDir = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:APP_GROUP_ID].path;
+        [MMKV initializeMMKV:nil groupDir:groupDir logLevel:MMKVLogInfo];
+ 
+         secureStorage = [[SecureStorage alloc]init];
+         IdStore = [[IDStore alloc] initWithMMKV:[MMKV mmkvWithID:@"mmkvIdStore"]];
--- a/patches/react-native-mmkv-storage+0.5.3.patch
+++ b/patches/react-native-mmkv-storage+0.5.3.patch
@@ -1,22 +0,0 @@
-diff --git a/node_modules/react-native-mmkv-storage/ios/MMKVNative.mm b/node_modules/react-native-mmkv-storage/ios/MMKVNative.mm
-index 299942e..9c5b3f9 100644
--- a/node_modules/react-native-mmkv-storage/ios/MMKVNative.mm
-+++ b/node_modules/react-native-mmkv-storage/ios/MMKVNative.mm
-@@ -690,12 +690,12 @@ static void install(jsi::Runtime & jsiRuntime)
-  
-     mmkvInstances = [NSMutableDictionary dictionary];
-     
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
-    NSString *libraryPath = (NSString *) [paths firstObject];
-    NSString *rootDir = [libraryPath stringByAppendingPathComponent:@"mmkv"];
-    rPath = rootDir;
-+    NSBundle *bundle = [NSBundle mainBundle];
-+    NSString *APP_GROUP_ID = [bundle objectForInfoDictionaryKey:@"AppGroupIdentifier"];
-+    NSString *groupDir = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:APP_GROUP_ID].path;
-+    rPath = groupDir;
-     _secureStorage = [[SecureStorage alloc] init];
-    [MMKV initializeMMKV:rootDir];
-+    [MMKV initializeMMKV:nil groupDir:groupDir logLevel:MMKVLogInfo];
-     install(*(jsi::Runtime *)cxxBridge.runtime);
-     [self migrate];
-