downgrade from expo 44 to 43 (#5891)

2022-01-04 09:54:05 +02:00
parent 112df5c3f8
commit fa88b86b36
5 changed files with 896 additions and 315 deletions
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -143,6 +143,8 @@
  "login.signIn": "Log In",
  "login.signingIn": "Logging In",
  "login.username": "Username",
+  "mentions.empty.paragraph": "You'll see messages here when someone mentions you or uses terms you're monitoring.",
+  "mentions.empty.title": "No Mentions yet",
  "mobile.about.appVersion": "App Version: {version} (Build {number})",
  "mobile.about.copyright": "Copyright 2015-{currentYear} Mattermost, Inc. All rights reserved",
  "mobile.about.database": "Database: {type}",
@@ -325,5 +327,11 @@
  "team_list.no_other_teams.title": "No additional teams to join",
  "user.edit_profile.email.auth_service": "Login occurs through {service}. Email cannot be updated. Email address used for notifications is {email}.",
  "user.edit_profile.email.web_client": "Email must be updated using a web client or desktop application.",
-  "user.settings.general.field_handled_externally": "Some fields below are handled through your login provider. If you want to change them, you’ll need to do so through your login provider."
+  "user.settings.general.email": "Email",
+  "user.settings.general.field_handled_externally": "Some fields below are handled through your login provider. If you want to change them, you’ll need to do so through your login provider.",
+  "user.settings.general.firstName": "First Name",
+  "user.settings.general.lastName": "Last Name",
+  "user.settings.general.nickname": "Nickname",
+  "user.settings.general.position": "Position",
+  "user.settings.general.username": "Username"
 }
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,16 +1,15 @@
 PODS:
-  - Alamofire (5.4.4)
+  - Alamofire (5.5.0)
  - boost (1.76.0)
  - BVLinearGradient (2.5.6):
    - React
  - DoubleConversion (1.1.6)
-  - EXFileSystem (13.1.0):
+  - EXFileSystem (13.0.3):
    - ExpoModulesCore
-  - Expo (44.0.3):
+  - Expo (43.0.4):
    - ExpoModulesCore
-  - ExpoModulesCore (0.6.3):
+  - ExpoModulesCore (0.4.9):
    - React-Core
-    - ReactCommon/turbomodule/core
  - FBLazyVector (0.66.4)
  - FBReactNativeSpec (0.66.4):
    - RCT-Folly (= 2021.06.28.00-v2)
@@ -443,7 +442,7 @@ PODS:
    - React
  - RNVectorIcons (9.0.0):
    - React-Core
-  - Rudder (1.2.1)
+  - Rudder (1.2.2)
  - SDWebImage (5.11.1):
    - SDWebImage/Core (= 5.11.1)
  - SDWebImage/Core (5.11.1)
@@ -735,13 +734,13 @@ CHECKOUT OPTIONS:
    :git: https://github.com/mattermost/Starscream.git

 SPEC CHECKSUMS:
-  Alamofire: f3b09a368f1582ab751b3fff5460276e0d2cf5c9
+  Alamofire: 1c4fb5369c3fe93d2857c780d8bbe09f06f97e7c
  boost: a7c83b31436843459a1961bfd74b96033dc77234
  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
-  EXFileSystem: 7d1309ba6b38b82ef7fc9e80174de3f9184ac8b4
-  Expo: 5f9812539b12998a813315ea8036971c9b56a9e7
-  ExpoModulesCore: d04e519b3e8e21523b195bb21a40144e30f1e163
+  EXFileSystem: 99aac7962c11c680681819dd9cbca24e20e5b1e7
+  Expo: 363a3f3c60d5a1d4f8badb29a869005487f2d9e4
+  ExpoModulesCore: e41ed0b72daeac74731816ad7997d639f0115a9d
  FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1
  FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
@@ -816,7 +815,7 @@ SPEC CHECKSUMS:
  RNShare: d76b8c9c6e6ffb38fc18f40b4338c9d867592ed3
  RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
  RNVectorIcons: 4143ba35feebab8fdbe6bc43d1e776b393d47ac8
