Merge pull request #4950 from andydotxyz/fix/iosmemoryfree

Fix crashes on low memory iOS devices
fyne-io · Jun 19, 2024 · 510bb87 · 510bb87
2 parents a17e7b9 + 6857054
commit 510bb87
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/internal/driver/mobile/app/android.go b/internal/driver/mobile/app/android.go
@@ -57,8 +57,6 @@ import (
 	"log"
 	"mime"
 	"os"
-	"runtime"
-	"runtime/debug"
 	"strings"
 	"time"
 	"unsafe"
@@ -278,8 +276,7 @@ func onConfigurationChanged(activity *C.ANativeActivity) {
 
 //export onLowMemory
 func onLowMemory(activity *C.ANativeActivity) {
-	runtime.GC()
-	debug.FreeOSMemory()
+	cleanCaches()
 }
 
 var (

diff --git a/internal/driver/mobile/app/darwin_ios.go b/internal/driver/mobile/app/darwin_ios.go
@@ -210,6 +210,11 @@ func lifecycleVisible() { theApp.sendLifecycle(lifecycle.StageVisible) }
 //export lifecycleFocused
 func lifecycleFocused() { theApp.sendLifecycle(lifecycle.StageFocused) }
 
+//export lifecycleMemoryWarning
+func lifecycleMemoryWarning() {
+	cleanCaches()
+}
+
 //export drawloop
 func drawloop() {
 	runtime.LockOSThread()

diff --git a/internal/driver/mobile/app/darwin_ios.m b/internal/driver/mobile/app/darwin_ios.m
@@ -70,6 +70,10 @@ - (void)applicationWillTerminate:(UIApplication *)application {
 	lifecycleDead();
 }
 
+- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
+	lifecycleMemoryWarning();
+}
+
 - (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray <NSURL *>*)urls {
     if ([urls count] == 0) {
         return;

diff --git a/internal/driver/mobile/app/mobile.go b/internal/driver/mobile/app/mobile.go
@@ -0,0 +1,15 @@
+//go:build ios || android
+
+package app
+
+import "C"
+import (
+	"runtime"
+	"runtime/debug"
+)
+
+// clean caches - called when the OS wants some memory back
+func cleanCaches() {
+	runtime.GC()
+	debug.FreeOSMemory()
+}