expo-file-system 13.0.2 → 13.1.2

package/CHANGELOG.md

@@ -10,10 +10,25 @@
 
 ### 💡 Others
 
-## 13.0.2 — 2021-10-15
+## 13.1.2 — 2022-01-22
 
 ### 🐛 Bug fixes
 
+- Fixed runtime crash due to `.toUpperCase` not being invoked as a function, it was missing `()`. ([#15615](https://github.com/expo/expo/pull/15615) by [@lukebrandonfarrell](https://github.com/lukebrandonfarrell))
+- Fixed `totalByteSent` in upload progress callback incorrectly sending `bytesSent` on iOS. ([#15615](https://github.com/expo/expo/pull/15615) by [@lukebrandonfarrell](https://github.com/lukebrandonfarrell))
+- Fixed simulator runtime crash on arm64 devices caused by `CFRelease(NULL)`. ([#15496](https://github.com/expo/expo/pull/15496) by [@daxaxelrod](https://github.com/daxaxelrod))
+
+## 13.1.1 — 2022-01-20
+
+### 🐛 Bug fixes
+
+- Fix build errors on React Native 0.66 caused by `okio` and `okhttp`. ([#15632](https://github.com/expo/expo/pull/15632) by [@kudo](https://github.com/kudo))
+
+## 13.1.0 — 2021-11-17
+
+### 🐛 Bug fixes
+
+- Fixed `uploadAsync` failing to resolve when using `BINARY_CONTENT`. ([#14764](https://github.com/expo/expo/pull/14764) by [@cruzach](https://github.com/cruzach))
 - Fix `okio` library build error for `react-native@0.65` or above. ([#14761](https://github.com/expo/expo/pull/14761) by [@kudo](https://github.com/kudo))
 
 ## 13.0.1 — 2021-10-01
@@ -34,6 +49,7 @@ _This version does not introduce any user-facing changes._
 ### 💡 Others
 
 - Updated `@expo/config-plugins` ([#14443](https://github.com/expo/expo/pull/14443) by [@EvanBacon](https://github.com/EvanBacon))
+- Rewritten module to Kotlin. ([#14549](https://github.com/expo/expo/pull/14549) by [@mstach60161](https://github.com/mstach60161))
 
 ## 12.0.0 — 2021-09-08
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '13.0.2'
+version = '13.1.2'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -53,11 +53,15 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8
+  }
+
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 30
-    versionName "13.0.2"
+    versionName "13.1.2"
   }
   lintOptions {
     abortOnError false
@@ -75,7 +79,27 @@ dependencies {
   api 'commons-io:commons-io:1.4'
   api 'com.squareup.okhttp3:okhttp:3.10.0'
   api 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0'
+  api 'com.squareup.okio:okio:1.17.5'
   api "androidx.legacy:legacy-support-v4:1.0.0"
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
 }
+
+// [BEGIN] Workaround okhttp/okio compatibility issue
+// Remove when we drop support for SDK 44
+def okhttpPinnedArtifacts = []
+configurations.api.getDependencies().removeIf { it ->
+  if (['com.squareup.okhttp3', 'com.squareup.okio'].contains(it.group)) {
+    okhttpPinnedArtifacts.add("${it.group}:${it.name}:${it.version}")
+    return true
+  }
+  return false
+}
+okhttpPinnedArtifacts.each { artifact ->
+  dependencies.add('compileOnly', artifact)
+  dependencies.add('testApi', artifact)
+  configurations.all {
+    resolutionStrategy.force(artifact)
+  }
+}
+// [END] Workaround okhttp/okio compatibility issue

package/android/src/main/java/expo/modules/filesystem/CountingRequestBody.kt

@@ -9,7 +9,7 @@ import okio.Sink
 import java.io.IOException
 
 @FunctionalInterface
-interface RequestBodyDecorator {
+fun interface RequestBodyDecorator {
   fun decorate(requestBody: RequestBody): RequestBody
 }
 
@@ -45,16 +45,7 @@ class CountingRequestBody(
   override fun writeTo(sink: BufferedSink) {
     val countingSink = CountingSink(sink, this, progressListener)
 
-    // `Okio.buffer` is deprecated in okio 2.x.
-    // To be compatible across react-native versions where
-    // react-native < 0.65, okio is 1.x
-    // react-native >= 0.65, okio is 2.x
-    // We just suppress the error.
-    // In okio 2.x, `Okio.buffer` is still an extension method proxied to `countingSink.buffer()`.
-    // See: https://github.com/square/okio/blob/b0f78aaa46/okio/src/jvmMain/kotlin/okio/-DeprecatedOkio.kt#L48-L56
-    @Suppress("DEPRECATION_ERROR")
     val bufferedSink = Okio.buffer(countingSink)
-
     requestBody.writeTo(bufferedSink)
     bufferedSink.flush()
   }

package/android/src/main/java/expo/modules/filesystem/FilePermissionModule.kt

@@ -0,0 +1,48 @@
+package expo.modules.filesystem
+
+import android.content.Context
+import expo.modules.interfaces.filesystem.FilePermissionModuleInterface
+import expo.modules.core.interfaces.InternalModule
+import expo.modules.interfaces.filesystem.Permission
+import java.io.File
+import java.io.IOException
+import java.util.*
+
+// The class needs to be 'open', because it's inherited in expoview
+open class FilePermissionModule : FilePermissionModuleInterface, InternalModule {
+  override fun getExportedInterfaces(): List<Class<*>> =
+    listOf(FilePermissionModuleInterface::class.java)
+
+  override fun getPathPermissions(context: Context, path: String): EnumSet<Permission> =
+    getInternalPathPermissions(path, context) ?: getExternalPathPermissions(path)
+
+  private fun getInternalPathPermissions(path: String, context: Context): EnumSet<Permission>? {
+    return try {
+      val canonicalPath = File(path).canonicalPath
+      getInternalPaths(context)
+        .firstOrNull { dir -> canonicalPath.startsWith("$dir/") || dir == canonicalPath }
+        ?.let { EnumSet.of(Permission.READ, Permission.WRITE) }
+    } catch (e: IOException) {
+      EnumSet.noneOf(Permission::class.java)
+    }
+  }
+
+  protected open fun getExternalPathPermissions(path: String): EnumSet<Permission> {
+    val file = File(path)
+    return EnumSet.noneOf(Permission::class.java).apply {
+      if (file.canRead()) {
+        add(Permission.READ)
+      }
+      if (file.canWrite()) {
+        add(Permission.WRITE)
+      }
+    }
+  }
+
+  @Throws(IOException::class)
+  private fun getInternalPaths(context: Context): List<String> =
+    listOf(
+      context.filesDir.canonicalPath,
+      context.cacheDir.canonicalPath
+    )
+}

package/android/src/main/java/expo/modules/filesystem/FileSystemFileProvider.kt

@@ -0,0 +1,5 @@
+package expo.modules.filesystem
+
+import androidx.core.content.FileProvider
+
+class FileSystemFileProvider : FileProvider()