-  Rudder: db8cfa8e5757599dfec74a1bdd04dc17b3859789
+  Rudder: 5569284198eaddd1763fb5faff8e076d4ac2c858
  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
  SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815
  Sentry: e58e062056a061ae1145e22ad3dff6e506bff177
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
    "deep-equal": "2.0.5",
    "deepmerge": "4.2.2",
    "emoji-regex": "10.0.0",
-    "expo": "44.0.3",
+    "expo": "43.0.4",
    "fuse.js": "6.5.3",
    "jail-monkey": "2.6.0",
    "lottie-ios": "3.2.3",
--- a/patches/expo-file-system+13.1.0.patch
+++ b/patches/expo-file-system+13.1.0.patch
@@ -1,166 +0,0 @@
-diff --git a/node_modules/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.kt b/node_modules/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.kt
-index 53bf40f..0ba5d89 100644
--- a/node_modules/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.kt
-+++ b/node_modules/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.kt
-@@ -56,6 +56,7 @@ import okhttp3.Callback
- import okhttp3.Headers
- import okhttp3.JavaNetCookieJar
- import okhttp3.MediaType
-+import okhttp3.MediaType.Companion.toMediaTypeOrNull
- import okhttp3.MultipartBody
- import okhttp3.OkHttpClient
- import okhttp3.Request
-@@ -63,11 +64,7 @@ import okhttp3.RequestBody
- import okhttp3.Response
- import okhttp3.ResponseBody
- 
-import okio.Buffer
-import okio.BufferedSource
-import okio.ForwardingSource
-import okio.Okio
-import okio.Source
-+import okio.*
- 
- import org.apache.commons.codec.binary.Hex
- import org.apache.commons.codec.digest.DigestUtils
-@@ -766,7 +763,7 @@ open class FileSystemModule(
-       }
- 
-       val body = createRequestBody(options, decorator, fileUri.toFile())
-      return requestBuilder.method(method, body).build()
-+      return method?.let { requestBuilder.method(it, body).build() }
-     } catch (e: Exception) {
-       e.message?.let { Log.e(TAG, it) }
-       promise.reject(e)
-@@ -791,7 +788,7 @@ open class FileSystemModule(
-         } ?: URLConnection.guessContentTypeFromName(file.name)
- 
-         val fieldName = options["fieldName"]?.let { it as String } ?: file.name
-        bodyBuilder.addFormDataPart(fieldName, file.name, decorator.decorate(RequestBody.create(MediaType.parse(mimeType), file)))
-+        bodyBuilder.addFormDataPart(fieldName, file.name, decorator.decorate(RequestBody.create(mimeType.toMediaTypeOrNull(), file)))
-         bodyBuilder.build()
-       }
-       else -> {
-@@ -816,9 +813,9 @@ open class FileSystemModule(
- 
-         override fun onResponse(call: Call, response: Response) {
-           val result = Bundle().apply {
-            putString("body", response.body()?.string())
-            putInt("status", response.code())
-            putBundle("headers", translateHeaders(response.headers()))
-+            putString("body", response.body?.string())
-+            putInt("status", response.code)
-+            putBundle("headers", translateHeaders(response.headers))
-           }
-           response.close()
-           promise.resolve(result)
-@@ -866,7 +863,7 @@ open class FileSystemModule(
-     taskHandlers[uuid] = TaskHandler(call)
-     call.enqueue(object : Callback {
-       override fun onFailure(call: Call, e: IOException) {
-        if (call.isCanceled) {
-+        if (call.isCanceled()) {
-           promise.resolve(null)
-           return
-         }
-@@ -876,11 +873,11 @@ open class FileSystemModule(
- 
-       override fun onResponse(call: Call, response: Response) {
-         val result = Bundle()
-        val body = response.body()
-+        val body = response.body
-         result.apply {
-           putString("body", body?.string())
-          putInt("status", response.code())
-          putBundle("headers", translateHeaders(response.headers()))
-+          putInt("status", response.code)
-+          putBundle("headers", translateHeaders(response.headers))
-         }
-         response.close()
-         promise.resolve(result)
-@@ -900,10 +897,10 @@ open class FileSystemModule(
-           val resources = context.resources
-           val packageName = context.packageName
-           val resourceId = resources.getIdentifier(url, "raw", packageName)
-          val bufferedSource = Okio.buffer(Okio.source(context.resources.openRawResource(resourceId)))
-+          val bufferedSource = context.resources.openRawResource(resourceId).source().buffer()
-           val file = uri.toFile()
-           file.delete()
-          val sink = Okio.buffer(Okio.sink(file))
-+          val sink = file.sink().buffer()
-           sink.writeAll(bufferedSource)
-           sink.close()
-           val result = Bundle()
-@@ -934,13 +931,13 @@ open class FileSystemModule(
-             override fun onResponse(call: Call, response: Response) {
-               val file = uri.toFile()
-               file.delete()
-              val sink = Okio.buffer(Okio.sink(file))
-              sink.writeAll(response.body()!!.source())
-+              val sink = file.sink().buffer()
-+              sink.writeAll(response.body!!.source())
-               sink.close()
-               val result = Bundle().apply {
-                 putString("uri", Uri.fromFile(file).toString())
-                putInt("status", response.code())
-                putBundle("headers", translateHeaders(response.headers()))
-+                putInt("status", response.code)
-+                putBundle("headers", translateHeaders(response.headers))
-                 if (options?.get("md5") == true) {
-                   putString("md5", md5(file))
-                 }
-@@ -1003,7 +1000,7 @@ open class FileSystemModule(
-         ?.addNetworkInterceptor { chain ->
-           val originalResponse = chain.proceed(chain.request())
-           originalResponse.newBuilder()
-            .body(ProgressResponseBody(originalResponse.body(), progressListener))
-+            .body(ProgressResponseBody(originalResponse.body, progressListener))
-             .build()
-         }
-         ?.build()
-@@ -1098,7 +1095,7 @@ open class FileSystemModule(
-       val options = params[0]?.options
-       return try {
-         val response = call!!.execute()
-        val responseBody = response.body()
-+        val responseBody = response.body
-         val input = BufferedInputStream(responseBody!!.byteStream())
-         val output = FileOutputStream(file, isResume == true)
-         val data = ByteArray(1024)
-@@ -1108,15 +1105,15 @@ open class FileSystemModule(
-         }
-         val result = Bundle().apply {
-           putString("uri", Uri.fromFile(file).toString())
-          putInt("status", response.code())
-          putBundle("headers", translateHeaders(response.headers()))
-+          putInt("status", response.code)
-+          putBundle("headers", translateHeaders(response.headers))
-           options?.get("md5").takeIf { it == true }?.let { putString("md5", file?.let { md5(it) }) }
-         }
-         response.close()
-         promise?.resolve(result)
-         null
-       } catch (e: Exception) {
-        if (call?.isCanceled == true) {
-+        if (call?.isCanceled() == true) {
-           promise?.resolve(null)
-           return null
-         }
-@@ -1139,7 +1136,7 @@ open class FileSystemModule(
-     override fun contentLength(): Long = responseBody?.contentLength() ?: -1
- 
-     override fun source(): BufferedSource =
-      bufferedSource ?: Okio.buffer(source(responseBody!!.source()))
-+      bufferedSource ?: source(responseBody!!.source()).buffer()
- 
-     private fun source(source: Source): Source {
-       return object : ForwardingSource(source) {
-@@ -1304,7 +1301,7 @@ open class FileSystemModule(
-   // Copied out of React Native's `NetworkingModule.java`
-   private fun translateHeaders(headers: Headers): Bundle {
-     val responseHeaders = Bundle()
-    for (i in 0 until headers.size()) {
-+    for (i in 0 until headers.size) {
-       val headerName = headers.name(i)
-       // multiple values for the same header
-       if (responseHeaders[headerName] != null) {