expo-screen-capture 5.8.0 → 5.8.1

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 5.8.1 — 2024-01-23
+
+### 🐛 Bug fixes
+
+- Fix screenshot listener not being called on Android 34. ([#26549](https://github.com/expo/expo/pull/26549) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 5.8.0 — 2023-12-15
 
 ### 🎉 New features

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '5.8.0'
+version = '5.8.1'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -94,7 +94,7 @@ android {
   namespace "expo.modules.screencapture"
   defaultConfig {
     versionCode 7
-    versionName '5.8.0'
+    versionName '5.8.1'
   }
 }
 

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
   <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+  <uses-permission android:name="android.permission.DETECT_SCREEN_CAPTURE" android:maxSdkVersion="34" />
 </manifest>

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

@@ -1,6 +1,7 @@
 package expo.modules.screencapture
 
 import android.Manifest
+import android.app.Activity
 import android.content.Context
 import android.os.Build
 import android.view.WindowManager
@@ -11,17 +12,31 @@ import expo.modules.kotlin.functions.Queues
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 
+const val eventName = "onScreenshot"
+
 class ScreenCaptureModule : Module() {
   private val context: Context
     get() = appContext.reactContext ?: throw Exceptions.AppContextLost()
   private val currentActivity
     get() = appContext.currentActivity ?: throw Exceptions.MissingActivity()
+  private var screenCaptureCallback: Activity.ScreenCaptureCallback? = null
 
   override fun definition() = ModuleDefinition {
     Name("ExpoScreenCapture")
 
+    Events(eventName)
+
     OnCreate {
-      ScreenshotEventEmitter(context, appContext.legacyModuleRegistry)
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+        screenCaptureCallback = Activity.ScreenCaptureCallback {
+          sendEvent(eventName)
+        }
+        currentActivity.registerScreenCaptureCallback(currentActivity.mainExecutor, screenCaptureCallback!!)
+      } else {
+        ScreenshotEventEmitter(context) {
+          sendEvent(eventName)
+        }
+      }
     }
 
     AsyncFunction("getPermissionsAsync") { promise: Promise ->
@@ -47,5 +62,13 @@ class ScreenCaptureModule : Module() {
     AsyncFunction("allowScreenCapture") {
       currentActivity.window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
     }.runOnQueue(Queues.MAIN)
+
+    OnDestroy {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+        screenCaptureCallback?.let {
+          currentActivity.unregisterScreenCaptureCallback(it)
+        }
+      }
+    }
   }
 }

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

@@ -6,32 +6,19 @@ import android.content.pm.PackageManager
 import android.database.ContentObserver
 import android.net.Uri
 import android.os.Build
-import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.provider.MediaStore
 import android.util.Log
-
-import androidx.core.content.ContextCompat
 import androidx.annotation.Nullable
-
-import expo.modules.core.ModuleRegistry
+import androidx.core.content.ContextCompat
 import expo.modules.core.interfaces.LifecycleEventListener
-import expo.modules.core.interfaces.services.EventEmitter
-import expo.modules.core.interfaces.services.UIManager
-
-import java.lang.Exception
 
-class ScreenshotEventEmitter(val context: Context, moduleRegistry: ModuleRegistry) : LifecycleEventListener {
-  private val onScreenshotEventName: String = "onScreenshot"
+class ScreenshotEventEmitter(val context: Context, onCapture: () -> Unit) : LifecycleEventListener {
   private var isListening: Boolean = true
-  private var eventEmitter: EventEmitter
   private var previousPath: String = ""
 
   init {
-    moduleRegistry.getModule(UIManager::class.java).registerLifecycleEventListener(this)
-    eventEmitter = moduleRegistry.getModule(EventEmitter::class.java)
-
     val contentObserver: ContentObserver = object : ContentObserver(Handler(Looper.getMainLooper())) {
       override fun onChange(selfChange: Boolean, uri: Uri?) {
         super.onChange(selfChange, uri)
@@ -43,7 +30,7 @@ class ScreenshotEventEmitter(val context: Context, moduleRegistry: ModuleRegistr
           val path = getFilePathFromContentResolver(context, uri)
           if (path != null && isPathOfNewScreenshot(path)) {
             previousPath = path
-            eventEmitter.emit(onScreenshotEventName, Bundle())
+            onCapture()
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-screen-capture",
-  "version": "5.8.0",
+  "version": "5.8.1",
   "description": "ExpoScreenCapture standalone module",
   "main": "build/ScreenCapture.js",
   "types": "build/ScreenCapture.d.ts",
@@ -39,5 +39,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "1a7c4e8ffed182e00cf1cf654ca2401441a7377a"
+  "gitHead": "7fb94e3c0598d0e2d428184b16eec5ec67d80388"
 }