expo-screen-capture 5.1.0 → 5.2.0

package/CHANGELOG.md

@@ -10,6 +10,20 @@
 
 ### 💡 Others
 
+## 5.2.0 — 2023-05-08
+
+### 🎉 New features
+
+- On Android, migrated to Expo Modules API. ([#22208](https://github.com/expo/expo/pull/22208) by [@alanjhughes](https://github.com/alanjhughes))
+
+### 💡 Others
+
+- Android: Switch from deprecated `toLowerCase` to `lowercase` function ([#22225](https://github.com/expo/expo/pull/22225) by [@hbiede](https://github.com/hbiede))
+
+## 5.1.1 — 2023-02-09
+
+_This version does not introduce any user-facing changes._
+
 ## 5.1.0 — 2023-02-03
 
 ### 💡 Others

package/README.md

@@ -13,7 +13,7 @@ This is especially important on Android, since the [`android.media.projection`](
 
 ## Installation in managed Expo projects
 
-For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/screen-capture/).
+For [managed](https://docs.expo.dev/archive/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/screen-capture/).
 
 ## Installation in bare React Native projects
 
@@ -21,13 +21,13 @@ For bare React Native projects, you must ensure that you have [installed and con
 
 ### Add the package to your npm dependencies
 
-```sh
-expo install expo-screen-capture
+```
+npx expo install expo-screen-capture
 ```
 
 ### Configure for iOS
 
-```sh
+```
 npx pod-install
 ```
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '5.1.0'
+version = '5.2.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -22,7 +22,7 @@ buildscript {
     if (ext.has("kotlinVersion")) {
       ext.kotlinVersion()
     } else {
-      ext.safeExtGet("kotlinVersion", "1.6.10")
+      ext.safeExtGet("kotlinVersion", "1.8.10")
     }
   }
 
@@ -74,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 7
-    versionName '5.1.0'
+    versionName '5.2.0'
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/screencapture/ScreenCaptureModule.kt

@@ -1,69 +1,31 @@
 package expo.modules.screencapture
 
-import android.app.Activity
 import android.content.Context
 import android.view.WindowManager
-
-import expo.modules.core.ExportedModule
-import expo.modules.core.ModuleRegistry
-import expo.modules.core.Promise
-import expo.modules.core.errors.CurrentActivityNotFoundException
-import expo.modules.core.interfaces.ActivityProvider
-import expo.modules.core.interfaces.ExpoMethod
-
-class ScreenCaptureModule(context: Context) : ExportedModule(context) {
-
-  private lateinit var mActivityProvider: ActivityProvider
-
-  override fun getName(): String {
-    return NAME
-  }
-
-  override fun onCreate(moduleRegistry: ModuleRegistry) {
-    mActivityProvider = moduleRegistry.getModule(ActivityProvider::class.java)
-    ScreenshotEventEmitter(context, moduleRegistry)
-  }
-
-  @ExpoMethod
-  fun preventScreenCapture(promise: Promise) {
-    val activity = getCurrentActivity()
-
-    activity.runOnUiThread {
-      try {
-        activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE)
-      } catch (exception: Exception) {
-        promise.reject(ERROR_CODE_PREVENTION, "Failed to prevent screen capture: " + exception)
-      }
-    }
-    promise.resolve(null)
-  }
-
-  @ExpoMethod
-  fun allowScreenCapture(promise: Promise) {
-    val activity = getCurrentActivity()
-
-    activity.runOnUiThread {
-      try {
-        activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-      } catch (exception: Exception) {
-        promise.reject(ERROR_CODE_PREVENTION, "Failed to reallow screen capture: " + exception)
-      }
+import expo.modules.kotlin.exception.Exceptions
+import expo.modules.kotlin.functions.Queues
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class ScreenCaptureModule : Module() {
+  private val context: Context
+    get() = appContext.reactContext ?: throw Exceptions.AppContextLost()
+  private val currentActivity
+    get() = appContext.currentActivity ?: throw Exceptions.MissingActivity()
+
+  override fun definition() = ModuleDefinition {
+    Name("ExpoScreenCapture")
+
+    OnCreate {
+      ScreenshotEventEmitter(context, appContext.legacyModuleRegistry)
     }
-    promise.resolve(null)
-  }
 
-  @Throws(CurrentActivityNotFoundException::class)
-  fun getCurrentActivity(): Activity {
-    val activity = mActivityProvider.currentActivity
-    if (activity != null) {
-      return activity
-    } else {
-      throw CurrentActivityNotFoundException()
-    }
-  }
+    AsyncFunction("preventScreenCapture") {
+      currentActivity.window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+    }.runOnQueue(Queues.MAIN)
 
-  companion object {
-    private val NAME = "ExpoScreenCapture"
-    private const val ERROR_CODE_PREVENTION = "ERR_SCREEN_CAPTURE_PREVENTION"
+    AsyncFunction("allowScreenCapture") {
+      currentActivity.window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+    }.runOnQueue(Queues.MAIN)
   }
 }

package/android/src/main/java/expo/modules/screencapture/ScreenShotEventEmitter.kt

@@ -7,6 +7,7 @@ import android.database.ContentObserver
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.provider.MediaStore
 import android.util.Log
 
@@ -30,7 +31,7 @@ class ScreenshotEventEmitter(val context: Context, moduleRegistry: ModuleRegistr
     moduleRegistry.getModule(UIManager::class.java).registerLifecycleEventListener(this)
     eventEmitter = moduleRegistry.getModule(EventEmitter::class.java)
 
-    val contentObserver: ContentObserver = object : ContentObserver(Handler()) {
+    val contentObserver: ContentObserver = object : ContentObserver(Handler(Looper.getMainLooper())) {
       override fun onChange(selfChange: Boolean, uri: Uri?) {
         super.onChange(selfChange, uri)
         if (isListening) {
@@ -65,14 +66,16 @@ class ScreenshotEventEmitter(val context: Context, moduleRegistry: ModuleRegistr
     return ContextCompat.checkSelfPermission(context, permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
   }
 
-  @Nullable private fun getFilePathFromContentResolver(context: Context, uri: Uri?): String? {
+  @Nullable
+  private fun getFilePathFromContentResolver(context: Context, uri: Uri?): String? {
     if (uri == null) {
       return null
     }
     try {
       val cursor = context.contentResolver.query(uri, arrayOf(MediaStore.Images.Media.DATA), null, null, null)
       if (cursor != null && cursor.moveToFirst()) {
-        val path = cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media.DATA))
+        val index = cursor.getColumnIndex(MediaStore.Images.Media.DATA)
+        val path = cursor.getString(index)
         cursor.close()
         return path
       }
@@ -83,7 +86,7 @@ class ScreenshotEventEmitter(val context: Context, moduleRegistry: ModuleRegistr
   }
 
   private fun isPathOfNewScreenshot(path: String): Boolean {
-    if (!path.toLowerCase().contains("screenshot")) {
+    if (!path.lowercase().contains("screenshot")) {
       return false
     }
     // Cannot check that the onChange event is for an insert operation until API level 30

package/build/ExpoScreenCapture.d.ts

@@ -1,3 +1,3 @@
-declare const _default: import("expo-modules-core").ProxyNativeModule;
+declare const _default: any;
 export default _default;
 //# sourceMappingURL=ExpoScreenCapture.d.ts.map

package/build/ExpoScreenCapture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoScreenCapture.d.ts","sourceRoot":"","sources":["../src/ExpoScreenCapture.ts"],"names":[],"mappings":";AAEA,wBAAoD"}
+{"version":3,"file":"ExpoScreenCapture.d.ts","sourceRoot":"","sources":["../src/ExpoScreenCapture.ts"],"names":[],"mappings":";AACA,wBAAwD"}

package/build/ExpoScreenCapture.js

@@ -1,3 +1,3 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExpoScreenCapture;
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExpoScreenCapture');
 //# sourceMappingURL=ExpoScreenCapture.js.map

package/build/ExpoScreenCapture.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoScreenCapture.js","sourceRoot":"","sources":["../src/ExpoScreenCapture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,eAAe,kBAAkB,CAAC,iBAAiB,CAAC","sourcesContent":["import { NativeModulesProxy } from 'expo-modules-core';\n\nexport default NativeModulesProxy.ExpoScreenCapture;\n"]}
+{"version":3,"file":"ExpoScreenCapture.js","sourceRoot":"","sources":["../src/ExpoScreenCapture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,eAAe,mBAAmB,CAAC,mBAAmB,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\nexport default requireNativeModule('ExpoScreenCapture');\n"]}

package/expo-module.config.json

@@ -0,0 +1,7 @@
+{
+  "name": "expo-screen-capture",
+  "platforms": ["ios", "android", "web"],
+  "android": {
+    "modules": ["expo.modules.screencapture.ScreenCaptureModule"]
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-screen-capture",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "ExpoScreenCapture standalone module",
   "main": "build/ScreenCapture.js",
   "types": "build/ScreenCapture.d.ts",
@@ -39,5 +39,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "1815e2eaad8c753588c7b1eb74420174a28e01f4"
+  "gitHead": "4ba50c428c8369bb6b3a51a860d4898ad4ccbe78"
 }

package/src/ExpoScreenCapture.ts

@@ -1,3 +1,2 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-
-export default NativeModulesProxy.ExpoScreenCapture;
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExpoScreenCapture');

package/android/src/main/java/expo/modules/screencapture/ScreenCapturePackage.kt

@@ -1,12 +0,0 @@
-package expo.modules.screencapture
-
-import android.content.Context
-
-import expo.modules.core.BasePackage
-import expo.modules.core.ExportedModule
-
-class ScreenCapturePackage : BasePackage() {
-  override fun createExportedModules(context: Context): List<ExportedModule> {
-    return listOf(ScreenCaptureModule(context) as ExportedModule)
-  }
-}

package/unimodule.json

@@ -1,4 +0,0 @@
-{
-  "name": "expo-screen-capture",
-  "platforms": ["ios", "android", "web"]
-}