From dab3d26238f8e9092b4c3f222fed6e3d6ba50085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Wed, 11 Sep 2024 22:34:52 +0200
Subject: [PATCH 01/34] Changes contact email address for solving rejection
 issues

---
 piwigo/Resources/ar.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/da.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/de.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/es.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/fr.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/hu.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/id.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/it.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/ja.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/nl.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/pl.lproj/AppStore.strings                 | 2 +-
 piwigo/Resources/pl.lproj/InfoPlist.strings                | 2 +-
 piwigo/Resources/pl.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/ru.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/sv.lproj/PrivacyPolicy.strings            | 2 +-
 piwigo/Resources/zh-Hans.lproj/PrivacyPolicy.strings       | 2 +-
 piwigo/Resources/zh-Hant.lproj/PrivacyPolicy.strings       | 2 +-
 piwigo/Settings.bundle/ar.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/da.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/de.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/es.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/fr.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/hu.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/id.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/it.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/ja.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/nl.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/pl.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/ru.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/sv.lproj/PrivacyPolicy.strings      | 2 +-
 piwigo/Settings.bundle/zh-Hans.lproj/PrivacyPolicy.strings | 2 +-
 piwigo/Settings.bundle/zh-Hant.lproj/PrivacyPolicy.strings | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/piwigo/Resources/ar.lproj/PrivacyPolicy.strings b/piwigo/Resources/ar.lproj/PrivacyPolicy.strings
index fa4191aad..252f08d59 100644
--- a/piwigo/Resources/ar.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/ar.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/da.lproj/PrivacyPolicy.strings b/piwigo/Resources/da.lproj/PrivacyPolicy.strings
index f3f023d40..d4e96538b 100644
--- a/piwigo/Resources/da.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/da.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (Frankrig)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/de.lproj/PrivacyPolicy.strings b/piwigo/Resources/de.lproj/PrivacyPolicy.strings
index bf36ccdd7..bdc94d65c 100644
--- a/piwigo/Resources/de.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/de.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (Frankreich)";
 
-"contact_email" = "iOS@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/es.lproj/PrivacyPolicy.strings b/piwigo/Resources/es.lproj/PrivacyPolicy.strings
index 6e79d4b03..414dc159f 100644
--- a/piwigo/Resources/es.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/es.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/fr.lproj/PrivacyPolicy.strings b/piwigo/Resources/fr.lproj/PrivacyPolicy.strings
index 4ecf2959c..29981b994 100644
--- a/piwigo/Resources/fr.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/fr.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/hu.lproj/PrivacyPolicy.strings b/piwigo/Resources/hu.lproj/PrivacyPolicy.strings
index 05414dba5..c69acb1b0 100644
--- a/piwigo/Resources/hu.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/hu.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/id.lproj/PrivacyPolicy.strings b/piwigo/Resources/id.lproj/PrivacyPolicy.strings
index abaedce45..fea35364e 100644
--- a/piwigo/Resources/id.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/id.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (Prancis)";
 
-"contact_email" = "iOS@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/it.lproj/PrivacyPolicy.strings b/piwigo/Resources/it.lproj/PrivacyPolicy.strings
index d9ab156d0..ea900c327 100644
--- a/piwigo/Resources/it.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/it.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/ja.lproj/PrivacyPolicy.strings b/piwigo/Resources/ja.lproj/PrivacyPolicy.strings
index 96d66ca87..178cdab23 100644
--- a/piwigo/Resources/ja.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/ja.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/nl.lproj/PrivacyPolicy.strings b/piwigo/Resources/nl.lproj/PrivacyPolicy.strings
index 233501a96..e2ab8e20b 100644
--- a/piwigo/Resources/nl.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/nl.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 Rue des Vignesm 21800 Queyigny (Frankrijk)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/pl.lproj/AppStore.strings b/piwigo/Resources/pl.lproj/AppStore.strings
index 155c6a9d4..bbb0ffbcc 100644
--- a/piwigo/Resources/pl.lproj/AppStore.strings
+++ b/piwigo/Resources/pl.lproj/AppStore.strings
@@ -14,6 +14,6 @@
 
 "promotional_text" = "Twoja biblioteka zdjęć w chmurze Piwigo pod ręką!";
 
-"subtitle" = "Twoje zdjęcia w chmurze";
+"subtitle" = "Twoje zdjęcia w Twojej chmurze";
 
 "keywords" = "Piwigo, Cloud, album, zdjęcie, video, obraz, wysyłanie, pobieranie";
diff --git a/piwigo/Resources/pl.lproj/InfoPlist.strings b/piwigo/Resources/pl.lproj/InfoPlist.strings
index 9271c4cab..d7ffe9b5a 100644
--- a/piwigo/Resources/pl.lproj/InfoPlist.strings
+++ b/piwigo/Resources/pl.lproj/InfoPlist.strings
@@ -8,4 +8,4 @@
 
 "NSPhotoLibraryUsageDescription" = "dzięki temu będzie w stanie przechowywać zdjęcia w aplikacji Zdjęcia i przesłać je do Twojej galerii Piwigo.";
 "NSSiriUsageDescription" = "aby Piwigo mógł przesyłać zdjęcia z Siri.";
-"NSLocalNetworkUsageDescription" = "Piwigo używa sieci lokalnej, aby uzyskać dostęp do serwera Piwigo.";
+"NSLocalNetworkUsageDescription" = "Piwigo używa sieci lokalnej, aby uzyskać dostęp do Twojego serwera Piwigo.";
diff --git a/piwigo/Resources/pl.lproj/PrivacyPolicy.strings b/piwigo/Resources/pl.lproj/PrivacyPolicy.strings
index 1fe313966..598a7a934 100644
--- a/piwigo/Resources/pl.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/pl.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (Francja)";
 
-"contact_email" = "iOS@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/ru.lproj/PrivacyPolicy.strings b/piwigo/Resources/ru.lproj/PrivacyPolicy.strings
index 47167f38a..c2de13325 100644
--- a/piwigo/Resources/ru.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/ru.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/sv.lproj/PrivacyPolicy.strings b/piwigo/Resources/sv.lproj/PrivacyPolicy.strings
index d08fed50f..4adc5a7be 100644
--- a/piwigo/Resources/sv.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/sv.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (Frankrike)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/zh-Hans.lproj/PrivacyPolicy.strings b/piwigo/Resources/zh-Hans.lproj/PrivacyPolicy.strings
index 7139e0fb1..7088a9482 100644
--- a/piwigo/Resources/zh-Hans.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/zh-Hans.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Resources/zh-Hant.lproj/PrivacyPolicy.strings b/piwigo/Resources/zh-Hant.lproj/PrivacyPolicy.strings
index 47c431c31..a126a8112 100644
--- a/piwigo/Resources/zh-Hant.lproj/PrivacyPolicy.strings
+++ b/piwigo/Resources/zh-Hant.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/ar.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/ar.lproj/PrivacyPolicy.strings
index fa4191aad..252f08d59 100644
--- a/piwigo/Settings.bundle/ar.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/ar.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/da.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/da.lproj/PrivacyPolicy.strings
index f3f023d40..d4e96538b 100644
--- a/piwigo/Settings.bundle/da.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/da.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (Frankrig)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/de.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/de.lproj/PrivacyPolicy.strings
index bf36ccdd7..bdc94d65c 100644
--- a/piwigo/Settings.bundle/de.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/de.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (Frankreich)";
 
-"contact_email" = "iOS@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/es.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/es.lproj/PrivacyPolicy.strings
index 6e79d4b03..414dc159f 100644
--- a/piwigo/Settings.bundle/es.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/es.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/fr.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/fr.lproj/PrivacyPolicy.strings
index 4ecf2959c..29981b994 100644
--- a/piwigo/Settings.bundle/fr.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/fr.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/hu.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/hu.lproj/PrivacyPolicy.strings
index 05414dba5..c69acb1b0 100644
--- a/piwigo/Settings.bundle/hu.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/hu.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/id.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/id.lproj/PrivacyPolicy.strings
index abaedce45..fea35364e 100644
--- a/piwigo/Settings.bundle/id.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/id.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (Prancis)";
 
-"contact_email" = "iOS@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/it.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/it.lproj/PrivacyPolicy.strings
index d9ab156d0..ea900c327 100644
--- a/piwigo/Settings.bundle/it.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/it.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/ja.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/ja.lproj/PrivacyPolicy.strings
index 96d66ca87..178cdab23 100644
--- a/piwigo/Settings.bundle/ja.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/ja.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/nl.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/nl.lproj/PrivacyPolicy.strings
index 233501a96..e2ab8e20b 100644
--- a/piwigo/Settings.bundle/nl.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/nl.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 Rue des Vignesm 21800 Queyigny (Frankrijk)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/pl.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/pl.lproj/PrivacyPolicy.strings
index 1fe313966..598a7a934 100644
--- a/piwigo/Settings.bundle/pl.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/pl.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (Francja)";
 
-"contact_email" = "iOS@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/ru.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/ru.lproj/PrivacyPolicy.strings
index 47167f38a..c2de13325 100644
--- a/piwigo/Settings.bundle/ru.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/ru.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/sv.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/sv.lproj/PrivacyPolicy.strings
index d08fed50f..4adc5a7be 100644
--- a/piwigo/Settings.bundle/sv.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/sv.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (Frankrike)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/zh-Hans.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/zh-Hans.lproj/PrivacyPolicy.strings
index 7139e0fb1..7088a9482 100644
--- a/piwigo/Settings.bundle/zh-Hans.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/zh-Hans.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";
diff --git a/piwigo/Settings.bundle/zh-Hant.lproj/PrivacyPolicy.strings b/piwigo/Settings.bundle/zh-Hant.lproj/PrivacyPolicy.strings
index 47c431c31..a126a8112 100644
--- a/piwigo/Settings.bundle/zh-Hant.lproj/PrivacyPolicy.strings
+++ b/piwigo/Settings.bundle/zh-Hant.lproj/PrivacyPolicy.strings
@@ -60,4 +60,4 @@
 
 "contact_address" = "Piwigo, 42 rue des Vignes, 21800 Quetigny (France)";
 
-"contact_email" = "ios@piwigo.org";
+"contact_email" = "piwigo@lelievre-berna.net";

From a96b28ec8497f368172929cab4589fc6a447463e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sat, 21 Sep 2024 12:19:37 +0200
Subject: [PATCH 02/34] Fixes missing dYSM file not created, increments app
 version

---
 piwigo.xcodeproj/project.pbxproj | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/piwigo.xcodeproj/project.pbxproj b/piwigo.xcodeproj/project.pbxproj
index 417527f32..03d4b57d6 100644
--- a/piwigo.xcodeproj/project.pbxproj
+++ b/piwigo.xcodeproj/project.pbxproj
@@ -3768,7 +3768,6 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZEC3W885H6;
@@ -3821,7 +3820,6 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZU5THW8T5W;
@@ -3869,7 +3867,6 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = ZEC3W885H6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Supporting Targets/piwigoWebAPI/Info.plist";
@@ -3909,7 +3906,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Supporting Targets/piwigoWebAPI/Info.plist";
@@ -3950,7 +3946,6 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 371;
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZEC3W885H6;
@@ -4006,7 +4001,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
 				CURRENT_PROJECT_VERSION = 371;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZU5THW8T5W;
@@ -4057,7 +4051,6 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZEC3W885H6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -4097,7 +4090,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Supporting Targets/piwigoScreenshots/Info.plist";
@@ -4135,7 +4127,6 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = ZEC3W885H6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = piwigoIntents/Resources/Info.plist;
@@ -4178,7 +4169,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = ZU5THW8T5W;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZU5THW8T5W;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -4220,7 +4210,6 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZEC3W885H6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -4261,7 +4250,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Supporting Targets/piwigoAppPreviews/Info.plist";
@@ -4436,10 +4424,8 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Eddy Lelievre-Berna (QWTTGCZPSN)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 559;
+				CURRENT_PROJECT_VERSION = 591;
 				DEAD_CODE_STRIPPING = YES;
-				"DEBUG_INFORMATION_FORMAT[sdk=*]" = "dwarf-with-dsym";
-				"DEBUG_INFORMATION_FORMAT[sdk=iphonesimulator*]" = dwarf;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZEC3W885H6;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -4458,7 +4444,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.2;
+				MARKETING_VERSION = 3.2.3;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -4508,7 +4494,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Pierrick Le Gall (ZU5THW8T5W)";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 559;
+				CURRENT_PROJECT_VERSION = 591;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZU5THW8T5W;
@@ -4527,7 +4513,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.2;
+				MARKETING_VERSION = 3.2.3;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20";
 				OTHER_LDFLAGS = (
 					"$(inherited)",

From 7afca3bd036aa10c3e2ccc2d562a51e652682b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sat, 21 Sep 2024 12:21:49 +0200
Subject: [PATCH 03/34] Fixes max size of downsampled image

---
 piwigo/Image/ImageUtilities.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/piwigo/Image/ImageUtilities.swift b/piwigo/Image/ImageUtilities.swift
index f419da894..84699eb86 100644
--- a/piwigo/Image/ImageUtilities.swift
+++ b/piwigo/Image/ImageUtilities.swift
@@ -258,7 +258,7 @@ class ImageUtilities: NSObject {
                 maxPixelSize = min(maxPixelSize, maxPixelWidth.floatValue)
             }
             if let maxPixelHeight = imageMetadata[kCGImagePropertyPixelHeight] as NSNumber? {
-                maxPixelSize = min(maxPixelSize, maxPixelHeight.floatValue)
+                maxPixelSize = max(maxPixelSize, maxPixelHeight.floatValue)
             }
         }
         let downsampleOptions = [kCGImageSourceCreateThumbnailFromImageAlways: true,

From 9c4023274402501fade034f879f685b2fa53022a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sat, 21 Sep 2024 12:22:50 +0200
Subject: [PATCH 04/34] Fixes content mode of thumbnails shown in albums

---
 piwigo/Album/ImageCollection/ImageCollectionViewCell.xib | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/piwigo/Album/ImageCollection/ImageCollectionViewCell.xib b/piwigo/Album/ImageCollection/ImageCollectionViewCell.xib
index 36382dcf5..45f45c3fe 100644
--- a/piwigo/Album/ImageCollection/ImageCollectionViewCell.xib
+++ b/piwigo/Album/ImageCollection/ImageCollectionViewCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="collection view cell content view" minToolsVersion="11.0"/>
@@ -19,7 +19,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="120" height="120"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Xpg-8s-0ki">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Xpg-8s-0ki">
                         <rect key="frame" x="0.0" y="0.0" width="120" height="120"/>
                     </imageView>
                     <view hidden="YES" alpha="0.59999999999999998" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P89-cH-cSc">

From f03850acfc2060195c9c2488e193095005788fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 22 Sep 2024 10:19:01 +0200
Subject: [PATCH 05/34] Moves getObjectCount() where it should be

---
 .../Data Cache/Image Data/ImageProvider.swift | 53 ++++++++-----------
 1 file changed, 22 insertions(+), 31 deletions(-)

diff --git a/piwigoKit/Data Cache/Image Data/ImageProvider.swift b/piwigoKit/Data Cache/Image Data/ImageProvider.swift
index 467a3011d..04cccf592 100644
--- a/piwigoKit/Data Cache/Image Data/ImageProvider.swift	
+++ b/piwigoKit/Data Cache/Image Data/ImageProvider.swift	
@@ -43,6 +43,26 @@ public class ImageProvider: NSObject {
     
     
     // MARK: - Get Images
+    public func getObjectCount() -> Int64 {
+
+        // Create a fetch request for the Image entity
+        let fetchRequest = NSFetchRequest<NSNumber>(entityName: "Image")
+        fetchRequest.resultType = .countResultType
+        
+        // Select images of the current server
+        fetchRequest.predicate = NSPredicate(format: "server.path == %@", NetworkVars.serverPath)
+
+        // Fetch number of objects
+        do {
+            let countResult = try bckgContext.fetch(fetchRequest)
+            return countResult.first!.int64Value
+        }
+        catch let error as NSError {
+            print("••> Image count not fetched \(error), \(error.userInfo)")
+        }
+        return Int64.zero
+    }
+
     func frcOfImage(inContext taskContext: NSManagedObjectContext,
                     withIds imageIds: Set<Int64>) -> NSFetchedResultsController<Image> {
         let fetchRequest = Image.fetchRequest()
@@ -465,9 +485,7 @@ public class ImageProvider: NSObject {
     
     
     // MARK: - Clear Images
-    /**
-     Purge cache from orphaned images
-     */
+    // Purge cache from orphaned images
     public func purgeOrphans() {
         
         // Retrieve images in persistent store
@@ -487,35 +505,8 @@ public class ImageProvider: NSObject {
         // Execute batch delete request
         try? bckgContext.executeAndMergeChanges(using: batchDeleteRequest)
     }
-    
-    
-    // MARK: - Clear Image Data
-    /**
-        Return number of images stored in cache
-     */
-    public func getObjectCount() -> Int64 {
-
-        // Create a fetch request for the Image entity
-        let fetchRequest = NSFetchRequest<NSNumber>(entityName: "Image")
-        fetchRequest.resultType = .countResultType
         
-        // Select images of the current server
-        fetchRequest.predicate = NSPredicate(format: "server.path == %@", NetworkVars.serverPath)
-
-        // Fetch number of objects
-        do {
-            let countResult = try bckgContext.fetch(fetchRequest)
-            return countResult.first!.int64Value
-        }
-        catch let error as NSError {
-            print("••> Image count not fetched \(error), \(error.userInfo)")
-        }
-        return Int64.zero
-    }
-
-    /**
-     Clear cached Core Data image entry
-     */
+    // Clear cached Core Data image entry
     public func clearAll() {
         
         // Retrieve images in persistent store

From 5c2e48eb59d5b3986114dfe21c0d90d1b3ea06ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 22 Sep 2024 10:27:58 +0200
Subject: [PATCH 06/34] Corrects comments

---
 piwigo/Settings/Extensions/SettingsViewController+Cache.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/piwigo/Settings/Extensions/SettingsViewController+Cache.swift b/piwigo/Settings/Extensions/SettingsViewController+Cache.swift
index b3267325d..8e3c094ce 100644
--- a/piwigo/Settings/Extensions/SettingsViewController+Cache.swift
+++ b/piwigo/Settings/Extensions/SettingsViewController+Cache.swift
@@ -16,7 +16,7 @@ extension SettingsViewController
     // MARK: - Image Sizes
     func getThumbnailSizes() -> Set<pwgImageSize> {
         // Album and photo thumbnails
-        // Select images whose size is lower than the default preview size
+        // Select images whose size is lower than or equal to the default thumbnail sizes
         let allSizes = pwgImageSize.allCases
         let thumbSize = max(AlbumVars.shared.defaultThumbnailSize, AlbumVars.shared.defaultAlbumThumbnailSize)
         return Set(allSizes.filter({$0.rawValue <= thumbSize}))
@@ -24,7 +24,7 @@ extension SettingsViewController
     
     func getPhotoSizes() -> Set<pwgImageSize> {
         // Album and photo thumbnails
-        // Select images whose size is lower than the default preview size
+        // Select images whose size is greater than the default thumbnail sizes
         let allSizes = pwgImageSize.allCases
         let thumbSize = max(AlbumVars.shared.defaultThumbnailSize, AlbumVars.shared.defaultAlbumThumbnailSize)
         return Set(allSizes.filter({$0.rawValue > thumbSize}))

From 93e0b489e3f7b7d6d717c98c18a6777836694d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 22 Sep 2024 14:04:26 +0200
Subject: [PATCH 07/34] Replaces "-opt" images produced with v3.2.2

---
 piwigo/Image/ImageUtilities.swift             | 23 ++++++++++++++++++-
 piwigo/Supporting Files/AppVars.swift         |  4 ++++
 piwigoKit/Supporting Files/URL+AppTools.swift |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/piwigo/Image/ImageUtilities.swift b/piwigo/Image/ImageUtilities.swift
index 84699eb86..b4999a57c 100644
--- a/piwigo/Image/ImageUtilities.swift
+++ b/piwigo/Image/ImageUtilities.swift
@@ -211,11 +211,32 @@ class ImageUtilities: NSObject {
     // MARK: - Image Downsampling
     // Downsampling large images for display at smaller size
     /// WWDC 2018 - Session 219 - Image and Graphics Best practices
+
+    // Bug introduced on 6 September 2024 (commit 18e427379a8132575a72ef053fe7d26090e09525)
+    static let dateCommit18e4273 = ISO8601DateFormatter().date(from: "2024-09-06T00:00:00Z")!
+    static let dateOfFirstOptImageV323 = {
+        if AppVars.shared.dateOfFirstOptImageV323 == Date.distantFuture.timeIntervalSinceReferenceDate {
+            AppVars.shared.dateOfFirstOptImageV323 = Date().timeIntervalSinceReferenceDate
+        }
+        return Date(timeIntervalSinceReferenceDate: AppVars.shared.dateOfFirstOptImageV323)
+    }()
+
     static func downsample(imageAt imageURL: URL, to pointSize: CGSize, scale: CGFloat) -> UIImage {
         // Optimised image available?
         let filePath = imageURL.path + CacheVars.shared.optImage
         if let optImage = UIImage(contentsOfFile: filePath) {
-            return optImage
+            // Images created since commit 18e4273 can be too small (v3.2.2) — fixed in v3.2.3.
+            let fileURL: URL?
+            if #available(iOS 16.0, *) {
+                fileURL = URL(filePath: filePath, directoryHint: .notDirectory)
+            } else {
+                // Fallback on earlier versions
+                fileURL = URL(fileURLWithPath: filePath)
+            }
+            if let fileCreationDate = fileURL?.creationDate,
+               (fileCreationDate < dateCommit18e4273 || fileCreationDate > dateOfFirstOptImageV323) {
+                return optImage
+            }
         }
         
         // Check that the image can be properly downsampled by checking its pixel format.
diff --git a/piwigo/Supporting Files/AppVars.swift b/piwigo/Supporting Files/AppVars.swift
index ff94f4d97..babe48e07 100644
--- a/piwigo/Supporting Files/AppVars.swift	
+++ b/piwigo/Supporting Files/AppVars.swift	
@@ -75,6 +75,10 @@ class AppVars: NSObject {
     /// - Remember for which version the What's New in Piwigo view was presented
     @UserDefault("didShowWhatsNewAppVersion", defaultValue: "2.12.7")
     var didShowWhatsNewAppVersion: String
+    
+    /// - Remember when the first '-opt' cached image was produced with version 3.2.3
+    @UserDefault("dateOfFirstOptImageV323", defaultValue: Date.distantFuture.timeIntervalSinceReferenceDate)
+    var dateOfFirstOptImageV323: TimeInterval
 
     
     // MARK: - Vars in UserDefaults / App Group
diff --git a/piwigoKit/Supporting Files/URL+AppTools.swift b/piwigoKit/Supporting Files/URL+AppTools.swift
index 330a56b79..6a1b41791 100644
--- a/piwigoKit/Supporting Files/URL+AppTools.swift	
+++ b/piwigoKit/Supporting Files/URL+AppTools.swift	
@@ -46,7 +46,7 @@ extension URL {
     }
     
     // Returns the creation date of the file
-    var creationDate: Date? {
+    public var creationDate: Date? {
         return attributes?[.creationDate] as? Date
     }
     

From 39f4c278cf9ae069e11f7cc0b7c465aaab90ba1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 22 Sep 2024 14:05:36 +0200
Subject: [PATCH 08/34] Removes useless log

---
 piwigoKit/Network/Extensions/PwgSession+Utilities.swift | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/piwigoKit/Network/Extensions/PwgSession+Utilities.swift b/piwigoKit/Network/Extensions/PwgSession+Utilities.swift
index e3127c256..5707f3c6c 100644
--- a/piwigoKit/Network/Extensions/PwgSession+Utilities.swift
+++ b/piwigoKit/Network/Extensions/PwgSession+Utilities.swift
@@ -78,7 +78,7 @@ extension PwgSession {
     func checkSession(ofUser user: User?,
                       completion: @escaping () -> Void,
                       failure: @escaping (NSError) -> Void) {
-//        debugPrint("••> seconds since last used: \(Date.timeIntervalSinceReferenceDate - (user?.lastUsed ?? 0.0))")
+//        debugPrint("••> Session checked \(Date.timeIntervalSinceReferenceDate - (user?.lastUsed ?? 0.0)) seconds ago.")
         if #available(iOSApplicationExtension 14.0, *) {
             logger.notice("Start checking session…")
         }
@@ -111,9 +111,6 @@ extension PwgSession {
                         // Perform login
                         let username = NetworkVars.username
                         let password = KeychainUtilities.password(forService: NetworkVars.serverPath, account: username)
-                        if #available(iOSApplicationExtension 14.0, *) {
-                            logger.notice("Create session for \(username, privacy: .private(mask: .hash))")
-                        }
                         PwgSession.shared.sessionLogin(withUsername: username, password: password) {
                             // Session now opened
                             getPiwigoConfig {

From 2e0f570b5648f281bb889e1b701ed4878a5f05e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 22 Sep 2024 14:27:22 +0200
Subject: [PATCH 09/34] Adds v3.2.3 release notes

---
 piwigo/Resources/ar.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/da.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/de.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/en.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/es.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/fr.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/hu.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/id.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/it.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/ja.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/nl.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/pl.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/ru.lproj/ReleaseNotes.strings              | 6 ++++--
 piwigo/Resources/sv.lproj/ReleaseNotes.strings              | 4 +++-
 piwigo/Resources/zh-Hans.lproj/ReleaseNotes.strings         | 4 +++-
 piwigo/Resources/zh-Hant.lproj/ReleaseNotes.strings         | 4 +++-
 .../Settings/Information/ReleaseNotesViewController.swift   | 1 +
 17 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/piwigo/Resources/ar.lproj/ReleaseNotes.strings b/piwigo/Resources/ar.lproj/ReleaseNotes.strings
index 61ec36712..03dbea6b8 100644
--- a/piwigo/Resources/ar.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/ar.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "Version 3.2.2\n\n• Adds an option to delete selections of photos/videos stored in the device\n• Bug fixes";
+"v3.2.3_text" = "الإصدار 3.2.3\n\n• اصلاحات الشوائب";
+
+"v3.2.2_text" = "Version 3.2.2\nSeptember 12, 2024\n\n• Adds an option to delete selections of photos/videos stored in the device\n• Bug fixes";
 
 "v3.2.1_text" = "Version 3.2.1\nJuly 29, 2024\n\n• Adds an option to display albums with or without descriptions\n• Bug fixes";
 
diff --git a/piwigo/Resources/da.lproj/ReleaseNotes.strings b/piwigo/Resources/da.lproj/ReleaseNotes.strings
index d16b86877..8cfc58532 100644
--- a/piwigo/Resources/da.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/da.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "Version 3.2.2\n\n• Tilføjer en mulighed for at slette udvalgte fotos/videoer, der er gemt på enheden\n• Fejlrettelser";
+"v3.2.3_text" = "Version 3.2.3\n\n• Fejlrettelser";
+
+"v3.2.2_text" = "Version 3.2.2\n12 september 2024\n\n• Tilføjer en mulighed for at slette udvalgte fotos/videoer, der er gemt på enheden\n• Fejlrettelser";
 
 "v3.2.1_text" = "Version 3.2.1\n29 juli 2024\n\n• Tilføjer en mulighed for at vise album med eller uden beskrivelser\n• Fejlrettelser";
 
diff --git a/piwigo/Resources/de.lproj/ReleaseNotes.strings b/piwigo/Resources/de.lproj/ReleaseNotes.strings
index f91f01540..79dbc0646 100644
--- a/piwigo/Resources/de.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/de.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "Version 3.2.2\n\n• Fügt eine Option zum Löschen einer Auswahl von auf dem Gerät gespeicherten Fotos/Videos hinzu\n• Fehlerbehebungen";
+"v3.2.3_text" = "Version 3.2.3\n\n• Fehlerbehebungen";
+
+"v3.2.2_text" = "Version 3.2.2\n12. September 2024\n\n• Fügt eine Option zum Löschen einer Auswahl von auf dem Gerät gespeicherten Fotos/Videos hinzu\n• Fehlerbehebungen";
 
 "v3.2.1_text" = "Version 3.2.1\n29. Juli 2024\n\n• Fügt eine Option hinzu zum Anzeigen von Alben mit oder ohne Beschreibung\n• Fehlerbehebungen";
 
diff --git a/piwigo/Resources/en.lproj/ReleaseNotes.strings b/piwigo/Resources/en.lproj/ReleaseNotes.strings
index c2619f4bd..1e21b15c0 100644
--- a/piwigo/Resources/en.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/en.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "Version 3.2.2\n\n• Adds an option to delete selections of photos/videos stored in the device\n• Bug fixes";
+"v3.2.3_text" = "Version 3.2.3\n\n• Bug fixes";
+
+"v3.2.2_text" = "Version 3.2.2\nSeptember 12, 2024\n\n• Adds an option to delete selections of photos/videos stored in the device\n• Bug fixes";
 
 "v3.2.1_text" = "Version 3.2.1\nJuly 29, 2024\n\n• Adds an option to display albums with or without descriptions\n• Bug fixes";
 
diff --git a/piwigo/Resources/es.lproj/ReleaseNotes.strings b/piwigo/Resources/es.lproj/ReleaseNotes.strings
index cc35e4f1b..2ec50bffc 100644
--- a/piwigo/Resources/es.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/es.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "Versión 3.2.2\n\n• Añade una opción para borrar selecciones de fotos/vídeos almacenados en el dispositivo\n• Corrección de errores";
+"v3.2.3_text" = "Versión 3.2.3\n\n• Corrección de errores";
+
+"v3.2.2_text" = "Versión 3.2.2\n12 de septiembre de 2024\n\n• Añade una opción para borrar selecciones de fotos/vídeos almacenados en el dispositivo\n• Corrección de errores";
 
 "v3.2.1_text" = "Versión 3.2.1\n29 de julio de 2024\n\n• Añade una opción para mostrar los álbumes con o sin descripciones\n• Corrección de errores";
 
diff --git a/piwigo/Resources/fr.lproj/ReleaseNotes.strings b/piwigo/Resources/fr.lproj/ReleaseNotes.strings
index d068c7686..856d307d0 100644
--- a/piwigo/Resources/fr.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/fr.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "Version 3.2.2\n\n• Ajout d'une option pour supprimer les sélections de photos/vidéos stockées dans l'appareil\n• Correction de bugs";
+"v3.2.3_text" = "Version 3.2.3\n\n• Correction de bugs";
+
+"v3.2.2_text" = "Version 3.2.2\n12 septembre 2024\n\n• Ajout d'une option pour supprimer les sélections de photos/vidéos stockées dans l'appareil\n• Correction de bugs";
 
 "v3.2.1_text" = "Version 3.2.1\n29 juillet 2024\n\n• Ajoute une option pour afficher les albums avec ou sans descriptions\n• Corrections de bugs";
 
diff --git a/piwigo/Resources/hu.lproj/ReleaseNotes.strings b/piwigo/Resources/hu.lproj/ReleaseNotes.strings
index 356f5d67c..94ca111b5 100644
--- a/piwigo/Resources/hu.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/hu.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "3.2.2-es verzió\n\n• Lehetőséget ad a készülékben tárolt fényképek/videók kiválasztásának törlésére\n• Hibajavítások";
+"v3.2.3_text" = "3.2.3-es verzió\n\n• Hibajavítások";
+
+"v3.2.2_text" = "3.2.2-es verzió\n2024 Szeptember 12\n\n• Lehetőséget ad a készülékben tárolt fényképek/videók kiválasztásának törlésére\n• Hibajavítások";
 
 "v3.2.1_text" = "3.2.1-es verzió\n2024 Július 29\n\n• Lehetőséget ad az albumok megjelenítésére leírással vagy anélkül\n• Hibajavítások";
 
diff --git a/piwigo/Resources/id.lproj/ReleaseNotes.strings b/piwigo/Resources/id.lproj/ReleaseNotes.strings
index 84241356b..33179bbf1 100644
--- a/piwigo/Resources/id.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/id.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "Version 3.2.2\n\n• Adds an option to delete selections of photos/videos stored in the device\n• Bug fixes";
+"v3.2.3_text" = "Versi 3.2.3\n\n• Perbaikan bug";
+
+"v3.2.2_text" = "Version 3.2.2\nSeptember 12, 2024\n\n• Adds an option to delete selections of photos/videos stored in the device\n• Bug fixes";
 
 "v3.2.1_text" = "Version 3.2.1\nJuly 29, 2024\n\n• Adds an option to display albums with or without descriptions\n• Bug fixes";
 
diff --git a/piwigo/Resources/it.lproj/ReleaseNotes.strings b/piwigo/Resources/it.lproj/ReleaseNotes.strings
index 314b280f6..aa10265c6 100644
--- a/piwigo/Resources/it.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/it.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "Versione 3.2.2\n\n• Aggiunge un'opzione per eliminare le selezioni di foto/video memorizzate nel dispositivo\n• Correzioni di bug";
+"v3.2.3_text" = "Versione 3.2.3\n\n• Correzioni di bug";
+
+"v3.2.2_text" = "Versione 3.2.2\n12 settembre 2024\n\n• Aggiunge un'opzione per eliminare le selezioni di foto/video memorizzate nel dispositivo\n• Correzioni di bug";
 
 "v3.2.1_text" = "Versione 3.2.1\n29 luglio 2024\n\n• Aggiunge un'opzione per visualizzare gli album con o senza descrizioni\n• Correzioni di bug";
 
diff --git a/piwigo/Resources/ja.lproj/ReleaseNotes.strings b/piwigo/Resources/ja.lproj/ReleaseNotes.strings
index 0c62fe151..a3c88b02a 100644
--- a/piwigo/Resources/ja.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/ja.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "バージョン3.2.2\n\n• デバイスに保存されている写真/ビデオの選択を削除するオプションを追加しました。\n• バグ修正";
+"v3.2.3_text" = "バージョン 3.2.3\n\n• バグの修正";
+
+"v3.2.2_text" = "バージョン3.2.2\n2024年9月12日\n\n• デバイスに保存されている写真/ビデオの選択を削除するオプションを追加しました。\n• バグ修正";
 
 "v3.2.1_text" = "バージョン 3.2.1\n2024年7月29日\n\n• アルバムを説明付きまたは説明なしで表示するオプションを追加\n• バグ修正";
 
diff --git a/piwigo/Resources/nl.lproj/ReleaseNotes.strings b/piwigo/Resources/nl.lproj/ReleaseNotes.strings
index b4b55da2b..24a1a813c 100644
--- a/piwigo/Resources/nl.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/nl.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "Versie 3.2.2\n\n• Optie toegevoegd voor het verwijderen van selecties van foto's/video's die op het apparaat zijn opgeslagen\n• Bug fixes";
+"v3.2.3_text" = "Versie 3.2.3\n\n• Foutjes verbeterd";
+
+"v3.2.2_text" = "Versie 3.2.2\n12 september 2024\n\n• Optie toegevoegd voor het verwijderen van selecties van foto's/video's die op het apparaat zijn opgeslagen\n• Bug fixes";
 
 "v3.2.1_text" = "Versie 3.2.1\n29 juli 2024\n\n• Voegt een optie toe om albums met of zonder beschrijvingen weer te geven\n• Bugfixes";
 
diff --git a/piwigo/Resources/pl.lproj/ReleaseNotes.strings b/piwigo/Resources/pl.lproj/ReleaseNotes.strings
index 3671a8d6e..7ed818c71 100644
--- a/piwigo/Resources/pl.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/pl.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "Wersja 3.2.2\n\n• Dodano opcję usuwania wybranych zdjęć/filmów zapisanych w urządzeniu\n• Poprawki błędów";
+"v3.2.3_text" = "Wersja 3.2.3\n\n• Poprawki błędów";
+
+"v3.2.2_text" = "Wersja 3.2.2\n12 września 2024\n\n• Dodano opcję usuwania wybranych zdjęć/filmów zapisanych w urządzeniu\n• Poprawki błędów";
 
 "v3.2.1_text" = "Wersja 3.2.1\n29 lipca 2024\n\n• Dodaje opcję wyświetlania albumów z ich opisami lub bez opisów\n• Poprawki błędów";
 
diff --git a/piwigo/Resources/ru.lproj/ReleaseNotes.strings b/piwigo/Resources/ru.lproj/ReleaseNotes.strings
index c0fb48c89..08f04d036 100644
--- a/piwigo/Resources/ru.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/ru.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "Версия 3.2.2\n\n• Добавлена возможность удаления избранных фотографий/видео, хранящихся на устройстве\n• Исправления ошибок";
+"v3.2.3_text" = "Версия 3.2.3\n\n• Исправления ошибок";
+
+"v3.2.2_text" = "Версия 3.2.2\n12 сентября 2024\n\n• Добавлена возможность удаления избранных фотографий/видео, хранящихся на устройстве\n• Исправления ошибок";
 
 "v3.2.1_text" = "Версия 3.2.1\n29 июля 2024\n\n• Добавлена ​​возможность отображать альбомы с описаниями или без них.\n• Исправление ошибок";
 
@@ -72,7 +74,7 @@
 
 "v2.7.2_text" = "Версия 2.7.2\n20 сентября 2021\n\n• совместимость с iOS 15\n• Мелкие исправления и улучшения интерфейса\n• Модернизация кода";
 
-"v2.7.1_text" = "Версия 2.7.1\n\n• Незначительные исправления и улучшения интерфейса\n• Улучшенные переводы";
+"v2.7.1_text" = "Версия 2.7.1\n1 сентября 2021\n\n• Незначительные исправления и улучшения интерфейса\n• Улучшенные переводы";
 
 "v2.7.0_text" = "Версия 2.7\n12 августа 2021\n\n• Автоматическая загрузка изображений и видео\n• Улучшенные настройки изображений и видео\n• Незначительные исправления ошибок и улучшения интерфейса\n• Модернизация кода";
 
diff --git a/piwigo/Resources/sv.lproj/ReleaseNotes.strings b/piwigo/Resources/sv.lproj/ReleaseNotes.strings
index 8207e03ac..7fd7d1856 100644
--- a/piwigo/Resources/sv.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/sv.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "Version 3.2.2\n\n• Lägger till ett alternativ för att radera urval av foton/videor som lagrats i enheten\n• Buggfixar";
+"v3.2.3_text" = "Version 3.2.3\n\n• Buggfixar";
+
+"v3.2.2_text" = "Version 3.2.2\n12 september 2024\n\n• Lägger till ett alternativ för att radera urval av foton/videor som lagrats i enheten\n• Buggfixar";
 
 "v3.2.1_text" = "Version 3.2.1\n29 juli 2024\n\n• Lägger till ett alternativ för att visa album med eller utan beskrivningar\n• Bug fixar";
 
diff --git a/piwigo/Resources/zh-Hans.lproj/ReleaseNotes.strings b/piwigo/Resources/zh-Hans.lproj/ReleaseNotes.strings
index f7a97dc61..2f2aff968 100644
--- a/piwigo/Resources/zh-Hans.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/zh-Hans.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "版本 3.2.2\n\n• 添加删除存储在设备中的照片/视频选项\n• 修正错误";
+"v3.2.3_text" = "版本 3.2.3\n\n• 错误修复";
+
+"v3.2.2_text" = "版本 3.2.2\n2024年9月12日\n\n• 添加删除存储在设备中的照片/视频选项\n• 修正错误";
 
 "v3.2.1_text" = "版本 3.2.1\n2024年7月29日\n\n• 添加显示带或不带描述的相册的选项\n• 错误修复";
 
diff --git a/piwigo/Resources/zh-Hant.lproj/ReleaseNotes.strings b/piwigo/Resources/zh-Hant.lproj/ReleaseNotes.strings
index f71467931..fa713ab47 100644
--- a/piwigo/Resources/zh-Hant.lproj/ReleaseNotes.strings
+++ b/piwigo/Resources/zh-Hant.lproj/ReleaseNotes.strings
@@ -6,7 +6,9 @@
  Copyright © 2017 Piwigo.org. All rights reserved.
  */
 
-"v3.2.2_text" = "版本 3.2.2\n\n• 新增刪除儲存於裝置中的相片/影片選項\n• 修正錯誤";
+"v3.2.3_text" = "版本 3.2.3\n\n• 錯誤修正";
+
+"v3.2.2_text" = "版本 3.2.2\n2024年9月12日\n\n• 新增刪除儲存於裝置中的相片/影片選項\n• 修正錯誤";
 
 "v3.2.1_text" = "版本3.2.1\n2024年7月29日\n\n• 新增一個選項來顯示有或沒有說明的相冊\n• 錯誤修正";
 
diff --git a/piwigo/Settings/Information/ReleaseNotesViewController.swift b/piwigo/Settings/Information/ReleaseNotesViewController.swift
index 620bbdaa6..84471c980 100644
--- a/piwigo/Settings/Information/ReleaseNotesViewController.swift
+++ b/piwigo/Settings/Information/ReleaseNotesViewController.swift
@@ -129,6 +129,7 @@ class ReleaseNotesViewController: UIViewController {
         let notesAttributedString = NSMutableAttributedString(string: "")
 
         // Release 3.2.x — Bundle string
+        notesAttributedString.append(releaseNotes("v3.2.3_text", comment: "v3.2.3 Release Notes text"))
         notesAttributedString.append(releaseNotes("v3.2.2_text", comment: "v3.2.2 Release Notes text"))
         notesAttributedString.append(releaseNotes("v3.2.1_text", comment: "v3.2.1 Release Notes text"))
         notesAttributedString.append(releaseNotes("v3.2.0_text", comment: "v3.2.0 Release Notes text"))

From d7211b9247c1e888822ae2c859ea6c6512f0c77f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 22 Sep 2024 14:36:14 +0200
Subject: [PATCH 10/34] Moves constant to appropriate section

---
 piwigoKit/Network/NetworkVars.swift | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/piwigoKit/Network/NetworkVars.swift b/piwigoKit/Network/NetworkVars.swift
index 41bbbcafb..0f15bf6a8 100644
--- a/piwigoKit/Network/NetworkVars.swift
+++ b/piwigoKit/Network/NetworkVars.swift
@@ -39,8 +39,11 @@ public class NetworkVars: NSObject {
     
     // MARK: - Vars in UserDefaults / Standard
     // Network variables stored in UserDefaults / Standard
-    /// - None
-    
+    /// - Request server update once a month max
+    @UserDefault("dateOfLastUpdateRequest", defaultValue: Date().timeIntervalSinceReferenceDate)
+    public static var dateOfLastUpdateRequest: TimeInterval
+
+
     
     // MARK: - Vars in UserDefaults / App Group
     // Network variables stored in UserDefaults / App Group
@@ -112,10 +115,6 @@ public class NetworkVars: NSObject {
     @UserDefault("usesCalcOrphans", defaultValue: false, userDefaults: UserDefaults.dataSuite)
     public static var usesCalcOrphans: Bool
 
-    /// - Request server update once a month max
-    @UserDefault("dateOfLastUpdateRequest", defaultValue: Date().timeIntervalSinceReferenceDate)
-    public static var dateOfLastUpdateRequest: TimeInterval
-
     
     // MARK: - Vars in Memory
     // Network variables kept in memory

From 38742cb3c8d2f947f1f567c01f984b5543a68599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 22 Sep 2024 23:30:00 +0200
Subject: [PATCH 11/34] Version 3.2.3 build 592

---
 piwigo/Info.plist    | 2 +-
 piwigoKit/Info.plist | 2 +-
 uploadKit/Info.plist | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/piwigo/Info.plist b/piwigo/Info.plist
index d274c5d78..b619b7bfa 100644
--- a/piwigo/Info.plist
+++ b/piwigo/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>591</string>
+	<string>592</string>
 	<key>INIntentsSupported</key>
 	<array>
 		<string>AutoUploadIntent</string>
diff --git a/piwigoKit/Info.plist b/piwigoKit/Info.plist
index fb3e9dacb..1a866d2f0 100644
--- a/piwigoKit/Info.plist
+++ b/piwigoKit/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.2.2</string>
 	<key>CFBundleVersion</key>
-	<string>594</string>
+	<string>595</string>
 </dict>
 </plist>
diff --git a/uploadKit/Info.plist b/uploadKit/Info.plist
index c509cbd27..0a05eb66e 100644
--- a/uploadKit/Info.plist
+++ b/uploadKit/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.2.1</string>
 	<key>CFBundleVersion</key>
-	<string>412</string>
+	<string>413</string>
 </dict>
 </plist>

From 6acf5592807aa745853ccac26ca7b4cedf8d1cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Tue, 24 Sep 2024 10:03:57 +0200
Subject: [PATCH 12/34] Version 3.2.3 build 593 for TestFlight testing

---
 piwigo/Info.plist    | 2 +-
 piwigoKit/Info.plist | 2 +-
 uploadKit/Info.plist | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/piwigo/Info.plist b/piwigo/Info.plist
index b619b7bfa..00057c44b 100644
--- a/piwigo/Info.plist
+++ b/piwigo/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>592</string>
+	<string>593</string>
 	<key>INIntentsSupported</key>
 	<array>
 		<string>AutoUploadIntent</string>
diff --git a/piwigoKit/Info.plist b/piwigoKit/Info.plist
index 1a866d2f0..01bb4e38d 100644
--- a/piwigoKit/Info.plist
+++ b/piwigoKit/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.2.2</string>
 	<key>CFBundleVersion</key>
-	<string>595</string>
+	<string>596</string>
 </dict>
 </plist>
diff --git a/uploadKit/Info.plist b/uploadKit/Info.plist
index 0a05eb66e..072d65012 100644
--- a/uploadKit/Info.plist
+++ b/uploadKit/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.2.1</string>
 	<key>CFBundleVersion</key>
-	<string>413</string>
+	<string>414</string>
 </dict>
 </plist>

From 78a43a499ce5888c54ee7c24ee2b291d4d522394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Wed, 25 Sep 2024 18:58:47 +0200
Subject: [PATCH 13/34] Fixes showing time zone on iPad - should not because
 unknown

---
 piwigo/Image/ImageViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/piwigo/Image/ImageViewController.swift b/piwigo/Image/ImageViewController.swift
index 8d06324c0..d7ea65628 100644
--- a/piwigo/Image/ImageViewController.swift
+++ b/piwigo/Image/ImageViewController.swift
@@ -508,7 +508,7 @@ class ImageViewController: UIViewController {
             let dateFormatter = DateUtilities.dateFormatter()
             if UIDevice.current.userInterfaceIdiom == .pad {
                 dateFormatter.dateStyle = .long
-                dateFormatter.timeStyle = .long
+                dateFormatter.timeStyle = .medium   // Without time zone (unknown)
                 subTitleLabel.text = dateFormatter.string(from: dateCreated)
             } else {
                 dateFormatter.dateStyle = .medium

From 6c8a3854d4afb8e8ba8c343f6e665f3841cf1ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 29 Sep 2024 16:21:29 +0200
Subject: [PATCH 14/34] PHAsset.creationDate returns UTC or real time so we do
 not show the time at which local images were created

---
 piwigo/Album/AlbumUtilities.swift             | 90 ++++++++++++-------
 .../ImageHeaderReusableView.swift             |  4 +-
 .../ImageOldHeaderReusableView.swift          |  4 +-
 .../LocalImagesHeaderReusableView.swift       |  2 +-
 4 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/piwigo/Album/AlbumUtilities.swift b/piwigo/Album/AlbumUtilities.swift
index 1fc53babf..cd532abbf 100644
--- a/piwigo/Album/AlbumUtilities.swift
+++ b/piwigo/Album/AlbumUtilities.swift
@@ -627,7 +627,7 @@ class AlbumUtilities: NSObject {
     }
     
     // MARK: - Album/Images Collections | Image Section
-    static func getDateLabels(for timeIntervals: [TimeInterval]) -> (String, String) {
+    static func getDateLabels(for timeIntervals: [TimeInterval], arePwgDates: Bool) -> (String, String) {
         // Creation date of images (or of availability)
         let refDate = DateUtilities.unknownDateInterval     // i.e. unknown date
         var dateLabelText = " "                             // Displayed when there is no date available
@@ -659,16 +659,20 @@ class AlbumUtilities: NSObject {
             dateLabelText = DateFormatter.localizedString(from: startDate, dateStyle: dateStyle, timeStyle: .none)
             
             // See http://www.unicode.org/reports/tr35/tr35-31/tr35-dates.html#Date_Format_Patterns
-            let dayFormatter = DateUtilities.dateFormatter()
-            switch UIScreen.main.bounds.size.width {
-            case 0..<400:
-                dayFormatter.setLocalizedDateFormatFromTemplate("eee HH:mm")
-            case 400...600:
-                dayFormatter.setLocalizedDateFormatFromTemplate("eeee HH:mm")
-            default:
-                dayFormatter.setLocalizedDateFormatFromTemplate("eeee HH:mm:ss")
+            let optFormatter = DateUtilities.dateFormatter()
+            if arePwgDates {
+                switch UIScreen.main.bounds.size.width {
+                case 0..<400:
+                    optFormatter.setLocalizedDateFormatFromTemplate("eee HH:mm")
+                case 400...600:
+                    optFormatter.setLocalizedDateFormatFromTemplate("eeee HH:mm")
+                default:
+                    optFormatter.setLocalizedDateFormatFromTemplate("eeee HH:mm:ss")
+                }
+            } else {
+                optFormatter.setLocalizedDateFormatFromTemplate("eeee")
             }
-            optionalDateLabelText = dayFormatter.string(from: startDate)
+            optionalDateLabelText = optFormatter.string(from: startDate)
             
             // Get creation date of last image and check that it is after "1900-01-08 00:00:00"
             if greatest > DateUtilities.weekAfterInterval, greatest != lowest {
@@ -682,9 +686,11 @@ class AlbumUtilities: NSObject {
                     // Images were taken the same day
                     // => Keep dateLabel as already set
                     // => Add ending time to optional string
-                    let timeStyle = UIScreen.main.bounds.size.width > 600 ? "HH:mm:ss" : "HH:mm"
-                    dayFormatter.setLocalizedDateFormatFromTemplate(timeStyle)
-                    optionalDateLabelText += " - " + dayFormatter.string(from: endDate)
+                    if arePwgDates {
+                        let timeStyle = UIScreen.main.bounds.size.width > 600 ? "HH:mm:ss" : "HH:mm"
+                        optFormatter.setLocalizedDateFormatFromTemplate(timeStyle)
+                        optionalDateLabelText += " - " + optFormatter.string(from: endDate)
+                    }
                     return (dateLabelText, optionalDateLabelText)
                 }
                 
@@ -692,7 +698,7 @@ class AlbumUtilities: NSObject {
                 let firstImageMonth = Calendar.current.dateComponents([.year, .month], from: startDate)
                 let lastImageMonth = Calendar.current.dateComponents([.year, .month], from: endDate)
                 if firstImageMonth == lastImageMonth {
-                    // Images taken during the sme month => Display days of month
+                    // Images taken during the same month => Display days of month
                     let dateFormatter = DateIntervalFormatter()
                     dateFormatter.timeStyle = .none
                     switch UIScreen.main.bounds.size.width {
@@ -705,17 +711,26 @@ class AlbumUtilities: NSObject {
                     
                     // Define optional string with day/time values
                     // See http://www.unicode.org/reports/tr35/tr35-31/tr35-dates.html#Date_Format_Patterns
-                    let dayFormatter = DateFormatter()
-                    dayFormatter.locale = .current
-                    switch UIScreen.main.bounds.size.width {
-                    case 0..<400:
-                        dayFormatter.setLocalizedDateFormatFromTemplate("eee HH:mm")
-                    case 400..<600:
-                        dayFormatter.setLocalizedDateFormatFromTemplate("eeee d HH:mm")
-                    default:
-                        dayFormatter.setLocalizedDateFormatFromTemplate("eeee d HH:mm:ss")
+                    let optFormatter = DateUtilities.dateFormatter()
+                    optFormatter.locale = .current
+                    if arePwgDates {
+                        switch UIScreen.main.bounds.size.width {
+                        case 0..<400:
+                            optFormatter.setLocalizedDateFormatFromTemplate("eee HH:mm")
+                        case 400..<600:
+                            optFormatter.setLocalizedDateFormatFromTemplate("eeee d HH:mm")
+                        default:
+                            optFormatter.setLocalizedDateFormatFromTemplate("eeee d HH:mm:ss")
+                        }
+                    } else {
+                        switch UIScreen.main.bounds.size.width {
+                        case 0..<400:
+                            optFormatter.setLocalizedDateFormatFromTemplate("eee d")
+                        default:
+                            optFormatter.setLocalizedDateFormatFromTemplate("eeee d")
+                        }
                     }
-                    optionalDateLabelText = dayFormatter.string(from: startDate) + " — " + dayFormatter.string(from: endDate)
+                    optionalDateLabelText = optFormatter.string(from: startDate) + " — " + optFormatter.string(from: endDate)
                     return (dateLabelText, optionalDateLabelText)
                 }
                 
@@ -734,16 +749,25 @@ class AlbumUtilities: NSObject {
                 
                 // Define optional string with day/time values
                 // See http://www.unicode.org/reports/tr35/tr35-31/tr35-dates.html#Date_Format_Patterns
-                let dayFormatter = DateUtilities.dateFormatter()
-                switch UIScreen.main.bounds.size.width {
-                case 0..<400:
-                    dayFormatter.setLocalizedDateFormatFromTemplate("eee HH:mm")
-                case 400..<600:
-                    dayFormatter.setLocalizedDateFormatFromTemplate("eeee d HH:mm")
-                default:
-                    dayFormatter.setLocalizedDateFormatFromTemplate("eeee d HH:mm:ss")
+                let optFormatter = DateUtilities.dateFormatter()
+                if arePwgDates {
+                    switch UIScreen.main.bounds.size.width {
+                    case 0..<400:
+                        optFormatter.setLocalizedDateFormatFromTemplate("eee HH:mm")
+                    case 400..<600:
+                        optFormatter.setLocalizedDateFormatFromTemplate("eeee d HH:mm")
+                    default:
+                        optFormatter.setLocalizedDateFormatFromTemplate("eeee d HH:mm:ss")
+                    }
+                } else {
+                    switch UIScreen.main.bounds.size.width {
+                    case 0..<400:
+                        optFormatter.setLocalizedDateFormatFromTemplate("eee d")
+                    default:
+                        optFormatter.setLocalizedDateFormatFromTemplate("eeee d")
+                    }
                 }
-                optionalDateLabelText = dayFormatter.string(from: startDate) + " — " + dayFormatter.string(from: endDate)
+                optionalDateLabelText = optFormatter.string(from: startDate) + " — " + optFormatter.string(from: endDate)
             }
         }
         return (dateLabelText, optionalDateLabelText)
diff --git a/piwigo/Album/ImageCollection/ImageHeaderReusableView.swift b/piwigo/Album/ImageCollection/ImageHeaderReusableView.swift
index dde33e93b..b94e38663 100644
--- a/piwigo/Album/ImageCollection/ImageHeaderReusableView.swift
+++ b/piwigo/Album/ImageCollection/ImageHeaderReusableView.swift
@@ -41,10 +41,10 @@ class ImageHeaderReusableView: UICollectionReusableView
         switch sortKey {
         case #keyPath(Image.dateCreated):
             let dateIntervals = images.map {$0.dateCreated}
-            dates = AlbumUtilities.getDateLabels(for: dateIntervals)
+            dates = AlbumUtilities.getDateLabels(for: dateIntervals, arePwgDates: true)
         case #keyPath(Image.datePosted):
             let dateIntervals = images.map {$0.datePosted}
-            dates = AlbumUtilities.getDateLabels(for: dateIntervals)
+            dates = AlbumUtilities.getDateLabels(for: dateIntervals, arePwgDates: true)
         default:
             break
         }
diff --git a/piwigo/Album/ImageCollection/ImageOldHeaderReusableView.swift b/piwigo/Album/ImageCollection/ImageOldHeaderReusableView.swift
index e979051d3..b923c7059 100644
--- a/piwigo/Album/ImageCollection/ImageOldHeaderReusableView.swift
+++ b/piwigo/Album/ImageCollection/ImageOldHeaderReusableView.swift
@@ -42,10 +42,10 @@ class ImageOldHeaderReusableView: UICollectionReusableView
         switch sortKey {
         case #keyPath(Image.dateCreated):
             let dateIntervals = images.map {$0.dateCreated}
-            dates = AlbumUtilities.getDateLabels(for: dateIntervals)
+            dates = AlbumUtilities.getDateLabels(for: dateIntervals, arePwgDates: true)
         case #keyPath(Image.datePosted):
             let dateIntervals = images.map {$0.datePosted}
-            dates = AlbumUtilities.getDateLabels(for: dateIntervals)
+            dates = AlbumUtilities.getDateLabels(for: dateIntervals, arePwgDates: true)
         default:
             break
         }
diff --git a/piwigo/Upload/Pick Local Images/LocalImagesHeaderReusableView.swift b/piwigo/Upload/Pick Local Images/LocalImagesHeaderReusableView.swift
index caf89817c..49d99fbb6 100644
--- a/piwigo/Upload/Pick Local Images/LocalImagesHeaderReusableView.swift	
+++ b/piwigo/Upload/Pick Local Images/LocalImagesHeaderReusableView.swift	
@@ -42,7 +42,7 @@ class LocalImagesHeaderReusableView: UICollectionReusableView {
         // Get date labels from images in section
         let oldest = DateUtilities.unknownDateInterval   // i.e. unknown date
         let dateIntervals = images.map { $0.creationDate?.timeIntervalSinceReferenceDate ?? oldest}
-        let dates = AlbumUtilities.getDateLabels(for: dateIntervals)
+        let dates = AlbumUtilities.getDateLabels(for: dateIntervals, arePwgDates: false)
         self.mainLabel.text = dates.0
 
         // Set labels from dates and place name

From 7de9d61bf9c6519983a4519c5147512ba668b523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 29 Sep 2024 18:41:43 +0200
Subject: [PATCH 15/34] Extract local creation dates of photos and videos from
 metadata

---
 .../Extensions/UploadManager+Image.swift      | 122 ++++++++---
 .../Extensions/UploadManager+Prepare.swift    |   2 +-
 .../Extensions/UploadManager+Video.swift      |  59 ++++-
 uploadKit/Info.plist                          |   2 +-
 .../Supporting Files/ImageMetadata.swift      | 206 ++++++++++++++----
 .../Supporting Files/VideoMetadata.swift      |  23 ++
 6 files changed, 333 insertions(+), 81 deletions(-)

diff --git a/uploadKit/Extensions/UploadManager+Image.swift b/uploadKit/Extensions/UploadManager+Image.swift
index f61042a4e..19fd63641 100644
--- a/uploadKit/Extensions/UploadManager+Image.swift
+++ b/uploadKit/Extensions/UploadManager+Image.swift
@@ -24,6 +24,9 @@ extension UploadManager {
         if (!upload.resizeImageOnUpload || upload.photoMaxSize == 0),
            !upload.compressImageOnUpload, !upload.stripGPSdataOnUpload
         {
+            // Get creation date from metadata if possible
+            upload.creationDate = getCreationDateOfImage(atURL: originalFileURL)
+            
             // Get MD5 checksum and MIME type, update counter
             finalizeImageFile(atURL: originalFileURL, with: upload) {
                 self.didPrepareImage(for: upload, nil)
@@ -98,17 +101,58 @@ extension UploadManager {
     }
 
     
-    // MARK: - Utilities    
-    /// - Strip private metadata w/o recompression
+    // MARK: - Utilities
+    // Extract creation date from metadata
+    /// -> update upload.creationDate
+    fileprivate func getCreationDateOfImage(atURL originalFileURL: URL) -> TimeInterval {
+        autoreleasepool {
+            // Initialise date with file creation date
+            let creationDate = (originalFileURL.creationDate ?? DateUtilities.unknownDate).timeIntervalSinceReferenceDate
+            
+            // Create image source
+            let options = [kCGImageSourceShouldCache : false] as CFDictionary
+            guard let sourceRef = CGImageSourceCreateWithURL(originalFileURL as CFURL, options) else {
+                // Could not prepare image source
+                return creationDate
+            }
+
+            // Get number of images in source
+            let nberOfImages = CGImageSourceGetCount(sourceRef)
+            if nberOfImages == 0 {
+                // Could not prepare image source
+                return creationDate
+            }
+            
+            // Get creation date from metadata if possible
+            if let dateFromMetadata = getCreationDateOfImageSource(sourceRef, options: options, nberOfImages: nberOfImages) {
+                return dateFromMetadata.timeIntervalSinceReferenceDate
+            }
+            return creationDate
+        }
+    }
+    
+    fileprivate func getCreationDateOfImageSource(_ sourceRef: CGImageSource, options: CFDictionary,
+                                              nberOfImages: Int) -> Date? {
+        // Loop over images contained in source file and adopt first available date/time of creation
+        for imageIndex in 0..<nberOfImages {
+            if let properties = CGImageSourceCopyPropertiesAtIndex(sourceRef, imageIndex, options) as? [CFString : Any],
+               let date = properties.creationDate() {
+                return date
+            }
+        }
+        return nil
+    }
+    
+    // Strip private metadata w/o recompression
     /// -> Return file URL w/ or w/o error
     private func stripMetadataOfImage(atURL originalFileURL:URL, with upload: Upload,
                                       completion: @escaping (URL) -> Void,
                                       failure: @escaping (Error?) -> Void) {
         autoreleasepool {
             // Create image source
-            let imageSourceOptions = [kCGImageSourceShouldCache      : false,
-                                      kCGImageSourceShouldAllowFloat : true] as CFDictionary
-            guard let sourceRef = CGImageSourceCreateWithURL(originalFileURL as CFURL, imageSourceOptions) else {
+            let options = [kCGImageSourceShouldCache      : false,
+                           kCGImageSourceShouldAllowFloat : true] as CFDictionary
+            guard let sourceRef = CGImageSourceCreateWithURL(originalFileURL as CFURL, options) else {
                 // Could not prepare image source
                 let error = NSError(domain: "Piwigo", code: UploadError.missingAsset.hashValue, userInfo: [NSLocalizedDescriptionKey : UploadError.missingAsset.localizedDescription])
                 failure(error)
@@ -123,6 +167,13 @@ extension UploadManager {
                 failure(error)
                 return
             }
+            
+            // Get creation date from metadata if possible
+            if let dateFromMetadata = getCreationDateOfImageSource(sourceRef, options: options, nberOfImages: nberOfImages) {
+                upload.creationDate = dateFromMetadata.timeIntervalSinceReferenceDate
+            } else {
+                upload.creationDate = (originalFileURL.creationDate ?? DateUtilities.unknownDate).timeIntervalSinceReferenceDate
+            }
 
             // Get URL of final image data file to be stored into Piwigo/Uploads directory
             let fileURL = getUploadFileURL(from: upload, deleted: true)
@@ -158,7 +209,7 @@ extension UploadManager {
         }
     }
     
-    // Modify images at URL (w/o changing its format)
+    // Modify image at URL (w/o changing its format)
     /// - Resize images
     /// - Compress images if demanded in properties
     /// - Strip private metadata if demanded in properties
@@ -168,9 +219,9 @@ extension UploadManager {
                              failure: @escaping (Error?) -> Void) {
         autoreleasepool {
             // Create image source
-            let imageSourceOptions = [kCGImageSourceShouldCacheImmediately : false,
-                                      kCGImageSourceShouldAllowFloat       : true] as CFDictionary
-            guard let sourceRef = CGImageSourceCreateWithURL(originalFileURL as CFURL, imageSourceOptions) else {
+            let options = [kCGImageSourceShouldCacheImmediately : false,
+                           kCGImageSourceShouldAllowFloat       : true] as CFDictionary
+            guard let sourceRef = CGImageSourceCreateWithURL(originalFileURL as CFURL, options) else {
                 // Could not prepare image source
                 let error = NSError(domain: "Piwigo", code: UploadError.missingAsset.hashValue, userInfo: [NSLocalizedDescriptionKey : UploadError.missingAsset.localizedDescription])
                 failure(error)
@@ -185,7 +236,14 @@ extension UploadManager {
                 failure(error)
                 return
             }
-            
+                        
+            // Get creation date from metadata if possible
+            if let dateFromMetadata = getCreationDateOfImageSource(sourceRef, options: options, nberOfImages: nberOfImages) {
+                upload.creationDate = dateFromMetadata.timeIntervalSinceReferenceDate
+            } else {
+                upload.creationDate = (originalFileURL.creationDate ?? DateUtilities.unknownDate).timeIntervalSinceReferenceDate
+            }
+
             // Get URL of final image data file to be stored into Piwigo/Uploads directory
             let fileURL = getUploadFileURL(from: upload, deleted: true)
 
@@ -200,22 +258,22 @@ extension UploadManager {
 
             // Apply properties of the source to the destination
             /// - must be done before adding images
-            if let containerProperties = CGImageSourceCopyProperties(sourceRef, imageSourceOptions) as? [CFString : Any] {
+            if let containerProperties = CGImageSourceCopyProperties(sourceRef, options) as? [CFString : Any] {
                 // Should we remove private metadata?
-                var options: [CFString : Any] = [:]
+                var properties: [CFString : Any] = [:]
                 if upload.stripGPSdataOnUpload {
                     // Removes private metadata attributed to this image
-                    options = containerProperties.stripPrivateProperties()
+                    properties = containerProperties.stripPrivateProperties()
                 } else {
-                    // Removes private metadata attributed to this image
-                    options = containerProperties
+                    // Keeps private metadata attributed to this image
+                    properties = containerProperties
                 }
                 
                 // Fix properties
-                options.fixProperties(from: containerProperties)
+                properties.fixProperties(from: containerProperties)
                 
                 // Copy metadata w/o private infos
-                CGImageDestinationSetProperties(destinationRef, options as CFDictionary)
+                CGImageDestinationSetProperties(destinationRef, properties as CFDictionary)
             }
 
             // Loop over images contained in source file
@@ -250,8 +308,7 @@ extension UploadManager {
                 
                 // Set metadata from the source image
                 var imageOptions: [CFString : Any] = [:]
-                if let imageProperties = CGImageSourceCopyPropertiesAtIndex(sourceRef, imageIndex,
-                                                                            imageSourceOptions) as? [CFString : Any] {
+                if let imageProperties = CGImageSourceCopyPropertiesAtIndex(sourceRef, imageIndex, options) as? [CFString : Any] {
                     // Should we remove private metadata?
                     if upload.stripGPSdataOnUpload {
                         // Removes private metadata attributed to this image
@@ -297,15 +354,31 @@ extension UploadManager {
                               failure: @escaping (Error?) -> Void) {
         autoreleasepool {
             // Create image source
-            let imageSourceOptions = [kCGImageSourceShouldCacheImmediately : false,
-                                      kCGImageSourceShouldAllowFloat       : true] as CFDictionary
-            guard let sourceRef = CGImageSourceCreateWithURL(originalFileURL as CFURL, imageSourceOptions) else {
+            let options = [kCGImageSourceShouldCacheImmediately : false,
+                           kCGImageSourceShouldAllowFloat       : true] as CFDictionary
+            guard let sourceRef = CGImageSourceCreateWithURL(originalFileURL as CFURL, options) else {
                 // Could not prepare image source
                 let error = NSError(domain: "Piwigo", code: UploadError.missingAsset.hashValue, userInfo: [NSLocalizedDescriptionKey : UploadError.missingAsset.localizedDescription])
                 failure(error)
                 return
             }
             
+            // Get number of images in source
+            let nberOfImages = CGImageSourceGetCount(sourceRef)
+            if nberOfImages == 0 {
+                // Could not prepare image source
+                let error = NSError(domain: "Piwigo", code: UploadError.missingAsset.hashValue, userInfo: [NSLocalizedDescriptionKey : UploadError.missingAsset.localizedDescription])
+                failure(error)
+                return
+            }
+                        
+            // Get creation date from metadata if possible
+            if let dateFromMetadata = getCreationDateOfImageSource(sourceRef, options: options, nberOfImages: nberOfImages) {
+                upload.creationDate = dateFromMetadata.timeIntervalSinceReferenceDate
+            } else {
+                upload.creationDate = (originalFileURL.creationDate ?? DateUtilities.unknownDate).timeIntervalSinceReferenceDate
+            }
+            
             // Get index of the primary image
             let imageIndex = CGImageSourceGetPrimaryImageIndex(sourceRef)
             
@@ -363,7 +436,7 @@ extension UploadManager {
             
             // Apply container properties of the source to the destination
             /// - must be done before adding images
-            if let containerProperties = CGImageSourceCopyProperties(sourceRef, imageSourceOptions) as? [CFString : Any] {
+            if let containerProperties = CGImageSourceCopyProperties(sourceRef, options) as? [CFString : Any] {
                 // Should we remove private metadata?
                 var options: [CFString : Any] = [:]
                 if upload.stripGPSdataOnUpload {
@@ -383,8 +456,7 @@ extension UploadManager {
 
             // Set metadata from the source image
             var imageOptions: Dictionary<CFString,Any> = [:]
-            if let imageProperties = CGImageSourceCopyPropertiesAtIndex(sourceRef, imageIndex,
-                                                                        imageSourceOptions) as? [CFString : Any] {
+            if let imageProperties = CGImageSourceCopyPropertiesAtIndex(sourceRef, imageIndex, options) as? [CFString : Any] {
                 // Should we remove private metadata?
                 if upload.stripGPSdataOnUpload {
                     // Removes private metadata attributed to this image
diff --git a/uploadKit/Extensions/UploadManager+Prepare.swift b/uploadKit/Extensions/UploadManager+Prepare.swift
index 4f119158f..65dc14947 100644
--- a/uploadKit/Extensions/UploadManager+Prepare.swift
+++ b/uploadKit/Extensions/UploadManager+Prepare.swift
@@ -221,7 +221,7 @@ extension UploadManager
             return
         }
 
-        // Retrieve creation date
+        // Retrieve creation date from PHAsset (local time, or UTC time if time zone provided)
         if let creationDate = originalAsset.creationDate {
             upload.creationDate = creationDate.timeIntervalSinceReferenceDate
         } else {
diff --git a/uploadKit/Extensions/UploadManager+Video.swift b/uploadKit/Extensions/UploadManager+Video.swift
index 79d312524..56a30e523 100644
--- a/uploadKit/Extensions/UploadManager+Video.swift
+++ b/uploadKit/Extensions/UploadManager+Video.swift
@@ -21,6 +21,14 @@ extension UploadManager {
             // Retrieve video data
             let originalVideo = AVAsset(url: originalFileURL)
 
+            // Get creation date from metadata if possible
+            let metadata = originalVideo.metadata
+            if let dateFromMetadata = metadata.creationDate() {
+                upload.creationDate = dateFromMetadata.timeIntervalSinceReferenceDate
+            } else {
+                upload.creationDate = (originalFileURL.creationDate ?? DateUtilities.unknownDate).timeIntervalSinceReferenceDate
+            }
+
             // Check if the user wants to:
             /// - reduce the frame size
             /// - remove the private metadata
@@ -46,6 +54,14 @@ extension UploadManager {
         // Retrieve video data
         let originalVideo = AVAsset(url: originalFileURL)
 
+        // Get creation date from metadata if possible
+        let metadata = originalVideo.metadata
+        if let dateFromMetadata = metadata.creationDate() {
+            upload.creationDate = dateFromMetadata.timeIntervalSinceReferenceDate
+        } else {
+            upload.creationDate = (originalFileURL.creationDate ?? DateUtilities.unknownDate).timeIntervalSinceReferenceDate
+        }
+
         // Check that the video can be exported
         checkVideoExportability(of: originalVideo, for: upload)
     }
@@ -71,6 +87,21 @@ extension UploadManager {
                 return
             }
             
+            // Get original fileURL
+            guard let originalFileURL = (originalVideo as? AVURLAsset)?.url else {
+                let error = NSError(domain: "Piwigo", code: 0, userInfo: [NSLocalizedDescriptionKey : UploadError.missingAsset.localizedDescription])
+                self.didPrepareVideo(for: upload, error)
+                return
+            }
+
+            // Get creation date from metadata if possible
+            let metadata = originalVideo.metadata
+            if let dateFromMetadata = metadata.creationDate() {
+                upload.creationDate = dateFromMetadata.timeIntervalSinceReferenceDate
+            } else {
+                upload.creationDate = (originalFileURL.creationDate ?? DateUtilities.unknownDate).timeIntervalSinceReferenceDate
+            }
+
             // Check if the user wants to:
             /// - reduce the frame size
             /// - remove the private metadata
@@ -81,13 +112,6 @@ extension UploadManager {
                 return
             }
             
-            // Get original fileURL
-            guard let originalFileURL = (originalVideo as? AVURLAsset)?.url else {
-                let error = NSError(domain: "Piwigo", code: 0, userInfo: [NSLocalizedDescriptionKey : UploadError.missingAsset.localizedDescription])
-                self.didPrepareVideo(for: upload, error)
-                return
-            }
-
             // Get MIME type
             let fileExt = originalFileURL.pathExtension.lowercased()
             if #available(iOS 14, *) {
@@ -158,6 +182,21 @@ extension UploadManager {
                 return
             }
             
+            // Get original fileURL
+            guard let originalFileURL = (originalVideo as? AVURLAsset)?.url else {
+                let error = NSError(domain: "Piwigo", code: 0, userInfo: [NSLocalizedDescriptionKey : UploadError.missingAsset.localizedDescription])
+                self.didPrepareVideo(for: upload, error)
+                return
+            }
+
+            // Get creation date from metadata if possible
+            let metadata = originalVideo.metadata
+            if let dateFromMetadata = metadata.creationDate() {
+                upload.creationDate = dateFromMetadata.timeIntervalSinceReferenceDate
+            } else {
+                upload.creationDate = (originalFileURL.creationDate ?? DateUtilities.unknownDate).timeIntervalSinceReferenceDate
+            }
+
             // Check that the video can be exported
             self.checkVideoExportability(of: originalVideo, for: upload)
         }
@@ -234,7 +273,7 @@ extension UploadManager {
                                                 resultHandler: { [unowned self] avasset, audioMix, info in
             // ====>> For debugging…
 //            if let metadata = avasset?.metadata {
-//                print("=> Metadata: \(metadata)")
+//                print("=> Metadata: \(metadata)\r=> Creation date: \(metadata.creationDate() ?? DateUtilities.unknownDate)")
 //            }
 //            if let creationDate = avasset?.creationDate {
 //                print("=> Creation date: \(creationDate)")
@@ -255,10 +294,10 @@ extension UploadManager {
 //                    let desc = (track.formatDescriptions[i]) as! CMFormatDescription
 //                    // Get String representation of media type (vide, soun, sbtl, etc.)
 //                    var type: String? = nil
-//                    type = self.FourCCString(CMFormatDescriptionGetMediaType(desc))
+//                    type = CMFormatDescriptionGetMediaType(desc).toString()
 //                    // Get String representation media subtype (avc1, aac, tx3g, etc.)
 //                    var subType: String? = nil
-//                    subType = self.FourCCString(CMFormatDescriptionGetMediaSubType(desc))
+//                    subType = CMFormatDescriptionGetMediaSubType(desc).toString()
 //                    // Format string as type/subType
 //                    format.append(contentsOf: "\(type ?? "")/\(subType ?? "")")
 //                    // Comma separate if more than one format description
diff --git a/uploadKit/Info.plist b/uploadKit/Info.plist
index 072d65012..f6aa11ad4 100644
--- a/uploadKit/Info.plist
+++ b/uploadKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.3</string>
 	<key>CFBundleVersion</key>
 	<string>414</string>
 </dict>
diff --git a/uploadKit/Supporting Files/ImageMetadata.swift b/uploadKit/Supporting Files/ImageMetadata.swift
index ee36a1f85..eaa03072f 100644
--- a/uploadKit/Supporting Files/ImageMetadata.swift	
+++ b/uploadKit/Supporting Files/ImageMetadata.swift	
@@ -10,12 +10,11 @@ import Foundation
 import ImageIO
 import UIKit
 
+// MARK: Private Metadata Properties
 class ImageMetadata {
-        
-    // MARK: - Private metadata properties
     // Exif private metadata properties
     /// See https://www.exiftool.org/TagNames/EXIF.html
-    let exifPrivateProperties: [CFString] = {
+    fileprivate static let exifPrivateProperties: [CFString] = {
         let properties = [kCGImagePropertyExifUserComment,          // User's comment
                           kCGImagePropertyExifSubjectLocation,      // Image’s primary subject
                           kCGImagePropertyExifMakerNote             // Information specified by the camera manufacturer
@@ -25,7 +24,7 @@ class ImageMetadata {
 
     // ExifEx private metadata properties
     /// See https://www.exiftool.org/TagNames/EXIF.html
-    let exifExPrivateProperties: [CFString] = {
+    fileprivate static let exifExPrivateProperties: [CFString] = {
         let properties = [kCGImagePropertyExifCameraOwnerName,      // Owner's name
                           kCGImagePropertyExifBodySerialNumber,     // Serial numbers
                           kCGImagePropertyExifLensSerialNumber      // Lens serial number
@@ -35,7 +34,7 @@ class ImageMetadata {
 
     // ExifAux private metadata properties
     /// See https://www.exiftool.org/TagNames/EXIF.html
-    let exifAuxPrivateProperties: [CFString] = {
+    fileprivate static let exifAuxPrivateProperties: [CFString] = {
         let properties = [kCGImagePropertyExifAuxSerialNumber,      // Serial number
                           kCGImagePropertyExifAuxLensSerialNumber,  // Lens serial number
                           kCGImagePropertyExifAuxOwnerName          // Owner's name
@@ -43,10 +42,21 @@ class ImageMetadata {
         return properties
     }()
         
+    // Exif creation date (YY:MM:DD HH:MM:SS format)
+    /// https://en.wikipedia.org/wiki/Exif
+    /// https://web.archive.org/web/20190624045241if_/http://www.cipa.jp:80/std/documents/e/DC-008-Translation-2019-E.pdf
+    fileprivate static var exifDateFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.dateFormat = "yyyy:MM:dd HH:mm:ss"
+        formatter.timeZone = TimeZone(secondsFromGMT: 0)
+        return formatter
+    }()
+
     // IPTC private metadata properties
     /// See https://www.exiftool.org/TagNames/IPTC.html
     /// See https://www.iptc.org/std/photometadata/specification/IPTC-PhotoMetadata
-    let iptcPrivateProperties: [CFString] = {
+    fileprivate static let iptcPrivateProperties: [CFString] = {
         let properties = [kCGImagePropertyIPTCContentLocationCode,  // Content location code
                           kCGImagePropertyIPTCContentLocationName,  // Content location name
                           kCGImagePropertyIPTCByline,               // Name of the person who created the image
@@ -67,47 +77,92 @@ class ImageMetadata {
         return properties
     }()
         
+    // IPTC creation date and time
+    /// https://en.wikipedia.org/wiki/IPTC_Information_Interchange_Model
+    /// https://iptc.org/standards/photo-metadata/iptc-standard/
+    fileprivate static var iptcDateFormatter1: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.dateFormat = "yyyyMMdd"
+        formatter.timeZone = TimeZone(secondsFromGMT: 0)
+        return formatter
+    }()
+
+    fileprivate static var iptcDateFormatter2: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.dateFormat = "yyyyMM"
+        formatter.timeZone = TimeZone(secondsFromGMT: 0)
+        return formatter
+    }()
+
+    fileprivate static var iptcDateFormatter3: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.dateFormat = "yyyy"
+        formatter.timeZone = TimeZone(secondsFromGMT: 0)
+        return formatter
+    }()
+
+    fileprivate static var iptcTimeFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.dateFormat = "yyyyMMdd'T'HHmmss"
+        formatter.timeZone = TimeZone(secondsFromGMT: 0)
+        return formatter
+    }()
+    
+    fileprivate static func iptcTimeSinceReferenceDate(timeStr: String?) -> TimeInterval? {
+        guard let timeStr = timeStr else { return nil }
+        
+        let dateStr = "20010101T" + timeStr.prefix(6)                   // Remove time zone if any
+        if let iptcTime = iptcTimeFormatter.date(from: dateStr) {
+            return iptcTime.timeIntervalSinceReferenceDate
+        }
+        return nil
+    }
+
     // PNG private metadata properties
     /// See https://www.exiftool.org/TagNames/PNG.html
-    let pngPrivateProperties: [CFString] = {
-        let properties = [kCGImagePropertyPNGAuthor                 // String that identifies the author
+    fileprivate static let pngPrivateProperties: [CFString] = {
+        let properties = [kCGImagePropertyPNGAuthor                     // String that identifies the author
         ]
         return properties
     }()
         
     // TIFF private metadata properties
-    let tiffPrivateProperties: [CFString] = {
-        let properties = [kCGImagePropertyTIFFArtist                // Artist who created the image
+    fileprivate static let tiffPrivateProperties: [CFString] = {
+        let properties = [kCGImagePropertyTIFFArtist                    // Artist who created the image
         ]
         return properties
     }()
         
     // DNG private metadata properties
-    let dngPrivateProperties: [CFString] = {
-        let properties = [kCGImagePropertyDNGCameraSerialNumber     // Camera serial number
+    fileprivate static let dngPrivateProperties: [CFString] = {
+        let properties = [kCGImagePropertyDNGCameraSerialNumber         // Camera serial number
         ]
         return properties
     }()
         
     // CIFF private metadata properties
-    let ciffPrivateProperties: [CFString] = {
-        let properties = [kCGImagePropertyCIFFOwnerName,            // Camera’s owner
-                          kCGImagePropertyCIFFRecordID,             // Number of images taken since the camera shipped
-                          kCGImagePropertyCIFFCameraSerialNumber    // Camera serial number
+    fileprivate static let ciffPrivateProperties: [CFString] = {
+        let properties = [kCGImagePropertyCIFFOwnerName,                // Camera’s owner
+                          kCGImagePropertyCIFFRecordID,                 // Number of images taken since the camera shipped
+                          kCGImagePropertyCIFFCameraSerialNumber        // Camera serial number
         ]
         return properties
     }()
         
     // Canon private metadata properties
-    let canonPrivateProperties: [CFString] = {
-        let properties = [kCGImagePropertyMakerCanonOwnerName,      // Camera’s owner
-                          kCGImagePropertyMakerCanonCameraSerialNumber // Camera serial number
+    fileprivate static let canonPrivateProperties: [CFString] = {
+        let properties = [kCGImagePropertyMakerCanonOwnerName,          // Camera’s owner
+                          kCGImagePropertyMakerCanonCameraSerialNumber  // Camera serial number
         ]
         return properties
     }()
         
     // Nikon private metadata properties
-    let nikonPrivateProperties: [CFString] = {
+    fileprivate static let nikonPrivateProperties: [CFString] = {
         let properties = [kCGImagePropertyMakerNikonCameraSerialNumber  // Camera’s owner
         ]
         return properties
@@ -115,6 +170,65 @@ class ImageMetadata {
 
 }
 
+
+// MARK: - Get Creation Date
+extension Dictionary where Key == CFString, Value == Any {
+    // Creation date from EXIF or IPTC metadata
+    func creationDate() -> Date? {
+        if let date = self.exifCreationDate() {
+            return date
+        }
+        if let date = self.iptcCreationDate() {
+            return date
+        }
+        return nil
+    }
+    
+    // EXIF creation date
+    fileprivate func exifCreationDate() -> Date? {
+        // Any EXIF metadata?
+        if let exifDict = self[kCGImagePropertyExifDictionary] as? [CFString:Any] {
+            // Time the image was created (YY:MM:DD HH:MM:SS format)
+            if let exifDate = exifDict[kCGImagePropertyExifDateTimeOriginal] as? String {
+                return ImageMetadata.exifDateFormatter.date(from: exifDate)
+            }
+
+            // Time the image was digitalized (YY:MM:DD HH:MM:SS format)
+            if let exifDate = exifDict[kCGImagePropertyExifDateTimeDigitized] as? String {
+               return ImageMetadata.exifDateFormatter.date(from: exifDate)
+            }
+        }
+        return nil
+    }
+    
+    // IPTC creation date
+    fileprivate func iptcCreationDate() -> Date? {
+        if let iptcDict = self[kCGImagePropertyIPTCDictionary] as? [CFString:Any],
+           let dateStr = iptcDict[kCGImagePropertyIPTCDateCreated] as? String {
+            // Are the year, month and day all known?
+            if let iptcDate = ImageMetadata.iptcDateFormatter1.date(from: dateStr) {
+                if let timeStr = iptcDict[kCGImagePropertyIPTCTimeCreated] as? String,
+                   let iptcTimeOffset = ImageMetadata.iptcTimeSinceReferenceDate(timeStr: timeStr) {
+                    let iptcTimeInterval = iptcDate.timeIntervalSinceReferenceDate
+                    return Date(timeIntervalSinceReferenceDate: iptcTimeInterval + iptcTimeOffset)
+                }
+                return iptcDate
+            }
+            // Are the year and month known?
+            if let iptcDate = ImageMetadata.iptcDateFormatter2.date(from: dateStr) {
+                return iptcDate
+            }
+            // Is the year known?
+            if let iptcDate = ImageMetadata.iptcDateFormatter3.date(from: dateStr) {
+                return iptcDate
+            }
+        }
+        return nil
+    }
+}
+
+
+// MARK: - Strip Private Metadata
 extension CGImageMetadata {
     // Remove CGImage private metadata
     // The GPS metadata will be removed using the kCGImageMetadataShouldExcludeGPS option
@@ -125,13 +239,13 @@ extension CGImageMetadata {
 
         // Get prefixes and keys of privata metadata
         var dictOfKeys = [CFString : [CFString]]()
-        dictOfKeys[kCGImageMetadataPrefixExif] = ImageMetadata().exifPrivateProperties
-        dictOfKeys[kCGImageMetadataPrefixExifEX] = ImageMetadata().exifExPrivateProperties
-        dictOfKeys[kCGImageMetadataPrefixExifAux] = ImageMetadata().exifAuxPrivateProperties
-        dictOfKeys[kCGImageMetadataPrefixIPTCCore] = ImageMetadata().iptcPrivateProperties
-        dictOfKeys[kCGImageMetadataPrefixTIFF] = ImageMetadata().tiffPrivateProperties
-        dictOfKeys[kCGImageMetadataPrefixIPTCExtension] = ImageMetadata().iptcPrivateProperties
-        dictOfKeys[kCGImageMetadataPrefixXMPBasic] = ImageMetadata().pngPrivateProperties
+        dictOfKeys[kCGImageMetadataPrefixExif] = ImageMetadata.exifPrivateProperties
+        dictOfKeys[kCGImageMetadataPrefixExifEX] = ImageMetadata.exifExPrivateProperties
+        dictOfKeys[kCGImageMetadataPrefixExifAux] = ImageMetadata.exifAuxPrivateProperties
+        dictOfKeys[kCGImageMetadataPrefixIPTCCore] = ImageMetadata.iptcPrivateProperties
+        dictOfKeys[kCGImageMetadataPrefixTIFF] = ImageMetadata.tiffPrivateProperties
+        dictOfKeys[kCGImageMetadataPrefixIPTCExtension] = ImageMetadata.iptcPrivateProperties
+        dictOfKeys[kCGImageMetadataPrefixXMPBasic] = ImageMetadata.pngPrivateProperties
 
         // Loop over all tags
         CGImageMetadataEnumerateTagsUsingBlock(self, nil, nil) { _, tag in
@@ -151,23 +265,23 @@ extension CGImageMetadata {
             }
             
             // Check remaining names
-            if ImageMetadata().pngPrivateProperties.contains(name) {
+            if ImageMetadata.pngPrivateProperties.contains(name) {
                 CGImageMetadataRemoveTagWithPath(metadata, nil, path as CFString)
                 return true
             }
-            if ImageMetadata().dngPrivateProperties.contains(name) {
+            if ImageMetadata.dngPrivateProperties.contains(name) {
                 CGImageMetadataRemoveTagWithPath(metadata, nil, path as CFString)
                 return true
             }
-            if ImageMetadata().ciffPrivateProperties.contains(name) {
+            if ImageMetadata.ciffPrivateProperties.contains(name) {
                 CGImageMetadataRemoveTagWithPath(metadata, nil, path as CFString)
                 return true
             }
-            if ImageMetadata().canonPrivateProperties.contains(name) {
+            if ImageMetadata.canonPrivateProperties.contains(name) {
                 CGImageMetadataRemoveTagWithPath(metadata, nil, path as CFString)
                 return true
             }
-            if ImageMetadata().nikonPrivateProperties.contains(name) {
+            if ImageMetadata.nikonPrivateProperties.contains(name) {
                 CGImageMetadataRemoveTagWithPath(metadata, nil, path as CFString)
                 return true
             }
@@ -178,7 +292,7 @@ extension CGImageMetadata {
 }
 
 extension Dictionary where Key == CFString, Value == Any {
-    // Remove CGImage properties w/o GPS and other private data
+    // Remove GPS and other private metadata
     public func stripPrivateProperties() -> [CFString:Any] {
         var properties = self as [CFString:Any]
         
@@ -190,18 +304,18 @@ extension Dictionary where Key == CFString, Value == Any {
         
         // Get other dictionaries with keys of privata data
         var dictOfKeys = [CFString : [CFString]]()
-        var exifPrivateProperties = ImageMetadata().exifPrivateProperties
-        exifPrivateProperties.append(contentsOf: ImageMetadata().exifExPrivateProperties)
+        var exifPrivateProperties = ImageMetadata.exifPrivateProperties
+        exifPrivateProperties.append(contentsOf: ImageMetadata.exifExPrivateProperties)
         dictOfKeys[kCGImagePropertyExifDictionary] = exifPrivateProperties
-        dictOfKeys[kCGImagePropertyExifAuxDictionary] = ImageMetadata().exifAuxPrivateProperties
-        dictOfKeys[kCGImagePropertyIPTCDictionary] = ImageMetadata().iptcPrivateProperties
-        dictOfKeys[kCGImagePropertyPNGDictionary] = ImageMetadata().pngPrivateProperties
-        dictOfKeys[kCGImagePropertyTIFFDictionary] = ImageMetadata().tiffPrivateProperties
-        dictOfKeys[kCGImagePropertyDNGDictionary] = ImageMetadata().dngPrivateProperties
-        dictOfKeys[kCGImagePropertyCIFFDictionary] = ImageMetadata().ciffPrivateProperties
-        dictOfKeys[kCGImagePropertyMakerCanonDictionary] = ImageMetadata().canonPrivateProperties
-        dictOfKeys[kCGImagePropertyMakerNikonDictionary] = ImageMetadata().nikonPrivateProperties
-
+        dictOfKeys[kCGImagePropertyExifAuxDictionary] = ImageMetadata.exifAuxPrivateProperties
+        dictOfKeys[kCGImagePropertyIPTCDictionary] = ImageMetadata.iptcPrivateProperties
+        dictOfKeys[kCGImagePropertyPNGDictionary] = ImageMetadata.pngPrivateProperties
+        dictOfKeys[kCGImagePropertyTIFFDictionary] = ImageMetadata.tiffPrivateProperties
+        dictOfKeys[kCGImagePropertyDNGDictionary] = ImageMetadata.dngPrivateProperties
+        dictOfKeys[kCGImagePropertyCIFFDictionary] = ImageMetadata.ciffPrivateProperties
+        dictOfKeys[kCGImagePropertyMakerCanonDictionary] = ImageMetadata.canonPrivateProperties
+        dictOfKeys[kCGImagePropertyMakerNikonDictionary] = ImageMetadata.nikonPrivateProperties
+        
         // Loop over the dictionaries
         for dict in dictOfKeys {
             // Check presence of dictionary
@@ -220,7 +334,11 @@ extension Dictionary where Key == CFString, Value == Any {
         }
         return properties
     }
+}
     
+
+// MARK: - Fix Metadata
+extension Dictionary where Key == CFString, Value == Any {
     // Fix image properties from resized/converted image
     mutating func fixContents(from image:CGImage) {
         var metadata = self
diff --git a/uploadKit/Supporting Files/VideoMetadata.swift b/uploadKit/Supporting Files/VideoMetadata.swift
index a683ac0fc..166acd0ff 100644
--- a/uploadKit/Supporting Files/VideoMetadata.swift	
+++ b/uploadKit/Supporting Files/VideoMetadata.swift	
@@ -8,7 +8,30 @@
 
 import AVFoundation
 
+// MARK: Private Metadata Properties
+class VideoMetadata {
+    // MP4 creation date (YY-MM-DD'T'HH:mm:ss format)
+    /// https://en.wikipedia.org/wiki/MP4_file_format
+    fileprivate static var mp4DateFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
+        formatter.timeZone = TimeZone(secondsFromGMT: 0)
+        return formatter
+    }()
+}
+
 extension Array where Element == AVMetadataItem {
+    // Returns the creation date (time zone info removed to retrieve the 'local' time)
+    public func creationDate() -> Date? {
+        let items = AVMetadataItem.metadataItems(from: self, filteredByIdentifier: .commonIdentifierCreationDate)
+        if let dateCreatedStr = items.first?.stringValue,
+           let dateCreated = VideoMetadata.mp4DateFormatter.date(from: String(dateCreatedStr.prefix(19))) {
+            return dateCreated
+        }
+        return nil
+    }
+    
     // Return whether metadata contains private data
     public func containsPrivateMetadata() -> Bool {
         let metadata = self as [AVMetadataItem]

From 22ea4cba8ae9f819f2f296c086ed8413c9c452c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 29 Sep 2024 20:01:21 +0200
Subject: [PATCH 16/34] Reverts thumbnails to aspect fill content mode

---
 piwigo/Album/ImageCollection/ImageCollectionViewCell.xib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/piwigo/Album/ImageCollection/ImageCollectionViewCell.xib b/piwigo/Album/ImageCollection/ImageCollectionViewCell.xib
index 45f45c3fe..daa0ee64f 100644
--- a/piwigo/Album/ImageCollection/ImageCollectionViewCell.xib
+++ b/piwigo/Album/ImageCollection/ImageCollectionViewCell.xib
@@ -19,7 +19,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="120" height="120"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Xpg-8s-0ki">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Xpg-8s-0ki">
                         <rect key="frame" x="0.0" y="0.0" width="120" height="120"/>
                     </imageView>
                     <view hidden="YES" alpha="0.59999999999999998" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P89-cH-cSc">

From 5d00dd4a86269069e9c1a0159635ecb884194c95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 29 Sep 2024 20:02:49 +0200
Subject: [PATCH 17/34] Fixes calculation of maxPixelSize which did not account
 for large/small aspect ratios

---
 piwigo/Image/ImageUtilities.swift | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/piwigo/Image/ImageUtilities.swift b/piwigo/Image/ImageUtilities.swift
index b4999a57c..737b53a95 100644
--- a/piwigo/Image/ImageUtilities.swift
+++ b/piwigo/Image/ImageUtilities.swift
@@ -274,12 +274,14 @@ class ImageUtilities: NSObject {
         let options = [kCGImagePropertyPixelWidth: true,
                       kCGImagePropertyPixelHeight: true] as CFDictionary
         var maxPixelSize = Float(max(pointSize.width, pointSize.height) * max(scale, 1.0))
-        if let imageMetadata = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, options) as? [CFString : CFNumber] {
-            if let maxPixelWidth = imageMetadata[kCGImagePropertyPixelWidth] as NSNumber? {
-                maxPixelSize = min(maxPixelSize, maxPixelWidth.floatValue)
-            }
-            if let maxPixelHeight = imageMetadata[kCGImagePropertyPixelHeight] as NSNumber? {
-                maxPixelSize = max(maxPixelSize, maxPixelHeight.floatValue)
+        if let imageMetadata = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, options) as? [CFString : CFNumber],
+           let width = imageMetadata[kCGImagePropertyPixelWidth] as? Float,
+           let height = imageMetadata[kCGImagePropertyPixelHeight] as? Float,
+           width > 1, height > 1 {
+            if width > height {
+                maxPixelSize *= width / height
+            } else {
+                maxPixelSize *= height / width
             }
         }
         let downsampleOptions = [kCGImageSourceCreateThumbnailFromImageAlways: true,

From 65c770ec36107563c918835d8635c32c2016d138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 29 Sep 2024 20:20:11 +0200
Subject: [PATCH 18/34] Version 3.2.3 build 594 for TestFlight testing

---
 piwigo/Info.plist    | 2 +-
 piwigoKit/Info.plist | 2 +-
 uploadKit/Info.plist | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/piwigo/Info.plist b/piwigo/Info.plist
index 00057c44b..1e138af96 100644
--- a/piwigo/Info.plist
+++ b/piwigo/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>593</string>
+	<string>594</string>
 	<key>INIntentsSupported</key>
 	<array>
 		<string>AutoUploadIntent</string>
diff --git a/piwigoKit/Info.plist b/piwigoKit/Info.plist
index 01bb4e38d..f8720b4cd 100644
--- a/piwigoKit/Info.plist
+++ b/piwigoKit/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.2.2</string>
 	<key>CFBundleVersion</key>
-	<string>596</string>
+	<string>597</string>
 </dict>
 </plist>
diff --git a/uploadKit/Info.plist b/uploadKit/Info.plist
index f6aa11ad4..060dcf10a 100644
--- a/uploadKit/Info.plist
+++ b/uploadKit/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.3</string>
 	<key>CFBundleVersion</key>
-	<string>414</string>
+	<string>415</string>
 </dict>
 </plist>

From bf42ed9c5b77deca8b105422cdaa99d7b004ac24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Tue, 1 Oct 2024 21:53:45 +0200
Subject: [PATCH 19/34] Check if the session is still active every 60 seconds
 or more

---
 .../Network/Extensions/PwgSession+Utilities.swift      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/piwigoKit/Network/Extensions/PwgSession+Utilities.swift b/piwigoKit/Network/Extensions/PwgSession+Utilities.swift
index 5707f3c6c..650c4bd2a 100644
--- a/piwigoKit/Network/Extensions/PwgSession+Utilities.swift
+++ b/piwigoKit/Network/Extensions/PwgSession+Utilities.swift
@@ -78,11 +78,17 @@ extension PwgSession {
     func checkSession(ofUser user: User?,
                       completion: @escaping () -> Void,
                       failure: @escaping (NSError) -> Void) {
-//        debugPrint("••> Session checked \(Date.timeIntervalSinceReferenceDate - (user?.lastUsed ?? 0.0)) seconds ago.")
+        // Check if the session is still active every 60 seconds or more
+        let secondsSinceLastCheck = Date.timeIntervalSinceReferenceDate - (user?.lastUsed ?? 0.0)
+        if secondsSinceLastCheck < 60 {
+            completion()
+            return
+        }
+        
+        // Determine if the session is still active
         if #available(iOSApplicationExtension 14.0, *) {
             logger.notice("Start checking session…")
         }
-        // Determine if the session is active and for how long before fetching
         let oldToken = NetworkVars.pwgToken
         PwgSession.shared.sessionGetStatus { username in
             if #available(iOSApplicationExtension 14.0, *) {

From 0d498b60427739eb6c53838f4829323a0ae9119a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Tue, 1 Oct 2024 21:54:22 +0200
Subject: [PATCH 20/34] Adopts debugPrint() everywhere

---
 .../Album/AlbumCollection/AlbumRenaming.swift |  2 +-
 piwigo/Album/AlbumNavigationController.swift  |  6 +-
 .../SelectCategoryViewController+Albums.swift |  2 +-
 .../SelectCategoryViewController+Images.swift |  4 +-
 .../SelectCategoryViewController.swift        |  8 +--
 piwigo/Album/AlbumViewController.swift        | 14 ++--
 .../AlbumViewController+Delete.swift          | 12 ++--
 .../AlbumViewController+FetchResults.swift    |  2 +-
 .../Extensions/AlbumViewController+Menu.swift |  2 +-
 .../AlbumViewController+Prefetching.swift     |  4 +-
 .../AlbumViewController+Share.swift           |  2 +-
 .../TagSelectorViewController.swift           |  2 +-
 .../ImageViewController+Delete.swift          |  4 +-
 piwigo/Image/ImageViewController.swift        | 10 +--
 .../EditImageDatePickerTableViewCell.swift    |  2 +-
 .../Cells/EditImageThumbTableViewCell.swift   |  2 +-
 ...geParamsViewController+ThumbnailCell.swift |  2 +-
 .../Parameters/Tags/TagsViewController.swift  |  2 +-
 .../ShareVideoActivityItemProvider.swift      |  4 +-
 .../AutoUploadIntenthandler.swift             |  4 +-
 piwigo/Login/LoginViewController.swift        | 10 +--
 .../ColorPaletteViewController.swift          |  6 +-
 .../ColorPaletteViewControllerOld.swift       |  8 +--
 .../TroubleshootingViewController.swift       |  2 +-
 .../Privacy/LockOptionsViewController.swift   |  6 +-
 .../Privacy/ShareMetadataViewController.swift |  6 +-
 piwigo/Settings/SettingsViewController.swift  |  4 +-
 ...ViewController+UITableViewDataSource.swift |  8 +--
 piwigo/Supporting Files/AppDelegate.swift     | 38 +++++------
 .../ExternalDisplaySceneDelegate.swift        | 12 ++--
 .../Macros/HapticUtilities.swift              | 28 ++++----
 .../Macros/UIFont+AppFonts.swift              |  4 +-
 .../Macros/UIImage+AppTools.swift             |  4 +-
 piwigo/Supporting Files/SceneDelegate.swift   | 16 ++---
 piwigo/Upload/PhotosFetch.swift               |  2 +-
 .../LocalImagesViewController+Data.swift      | 30 ++++-----
 ...LocalImagesViewController+DataSource.swift |  2 +-
 ...lImagesViewController+HeaderDelegate.swift |  2 +-
 .../LocalImageCollectionViewCell.swift        |  2 +-
 .../LocalImagePreviewViewController.swift     |  2 +-
 .../LocalImagesViewController.swift           |  2 +-
 .../PasteboardImagesViewController+Data.swift | 10 +--
 ...boardImagesViewController+DataSource.swift |  2 +-
 .../PasteboardImagesViewController.swift      |  2 +-
 .../PasteboardObject.swift                    |  4 +-
 .../LocalAlbumsViewController.swift           |  8 +--
 .../UploadParametersViewController.swift      | 10 +--
 .../UploadSettingsViewController.swift        | 18 ++---
 .../UploadImageTableViewCell.swift            |  4 +-
 .../UploadQueueViewController.swift           |  8 +--
 .../UploadQueueViewControllerOld.swift        | 20 +++---
 piwigo/Video/PlaybackController.swift         |  2 +-
 .../PlayerViewControllerCoordinator.swift     |  4 +-
 piwigoIntents/UploadPhotosHandler.swift       |  6 +-
 .../Data Cache/Album Data/AlbumProvider.swift | 34 +++++-----
 .../Image Data/Image+CoreDataClass.swift      |  4 +-
 .../Data Cache/Image Data/ImageProvider.swift | 20 +++---
 .../Location Data/LocationProvider.swift      | 16 ++---
 .../Migration Tools/DataMigrator.swift        | 42 ++++++------
 .../Server Data/ServerProvider.swift          |  6 +-
 .../Data Cache/Tag Data/TagProvider.swift     | 18 ++---
 .../Upload Data/Upload+CoreDataClass.swift    |  2 +-
 .../Upload Data/UploadProvider.swift          | 12 ++--
 .../Data Cache/User Data/UserProvider.swift   |  6 +-
 .../Extensions/PwgSession+Delegate.swift      |  4 +-
 .../Network/Extensions/PwgSession+Image.swift |  2 +-
 .../Extensions/PwgSession+Utilities.swift     |  7 +-
 piwigoKit/Network/KeychainUtilities.swift     |  4 +-
 piwigoKit/Network/ParseXMLData.swift          |  6 +-
 .../pwg.categories/pwg.categories.add.swift   |  2 +-
 .../pwg.categories.calculateOrphans.swift     |  2 +-
 .../pwg.images/pwg.images.upload.swift        |  2 +-
 .../pwg.images/pwg.images.uploadAsync.swift   |  2 +-
 piwigoKit/Supporting Files/URL+AppTools.swift |  6 +-
 .../Extensions/UploadManager+Finisher.swift   | 18 ++---
 .../Extensions/UploadManager+Prepare.swift    | 14 ++--
 .../Extensions/UploadManager+Resume.swift     | 14 ++--
 .../Extensions/UploadManager+Tasks.swift      | 28 ++++----
 .../Extensions/UploadManager+Transfer.swift   | 66 +++++++++----------
 .../Extensions/UploadManager+Utilities.swift  |  6 +-
 .../Extensions/UploadManager+Video.swift      | 32 ++++-----
 .../Supporting Files/ImageMetadata.swift      |  4 +-
 uploadKit/UploadManager.swift                 |  2 +-
 uploadKit/UploadSessions.swift                | 42 ++++++------
 84 files changed, 403 insertions(+), 402 deletions(-)

diff --git a/piwigo/Album/AlbumCollection/AlbumRenaming.swift b/piwigo/Album/AlbumCollection/AlbumRenaming.swift
index 31d15462a..ecb2b2f7a 100644
--- a/piwigo/Album/AlbumCollection/AlbumRenaming.swift
+++ b/piwigo/Album/AlbumCollection/AlbumRenaming.swift
@@ -138,7 +138,7 @@ class AlbumRenaming: NSObject
                     do {
                         try mainContext.save()
                     } catch let error as NSError {
-                        print("Could not save context, \(error.userInfo)")
+                        debugPrint("Could not save context, \(error.userInfo)")
                     }
                     
                     // Hide HUD
diff --git a/piwigo/Album/AlbumNavigationController.swift b/piwigo/Album/AlbumNavigationController.swift
index b9124694c..2c36365b0 100644
--- a/piwigo/Album/AlbumNavigationController.swift
+++ b/piwigo/Album/AlbumNavigationController.swift
@@ -26,8 +26,8 @@ class AlbumNavigationController: UINavigationController
     // MARK: - View Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        print("============================================")
-        print("••> viewDidLoad in AlbumNavigationController")
+        debugPrint("============================================")
+        debugPrint("••> viewDidLoad in AlbumNavigationController")
 
         // Navigation bar
         navigationBar.accessibilityIdentifier = "AlbumImagesNav"
@@ -84,7 +84,7 @@ class AlbumNavigationController: UINavigationController
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        print("••> viewWillAppear in AlbumNavigationController")
+        debugPrint("••> viewWillAppear in AlbumNavigationController")
         
         // Set colors, fonts, etc.
         applyColorPalette()
diff --git a/piwigo/Album/AlbumSelector/SelectCategoryViewController+Albums.swift b/piwigo/Album/AlbumSelector/SelectCategoryViewController+Albums.swift
index 7988def6f..6c83d4390 100644
--- a/piwigo/Album/AlbumSelector/SelectCategoryViewController+Albums.swift
+++ b/piwigo/Album/AlbumSelector/SelectCategoryViewController+Albums.swift
@@ -81,7 +81,7 @@ extension SelectCategoryViewController {
                     do {
                         try self.mainContext.save()
                     } catch let error as NSError {
-                        print("Could not fetch \(error), \(error.userInfo)")
+                        debugPrint("Could not fetch \(error), \(error.userInfo)")
                     }
 
                     // Close HUD
diff --git a/piwigo/Album/AlbumSelector/SelectCategoryViewController+Images.swift b/piwigo/Album/AlbumSelector/SelectCategoryViewController+Images.swift
index e97c733fa..d98646406 100644
--- a/piwigo/Album/AlbumSelector/SelectCategoryViewController+Images.swift
+++ b/piwigo/Album/AlbumSelector/SelectCategoryViewController+Images.swift
@@ -25,7 +25,7 @@ extension SelectCategoryViewController {
                 do {
                     try self.mainContext.save()
                 } catch let error as NSError {
-                    print("Could not save copied images \(error), \(error.userInfo)")
+                    debugPrint("Could not save copied images \(error), \(error.userInfo)")
                 }
                 // Hide HUD and dismiss album selector
                 self.hideHUD(afterDelay: pwgDelayHUD) {
@@ -108,7 +108,7 @@ extension SelectCategoryViewController {
                 do {
                     try self.mainContext.save()
                 } catch let error as NSError {
-                    print("Could not save moved images \(error), \(error.userInfo)")
+                    debugPrint("Could not save moved images \(error), \(error.userInfo)")
                 }
 
                 // Hide HUD and dismiss album selector
diff --git a/piwigo/Album/AlbumSelector/SelectCategoryViewController.swift b/piwigo/Album/AlbumSelector/SelectCategoryViewController.swift
index 8ef3bbf76..982944060 100644
--- a/piwigo/Album/AlbumSelector/SelectCategoryViewController.swift
+++ b/piwigo/Album/AlbumSelector/SelectCategoryViewController.swift
@@ -269,7 +269,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
             try recentAlbums.performFetch()
             try albums.performFetch()
         } catch {
-            print("Error: \(error)")
+            debugPrint("Error: \(error)")
         }
 
         // Button for returning to albums/images collections
@@ -582,7 +582,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "CategoryTableViewCell", for: indexPath) as? CategoryTableViewCell else {
-            print("Error: tableView.dequeueReusableCell does not return a CategoryTableViewCell!")
+            debugPrint("Error: tableView.dequeueReusableCell does not return a CategoryTableViewCell!")
             return CategoryTableViewCell()
         }
 
@@ -736,7 +736,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
         switch wantedAction {
         case .setDefaultAlbum:
             // The current default category is not selectable
-            print("••> albums: \(albumData.pwgID) and \(inputAlbum.pwgID)")
+            debugPrint("••> albums: \(albumData.pwgID) and \(inputAlbum.pwgID)")
             if albumData.pwgID == inputAlbum.pwgID {
                 return false
             }
@@ -1041,7 +1041,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
             do {
                 try self.mainContext.save()
             } catch let error as NSError {
-                print("Could not fetch \(error), \(error.userInfo)")
+                debugPrint("Could not fetch \(error), \(error.userInfo)")
             }
             // Dismiss the view
             self.dismiss(animated: true, completion: {})
diff --git a/piwigo/Album/AlbumViewController.swift b/piwigo/Album/AlbumViewController.swift
index f2867401d..c9b935527 100644
--- a/piwigo/Album/AlbumViewController.swift
+++ b/piwigo/Album/AlbumViewController.swift
@@ -229,8 +229,8 @@ class AlbumViewController: UIViewController
     // MARK: - View Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        print("--------------------------------------------------")
-        print("••> viewDidLoad in AlbumViewController: Album #\(categoryId)")
+        debugPrint("--------------------------------------------------")
+        debugPrint("••> viewDidLoad in AlbumViewController: Album #\(categoryId)")
 
         // Initialise data source
         do {
@@ -239,7 +239,7 @@ class AlbumViewController: UIViewController
             }
             try images.performFetch()
         } catch {
-            print("Error: \(error)")
+            debugPrint("Error: \(error)")
         }
         
         // Place search bar in navigation bar of root album
@@ -381,7 +381,7 @@ class AlbumViewController: UIViewController
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        print("••> viewWillAppear in AlbumViewController: Album #\(categoryId)")
+        debugPrint("••> viewWillAppear in AlbumViewController: Album #\(categoryId)")
         
         // For testing…
 //        timeCounter = CFAbsoluteTimeGetCurrent()
@@ -415,14 +415,14 @@ class AlbumViewController: UIViewController
     
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        print("••> viewDidAppear in AlbumViewController: Album #\(categoryId)")
+        debugPrint("••> viewDidAppear in AlbumViewController: Album #\(categoryId)")
         
         // Speed and memory measurements with iPad Pro 11" in debug mode
         /// Old method —> 0 photo: 527 ms, 24 photos: 583 ms, 3020 photos: 15 226 ms (memory crash after repeating tests)
         /// hasFavorites  cached —> a very little quicker but less memory impacting (-195 MB transcient allocations for 3020 photos)
         /// placeHolder & size cached —> 0 photo: 526 ms, 24 photos: 585 ms, 3020 photos: 14 586 ms i.e. -6% (memory crash after repeating tests)
 //        let duration = (CFAbsoluteTimeGetCurrent() - timeCounter)*1000
-//        print("••> completed in \(duration.rounded()) ms")
+//        debugPrint("••> completed in \(duration.rounded()) ms")
 
         // The user may have cleared the cached data
         // Display an empty root album in that case
@@ -635,7 +635,7 @@ class AlbumViewController: UIViewController
                 .value(forHTTPHeaderField: NetworkVars.HTTPCatID) == catIDstr })
             // Cancel remaining tasks related with this completed upload request
             tasksToCancel.forEach({
-                print("\(DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)) > Cancel task \($0.taskIdentifier) related with album \(self.categoryId)")
+                debugPrint("\(DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)) > Cancel task \($0.taskIdentifier) related with album \(self.categoryId)")
                 $0.cancel()
             })
         }
diff --git a/piwigo/Album/Extensions/AlbumViewController+Delete.swift b/piwigo/Album/Extensions/AlbumViewController+Delete.swift
index c36367fac..45c61c47e 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Delete.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Delete.swift
@@ -153,7 +153,7 @@ extension AlbumViewController
                     do {
                         try self.mainContext.save()
                     } catch let error as NSError {
-                        print("Could not save moved images \(error), \(error.userInfo)")
+                        debugPrint("Could not save moved images \(error), \(error.userInfo)")
                     }
                     // Hide HUD and deselect images
                     navigationController?.hideHUD() { [self] in
@@ -227,7 +227,7 @@ extension AlbumViewController
                     do {
                         try self.mainContext.save()
                     } catch let error as NSError {
-                        print("Could not save moved images \(error), \(error.userInfo)")
+                        debugPrint("Could not save moved images \(error), \(error.userInfo)")
                     }
                     // Hide HUD and update buttons
                     updateBarsInSelectMode()
@@ -246,7 +246,7 @@ extension AlbumViewController
                     do {
                         try self.mainContext.save()
                     } catch let error as NSError {
-                        print("Could not save moved images \(error), \(error.userInfo)")
+                        debugPrint("Could not save moved images \(error), \(error.userInfo)")
                     }
                     // Hide HUD and update buttons
                     updateBarsInSelectMode()
@@ -262,7 +262,7 @@ extension AlbumViewController
                 do {
                     try self.mainContext.save()
                 } catch let error as NSError {
-                    print("Could not save deleted images \(error), \(error.userInfo)")
+                    debugPrint("Could not save deleted images \(error), \(error.userInfo)")
                 }
                 // Hide HUD and deselect images
                 navigationController?.hideHUD(afterDelay: pwgDelayHUD) { [self] in
@@ -297,7 +297,7 @@ extension AlbumViewController
                     do {
                         try self.mainContext.save()
                     } catch let error as NSError {
-                        print("Could not save albums after image deletion \(error), \(error.userInfo)")
+                        debugPrint("Could not save albums after image deletion \(error), \(error.userInfo)")
                     }
 
                     // Delete upload requests of images deleted from the Piwigo server
@@ -338,7 +338,7 @@ extension AlbumViewController
                 do {
                     try self.mainContext.save()
                 } catch let error as NSError {
-                    print("Could not save moved images \(error), \(error.userInfo)")
+                    debugPrint("Could not save moved images \(error), \(error.userInfo)")
                 }
                 // Hide HUD and update buttons
                 navigationController?.hideHUD() { [self] in
diff --git a/piwigo/Album/Extensions/AlbumViewController+FetchResults.swift b/piwigo/Album/Extensions/AlbumViewController+FetchResults.swift
index 475fbdaf7..e2fec4164 100644
--- a/piwigo/Album/Extensions/AlbumViewController+FetchResults.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+FetchResults.swift
@@ -115,7 +115,7 @@ extension AlbumViewController: NSFetchedResultsControllerDelegate
                 selectedVideosIDs.remove(image.pwgID)
                 // Delete image
                 updateOperations.append( BlockOperation {  [weak self] in
-                    debugPrint("••> Delete image of album #\(self?.categoryId ?? Int32.min) at \(indexPath)")
+//                    debugPrint("••> Delete image of album #\(self?.categoryId ?? Int32.min) at \(indexPath)")
                     self?.collectionView?.deleteItems(at: [indexPath])
                 })
             case .move:
diff --git a/piwigo/Album/Extensions/AlbumViewController+Menu.swift b/piwigo/Album/Extensions/AlbumViewController+Menu.swift
index e46ef1e6a..52bbfe54a 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Menu.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Menu.swift
@@ -356,7 +356,7 @@ extension AlbumViewController: ImageHeaderDelegate
             selectedSections[section] = .select
         }
 //        let diff = (CFAbsoluteTimeGetCurrent() - start)*1000
-//        print("=> Select/Deselect \(localImagesCollection.numberOfItems(inSection: section)) images of section \(section) took \(diff) ms")
+//        debugPrint("=> Select/Deselect \(localImagesCollection.numberOfItems(inSection: section)) images of section \(section) took \(diff) ms")
         
         // Update navigation bar and toolbar
         updateBarsInSelectMode()
diff --git a/piwigo/Album/Extensions/AlbumViewController+Prefetching.swift b/piwigo/Album/Extensions/AlbumViewController+Prefetching.swift
index f98878f63..9cefb809c 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Prefetching.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Prefetching.swift
@@ -14,7 +14,7 @@ import piwigoKit
 extension AlbumViewController: UICollectionViewDataSourcePrefetching
 {
     func collectionView(_ collectionView: UICollectionView, prefetchItemsAt indexPaths: [IndexPath]) {
-//        print("••> prefetchingItemsAt \(indexPaths.debugDescription)")
+//        debugPrint("••> prefetchingItemsAt \(indexPaths.debugDescription)")
         let scale = self.traitCollection.displayScale
         for indexPath in indexPaths {
             switch indexPath.section {
@@ -51,7 +51,7 @@ extension AlbumViewController: UICollectionViewDataSourcePrefetching
     }
     
     func collectionView(_ collectionView: UICollectionView, cancelPrefetchingForItemsAt indexPaths: [IndexPath]) {
-//        print("••> cancelPrefetchingForItemsAt \(indexPaths.debugDescription)")
+//        debugPrint("••> cancelPrefetchingForItemsAt \(indexPaths.debugDescription)")
         for indexPath in indexPaths {
             switch indexPath.section {
             case 0 /* Albums (see XIB file) */:
diff --git a/piwigo/Album/Extensions/AlbumViewController+Share.swift b/piwigo/Album/Extensions/AlbumViewController+Share.swift
index 0fe9a50d1..61db9608b 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Share.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Share.swift
@@ -95,7 +95,7 @@ extension AlbumViewController
             }
         }
 //        let duration = (CFAbsoluteTimeGetCurrent() - timeCounter)*1000
-//        print("••> completed in \(duration.rounded()) ms")
+//        debugPrint("••> completed in \(duration.rounded()) ms")
 
         // Close HUD if needed
         DispatchQueue.main.async {
diff --git a/piwigo/Album/TagSelector/TagSelectorViewController.swift b/piwigo/Album/TagSelector/TagSelectorViewController.swift
index 1cf3dbfc8..cf8748b21 100644
--- a/piwigo/Album/TagSelector/TagSelectorViewController.swift
+++ b/piwigo/Album/TagSelector/TagSelectorViewController.swift
@@ -194,7 +194,7 @@ class TagSelectorViewController: UITableViewController {
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell
     {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "TagSelectorCell", for: indexPath) as? TagSelectorCell else {
-            print("Error: tableView.dequeueReusableCell does not return a TagSelectorCell!")
+            debugPrint("Error: tableView.dequeueReusableCell does not return a TagSelectorCell!")
             return TagSelectorCell()
         }
         cell.configure(with: tags.object(at: indexPath))
diff --git a/piwigo/Image/Extensions/ImageViewController+Delete.swift b/piwigo/Image/Extensions/ImageViewController+Delete.swift
index aab693a17..761331175 100644
--- a/piwigo/Image/Extensions/ImageViewController+Delete.swift
+++ b/piwigo/Image/Extensions/ImageViewController+Delete.swift
@@ -111,7 +111,7 @@ extension ImageViewController
                     do {
                         try self.mainContext.save()
                     } catch let error as NSError {
-                        print("Could not save copied images \(error), \(error.userInfo)")
+                        debugPrint("Could not save copied images \(error), \(error.userInfo)")
                     }
                 }
 
@@ -191,7 +191,7 @@ extension ImageViewController
                 do {
                     try self.mainContext.save()
                 } catch let error as NSError {
-                    print("Could not save albums after image deletion \(error), \(error.userInfo)")
+                    debugPrint("Could not save albums after image deletion \(error), \(error.userInfo)")
                 }
 
                 // If this image was uploaded with the iOS app,
diff --git a/piwigo/Image/ImageViewController.swift b/piwigo/Image/ImageViewController.swift
index d7ea65628..3947afd58 100644
--- a/piwigo/Image/ImageViewController.swift
+++ b/piwigo/Image/ImageViewController.swift
@@ -241,7 +241,7 @@ class ImageViewController: UIViewController {
     }
     
     deinit {
-        print("••> ImageViewController is being deinitialized.")
+//        debugPrint("••> ImageViewController is being deinitialized.")
         // Unregister all observers
         NotificationCenter.default.removeObserver(self)
     }
@@ -723,7 +723,7 @@ class ImageViewController: UIViewController {
     // Buttons are disabled (greyed) when retrieving image data
     // They are also disabled during an action
     func setEnableStateOfButtons(_ state: Bool) {
-        print("••> \(state ? "Enable" : "Disable") buttons")
+//        debugPrint("••> \(state ? "Enable" : "Disable") buttons")
         actionBarButton?.isEnabled = state
         shareBarButton.isEnabled = state
         moveBarButton.isEnabled = state
@@ -883,7 +883,7 @@ extension ImageViewController: UIPageViewControllerDelegate
         }
         
         // Set title and buttons
-        print("••> Did finish animating page view controller for image at index \(indexPath)")
+//        debugPrint("••> Did finish animating page view controller for image at index \(indexPath)")
         setTitleViewFromImageData()
         updateNavBar()
         setEnableStateOfButtons(imageData.fileSize != Int64.zero)
@@ -910,7 +910,7 @@ extension ImageViewController: UIPageViewControllerDataSource
 {
     // Create view controller for presenting the image at the provided index
     func imageDetailViewController(ofImage imageData: Image, atIndexPath indexPath: IndexPath) -> ImageDetailViewController? {
-        print("••> Create page view controller for image #\(imageData.pwgID) at index \(indexPath)")
+//        debugPrint("••> Create page view controller for image #\(imageData.pwgID) at index \(indexPath)")
         guard let imageDVC = storyboard?.instantiateViewController(withIdentifier: "ImageDetailViewController") as? ImageDetailViewController
         else { return nil }
 
@@ -922,7 +922,7 @@ extension ImageViewController: UIPageViewControllerDataSource
     
     // Create view controller for presenting the video at the provided index
     func videoDetailViewController(ofImage imageData: Image, atIndexPath indexPath: IndexPath) -> VideoDetailViewController? {
-        debugPrint("••> Create page view controller for video #\(imageData.pwgID) at index \(indexPath)")
+//        debugPrint("••> Create page view controller for video #\(imageData.pwgID) at index \(indexPath)")
         guard let videoDVC = storyboard?.instantiateViewController(withIdentifier: "VideoDetailViewController") as? VideoDetailViewController
         else { return nil }
 
diff --git a/piwigo/Image/Parameters/Cells/EditImageDatePickerTableViewCell.swift b/piwigo/Image/Parameters/Cells/EditImageDatePickerTableViewCell.swift
index ab3928996..51ace4e78 100644
--- a/piwigo/Image/Parameters/Cells/EditImageDatePickerTableViewCell.swift
+++ b/piwigo/Image/Parameters/Cells/EditImageDatePickerTableViewCell.swift
@@ -325,7 +325,7 @@ extension EditImageDatePickerTableViewCell: UIPickerViewDelegate
 //        var rightPaneWidth = sepDay / 2 + 5 * separatorWidth + 3 * time + 2 * sepTime
 //        rightPaneWidth += is24hFormat ? 0.0 : separatorWidth + ampm + separatorWidth + rightMargin
 //        let remainingSpace = pickerView.bounds.size.width - leftPaneWidth - rightPaneWidth
-//        print("=> left:\(leftPaneWidth), right:\(rightPaneWidth), width:\(pickerView.bounds.size.width) (remaining:\(remainingSpace))")
+//        debugPrint("=> left:\(leftPaneWidth), right:\(rightPaneWidth), width:\(pickerView.bounds.size.width) (remaining:\(remainingSpace))")
         // iPhone SE, iOS 11 => left:136, right:179, width:318 (remaining:3)
         // iPhone Xs, iOS 12 => left:131, right:174, width:373 (remaining:68)
 
diff --git a/piwigo/Image/Parameters/Cells/EditImageThumbTableViewCell.swift b/piwigo/Image/Parameters/Cells/EditImageThumbTableViewCell.swift
index 5466af001..3d9f6f55e 100644
--- a/piwigo/Image/Parameters/Cells/EditImageThumbTableViewCell.swift
+++ b/piwigo/Image/Parameters/Cells/EditImageThumbTableViewCell.swift
@@ -65,7 +65,7 @@ extension EditImageThumbTableViewCell: UICollectionViewDataSource
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "EditImageThumbCollectionViewCell", for: indexPath) as? EditImageThumbCollectionViewCell else {
-            print("Error: collectionView.dequeueReusableCell does not return a EditImageThumbCollectionViewCell!")
+            debugPrint("Error: collectionView.dequeueReusableCell does not return a EditImageThumbCollectionViewCell!")
             return EditImageThumbCollectionViewCell()
         }
         cell.config(withImage: images?[indexPath.row], removeOption: ((images?.count ?? 0) > 1))
diff --git a/piwigo/Image/Parameters/Extensions/EditImageParamsViewController+ThumbnailCell.swift b/piwigo/Image/Parameters/Extensions/EditImageParamsViewController+ThumbnailCell.swift
index 833e9d8ca..1bb09b9c6 100644
--- a/piwigo/Image/Parameters/Extensions/EditImageParamsViewController+ThumbnailCell.swift
+++ b/piwigo/Image/Parameters/Extensions/EditImageParamsViewController+ThumbnailCell.swift
@@ -43,7 +43,7 @@ extension EditImageParamsViewController: EditImageThumbnailCellDelegate
         do {
             try mainContext.save()
         } catch let error as NSError {
-            print("Could not fetch \(error), \(error.userInfo)")
+            debugPrint("Could not fetch \(error), \(error.userInfo)")
         }
 
         // Update parent image view
diff --git a/piwigo/Image/Parameters/Tags/TagsViewController.swift b/piwigo/Image/Parameters/Tags/TagsViewController.swift
index a06fa7fe6..1172bd6b4 100644
--- a/piwigo/Image/Parameters/Tags/TagsViewController.swift
+++ b/piwigo/Image/Parameters/Tags/TagsViewController.swift
@@ -265,7 +265,7 @@ class TagsViewController: UITableViewController {
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "TagTableViewCell", for: indexPath) as? TagTableViewCell else {
-            print("Error: tableView.dequeueReusableCell does not return a TagTableViewCell!")
+            debugPrint("Error: tableView.dequeueReusableCell does not return a TagTableViewCell!")
             return TagTableViewCell()
         }
         switch indexPath.section {
diff --git a/piwigo/Image/Share/ShareVideoActivityItemProvider.swift b/piwigo/Image/Share/ShareVideoActivityItemProvider.swift
index 1df1769f6..c59405f92 100644
--- a/piwigo/Image/Share/ShareVideoActivityItemProvider.swift
+++ b/piwigo/Image/Share/ShareVideoActivityItemProvider.swift
@@ -201,9 +201,9 @@ class ShareVideoActivityItemProvider: UIActivityItemProvider {
 
         // For debugging
 //        let commonMetadata = asset.commonMetadata
-//        print("===>> Common Metadata: \(commonMetadata)")
+//        debugPrint("===>> Common Metadata: \(commonMetadata)")
 //        let allMetadata = asset.metadata
-//        print("===>> All Metadata: \(allMetadata)")
+//        debugPrint("===>> All Metadata: \(allMetadata)")
 
         if !asset.metadata.containsPrivateMetadata() {
             // Notify the delegate on the main thread to show how it makes progress.
diff --git a/piwigo/In-App Intents/AutoUploadIntenthandler.swift b/piwigo/In-App Intents/AutoUploadIntenthandler.swift
index e3de6a4c6..4760c132f 100644
--- a/piwigo/In-App Intents/AutoUploadIntenthandler.swift	
+++ b/piwigo/In-App Intents/AutoUploadIntenthandler.swift	
@@ -30,8 +30,8 @@ class AutoUploadIntentHandler: NSObject, AutoUploadIntentHandling {
     
     // MARK: - Handle Intent
     func handle(intent: AutoUploadIntent, completion: @escaping (AutoUploadIntentResponse) -> Void) {
-        print("••> !!!!!!!!!!!!!!!!!!!!!!!!!")
-        print("••> In-app intent starting...")
+        debugPrint("••> !!!!!!!!!!!!!!!!!!!!!!!!!")
+        debugPrint("••> In-app intent starting...")
 
         // Is auto-uploading enabled?
         if !UploadVars.isAutoUploadActive {
diff --git a/piwigo/Login/LoginViewController.swift b/piwigo/Login/LoginViewController.swift
index c9a343d75..99856bb77 100644
--- a/piwigo/Login/LoginViewController.swift
+++ b/piwigo/Login/LoginViewController.swift
@@ -197,7 +197,7 @@ class LoginViewController: UIViewController {
         isAlreadyTryingToLogin = true
         NetworkVars.userStatus = pwgUserStatus.guest
         NetworkVars.usesCommunityPluginV29 = false
-        print(
+        debugPrint(
             "   usesCommunityPluginV29=\(NetworkVars.usesCommunityPluginV29 ? "YES" : "NO"), hasUserRights=\(NetworkVars.userStatus.rawValue)")
 
         // Check server address and cancel login if address not provided
@@ -345,7 +345,7 @@ class LoginViewController: UIViewController {
     }
 
     func performLogin() {
-        print(
+        debugPrint(
             "   usesCommunityPluginV29=\(NetworkVars.usesCommunityPluginV29 ? "YES" : "NO"), hasUserRights=\(NetworkVars.userStatus.rawValue)")
 
         // Perform login if username exists
@@ -396,7 +396,7 @@ class LoginViewController: UIViewController {
 
     // Determine true user rights when Community extension installed
     func getCommunityStatus() {
-        print(
+        debugPrint(
             "   usesCommunityPluginV29=\(NetworkVars.usesCommunityPluginV29 ? "YES" : "NO"), hasUserRights=\(NetworkVars.userStatus.rawValue)")
         // Community plugin installed?
         if NetworkVars.usesCommunityPluginV29 {
@@ -427,7 +427,7 @@ class LoginViewController: UIViewController {
 
     // Check Piwigo version, get token, available sizes, etc.
     func getSessionStatus() {
-        print(
+        debugPrint(
             "   hasCommunityPlugin=\(NetworkVars.usesCommunityPluginV29 ? "YES" : "NO"), hasUserRights=\(NetworkVars.userStatus.rawValue)")
         // Update HUD during login
         updateHUD(detail: NSLocalizedString("login_serverParameters", comment: "Piwigo Parameters"))
@@ -597,7 +597,7 @@ class LoginViewController: UIViewController {
         guard let serverURL = URL(string: serverString) else { return false }
 
         // Is the port provided ?
-//        print("sheme:\(serverURL.scheme), user:\(serverURL.user), pwd:\(serverURL.password), host:\(serverURL.host), port:\(serverURL.port), path:\(serverURL.path)")
+//        debugPrint("sheme:\(serverURL.scheme), user:\(serverURL.user), pwd:\(serverURL.password), host:\(serverURL.host), port:\(serverURL.port), path:\(serverURL.path)")
         if serverURL.port != nil {
             // Port provided => Adopt user choice but check protocol
             // Save username, server address and protocol to disk
diff --git a/piwigo/Settings/Appearance/ColorPaletteViewController.swift b/piwigo/Settings/Appearance/ColorPaletteViewController.swift
index 5c59a8ce9..42924ba72 100644
--- a/piwigo/Settings/Appearance/ColorPaletteViewController.swift
+++ b/piwigo/Settings/Appearance/ColorPaletteViewController.swift
@@ -121,14 +121,14 @@ class ColorPaletteViewController: UIViewController, UITableViewDataSource, UITab
         case 0:
             if UIDevice.current.userInterfaceIdiom == .phone {
                 guard let cell = tableView.dequeueReusableCell(withIdentifier: "PhoneTableViewCell", for: indexPath) as? PhoneTableViewCell else {
-                    print("Error: tableView.dequeueReusableCell does not return a PhoneTableViewCell!")
+                    debugPrint("Error: tableView.dequeueReusableCell does not return a PhoneTableViewCell!")
                     return LabelTableViewCell()
                 }
                 cell.configure()
                 tableViewCell = cell
             } else {
                 guard let cell = tableView.dequeueReusableCell(withIdentifier: "PadTableViewCell", for: indexPath) as? PadTableViewCell else {
-                    print("Error: tableView.dequeueReusableCell does not return a PadTableViewCell!")
+                    debugPrint("Error: tableView.dequeueReusableCell does not return a PadTableViewCell!")
                     return LabelTableViewCell()
                 }
                 cell.configure()
@@ -137,7 +137,7 @@ class ColorPaletteViewController: UIViewController, UITableViewDataSource, UITab
             
         case 1:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "SwitchTableViewCell", for: indexPath) as? SwitchTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
                 return SwitchTableViewCell()
             }
             cell.configure(with: NSLocalizedString("settings_switchPalette", comment: "Automatic"))
diff --git a/piwigo/Settings/Appearance/ColorPaletteViewControllerOld.swift b/piwigo/Settings/Appearance/ColorPaletteViewControllerOld.swift
index 67674b0ad..7dec3bc8c 100644
--- a/piwigo/Settings/Appearance/ColorPaletteViewControllerOld.swift
+++ b/piwigo/Settings/Appearance/ColorPaletteViewControllerOld.swift
@@ -102,14 +102,14 @@ class ColorPaletteViewControllerOld: UIViewController, UITableViewDataSource, UI
         case 0 /* Ligh and Dark options */:
             if UIDevice.current.userInterfaceIdiom == .phone {
                 guard let cell = tableView.dequeueReusableCell(withIdentifier: "PhoneTableViewCell", for: indexPath) as? PhoneTableViewCell else {
-                    print("Error: tableView.dequeueReusableCell does not return a PhoneTableViewCell!")
+                    debugPrint("Error: tableView.dequeueReusableCell does not return a PhoneTableViewCell!")
                     return LabelTableViewCell()
                 }
                 cell.configure()
                 tableViewCell = cell
             } else {
                 guard let cell = tableView.dequeueReusableCell(withIdentifier: "PadTableViewCell", for: indexPath) as? PadTableViewCell else {
-                    print("Error: tableView.dequeueReusableCell does not return a PadTableViewCell!")
+                    debugPrint("Error: tableView.dequeueReusableCell does not return a PadTableViewCell!")
                     return LabelTableViewCell()
                 }
                 cell.configure()
@@ -118,7 +118,7 @@ class ColorPaletteViewControllerOld: UIViewController, UITableViewDataSource, UI
 
         case 1 /* Automatic mode? */:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "SwitchTableViewCell", for: indexPath) as? SwitchTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
                 return SwitchTableViewCell()
             }
             cell.configure(with: NSLocalizedString("settings_switchPalette", comment: "Automatic"))
@@ -151,7 +151,7 @@ class ColorPaletteViewControllerOld: UIViewController, UITableViewDataSource, UI
             
         case 2 /* Switch at ambient brightness? */:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "SliderTableViewCell", for: indexPath) as? SliderTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a SliderTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a SliderTableViewCell!")
                 return SliderTableViewCell()
             }
             let value = Float(AppVars.shared.switchPaletteThreshold)
diff --git a/piwigo/Settings/Information/TroubleshootingViewController.swift b/piwigo/Settings/Information/TroubleshootingViewController.swift
index cef6dbf67..6d03f4e0d 100644
--- a/piwigo/Settings/Information/TroubleshootingViewController.swift
+++ b/piwigo/Settings/Information/TroubleshootingViewController.swift
@@ -143,7 +143,7 @@ class TroubleshootingViewController: UIViewController {
                 let predicate = NSPredicate(format: "subsystem IN %@", ["org.piwigo", "org.piwigoKit", "org.uploadKit"])
                 let allEntries = try logStore.getEntries(at: oneHourAgo, matching: predicate)
                 let duration = (CFAbsoluteTimeGetCurrent() - timeCounter)*1000
-                print("••> completed in \(duration.rounded()) ms")
+                debugPrint("••> completed in \(duration.rounded()) ms")
                 let entries = allEntries.compactMap({$0 as? OSLogEntryLog})
                 // Core Data
                 var someLogs = entries.filter({$0.category == "TagToTagMigrationPolicy_09_to_0C"})
diff --git a/piwigo/Settings/Privacy/LockOptionsViewController.swift b/piwigo/Settings/Privacy/LockOptionsViewController.swift
index c5b3e3eda..840530e5c 100644
--- a/piwigo/Settings/Privacy/LockOptionsViewController.swift
+++ b/piwigo/Settings/Privacy/LockOptionsViewController.swift
@@ -134,7 +134,7 @@ class LockOptionsViewController: UIViewController, UITableViewDelegate, UITableV
         switch indexPath.section {
         case 0:     // Auto-Upload On/Off
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "SwitchTableViewCell", for: indexPath) as? SwitchTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
                 return SwitchTableViewCell()
             }
             let title = NSLocalizedString("settings_appLock", comment: "App Lock")
@@ -158,7 +158,7 @@ class LockOptionsViewController: UIViewController, UITableViewDelegate, UITableV
 
         case 1:     // Change Password
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "ButtonTableViewCell", for: indexPath) as? ButtonTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a ButtonTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a ButtonTableViewCell!")
                 return ButtonTableViewCell()
             }
             if AppVars.shared.appLockKey.isEmpty {
@@ -171,7 +171,7 @@ class LockOptionsViewController: UIViewController, UITableViewDelegate, UITableV
 
         case 2:     // TouchID / FaceID / OpticID On/Off
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "SwitchTableViewCell", for: indexPath) as? SwitchTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
                 return SwitchTableViewCell()
             }
             var title = ""
diff --git a/piwigo/Settings/Privacy/ShareMetadataViewController.swift b/piwigo/Settings/Privacy/ShareMetadataViewController.swift
index e4765dd63..cb11dd478 100644
--- a/piwigo/Settings/Privacy/ShareMetadataViewController.swift
+++ b/piwigo/Settings/Privacy/ShareMetadataViewController.swift
@@ -169,7 +169,7 @@ class ShareMetadataViewController: UIViewController, UITableViewDelegate, UITabl
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
 
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "ShareMetadataCell", for: indexPath) as? ShareMetadataCell else {
-            print("Error: tableView.dequeueReusableCell does not return a ShareMetadataCell!")
+            debugPrint("Error: tableView.dequeueReusableCell does not return a ShareMetadataCell!")
             return ShareMetadataCell()
         }
 
@@ -412,7 +412,7 @@ class ShareMetadataViewController: UIViewController, UITableViewDelegate, UITabl
         case pwgActivityTypeOther:
             ImageVars.shared.shareMetadataTypeOther = newState
             default:
-                print("Error: Unknown activity \(String(describing: activity))")
+                debugPrint("Error: Unknown activity \(String(describing: activity))")
         }
 
         // Clean up /tmp directory where shared files are temporarily stored
@@ -479,7 +479,7 @@ class ShareMetadataViewController: UIViewController, UITableViewDelegate, UITabl
             name = width > 375 ? NSLocalizedString("shareActivityCode_Other>375px", comment: "Share images with other apps")
                                : NSLocalizedString("shareActivityCode_Other", comment: "Share with other apps")
             default:
-                print("Error: Unknown activity \(String(describing: activity))")
+                debugPrint("Error: Unknown activity \(String(describing: activity))")
         }
 
         return name
diff --git a/piwigo/Settings/SettingsViewController.swift b/piwigo/Settings/SettingsViewController.swift
index f4faa6dc9..d4c914c0c 100644
--- a/piwigo/Settings/SettingsViewController.swift
+++ b/piwigo/Settings/SettingsViewController.swift
@@ -271,8 +271,8 @@ class SettingsViewController: UIViewController {
         
         // Invite user to translate the app
         let langCode: String = NSLocale.current.languageCode ?? "en"
-//        print("=> langCode: ", String(describing: langCode))
-//        print(String(format: "=> now:%.0f > last:%.0f + %.0f", Date().timeIntervalSinceReferenceDate,         AppVars.shared.dateOfLastTranslationRequest, AppVars.shared.pwgOneMonth))
+//        debugPrint("=> langCode: ", String(describing: langCode))
+//        debugPrint(String(format: "=> now:%.0f > last:%.0f + %.0f", Date().timeIntervalSinceReferenceDate,         AppVars.shared.dateOfLastTranslationRequest, AppVars.shared.pwgOneMonth))
         let now: Double = Date().timeIntervalSinceReferenceDate
         let dueDate: Double = AppVars.shared.dateOfLastTranslationRequest + AppVars.shared.pwgOneMonth
         if (now > dueDate) && (["ar","id","ko","pt-BR","sv","uk"].contains(langCode)) {
diff --git a/piwigo/Settings/Upload/Auto-Upload/Extensions/AutoUploadViewController+UITableViewDataSource.swift b/piwigo/Settings/Upload/Auto-Upload/Extensions/AutoUploadViewController+UITableViewDataSource.swift
index bbb4f5b0b..7956b4cfd 100644
--- a/piwigo/Settings/Upload/Auto-Upload/Extensions/AutoUploadViewController+UITableViewDataSource.swift
+++ b/piwigo/Settings/Upload/Auto-Upload/Extensions/AutoUploadViewController+UITableViewDataSource.swift
@@ -38,7 +38,7 @@ extension AutoUploadViewController: UITableViewDataSource
         switch indexPath.section {
         case 0:     // Auto-Upload On/Off
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "SwitchTableViewCell", for: indexPath) as? SwitchTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
                 return SwitchTableViewCell()
             }
             let title = NSLocalizedString("settings_autoUpload", comment: "Auto Upload")
@@ -65,7 +65,7 @@ extension AutoUploadViewController: UITableViewDataSource
             
         case 1:     // Source & destination albums
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "LabelTableViewCell", for: indexPath) as? LabelTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a LabelTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a LabelTableViewCell!")
                 return LabelTableViewCell()
             }
             
@@ -110,7 +110,7 @@ extension AutoUploadViewController: UITableViewDataSource
             switch indexPath.row {
             case 0 /* Tags */ :
                 guard let cell = tableView.dequeueReusableCell(withIdentifier: "tags", for: indexPath) as? EditImageTagsTableViewCell else {
-                    print("Error: tableView.dequeueReusableCell does not return a EditImageTagsTableViewCell!")
+                    debugPrint("Error: tableView.dequeueReusableCell does not return a EditImageTagsTableViewCell!")
                     return EditImageTagsTableViewCell()
                 }
                 // Retrieve tags and switch to old cache data format
@@ -120,7 +120,7 @@ extension AutoUploadViewController: UITableViewDataSource
 
             case 1 /* Comments */ :
                 guard let cell = tableView.dequeueReusableCell(withIdentifier: "comment", for: indexPath) as? EditImageTextViewTableViewCell else {
-                    print("Error: tableView.dequeueReusableCell does not return a EditImageTextViewTableViewCell!")
+                    debugPrint("Error: tableView.dequeueReusableCell does not return a EditImageTextViewTableViewCell!")
                     return EditImageTextViewTableViewCell()
                 }
                 cell.config(withText: NSAttributedString(string: UploadVars.autoUploadComments),
diff --git a/piwigo/Supporting Files/AppDelegate.swift b/piwigo/Supporting Files/AppDelegate.swift
index 80bf63327..99cf6ff39 100644
--- a/piwigo/Supporting Files/AppDelegate.swift	
+++ b/piwigo/Supporting Files/AppDelegate.swift	
@@ -45,7 +45,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                         launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
         // Register notifications for displaying number of uploads to perform in app badge
         UNUserNotificationCenter.current().requestAuthorization(options: .badge) { granted, Error in
-//                if granted { print("request succeeded!") }
+//                if granted { debugPrint("request succeeded!") }
         }
 
         // Color palette depends on system settings
@@ -213,19 +213,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
-        print("Did fail to register notifications.")
+        debugPrint("Did fail to register notifications.")
     }
     
 
     // MARK: - Transitioning to the Foreground
     func applicationWillEnterForeground(_ application: UIApplication) {
-        print("••> App will enter foreground.")
+        debugPrint("••> App will enter foreground.")
         // Called when the app is about to enter the foreground.
         // This call is then followed by a call to applicationDidBecomeActive().
     }
         
     func applicationDidBecomeActive(_ application: UIApplication) {
-        print("••> App did become active.")
+        debugPrint("••> App did become active.")
         // The app has become active.
         // Restart any tasks that were paused (or not yet started) while the application was inactive.
         // If the application was previously in the background, optionally refresh the user interface.
@@ -266,7 +266,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     
     // MARK: - Transitioning to the Background
     func applicationWillResignActive(_ application: UIApplication) {
-        print("••> App will resign active.")
+        debugPrint("••> App will resign active.")
         // Called when the app is about to become inactive. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
         // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
 
@@ -302,7 +302,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
     
     func applicationDidEnterBackground(_ application: UIApplication) {
-        print("••> App did enter background.")
+        debugPrint("••> App did enter background.")
         // Called when the app is now in the background.
         // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
         // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
@@ -315,7 +315,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
         
     func applicationWillTerminate(_ application: UIApplication) {
-        print("••> App will terminate.")
+        debugPrint("••> App will terminate.")
         // Called when the application is about to terminate.
         // Save data if appropriate. See also applicationDidEnterBackground:.
         
@@ -343,12 +343,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     // MARK: - Background Uploading
     func application(_ application: UIApplication, handleEventsForBackgroundURLSession
                         identifier: String, completionHandler: @escaping () -> Void) {
-        print("    > Handle events for background session with ID: \(identifier)");
+        debugPrint("    > Handle events for background session with ID: \(identifier)");
         
         // Upload session of the app?
         if identifier.compare(UploadSessions.shared.uploadBckgSessionIdentifier) == .orderedSame {
             UploadSessions.shared.uploadSessionCompletionHandler = completionHandler
-            print("    > Rejoining session with CompletionHandler.")
+            debugPrint("••> Rejoining session with CompletionHandler.")
         }
     }
     
@@ -393,9 +393,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Submit upload request
         do {
             try BGTaskScheduler.shared.submit(request)
-            print("    > Background upload task request submitted with success.")
+            debugPrint("••> Background upload task request submitted with success.")
         } catch {
-            print("    > Failed to submit background upload request: \(error)")
+            debugPrint("••> Failed to submit background upload request: \(error)")
         }
     }
 
@@ -403,7 +403,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     private func handleNextUpload(task: BGProcessingTask) {
         // Schedule the next upload if needed
         if UploadManager.shared.nberOfUploadsToComplete > 0 {
-            print("    > Schedule next uploads.")
+            debugPrint("    > Schedule next uploads.")
             scheduleNextUpload()
         }
 
@@ -442,7 +442,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Provide an expiration handler for the background task
         // that cancels the operation
         task.expirationHandler = {
-            print("    > Task expired: Upload operation cancelled.")
+            debugPrint("    > Task expired: Upload operation cancelled.")
             // Cancel operations
             uploadQueue.cancelAllOperations()
         }
@@ -451,7 +451,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // when the operation completes
         let lastOperation = uploadOperations.last!
         lastOperation.completionBlock = {
-            print("    > Task completed with success.")
+            debugPrint("••> Task completed with success.")
             task.setTaskCompleted(success: true)
             // Save cached data in the main thread
             DispatchQueue.main.async {
@@ -460,7 +460,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         }
 
         // Start the operation
-        print("    > Start upload operations in background task...");
+        debugPrint("••> Start upload operations in background task...");
         uploadQueue.addOperations(uploadOperations, waitUntilFinished: false)
     }
 
@@ -518,7 +518,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 }
             }
             catch {
-                print("Could not clean up the temporary directory")
+                debugPrint("Could not clean up the temporary directory")
             }
         }
     }
@@ -871,7 +871,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     private func initColorPalette() {
         // Color palette depends on system settings
         AppVars.shared.isSystemDarkModeActive = (UIScreen.main.traitCollection.userInterfaceStyle == .dark)
-        print("••> iOS mode: \(AppVars.shared.isSystemDarkModeActive ? "Dark" : "Light"), App mode: \(AppVars.shared.isDarkPaletteModeActive ? "Dark" : "Light"), Brightness: \(lroundf(Float(UIScreen.main.brightness) * 100.0))/\(AppVars.shared.switchPaletteThreshold), app: \(AppVars.shared.isDarkPaletteActive ? "Dark" : "Light")")
+        debugPrint("••> iOS mode: \(AppVars.shared.isSystemDarkModeActive ? "Dark" : "Light"), App mode: \(AppVars.shared.isDarkPaletteModeActive ? "Dark" : "Light"), Brightness: \(lroundf(Float(UIScreen.main.brightness) * 100.0))/\(AppVars.shared.switchPaletteThreshold), app: \(AppVars.shared.isDarkPaletteActive ? "Dark" : "Light")")
 
         // Apply color palette
         screenBrightnessChanged()
@@ -982,7 +982,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         // Notify palette change to views
         NotificationCenter.default.post(name: .pwgPaletteChanged, object: nil)
-//        print("••> App changed to \(AppVars.shared.isDarkPaletteActive ? "dark" : "light") mode");
+//        debugPrint("••> App changed to \(AppVars.shared.isDarkPaletteActive ? "dark" : "light") mode");
     }
 }
 
@@ -1008,7 +1008,7 @@ extension AppDelegate: AppLockDelegate {
 
             // Login?
             if service.count > 0 || (username.count > 0 && password.count > 0) {
-                print("••> Call launchLogin() from AppDelegate.")
+                debugPrint("••> Call launchLogin() from AppDelegate.")
                 loginVC.launchLogin()
             }
             return
diff --git a/piwigo/Supporting Files/ExternalDisplaySceneDelegate.swift b/piwigo/Supporting Files/ExternalDisplaySceneDelegate.swift
index b5ffb70bc..30ce82aa7 100644
--- a/piwigo/Supporting Files/ExternalDisplaySceneDelegate.swift	
+++ b/piwigo/Supporting Files/ExternalDisplaySceneDelegate.swift	
@@ -28,7 +28,7 @@ class ExternalDisplaySceneDelegate: UIResponder, UIWindowSceneDelegate {
      The recommended approach is for the SceneDelegate to retain the scene's window.
      */
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
-        print("••> \(session.persistentIdentifier): Scene will connect to session.")
+        debugPrint("••> \(session.persistentIdentifier): Scene will connect to session.")
         guard let windowScene = (scene as? UIWindowScene) else { return }
         let window = UIWindow(windowScene: windowScene)
         
@@ -97,7 +97,7 @@ class ExternalDisplaySceneDelegate: UIResponder, UIWindowSceneDelegate {
     }
     
     func sceneDidDisconnect(_ scene: UIScene) {
-        print("••> \(scene.session.persistentIdentifier): Scene did disconnect.")
+        debugPrint("••> \(scene.session.persistentIdentifier): Scene did disconnect.")
         // Called as the scene is being released by the system.
         // This occurs shortly after the scene enters the background, or when its session is discarded.
         // Release any resources associated with this scene that can be re-created the next time the scene connects.
@@ -151,13 +151,13 @@ class ExternalDisplaySceneDelegate: UIResponder, UIWindowSceneDelegate {
     
     // MARK: - Transitioning to the Foreground
 //    func sceneWillEnterForeground(_ scene: UIScene) {
-//        print("••> \(scene.session.persistentIdentifier): Scene will enter foreground.")
+//        debugPrint("••> \(scene.session.persistentIdentifier): Scene will enter foreground.")
 //        // Called as the scene is about to begin running in the foreground and become visible to the user.
 //        // Use this method to undo the changes made on entering the background.
 //    }
 
 //    func sceneDidBecomeActive(_ scene: UIScene) {
-//        print("••> \(scene.session.persistentIdentifier): Scene did become active.")
+//        debugPrint("••> \(scene.session.persistentIdentifier): Scene did become active.")
 //        // Called when the scene has become active and is now responding to user events.
 //        // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
 //    }
@@ -165,13 +165,13 @@ class ExternalDisplaySceneDelegate: UIResponder, UIWindowSceneDelegate {
     
     // MARK: - Transitioning to the Background
     func sceneWillResignActive(_ scene: UIScene) {
-        print("••> \(scene.session.persistentIdentifier): Scene will resign active.")
+        debugPrint("••> \(scene.session.persistentIdentifier): Scene will resign active.")
         // Called when the scene is about to resign the active state and stop responding to user events.
         // This may occur due to temporary interruptions (ex. an incoming phone call).
     }
 
     func sceneDidEnterBackground(_ scene: UIScene) {
-        print("••> \(scene.session.persistentIdentifier): Scene did enter background.")
+        debugPrint("••> \(scene.session.persistentIdentifier): Scene did enter background.")
         // Called when the scene is running in the background and is no longer onscreen.
         // Use this method to save data, release shared resources, and store enough scene-specific state information to restore the scene back to its current state.
     }
diff --git a/piwigo/Supporting Files/Macros/HapticUtilities.swift b/piwigo/Supporting Files/Macros/HapticUtilities.swift
index 6eb57eec0..5e910e627 100644
--- a/piwigo/Supporting Files/Macros/HapticUtilities.swift	
+++ b/piwigo/Supporting Files/Macros/HapticUtilities.swift	
@@ -28,45 +28,45 @@ class HapticUtilities {
             let audioSession = AVAudioSession.sharedInstance()
             engine = try CHHapticEngine(audioSession: audioSession)
         } catch let error {
-            print("Engine Creation Error: \(error)")
+            debugPrint("Engine Creation Error: \(error)")
         }
         
         guard let engine = engine else {
-            print("Failed to create engine!")
+            debugPrint("Failed to create engine!")
             return nil
         }
 
         // The stopped handler alerts you of engine stoppage due to external causes.
         engine.stoppedHandler = { reason in
-            print("The engine stopped for reason: \(reason.rawValue)")
+            debugPrint("The engine stopped for reason: \(reason.rawValue)")
             switch reason {
             case .audioSessionInterrupt:
-                print("Audio session interrupt")
+                debugPrint("Audio session interrupt")
             case .applicationSuspended:
-                print("Application suspended")
+                debugPrint("Application suspended")
             case .idleTimeout:
-                print("Idle timeout")
+                debugPrint("Idle timeout")
             case .systemError:
-                print("System error")
+                debugPrint("System error")
             case .notifyWhenFinished:
-                print("Playback finished")
+                debugPrint("Playback finished")
             case .gameControllerDisconnect:
-                print("Controller disconnected.")
+                debugPrint("Controller disconnected.")
             case .engineDestroyed:
-                print("Engine destroyed.")
+                debugPrint("Engine destroyed.")
             @unknown default:
-                print("Unknown error")
+                debugPrint("Unknown error")
             }
         }
  
         // The reset handler provides an opportunity for your app to restart the engine in case of failure.
         engine.resetHandler = {
             // Try restarting the engine.
-            print("The engine reset --> Restarting now!")
+            debugPrint("The engine reset --> Restarting now!")
             do {
                 try HapticUtilities.shared.engine?.start()
             } catch {
-                print("Failed to restart the engine: \(error)")
+                debugPrint("Failed to restart the engine: \(error)")
             }
         }
         return engine
@@ -91,7 +91,7 @@ class HapticUtilities {
             try engine?.playPattern(from: URL(fileURLWithPath: path))
             
         } catch { // Engine startup errors
-            print("An error occured playing \(filename): \(error).")
+            debugPrint("An error occured playing \(filename): \(error).")
         }
     }
 }
diff --git a/piwigo/Supporting Files/Macros/UIFont+AppFonts.swift b/piwigo/Supporting Files/Macros/UIFont+AppFonts.swift
index 6ca21033d..579bfa90a 100644
--- a/piwigo/Supporting Files/Macros/UIFont+AppFonts.swift	
+++ b/piwigo/Supporting Files/Macros/UIFont+AppFonts.swift	
@@ -96,6 +96,6 @@ extension UIFont {
 // Code for determining font name, e.g. LacunaRegular, OpenSans
 
 //for familyName in UIFont.familyNames {
-//    print("Family \(familyName)")
-//    print("Names = \(UIFont.fontNames(forFamilyName: familyName))")
+//    debugPrint("Family \(familyName)")
+//    debugPrint("Names = \(UIFont.fontNames(forFamilyName: familyName))")
 //}
diff --git a/piwigo/Supporting Files/Macros/UIImage+AppTools.swift b/piwigo/Supporting Files/Macros/UIImage+AppTools.swift
index e327e28e9..5bb151cc1 100644
--- a/piwigo/Supporting Files/Macros/UIImage+AppTools.swift	
+++ b/piwigo/Supporting Files/Macros/UIImage+AppTools.swift	
@@ -77,7 +77,7 @@ extension UIImage {
             // Crop image
             guard let croppedImage = cgImage.cropping(to: salientRect) else { return nil }
 //            let diff:Double = (CFAbsoluteTimeGetCurrent() - start)*1000.0
-//            print("   processed attention based saliency in \(round(diff*10.0)/10.0) ms")
+//            debugPrint("   processed attention based saliency in \(round(diff*10.0)/10.0) ms")
             return UIImage(cgImage:croppedImage)
         }
 
@@ -91,7 +91,7 @@ extension UIImage {
             // Crop image
             guard let croppedImage = cgImage.cropping(to: salientRect) else { return nil }
 //            let diff:Double = (CFAbsoluteTimeGetCurrent() - start)*1000.0
-//            print("   processed objectness based saliency in \(round(diff*10.0)/10.0) ms")
+//            debugPrint("   processed objectness based saliency in \(round(diff*10.0)/10.0) ms")
             return UIImage(cgImage:croppedImage)
         }
         return nil
diff --git a/piwigo/Supporting Files/SceneDelegate.swift b/piwigo/Supporting Files/SceneDelegate.swift
index 2f1d28a71..5c7f348ea 100644
--- a/piwigo/Supporting Files/SceneDelegate.swift	
+++ b/piwigo/Supporting Files/SceneDelegate.swift	
@@ -42,7 +42,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         The recommended approach is for the SceneDelegate to retain the scene's window.
     */
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
-        print("••> \(session.persistentIdentifier): Scene will connect to session.")
+        debugPrint("••> \(session.persistentIdentifier): Scene will connect to session.")
         guard let appDelegate = UIApplication.shared.delegate as? AppDelegate,
               let windowScene = (scene as? UIWindowScene) else { return }
         let window = UIWindow(windowScene: windowScene)
@@ -254,7 +254,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     }
 
     func sceneDidDisconnect(_ scene: UIScene) {
-        print("••> \(scene.session.persistentIdentifier): Scene did disconnect.")
+        debugPrint("••> \(scene.session.persistentIdentifier): Scene did disconnect.")
         // Called as the scene is being released by the system.
         // This occurs shortly after the scene enters the background, or when its session is discarded.
         // Release any resources associated with this scene that can be re-created the next time the scene connects.
@@ -264,13 +264,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     
     // MARK: - Transitioning to the Foreground
     func sceneWillEnterForeground(_ scene: UIScene) {
-        print("••> \(scene.session.persistentIdentifier): Scene will enter foreground.")
+        debugPrint("••> \(scene.session.persistentIdentifier): Scene will enter foreground.")
         // Called as the scene is about to begin running in the foreground and become visible to the user.
         // Use this method to undo the changes made on entering the background.
     }
 
     func sceneDidBecomeActive(_ scene: UIScene) {
-        print("••> \(scene.session.persistentIdentifier): Scene did become active.")
+        debugPrint("••> \(scene.session.persistentIdentifier): Scene did become active.")
         // Called when the scene has become active and is now responding to user events.
         // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
 
@@ -319,7 +319,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     // MARK: - Transitioning to the Background
     func sceneWillResignActive(_ scene: UIScene) {
-        print("••> \(scene.session.persistentIdentifier): Scene will resign active.")
+        debugPrint("••> \(scene.session.persistentIdentifier): Scene will resign active.")
         // Called when the scene is about to resign the active state and stop responding to user events.
         // This may occur due to temporary interruptions (ex. an incoming phone call).
 
@@ -360,7 +360,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     }
 
     func sceneDidEnterBackground(_ scene: UIScene) {
-        print("••> \(scene.session.persistentIdentifier): Scene did enter background.")
+        debugPrint("••> \(scene.session.persistentIdentifier): Scene did enter background.")
         // Called when the scene is running in the background and is no longer onscreen.
         // Use this method to save data, release shared resources, and store enough scene-specific state information to restore the scene back to its current state.
 
@@ -389,7 +389,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     // MARK: - Privacy & Passcode
     func addPrivacyProtection() {
-        print("••> \(window?.windowScene?.session.persistentIdentifier ?? "UNKNOWN"): Scene shows privacy protection window.")
+        debugPrint("••> \(window?.windowScene?.session.persistentIdentifier ?? "UNKNOWN"): Scene shows privacy protection window.")
         // Blur views if the App Lock is enabled
         /// The passcode window is not presented now so that the app
         /// does not request the passcode until it is put into the background.
@@ -415,7 +415,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 @available(iOS 13.0, *)
 extension SceneDelegate: AppLockDelegate {
     func loginOrReloginAndResumeUploads() {
-        print("••> \(window?.windowScene?.session.persistentIdentifier ?? "UNKNOWN"): Scene presents the login view or resume uploads.")
+        debugPrint("••> \(window?.windowScene?.session.persistentIdentifier ?? "UNKNOWN"): Scene presents the login view or resume uploads.")
         // Remove privacy view
         privacyView?.removeFromSuperview()
         
diff --git a/piwigo/Upload/PhotosFetch.swift b/piwigo/Upload/PhotosFetch.swift
index 9d6aa31a1..d96c07b4d 100644
--- a/piwigo/Upload/PhotosFetch.swift
+++ b/piwigo/Upload/PhotosFetch.swift
@@ -127,7 +127,7 @@ class PhotosFetch: NSObject {
                 }
             }
         @unknown default:
-            print("unknown Photo Library authorization status")
+            debugPrint("unknown Photo Library authorization status")
         }
     }
 
diff --git a/piwigo/Upload/Pick Local Images/Extensions/LocalImagesViewController+Data.swift b/piwigo/Upload/Pick Local Images/Extensions/LocalImagesViewController+Data.swift
index cc251b63c..05e03b2e9 100644
--- a/piwigo/Upload/Pick Local Images/Extensions/LocalImagesViewController+Data.swift	
+++ b/piwigo/Upload/Pick Local Images/Extensions/LocalImagesViewController+Data.swift	
@@ -41,7 +41,7 @@ extension LocalImagesViewController
 
         // Next 2 lines for testing
 //        let diff = (CFAbsoluteTimeGetCurrent() - start)*1000
-//        print("=> Fetched \(fetchedImages.count) assets in \(diff) ms")
+//        debugPrint("=> Fetched \(fetchedImages.count) assets in \(diff) ms")
         // => Fetched 74925 assets in 90 ms w/o hidden assets on iPhone 14 Pro
         // => Fetched 70331 assets in 206 ms w/ hidden assets on iPhone 11 Pro
         // => Fetched 70331 assets in 217 ms w/o hidden assets on iPhone 11 Pro
@@ -146,10 +146,10 @@ extension LocalImagesViewController
         }
         
 //        uploadsInQueue.forEach({
-//            print("••> uploadsInQueue: \($0?.0 ?? "")")
+//            debugPrint("••> uploadsInQueue: \($0?.0 ?? "")")
 //        })
 //        indexedUploadsInQueue.forEach({
-//            print("••> indexedUploadsInQueue: \($0?.0 ?? "")")
+//            debugPrint("••> indexedUploadsInQueue: \($0?.0 ?? "")")
 //        })
     }
 
@@ -179,7 +179,7 @@ extension LocalImagesViewController
         for i in 0...iterations {
             // Continue with this operation?
             if queue.operations.first!.isCancelled {
-                print("Stop first operation in iteration \(i) ;-)")
+                debugPrint("Stop first operation in iteration \(i) ;-)")
                 indexOfImageSortedByDay = [IndexSet]()
                 indexOfImageSortedByWeek = [IndexSet]()
                 indexOfImageSortedByMonth = [IndexSet]()
@@ -237,7 +237,7 @@ extension LocalImagesViewController
         indexOfImageSortedByWeek.append(IndexSet(integersIn: firstIndexOfSameWeek..<images.count))
         indexOfImageSortedByMonth.append(IndexSet(integersIn: firstIndexOfSameMonth..<images.count))
 //        let diff = (CFAbsoluteTimeGetCurrent() - start)*1000
-//        print("   sorted \(fetchedImages.count) images by days, weeks and months in \(diff) ms")
+//        debugPrint("   sorted \(fetchedImages.count) images by days, weeks and months in \(diff) ms")
     }
     
     private func sortByMonthWeekDayAndUpdateSelection(images: PHFetchResult<PHAsset>) -> (Void)  {
@@ -267,7 +267,7 @@ extension LocalImagesViewController
         for i in 0...iterations {
             // Continue with this operation?
             if queue.operations.first!.isCancelled {
-                print("Stop first operation in iteration \(i) ;-)")
+                debugPrint("Stop first operation in iteration \(i) ;-)")
                 indexOfImageSortedByDay = [IndexSet]()
                 indexOfImageSortedByWeek = [IndexSet]()
                 indexOfImageSortedByMonth = [IndexSet]()
@@ -331,7 +331,7 @@ extension LocalImagesViewController
         indexOfImageSortedByWeek.append(IndexSet(integersIn: firstIndexOfSameWeek..<images.count))
         indexOfImageSortedByMonth.append(IndexSet(integersIn: firstIndexOfSameMonth..<images.count))
 //        let diff = (CFAbsoluteTimeGetCurrent() - start)*1000
-//        print("   sorted \(fetchedImages.count) images by days, weeks and months and updated selection in \(diff) ms")
+//        debugPrint("   sorted \(fetchedImages.count) images by days, weeks and months and updated selection in \(diff) ms")
     }
     
     // Return image index from indexPath
@@ -414,7 +414,7 @@ extension LocalImagesViewController
             // Continue with this operation?
             if queue.operations.first!.isCancelled {
                 indexedUploadsInQueue = []
-                print("Stop second operation in iteration \(i) ;-)")
+                debugPrint("Stop second operation in iteration \(i) ;-)")
                 return
             }
             
@@ -432,7 +432,7 @@ extension LocalImagesViewController
             }
         }
         let diff = (CFAbsoluteTimeGetCurrent() - start)*1000
-        print("   indexed \(fetchedImages.count) images by iterating fetched images in \(diff) ms")
+        debugPrint("   indexed \(fetchedImages.count) images by iterating fetched images in \(diff) ms")
     }
 
     private func cachingUploadIndicesIteratingUploadsInQueue() -> (Void) {
@@ -453,7 +453,7 @@ extension LocalImagesViewController
                 // Continue with this operation?
                 if queue.operations.first!.isCancelled {
                     indexedUploadsInQueue = []
-                    print("Stop second operation in iteration \(i) ;-)")
+                    debugPrint("Stop second operation in iteration \(i) ;-)")
                     return
                 }
 
@@ -479,7 +479,7 @@ extension LocalImagesViewController
             }
         }
         let diff = (CFAbsoluteTimeGetCurrent() - start)*1000
-        print("   cached \(count) images by iterating uploads in queue in \(diff) ms")
+        debugPrint("   cached \(count) images by iterating uploads in queue in \(diff) ms")
     }
     
     func getUploadStateOfImage(at index: Int,
@@ -511,7 +511,7 @@ extension LocalImagesViewController: NSFetchedResultsControllerDelegate
 
         switch type {
         case .insert:
-            print("••> LocalImagesViewController: insert pending upload request…")
+            debugPrint("••> LocalImagesViewController: insert pending upload request…")
             // Add upload request to cache and update cell
             guard let upload:Upload = anObject as? Upload else { return }
 
@@ -542,7 +542,7 @@ extension LocalImagesViewController: NSFetchedResultsControllerDelegate
             // Update corresponding cell
             updateCellAndSectionHeader(for: upload)
         case .delete:
-            print("••> LocalImagesViewController: delete pending upload request…")
+            debugPrint("••> LocalImagesViewController: delete pending upload request…")
             // Delete upload request from cache and update cell
             guard let upload:Upload = anObject as? Upload else { return }
 
@@ -560,7 +560,7 @@ extension LocalImagesViewController: NSFetchedResultsControllerDelegate
         case .move:
             assertionFailure("••> LocalImagesViewController: Unexpected move!")
         case .update:
-            print("••• LocalImagesViewController controller:update...")
+            debugPrint("••• LocalImagesViewController controller:update...")
             // Update upload request and cell
             guard let upload:Upload = anObject as? Upload else { return }
 
@@ -576,7 +576,7 @@ extension LocalImagesViewController: NSFetchedResultsControllerDelegate
     }
 
     func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
-        print("••• LocalImagesViewController controller:didChangeContent...")
+        debugPrint("••• LocalImagesViewController controller:didChangeContent...")
         // Update navigation bar
         updateActionButton()
         updateNavBar()
diff --git a/piwigo/Upload/Pick Local Images/Extensions/LocalImagesViewController+DataSource.swift b/piwigo/Upload/Pick Local Images/Extensions/LocalImagesViewController+DataSource.swift
index 1fcc95cd5..74100c667 100644
--- a/piwigo/Upload/Pick Local Images/Extensions/LocalImagesViewController+DataSource.swift	
+++ b/piwigo/Upload/Pick Local Images/Extensions/LocalImagesViewController+DataSource.swift	
@@ -119,7 +119,7 @@ extension LocalImagesViewController: UICollectionViewDataSource
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         // Create cell
         guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "LocalImageCollectionViewCell", for: indexPath) as? LocalImageCollectionViewCell else {
-            print("Error: collectionView.dequeueReusableCell does not return a LocalImageCollectionViewCell!")
+            debugPrint("Error: collectionView.dequeueReusableCell does not return a LocalImageCollectionViewCell!")
             return LocalImageCollectionViewCell()
         }
         
diff --git a/piwigo/Upload/Pick Local Images/Extensions/LocalImagesViewController+HeaderDelegate.swift b/piwigo/Upload/Pick Local Images/Extensions/LocalImagesViewController+HeaderDelegate.swift
index 653c5fd32..13933151a 100644
--- a/piwigo/Upload/Pick Local Images/Extensions/LocalImagesViewController+HeaderDelegate.swift	
+++ b/piwigo/Upload/Pick Local Images/Extensions/LocalImagesViewController+HeaderDelegate.swift	
@@ -57,7 +57,7 @@ extension LocalImagesViewController: LocalImagesHeaderDelegate
             selectedSections[section] = .select
         }
 //        let diff = (CFAbsoluteTimeGetCurrent() - start)*1000
-//        print("=> Select/Deselect \(localImagesCollection.numberOfItems(inSection: section)) images of section \(section) took \(diff) ms")
+//        debugPrint("=> Select/Deselect \(localImagesCollection.numberOfItems(inSection: section)) images of section \(section) took \(diff) ms")
         
         // Update navigation bar
         self.updateNavBar()
diff --git a/piwigo/Upload/Pick Local Images/LocalImageCollectionViewCell.swift b/piwigo/Upload/Pick Local Images/LocalImageCollectionViewCell.swift
index ff111b73c..08487230c 100644
--- a/piwigo/Upload/Pick Local Images/LocalImageCollectionViewCell.swift	
+++ b/piwigo/Upload/Pick Local Images/LocalImageCollectionViewCell.swift	
@@ -58,7 +58,7 @@ class LocalImageCollectionViewCell: UICollectionViewCell {
             DispatchQueue.main.async {
                 guard let image = result else {
                     if let error = info?[PHImageErrorKey] as? Error {
-                        print("••> Error : \(error.localizedDescription)")
+                        debugPrint("••> Error : \(error.localizedDescription)")
                     }
                     self.changeCellImageIfNeeded(withImage: UIImage(named: "placeholder")!)
                     return
diff --git a/piwigo/Upload/Pick Local Images/LocalImagePreviewViewController.swift b/piwigo/Upload/Pick Local Images/LocalImagePreviewViewController.swift
index ca16085d4..e6aa66434 100644
--- a/piwigo/Upload/Pick Local Images/LocalImagePreviewViewController.swift	
+++ b/piwigo/Upload/Pick Local Images/LocalImagePreviewViewController.swift	
@@ -26,7 +26,7 @@ class LocalImagePreviewViewController: UIViewController {
             DispatchQueue.main.async {
                 guard let image = result else {
                     if let error = info?[PHImageErrorKey] as? Error {
-                        print("••> Error : \(error.localizedDescription)")
+                        debugPrint("••> Error : \(error.localizedDescription)")
                     }
                     self.imageView.image = UIImage(named: "placeholder")!
                     return
diff --git a/piwigo/Upload/Pick Local Images/LocalImagesViewController.swift b/piwigo/Upload/Pick Local Images/LocalImagesViewController.swift
index 7a37581b4..d50b2e2cd 100644
--- a/piwigo/Upload/Pick Local Images/LocalImagesViewController.swift	
+++ b/piwigo/Upload/Pick Local Images/LocalImagesViewController.swift	
@@ -140,7 +140,7 @@ class LocalImagesViewController: UIViewController
         do {
             try uploads.performFetch()
         } catch {
-            print("Error: \(error)")
+            debugPrint("Error: \(error)")
         }
                                                                                         
         // Sort images in background
diff --git a/piwigo/Upload/Pick Pasteboard Images/Extensions/PasteboardImagesViewController+Data.swift b/piwigo/Upload/Pick Pasteboard Images/Extensions/PasteboardImagesViewController+Data.swift
index a2e9fa6a5..a239b69a0 100644
--- a/piwigo/Upload/Pick Pasteboard Images/Extensions/PasteboardImagesViewController+Data.swift	
+++ b/piwigo/Upload/Pick Pasteboard Images/Extensions/PasteboardImagesViewController+Data.swift	
@@ -64,7 +64,7 @@ extension PasteboardImagesViewController {
         case .new:
             startPreparation(of: pbObject, at: indexPath)
         default:
-            print("Do nothing")
+            debugPrint("Do nothing")
         }
     }
 
@@ -166,7 +166,7 @@ extension PasteboardImagesViewController: NSFetchedResultsControllerDelegate
 
         switch type {
         case .insert:
-            print("••> PasteboardImagesViewController: insert pending upload request…")
+            debugPrint("••> PasteboardImagesViewController: insert pending upload request…")
             // Add upload request to cache and update cell
             guard let upload:Upload = anObject as? Upload else { return }
 
@@ -181,7 +181,7 @@ extension PasteboardImagesViewController: NSFetchedResultsControllerDelegate
             // Update corresponding cell
             updateCellAndSectionHeader(for: upload)
         case .delete:
-            print("••> PasteboardImagesViewController: delete pending upload request…")
+            debugPrint("••> PasteboardImagesViewController: delete pending upload request…")
             // Delete upload request from cache and update cell
             guard let upload:Upload = anObject as? Upload else { return }
 
@@ -201,7 +201,7 @@ extension PasteboardImagesViewController: NSFetchedResultsControllerDelegate
         case .move:
             assertionFailure("••> PasteboardImagesViewController: Unexpected move!")
         case .update:
-            print("••• PasteboardImagesViewController controller:update...")
+            debugPrint("••• PasteboardImagesViewController controller:update...")
             // Update upload request and cell
             guard let upload:Upload = anObject as? Upload else { return }
 
@@ -218,7 +218,7 @@ extension PasteboardImagesViewController: NSFetchedResultsControllerDelegate
     }
     
     func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
-//        print("••• PasteboardImagesViewController controller:didChangeContent...")
+//        debugPrint("••• PasteboardImagesViewController controller:didChangeContent...")
         // Update navigation bar
         DispatchQueue.main.async {
             self.updateNavBar()
diff --git a/piwigo/Upload/Pick Pasteboard Images/Extensions/PasteboardImagesViewController+DataSource.swift b/piwigo/Upload/Pick Pasteboard Images/Extensions/PasteboardImagesViewController+DataSource.swift
index ecb81b213..d725e814b 100644
--- a/piwigo/Upload/Pick Pasteboard Images/Extensions/PasteboardImagesViewController+DataSource.swift	
+++ b/piwigo/Upload/Pick Pasteboard Images/Extensions/PasteboardImagesViewController+DataSource.swift	
@@ -62,7 +62,7 @@ extension PasteboardImagesViewController: UICollectionViewDataSource
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         // Create cell
         guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "LocalImageCollectionViewCell", for: indexPath) as? LocalImageCollectionViewCell else {
-            print("Error: collectionView.dequeueReusableCell does not return a LocalImageCollectionViewCell!")
+            debugPrint("Error: collectionView.dequeueReusableCell does not return a LocalImageCollectionViewCell!")
             return LocalImageCollectionViewCell()
         }
         
diff --git a/piwigo/Upload/Pick Pasteboard Images/PasteboardImagesViewController.swift b/piwigo/Upload/Pick Pasteboard Images/PasteboardImagesViewController.swift
index c725f1f55..fc20f04e4 100644
--- a/piwigo/Upload/Pick Pasteboard Images/PasteboardImagesViewController.swift	
+++ b/piwigo/Upload/Pick Pasteboard Images/PasteboardImagesViewController.swift	
@@ -103,7 +103,7 @@ class PasteboardImagesViewController: UIViewController, UIScrollViewDelegate {
         do {
             try uploads.performFetch()
         } catch {
-            print("Error: \(error)")
+            debugPrint("Error: \(error)")
         }
 
         // Retrieve pasteboard object indexes and types, then create identifiers
diff --git a/piwigo/Upload/Pick Pasteboard Images/PasteboardObject.swift b/piwigo/Upload/Pick Pasteboard Images/PasteboardObject.swift
index 0ca563c43..06ed1f6b1 100644
--- a/piwigo/Upload/Pick Pasteboard Images/PasteboardObject.swift	
+++ b/piwigo/Upload/Pick Pasteboard Images/PasteboardObject.swift	
@@ -207,11 +207,11 @@ class ObjectPreparation : Operation {
         }
         catch let error as NSError {
             // Disk full?
-            print("could not save image file: \(error)")
+            debugPrint("could not save image file: \(error)")
             pbObject.state = .failed
         }
         
 //        let diff = (CFAbsoluteTimeGetCurrent() - start)*1000
-//        print("   did try to write clipboard object at index \(index) on disk in \(diff) ms")
+//        debugPrint("   did try to write clipboard object at index \(index) on disk in \(diff) ms")
     }
 }
diff --git a/piwigo/Upload/Pick Photos Album/LocalAlbumsViewController.swift b/piwigo/Upload/Pick Photos Album/LocalAlbumsViewController.swift
index 6d15d852e..cc8e76272 100644
--- a/piwigo/Upload/Pick Photos Album/LocalAlbumsViewController.swift	
+++ b/piwigo/Upload/Pick Photos Album/LocalAlbumsViewController.swift	
@@ -407,7 +407,7 @@ class LocalAlbumsViewController: UIViewController, UITableViewDelegate, UITableV
         switch albumType {
         case .pasteboard:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "LocalAlbumsNoDatesTableViewCell", for: indexPath) as? LocalAlbumsNoDatesTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a LocalAlbumsNoDatesTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a LocalAlbumsNoDatesTableViewCell!")
                 return LocalAlbumsNoDatesTableViewCell()
             }
             let title = NSLocalizedString("categoryUpload_pasteboard", comment: "Clipboard")
@@ -448,7 +448,7 @@ class LocalAlbumsViewController: UIViewController, UITableViewDelegate, UITableV
         // Display [+] button at the bottom of section presenting a limited number of albums
         guard let aCollection = assetCollection else {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "LocalAlbumsMoreTableViewCell", for: indexPath) as? LocalAlbumsMoreTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a LocalAlbumsMoreTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a LocalAlbumsMoreTableViewCell!")
                 return LocalAlbumsMoreTableViewCell()
             }
             cell.configure()
@@ -462,7 +462,7 @@ class LocalAlbumsViewController: UIViewController, UITableViewDelegate, UITableV
 
         if let startDate = aCollection.startDate, let endDate = aCollection.endDate {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "LocalAlbumsTableViewCell", for: indexPath) as? LocalAlbumsTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a LocalAlbumsTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a LocalAlbumsTableViewCell!")
                 return LocalAlbumsTableViewCell()
             }
             cell.configure(with: title, nberPhotos: nberPhotos, startDate: startDate, endDate: endDate)
@@ -476,7 +476,7 @@ class LocalAlbumsViewController: UIViewController, UITableViewDelegate, UITableV
         }
         else {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "LocalAlbumsNoDatesTableViewCell", for: indexPath) as? LocalAlbumsNoDatesTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a LocalAlbumsNoDatesTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a LocalAlbumsNoDatesTableViewCell!")
                 return LocalAlbumsNoDatesTableViewCell()
             }
             cell.configure(with: title, nberPhotos: nberPhotos)
diff --git a/piwigo/Upload/Upload Options/UploadParametersViewController.swift b/piwigo/Upload/Upload Options/UploadParametersViewController.swift
index c96eea665..5648ba6b0 100644
--- a/piwigo/Upload/Upload Options/UploadParametersViewController.swift	
+++ b/piwigo/Upload/Upload Options/UploadParametersViewController.swift	
@@ -134,7 +134,7 @@ class UploadParametersViewController: UITableViewController, UITextFieldDelegate
         switch EditImageDetailsOrder(rawValue: row) {
         case .imageName:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "title", for: indexPath) as? EditImageTextFieldTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a EditImageTextFieldTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a EditImageTextFieldTableViewCell!")
                 return EditImageTextFieldTableViewCell()
             }
             cell.config(withLabel: NSAttributedString(string: NSLocalizedString("editImageDetails_title", comment: "Title:")),
@@ -147,7 +147,7 @@ class UploadParametersViewController: UITableViewController, UITextFieldDelegate
 
         case .author:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "author", for: indexPath) as? EditImageTextFieldTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a EditImageTextFieldTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a EditImageTextFieldTableViewCell!")
                 return EditImageTextFieldTableViewCell()
             }
             cell.config(withLabel: NSAttributedString(string: NSLocalizedString("editImageDetails_author", comment: "Author:")),
@@ -160,7 +160,7 @@ class UploadParametersViewController: UITableViewController, UITextFieldDelegate
 
         case .privacy:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "privacy", for: indexPath) as? EditImagePrivacyTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a EditImagePrivacyTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a EditImagePrivacyTableViewCell!")
                 return EditImagePrivacyTableViewCell()
             }
             cell.setLeftLabel(withText: NSLocalizedString("editImageDetails_privacyLevel", comment: "Who can see this photo?"))
@@ -170,7 +170,7 @@ class UploadParametersViewController: UITableViewController, UITextFieldDelegate
 
         case .tags:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "tags", for: indexPath) as? EditImageTagsTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a EditImageTagsTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a EditImageTagsTableViewCell!")
                 return EditImageTagsTableViewCell()
             }
             cell.config(withList: commonTags,
@@ -180,7 +180,7 @@ class UploadParametersViewController: UITableViewController, UITextFieldDelegate
 
         case .comment:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "comment", for: indexPath) as? EditImageTextViewTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a EditImageTextViewTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a EditImageTextViewTableViewCell!")
                 return EditImageTextViewTableViewCell()
             }
             cell.config(withText: NSAttributedString(string: commonComment),
diff --git a/piwigo/Upload/Upload Options/UploadSettingsViewController.swift b/piwigo/Upload/Upload Options/UploadSettingsViewController.swift
index 6b8b9c8af..5cb3b6156 100644
--- a/piwigo/Upload/Upload Options/UploadSettingsViewController.swift	
+++ b/piwigo/Upload/Upload Options/UploadSettingsViewController.swift	
@@ -115,7 +115,7 @@ class UploadSettingsViewController: UITableViewController, UITextFieldDelegate {
         switch row {
         case 0 /* Strip private Metadata? */:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "SwitchTableViewCell", for: indexPath) as? SwitchTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
                 return SwitchTableViewCell()
             }
             // See https://iosref.com/res
@@ -134,7 +134,7 @@ class UploadSettingsViewController: UITableViewController, UITextFieldDelegate {
             
         case 1 /* Resize Before Upload? */:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "SwitchTableViewCell", for: indexPath) as? SwitchTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
                 return SwitchTableViewCell()
             }
             cell.configure(with: NSLocalizedString("settings_photoResize", comment: "Resize Before Upload"))
@@ -158,7 +158,7 @@ class UploadSettingsViewController: UITableViewController, UITextFieldDelegate {
             
         case 2 /* Upload Photo Max Size */:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "LabelTableViewCell", for: indexPath) as? LabelTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a LabelTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a LabelTableViewCell!")
                 return LabelTableViewCell()
             }
             cell.configure(with: "… " + NSLocalizedString("severalImages", comment: "Photos"),
@@ -169,7 +169,7 @@ class UploadSettingsViewController: UITableViewController, UITextFieldDelegate {
 
         case 3 /* Upload Max Video Size */:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "LabelTableViewCell", for: indexPath) as? LabelTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a LabelTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a LabelTableViewCell!")
                 return LabelTableViewCell()
             }
             cell.configure(with: "… " + NSLocalizedString("severalVideos", comment: "Videos"),
@@ -180,7 +180,7 @@ class UploadSettingsViewController: UITableViewController, UITextFieldDelegate {
             
         case 4 /* Compress before Upload? */:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "SwitchTableViewCell", for: indexPath) as? SwitchTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
                 return SwitchTableViewCell()
             }
             // See https://iosref.com/res
@@ -209,7 +209,7 @@ class UploadSettingsViewController: UITableViewController, UITextFieldDelegate {
             
         case 5 /* Image Quality slider */:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "SliderTableViewCell", for: indexPath) as? SliderTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a SliderTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a SliderTableViewCell!")
                 return SliderTableViewCell()
             }
             // Slider value
@@ -227,7 +227,7 @@ class UploadSettingsViewController: UITableViewController, UITextFieldDelegate {
             
         case 6 /* Prefix Filename Before Upload switch */:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "SwitchTableViewCell", for: indexPath) as? SwitchTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
                 return SwitchTableViewCell()
             }
             // See https://iosref.com/res
@@ -260,7 +260,7 @@ class UploadSettingsViewController: UITableViewController, UITextFieldDelegate {
             
         case 7 /* Filename prefix? */:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "TextFieldTableViewCell", for: indexPath) as? TextFieldTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a TextFieldTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a TextFieldTableViewCell!")
                 return TextFieldTableViewCell()
             }
             // See https://iosref.com/res
@@ -282,7 +282,7 @@ class UploadSettingsViewController: UITableViewController, UITextFieldDelegate {
             
         case 8 /* Delete image after upload? */:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "SwitchTableViewCell", for: indexPath) as? SwitchTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a SwitchTableViewCell!")
                 return SwitchTableViewCell()
             }
             // See https://iosref.com/res
diff --git a/piwigo/Upload/Upload Queue/UploadImageTableViewCell.swift b/piwigo/Upload/Upload Queue/UploadImageTableViewCell.swift
index de6d8407b..2f92564dd 100644
--- a/piwigo/Upload/Upload Queue/UploadImageTableViewCell.swift	
+++ b/piwigo/Upload/Upload Queue/UploadImageTableViewCell.swift	
@@ -106,7 +106,7 @@ class UploadImageTableViewCell: UITableViewCell {
             }
             catch let error as NSError {
                 // Could not find the file to upload!
-                print(error.localizedDescription)
+                debugPrint(error.localizedDescription)
                 image = imagePlaceholder
             }
         }
@@ -202,7 +202,7 @@ class UploadImageTableViewCell: UITableViewCell {
             DispatchQueue.main.async(execute: {
                 guard let image = result else {
                     if let error = info?[PHImageErrorKey] as? Error {
-                        print("••> Error : \(error.localizedDescription)")
+                        debugPrint("••> Error : \(error.localizedDescription)")
                     }
                     self.changeCellImageIfNeeded(withImage: UIImage(named: "placeholder")!)
                     return
diff --git a/piwigo/Upload/Upload Queue/UploadQueueViewController.swift b/piwigo/Upload/Upload Queue/UploadQueueViewController.swift
index 0df499c39..d416f200d 100644
--- a/piwigo/Upload/Upload Queue/UploadQueueViewController.swift	
+++ b/piwigo/Upload/Upload Queue/UploadQueueViewController.swift	
@@ -86,7 +86,7 @@ class UploadQueueViewController: UIViewController, UITableViewDelegate {
             try uploads.performFetch()
         }
         catch {
-            print("••> Could not fetch uploads: \(error)")
+            debugPrint("••> Could not fetch uploads: \(error)")
         }
     }
 
@@ -294,7 +294,7 @@ class UploadQueueViewController: UIViewController, UITableViewDelegate {
     private func configDataSource() -> DataSource {
         let dataSource = DataSource(tableView: queueTableView) { [self] (tableView, indexPath, objectID) -> UITableViewCell? in
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "UploadImageTableViewCell", for: indexPath) as? UploadImageTableViewCell else {
-                print("Error: tableView.dequeueReusableCell does not return a UploadImageTableViewCell!")
+                debugPrint("Error: tableView.dequeueReusableCell does not return a UploadImageTableViewCell!")
                 return UploadImageTableViewCell()
             }
             guard let upload = try? self.mainContext.existingObject(with: objectID) as? Upload else {
@@ -349,7 +349,7 @@ class UploadQueueViewController: UIViewController, UITableViewDelegate {
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         guard let header = tableView.dequeueReusableHeaderFooterView(withIdentifier: "UploadImageHeaderView") as? UploadImageHeaderView else {
-            print("Error: tableView.dequeueReusableHeaderFooterView does not return a UploadImageHeaderView!")
+            debugPrint("Error: tableView.dequeueReusableHeaderFooterView does not return a UploadImageHeaderView!")
             return UploadImageHeaderView()
         }
         let sectionKey = SectionKeys(rawValue: diffableDataSource.snapshot().sectionIdentifiers[section]) ?? SectionKeys.Section4
@@ -415,7 +415,7 @@ class UploadQueueViewController: UIViewController, UITableViewDelegate {
            let progressFraction = notification.userInfo?["progressFraction"] as? Float,
            let visibleCells = queueTableView.visibleCells as? [UploadImageTableViewCell],
            let cell = visibleCells.first(where: {$0.localIdentifier == localIdentifier}) {
-            print("••> progressFraction = \(progressFraction) in applyUploadProgress()")
+            debugPrint("••> progressFraction = \(progressFraction) in applyUploadProgress()")
             cell.uploadingProgress?.setProgress(progressFraction, animated: true)
         }
     }
diff --git a/piwigo/Upload/Upload Queue/UploadQueueViewControllerOld.swift b/piwigo/Upload/Upload Queue/UploadQueueViewControllerOld.swift
index a18a8958f..8a1be40db 100644
--- a/piwigo/Upload/Upload Queue/UploadQueueViewControllerOld.swift	
+++ b/piwigo/Upload/Upload Queue/UploadQueueViewControllerOld.swift	
@@ -66,7 +66,7 @@ class UploadQueueViewControllerOld: UIViewController, UITableViewDelegate, UITab
         do {
             try uploads.performFetch()
         } catch {
-            print("Error: \(error)")
+            debugPrint("Error: \(error)")
         }
 
         // Buttons
@@ -322,7 +322,7 @@ class UploadQueueViewControllerOld: UIViewController, UITableViewDelegate, UITab
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         guard let header = tableView.dequeueReusableHeaderFooterView(withIdentifier: "UploadImageHeaderView") as? UploadImageHeaderView else {
-            print("Error: tableView.dequeueReusableHeaderFooterView does not return a UploadImageHeaderView!")
+            debugPrint("Error: tableView.dequeueReusableHeaderFooterView does not return a UploadImageHeaderView!")
             return UploadImageHeaderView()
         }
         if let sectionInfo = uploads.sections?[section] {
@@ -353,7 +353,7 @@ class UploadQueueViewControllerOld: UIViewController, UITableViewDelegate, UITab
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "UploadImageTableViewCell", for: indexPath) as? UploadImageTableViewCell else {
-            print("Error: tableView.dequeueReusableCell does not return a UploadImageTableViewCell!")
+            debugPrint("Error: tableView.dequeueReusableCell does not return a UploadImageTableViewCell!")
             return UploadImageTableViewCell()
         }
         cell.configure(with: uploads.object(at: indexPath),
@@ -430,14 +430,14 @@ extension UploadQueueViewControllerOld: NSFetchedResultsControllerDelegate {
     }
     
     func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) {
-        print("    > sectionInfo:", sectionInfo)
+        debugPrint("    > sectionInfo:", sectionInfo)
 
         switch type {
         case .insert:
-            print("insert section… at", sectionIndex)
+            debugPrint("insert section… at", sectionIndex)
             queueTableView.insertSections(IndexSet(integer: sectionIndex), with: .automatic)
         case .delete:
-            print("delete section… at", sectionIndex)
+            debugPrint("delete section… at", sectionIndex)
             queueTableView.deleteSections(IndexSet(integer: sectionIndex), with: .automatic)
         case .move, .update:
             fallthrough
@@ -451,21 +451,21 @@ extension UploadQueueViewControllerOld: NSFetchedResultsControllerDelegate {
         switch type {
         case .insert:
             guard let newIndexPath = newIndexPath else { return }
-            print("insert… at", newIndexPath)
+            debugPrint("insert… at", newIndexPath)
             queueTableView.insertRows(at: [newIndexPath], with: .automatic)
         case .delete:
             guard let oldIndexPath = indexPath else { return }
-            print("delete… at", oldIndexPath)
+            debugPrint("delete… at", oldIndexPath)
             queueTableView.deleteRows(at: [oldIndexPath], with: .automatic)
         case .move:
             guard let oldIndexPath = indexPath else { return }
             guard let newIndexPath = newIndexPath else { return }
-            print("move… from", oldIndexPath, "to", newIndexPath)
+            debugPrint("move… from", oldIndexPath, "to", newIndexPath)
             queueTableView.deleteRows(at: [oldIndexPath], with: .fade)
             queueTableView.insertRows(at: [newIndexPath], with: .fade)
         case .update:
             guard let oldIndexPath = indexPath else { return }
-            print("update… at", oldIndexPath)
+            debugPrint("update… at", oldIndexPath)
             if newIndexPath == nil {        // Regular update
                 queueTableView.reloadRows(at: [oldIndexPath], with: .automatic)
             } else {                        // Moving update when using iOS 10
diff --git a/piwigo/Video/PlaybackController.swift b/piwigo/Video/PlaybackController.swift
index d62df5e92..f644c2d20 100644
--- a/piwigo/Video/PlaybackController.swift
+++ b/piwigo/Video/PlaybackController.swift
@@ -25,7 +25,7 @@ class PlaybackController {
         do {
             try AVAudioSession.sharedInstance().setCategory(.playback)
         } catch {
-            print(error)
+            debugPrint(error)
         }
     }
     
diff --git a/piwigo/Video/PlayerViewControllerCoordinator.swift b/piwigo/Video/PlayerViewControllerCoordinator.swift
index df74ce8d7..fa992665f 100644
--- a/piwigo/Video/PlayerViewControllerCoordinator.swift
+++ b/piwigo/Video/PlayerViewControllerCoordinator.swift
@@ -353,7 +353,7 @@ class PlayerViewControllerCoordinator: NSObject {
                    let fm = FileManager.default
                    let dirURL = self.video.cacheURL.deletingLastPathComponent()
                    if fm.fileExists(atPath: dirURL.path) == false {
-                       print("••> Create directory \(dirURL.path)")
+                       debugPrint("••> Create directory \(dirURL.path)")
                        try? fm.createDirectory(at: dirURL, withIntermediateDirectories: true,
                                                    attributes: nil)
                    }
@@ -678,7 +678,7 @@ extension PlayerViewControllerCoordinator: AVAssetResourceLoaderDelegate
         }
         else {
             // Other type: username password, client trust...
-            print("Other type: username password, client trust...")
+            debugPrint("Other type: username password, client trust...")
         }
         return true
     }
diff --git a/piwigoIntents/UploadPhotosHandler.swift b/piwigoIntents/UploadPhotosHandler.swift
index 60bd0f37d..825e13e3a 100644
--- a/piwigoIntents/UploadPhotosHandler.swift
+++ b/piwigoIntents/UploadPhotosHandler.swift
@@ -45,7 +45,7 @@ class UploadPhotosHandler: NSObject, UploadPhotosIntentHandling {
         let fileTypes = NetworkVars.serverFileTypes
         for index in 0..<files.count {
             guard let fileUrl = files[index].fileURL else { continue }
-            print("••> \(String(describing: files[index].typeIdentifier))")
+            debugPrint("••> \(String(describing: files[index].typeIdentifier))")
             if fileTypes.contains(fileUrl.pathExtension.lowercased()) {
 
                 // Delete file of same name in Uploads directory if it already exists (incomplete previous attempt?)
@@ -175,7 +175,7 @@ class UploadPhotosHandler: NSObject, UploadPhotosIntentHandling {
                 // when the operation completes
                 let lastOperation = uploadOperations.last!
                 lastOperation.completionBlock = {
-                    print("••> Task completed with success.")
+                    debugPrint("••> Task completed with success.")
                     // Save cached data in the main thread
                     DispatchQueue.main.async {
                         self.mainContext.saveIfNeeded()
@@ -183,7 +183,7 @@ class UploadPhotosHandler: NSObject, UploadPhotosIntentHandling {
                 }
 
                 // Start the operations
-                print("••> Start upload operations in background task...");
+                debugPrint("••> Start upload operations in background task...");
                 uploadQueue.addOperations(uploadOperations, waitUntilFinished: false)
 
                 // Inform user that the shortcut was excuted with success
diff --git a/piwigoKit/Data Cache/Album Data/AlbumProvider.swift b/piwigoKit/Data Cache/Album Data/AlbumProvider.swift
index 7daa9f074..d219cb5f9 100644
--- a/piwigoKit/Data Cache/Album Data/AlbumProvider.swift	
+++ b/piwigoKit/Data Cache/Album Data/AlbumProvider.swift	
@@ -79,7 +79,7 @@ public class AlbumProvider: NSObject {
             do {
                 try controller.performFetch()
             } catch {
-                print("••> getAlbum() unresolved error: \(error)")
+                debugPrint("••> getAlbum() unresolved error: \(error)")
                 return
             }
             
@@ -91,7 +91,7 @@ public class AlbumProvider: NSObject {
                 // Get current User object (will create Server object if needed)
                 guard let album = NSEntityDescription.insertNewObject(forEntityName: "Album",
                                                                       into: taskContext) as? Album else {
-                    print(AlbumError.creationError.localizedDescription)
+                    debugPrint(AlbumError.creationError.localizedDescription)
                     return
                 }
                 
@@ -102,7 +102,7 @@ public class AlbumProvider: NSObject {
                     currentAlbum = album
                 }
                 catch {
-                    print(error.localizedDescription)
+                    debugPrint(error.localizedDescription)
                     taskContext.delete(album)
                 }
                 
@@ -131,7 +131,7 @@ public class AlbumProvider: NSObject {
                             thumbnailSize: pwgImageSize, completion: @escaping (Error?) -> Void) {
         // Smart album requested?
         if parentId < 0 { fatalError("••> Cannot fetch data of smart album!") }
-        print("••> Fetch albums in parent with ID: \(parentId)")
+        debugPrint("••> Fetch albums in parent with ID: \(parentId)")
         
         // Prepare parameters for collecting recursively album data
         let paramsDict: [String : Any] = [
@@ -189,7 +189,7 @@ public class AlbumProvider: NSObject {
     
     private func fetchCommunityAlbums(inParentWithId parentId: Int32, recursively: Bool = false,
                                       albums: [CategoryData], completion: @escaping (Error?) -> Void) {
-        print("••> Fetch Community albums in parent with ID: \(parentId)")
+        debugPrint("••> Fetch Community albums in parent with ID: \(parentId)")
         // Prepare parameters
         let paramsDict: [String : Any] = ["cat_id"    : parentId,
                                           "recursive" : recursively]
@@ -208,7 +208,7 @@ public class AlbumProvider: NSObject {
                 if albumsJSON.errorCode != 0 {
                     let error = PwgSession.shared.localizedError(for: albumsJSON.errorCode,
                                                                  errorMessage: albumsJSON.errorMessage)
-                    print("••> fetchCommunityAlbums error: \(error as NSError)")
+                    debugPrint("••> fetchCommunityAlbums error: \(error as NSError)")
                     try self.importAlbums(albums, recursively: recursively, inParent: parentId)
                     completion(nil)
                     return
@@ -316,7 +316,7 @@ public class AlbumProvider: NSObject {
 
         // Get current user object (will create server and user objects if needed)
         guard let user = userProvider.getUserAccount(inContext: bckgContext) else {
-            print("AlbumProvider.importOneBatch() unresolved error: Could not get user object!")
+            debugPrint("AlbumProvider.importOneBatch() unresolved error: Could not get user object!")
             return (success, albumToDeleteIDs)
         }
         if user.isFault {
@@ -397,17 +397,17 @@ public class AlbumProvider: NSObject {
                     }
                     catch AlbumError.missingData {
                         // Could not perform the update
-                        print(AlbumError.missingData.localizedDescription)
+                        debugPrint(AlbumError.missingData.localizedDescription)
                     }
                     catch {
-                        print(error.localizedDescription)
+                        debugPrint(error.localizedDescription)
                     }
                 }
                 else {
                     // Create an Album managed object on the private queue context.
                     guard let album = NSEntityDescription.insertNewObject(forEntityName: "Album",
                                                                           into: bckgContext) as? Album else {
-                        print(AlbumError.creationError.localizedDescription)
+                        debugPrint(AlbumError.creationError.localizedDescription)
                         return
                     }
                     
@@ -422,11 +422,11 @@ public class AlbumProvider: NSObject {
                     }
                     catch AlbumError.missingData {
                         // Delete invalid Album from the private queue context.
-                        print(AlbumError.missingData.localizedDescription)
+                        debugPrint(AlbumError.missingData.localizedDescription)
                         bckgContext.delete(album)
                     }
                     catch {
-                        print(error.localizedDescription)
+                        debugPrint(error.localizedDescription)
                     }
                 }
             }
@@ -443,7 +443,7 @@ public class AlbumProvider: NSObject {
                     // Delete albums not returned by the fetch
                     let albumsToDelete = cachedAlbums.filter({albumToDeleteIDs.contains($0.pwgID)})
                     albumsToDelete.forEach { album in
-                        print("••> delete album with ID:\(album.pwgID) and name:\(album.name)")
+                        debugPrint("••> delete album with ID:\(album.pwgID) and name:\(album.name)")
                         bckgContext.delete(album)
                     }
 
@@ -510,7 +510,7 @@ public class AlbumProvider: NSObject {
                   let parent = getAlbum(ofUser: user, withId: parentID),
                   let album = NSEntityDescription.insertNewObject(forEntityName: "Album",
                                                                   into: bckgContext) as? Album else {
-                print(AlbumError.creationError.localizedDescription)
+                debugPrint(AlbumError.creationError.localizedDescription)
                 return
             }
             
@@ -541,11 +541,11 @@ public class AlbumProvider: NSObject {
             }
             catch AlbumError.missingData {
                 // Delete invalid Album from the private queue context.
-                print(AlbumError.missingData.localizedDescription)
+                debugPrint(AlbumError.missingData.localizedDescription)
                 bckgContext.delete(album)
             }
             catch {
-                print(error.localizedDescription)
+                debugPrint(error.localizedDescription)
             }
             
             // Save all insertions from the context to the store.
@@ -620,7 +620,7 @@ public class AlbumProvider: NSObject {
             return countResult.first!.int64Value
         }
         catch let error as NSError {
-            print("••> Album count not fetched \(error), \(error.userInfo)")
+            debugPrint("••> Album count not fetched \(error), \(error.userInfo)")
         }
         return Int64.zero
     }
diff --git a/piwigoKit/Data Cache/Image Data/Image+CoreDataClass.swift b/piwigoKit/Data Cache/Image Data/Image+CoreDataClass.swift
index 84938f524..e3c8c3cf8 100644
--- a/piwigoKit/Data Cache/Image Data/Image+CoreDataClass.swift	
+++ b/piwigoKit/Data Cache/Image Data/Image+CoreDataClass.swift	
@@ -326,9 +326,9 @@ public class Image: NSManagedObject {
             do {
                 try fm.removeItem(at: dirURL.appendingPathComponent(ID))
                 try fm.removeItem(at: dirURL.appendingPathComponent(IDopt))
-                print("••> \(size.name) image: \(self.pwgID) removed from cache.")
+                debugPrint("••> \(size.name) image: \(self.pwgID) removed from cache.")
             } catch {
-                print("••> \(size.name) image: \(error.localizedDescription)")
+                debugPrint("••> \(size.name) image: \(error.localizedDescription)")
             }
         }
     }
diff --git a/piwigoKit/Data Cache/Image Data/ImageProvider.swift b/piwigoKit/Data Cache/Image Data/ImageProvider.swift
index 04cccf592..c60d321fb 100644
--- a/piwigoKit/Data Cache/Image Data/ImageProvider.swift	
+++ b/piwigoKit/Data Cache/Image Data/ImageProvider.swift	
@@ -58,7 +58,7 @@ public class ImageProvider: NSObject {
             return countResult.first!.int64Value
         }
         catch let error as NSError {
-            print("••> Image count not fetched \(error), \(error.userInfo)")
+            debugPrint("••> Image count not fetched \(error), \(error.userInfo)")
         }
         return Int64.zero
     }
@@ -117,7 +117,7 @@ public class ImageProvider: NSObject {
     public func fetchImages(ofAlbumWithId albumId: Int32, withQuery query: String,
                             sort: pwgImageSort, fromPage page:Int, perPage: Int,
                             completion: @escaping (Set<Int64>, Int64, Error?) -> Void) {
-        print("••> Fetch images of album \(albumId) at page \(page)…")
+        debugPrint("••> Fetch images of album \(albumId) at page \(page)…")
         // Prepare parameters for collecting image data
         var method = pwgCategoriesGetImages
         var paramsDict: [String : Any] = [
@@ -342,7 +342,7 @@ public class ImageProvider: NSObject {
         
         // Get current user object (will create server and user objects if needed)
         guard let user = userProvider.getUserAccount(inContext: bckgContext) else {
-            print("ImageProvider.importOneBatch() unresolved error: Could not get user object!")
+            debugPrint("ImageProvider.importOneBatch() unresolved error: Could not get user object!")
             return false
         }
         if user.isFault {
@@ -353,7 +353,7 @@ public class ImageProvider: NSObject {
         
         // Get album of selected ID (should exist at this stage)
         guard let album = user.albums?.first(where: {$0.pwgID == albumId}) else {
-            print("ImageProvider.importOneBatch() unresolved error: Could not get album object!")
+            debugPrint("ImageProvider.importOneBatch() unresolved error: Could not get album object!")
             return false
         }
         if album.isFault {
@@ -422,24 +422,24 @@ public class ImageProvider: NSObject {
                     }
                     catch ImageError.missingData {
                         // Could not perform the update
-                        print(ImageError.missingData.localizedDescription)
+                        debugPrint(ImageError.missingData.localizedDescription)
                     }
                     catch {
-                        print(error.localizedDescription)
+                        debugPrint(error.localizedDescription)
                     }
                 }
                 else {
                     // Create a Sizes managed object on the private queue context.
                     guard let sizes = NSEntityDescription.insertNewObject(forEntityName: "Sizes",
                                                                           into: bckgContext) as? Sizes else {
-                        print(ImageError.creationError.localizedDescription)
+                        debugPrint(ImageError.creationError.localizedDescription)
                         return
                     }
 
                     // Create an Image managed object on the private queue context.
                     guard let image = NSEntityDescription.insertNewObject(forEntityName: "Image",
                                                                           into: bckgContext) as? Image else {
-                        print(ImageError.creationError.localizedDescription)
+                        debugPrint(ImageError.creationError.localizedDescription)
                         return
                     }
                     
@@ -460,11 +460,11 @@ public class ImageProvider: NSObject {
                     }
                     catch ImageError.missingData {
                         // Delete invalid Image from the private queue context.
-                        print(ImageError.missingData.localizedDescription)
+                        debugPrint(ImageError.missingData.localizedDescription)
                         bckgContext.delete(image)
                     }
                     catch {
-                        print(error.localizedDescription)
+                        debugPrint(error.localizedDescription)
                     }
                 }
             }
diff --git a/piwigoKit/Data Cache/Location Data/LocationProvider.swift b/piwigoKit/Data Cache/Location Data/LocationProvider.swift
index 1e82ab06d..e06d85f39 100644
--- a/piwigoKit/Data Cache/Location Data/LocationProvider.swift	
+++ b/piwigoKit/Data Cache/Location Data/LocationProvider.swift	
@@ -161,7 +161,7 @@ public class LocationProvider: NSObject {
                     }
 
                     // Log placemarks[0]
-//                    print("\n===>> name:\(placeMark?.name ?? ""), country:\(country), administrativeArea:\(administrativeArea), subAdministrativeArea:\(subAdministrativeArea), locality:\(locality), subLocality:\(subLocality), thoroughfare:\(thoroughfare), subThoroughfare:\(placeMark?.subThoroughfare ?? ""), region:\(region), areasOfInterest:\(placeMark?.areasOfInterest?[0] ?? ""), inlandWater:\(inlandWater), ocean:\(ocean)\n")
+//                    debugPrint("\n===>> name:\(placeMark?.name ?? ""), country:\(country), administrativeArea:\(administrativeArea), subAdministrativeArea:\(subAdministrativeArea), locality:\(locality), subLocality:\(subLocality), thoroughfare:\(thoroughfare), subThoroughfare:\(placeMark?.subThoroughfare ?? ""), region:\(region), areasOfInterest:\(placeMark?.areasOfInterest?[0] ?? ""), inlandWater:\(inlandWater), ocean:\(ocean)\n")
 
                     DispatchQueue.global(qos: .background).async {
                         // Create a private queue context.
@@ -187,7 +187,7 @@ public class LocationProvider: NSObject {
                     }
                 } else {
                     // Did not return place names
-                    print(String(format: "Geocoder: no place mark returned!\n=> %@", error?.localizedDescription ?? ""))
+                    debugPrint(String(format: "Geocoder: no place mark returned!\n=> %@", error?.localizedDescription ?? ""))
                 }
                 semaphore.signal()
             })
@@ -196,7 +196,7 @@ public class LocationProvider: NSObject {
         })
 
         queue.addOperation(operation)
-//        print("===> fetchPlaceName operations:", queue.operationCount)
+//        debugPrint("===> fetchPlaceName operations:", queue.operationCount)
     }
 
 
@@ -215,7 +215,7 @@ public class LocationProvider: NSObject {
             // Create a Location managed object on the private queue context.
             guard let newLocation = NSEntityDescription.insertNewObject(forEntityName: "Location", into: taskContext) as? Location
             else {
-                print(LocationError.creationError.localizedDescription)
+                debugPrint(LocationError.creationError.localizedDescription)
                 return
             }
             
@@ -225,11 +225,11 @@ public class LocationProvider: NSObject {
             }
             catch LocationError.missingData {
                 // Delete invalid Location from the private queue context.
-                print(LocationError.missingData.localizedDescription)
+                debugPrint(LocationError.missingData.localizedDescription)
                 taskContext.delete(newLocation)
             }
             catch {
-                print(error.localizedDescription)
+                debugPrint(error.localizedDescription)
             }
             
             // Save all insertions and deletions from the context to the store.
@@ -238,7 +238,7 @@ public class LocationProvider: NSObject {
                     try taskContext.save()
                 }
                 catch {
-                    print("Error: \(error.localizedDescription)\nCould not save Core Data context.")
+                    debugPrint("Error: \(error.localizedDescription)\nCould not save Core Data context.")
                     return
                 }
                 // Reset the taskContext to free the cache and lower the memory footprint.
@@ -267,7 +267,7 @@ public class LocationProvider: NSObject {
             return countResult.first!.int64Value
         }
         catch let error as NSError {
-            print("••> Album count not fetched \(error), \(error.userInfo)")
+            debugPrint("••> Album count not fetched \(error), \(error.userInfo)")
         }
         return Int64.zero
     }
diff --git a/piwigoKit/Data Cache/Migration Tools/DataMigrator.swift b/piwigoKit/Data Cache/Migration Tools/DataMigrator.swift
index a8627e719..ff1bd8197 100644
--- a/piwigoKit/Data Cache/Migration Tools/DataMigrator.swift	
+++ b/piwigoKit/Data Cache/Migration Tools/DataMigrator.swift	
@@ -107,7 +107,7 @@ public class DataMigrator: NSObject {
                 try fm.createDirectory(at: applicationIncompatibleStoresDirectory,
                                        withIntermediateDirectories: true, attributes: nil)
             } catch let error {
-                print("Unable to create a directory for corrupted data stores: \(error.localizedDescription)")
+                debugPrint("Unable to create a directory for corrupted data stores: \(error.localizedDescription)")
             }
         }
         
@@ -127,7 +127,7 @@ public class DataMigrator: NSObject {
             do {
                 try fm.moveItem(at: storeURL, to: corruptURL)
             } catch let error {
-                print("Unable to move a corrupted data store: \(error.localizedDescription)")
+                debugPrint("Unable to move a corrupted data store: \(error.localizedDescription)")
             }
         }
 
@@ -142,7 +142,7 @@ public class DataMigrator: NSObject {
             do {
                 try fm.moveItem(at: shmURL, to: corruptURL)
             } catch let error {
-                print("Unable to move a corrupted data store: \(error.localizedDescription)")
+                debugPrint("Unable to move a corrupted data store: \(error.localizedDescription)")
             }
         }
 
@@ -157,7 +157,7 @@ public class DataMigrator: NSObject {
             do {
                 try fm.moveItem(at: walURL, to: corruptURL)
             } catch let error {
-                print("Unable to move a corrupted data store: \(error.localizedDescription)")
+                debugPrint("Unable to move a corrupted data store: \(error.localizedDescription)")
             }
         }
     }
@@ -184,7 +184,7 @@ public class DataMigrator: NSObject {
             try fm.removeItem(at: oldURL)
         }
         catch let error {
-            print("Unable to move content of Uploads directory: \(error.localizedDescription)")
+            debugPrint("Unable to move content of Uploads directory: \(error.localizedDescription)")
         }
     }
 
@@ -307,17 +307,17 @@ private extension DataMigrationVersion {
 
             // For debugging
 //            let modelEntities = model.entityVersionHashesByName.mapValues({ $0 })
-//            print("\($0.rawValue)")
-//            print("••> Tag (model)     : \(Array(arrayLiteral: modelEntities["Tag"]?.base64EncodedString()))")
-//            print("••> Location (model): \(Array(arrayLiteral: modelEntities["Location"]?.base64EncodedString()))")
-//            print("••> Upload (model)  : \(Array(arrayLiteral: modelEntities["Upload"]?.base64EncodedString()))")
+//            debugPrint("\($0.rawValue)")
+//            debugPrint("••> Tag (model)     : \(Array(arrayLiteral: modelEntities["Tag"]?.base64EncodedString()))")
+//            debugPrint("••> Location (model): \(Array(arrayLiteral: modelEntities["Location"]?.base64EncodedString()))")
+//            debugPrint("••> Upload (model)  : \(Array(arrayLiteral: modelEntities["Upload"]?.base64EncodedString()))")
 
 //            let metadataEntities = metadata[NSStoreModelVersionHashesKey] as! [String : Data]
 //            let metaEntities = metadataEntities.mapValues({ $0 })
-//            print("••> Tag (meta)      : \(Array(arrayLiteral: metaEntities["Tag"]?.base64EncodedString()))")
-//            print("••> Location (meta) : \(Array(arrayLiteral: metaEntities["Location"]?.base64EncodedString()))")
-//            print("••> Upload (meta)   : \(Array(arrayLiteral: metaEntities["Upload"]?.base64EncodedString()))")
-//            print("……")
+//            debugPrint("••> Tag (meta)      : \(Array(arrayLiteral: metaEntities["Tag"]?.base64EncodedString()))")
+//            debugPrint("••> Location (meta) : \(Array(arrayLiteral: metaEntities["Location"]?.base64EncodedString()))")
+//            debugPrint("••> Upload (meta)   : \(Array(arrayLiteral: metaEntities["Upload"]?.base64EncodedString()))")
+//            debugPrint("……")
 
             return model.isConfiguration(withName: nil, compatibleWithStoreMetadata: metadata)
         }
@@ -326,35 +326,35 @@ private extension DataMigrationVersion {
         if compatibleVersion == nil {
             if let appVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String {
                 if appVersion.compare("2.5", options: .numeric) == .orderedAscending {
-        //            print("••> \(appVersion) is smaller than 2.5")
+        //            debugPrint("••> \(appVersion) is smaller than 2.5")
                     return .version01
                 }
                 else if appVersion.compare("2.5.2", options: .numeric) == .orderedAscending {
-        //            print("••> \(appVersion) is smaller than 2.5.2")
+        //            debugPrint("••> \(appVersion) is smaller than 2.5.2")
                     return .version03
                 }
                 else if appVersion.compare("2.6", options: .numeric) == .orderedAscending {
-        //            print("••> \(appVersion) is smaller than 2.6")
+        //            debugPrint("••> \(appVersion) is smaller than 2.6")
                     return .version04
                 }
                 else if appVersion.compare("2.6.2", options: .numeric) == .orderedAscending {
-        //            print("••> \(appVersion) is smaller than 2.6.2")
+        //            debugPrint("••> \(appVersion) is smaller than 2.6.2")
                     return .version06
                 }
                 else if appVersion.compare("2.7", options: .numeric) == .orderedAscending {
-        //            print("••> \(appVersion) is smaller than 2.7")
+        //            debugPrint("••> \(appVersion) is smaller than 2.7")
                     return .version07
                 }
                 else if appVersion.compare("2.12", options: .numeric) == .orderedAscending {
-        //            print("••> \(appVersion) is smaller than 2.12")
+        //            debugPrint("••> \(appVersion) is smaller than 2.12")
                     return .version08
                 }
                 else if appVersion.compare("3.00", options: .numeric) == .orderedAscending {
-        //            print("••> \(appVersion) is smaller than 3.00")
+        //            debugPrint("••> \(appVersion) is smaller than 3.00")
                     return .version09
                 }
                 else if appVersion.compare("3.20", options: .numeric) == .orderedAscending {
-        //            print("••> \(appVersion) is smaller than 3.2")
+        //            debugPrint("••> \(appVersion) is smaller than 3.2")
                     return .version0C
                 }
                 return .version0F
diff --git a/piwigoKit/Data Cache/Server Data/ServerProvider.swift b/piwigoKit/Data Cache/Server Data/ServerProvider.swift
index 85fd056f4..538929b7d 100644
--- a/piwigoKit/Data Cache/Server Data/ServerProvider.swift	
+++ b/piwigoKit/Data Cache/Server Data/ServerProvider.swift	
@@ -53,7 +53,7 @@ public class ServerProvider: NSObject {
                 // Create a Server object on the current queue context.
                 guard let server = NSEntityDescription.insertNewObject(forEntityName: "Server",
                                                                        into: taskContext) as? Server else {
-                    print(ServerError.creationError.localizedDescription)
+                    debugPrint(ServerError.creationError.localizedDescription)
                     return
                 }
                 
@@ -64,11 +64,11 @@ public class ServerProvider: NSObject {
                 }
                 catch ServerError.wrongURL {
                     // Delete invalid Tag from the private queue context.
-                    print(ServerError.wrongURL.localizedDescription)
+                    debugPrint(ServerError.wrongURL.localizedDescription)
                     taskContext.delete(server)
                 }
                 catch {
-                    print(error.localizedDescription)
+                    debugPrint(error.localizedDescription)
                     taskContext.delete(server)
                 }
             }
diff --git a/piwigoKit/Data Cache/Tag Data/TagProvider.swift b/piwigoKit/Data Cache/Tag Data/TagProvider.swift
index 7068a77b4..343dfc115 100644
--- a/piwigoKit/Data Cache/Tag Data/TagProvider.swift	
+++ b/piwigoKit/Data Cache/Tag Data/TagProvider.swift	
@@ -142,7 +142,7 @@ public class TagProvider: NSObject {
             
             // Get current server object
             guard let server = serverProvider.getServer(inContext: bckgContext) else {
-                print(TagError.creationError.localizedDescription)
+                debugPrint(TagError.creationError.localizedDescription)
                 return
             }
             
@@ -163,7 +163,7 @@ public class TagProvider: NSObject {
             do {
                 try controller.performFetch()
             } catch {
-                print(TagError.creationError.localizedDescription)
+                debugPrint(TagError.creationError.localizedDescription)
                 return
             }
             let cachedTags:[Tag] = controller.fetchedObjects ?? []
@@ -192,17 +192,17 @@ public class TagProvider: NSObject {
                     }
                     catch TagError.missingData {
                         // Could not perform the update
-                        print(TagError.missingData.localizedDescription)
+                        debugPrint(TagError.missingData.localizedDescription)
                     }
                     catch {
-                        print(error.localizedDescription)
+                        debugPrint(error.localizedDescription)
                     }
                 }
                 else {
                     // Create a Tag managed object on the private queue context.
                     guard let tag = NSEntityDescription.insertNewObject(forEntityName: "Tag",
                                                                         into: bckgContext) as? Tag else {
-                        print(TagError.creationError.localizedDescription)
+                        debugPrint(TagError.creationError.localizedDescription)
                         return
                     }
                     
@@ -212,11 +212,11 @@ public class TagProvider: NSObject {
                     }
                     catch TagError.missingData {
                         // Delete invalid Tag from the private queue context.
-                        print(TagError.missingData.localizedDescription)
+                        debugPrint(TagError.missingData.localizedDescription)
                         bckgContext.delete(tag)
                     }
                     catch {
-                        print(error.localizedDescription)
+                        debugPrint(error.localizedDescription)
                     }
                 }
             }
@@ -227,7 +227,7 @@ public class TagProvider: NSObject {
                 // Delete tags
                 let tagToDelete = cachedTags.filter({tagToDeleteIDs.contains($0.tagId)})
                 tagToDelete.forEach { tag in
-                    print("••> delete tag with ID:\(tag.tagId) and name:\(tag.tagName)")
+                    debugPrint("••> delete tag with ID:\(tag.tagId) and name:\(tag.tagName)")
                     bckgContext.delete(tag)
                 }
             }
@@ -359,7 +359,7 @@ public class TagProvider: NSObject {
             return countResult.first!.int64Value
         }
         catch let error as NSError {
-            print("••> Tag count not fetched \(error), \(error.userInfo)")
+            debugPrint("••> Tag count not fetched \(error), \(error.userInfo)")
         }
         return Int64.zero
     }
diff --git a/piwigoKit/Data Cache/Upload Data/Upload+CoreDataClass.swift b/piwigoKit/Data Cache/Upload Data/Upload+CoreDataClass.swift
index 535cd5bf9..ce7257365 100644
--- a/piwigoKit/Data Cache/Upload Data/Upload+CoreDataClass.swift	
+++ b/piwigoKit/Data Cache/Upload Data/Upload+CoreDataClass.swift	
@@ -195,7 +195,7 @@ public class Upload: NSManagedObject {
                 try filesToDelete.forEach({ try fm.removeItem(at: $0) })
             }
             catch let error {
-                print("••> could not clear the Uploads folder: \(error)")
+                debugPrint("••> could not clear the Uploads folder: \(error)")
             }
         }
     }
diff --git a/piwigoKit/Data Cache/Upload Data/UploadProvider.swift b/piwigoKit/Data Cache/Upload Data/UploadProvider.swift
index b981fff2c..4b34ad3e8 100644
--- a/piwigoKit/Data Cache/Upload Data/UploadProvider.swift	
+++ b/piwigoKit/Data Cache/Upload Data/UploadProvider.swift	
@@ -136,15 +136,15 @@ public class UploadProvider: NSObject {
                     }
                     catch UploadError.missingData {
                         // Could not perform the update
-                        print(UploadError.missingData.localizedDescription)
+                        debugPrint(UploadError.missingData.localizedDescription)
                     }
                     catch {
-                        print(error.localizedDescription)
+                        debugPrint(error.localizedDescription)
                     }
                 } else {
                     // Create an Upload managed object on the private queue context.
                     guard let upload = NSEntityDescription.insertNewObject(forEntityName: "Upload", into: bckgContext) as? Upload else {
-                        print(UploadError.creationError.localizedDescription)
+                        debugPrint(UploadError.creationError.localizedDescription)
                         return
                     }
                     
@@ -156,11 +156,11 @@ public class UploadProvider: NSObject {
                     }
                     catch UploadError.missingData {
                         // Delete invalid Upload from the private queue context.
-                        print(UploadError.missingData.localizedDescription)
+                        debugPrint(UploadError.missingData.localizedDescription)
                         bckgContext.delete(upload)
                     }
                     catch {
-                        print(error.localizedDescription)
+                        debugPrint(error.localizedDescription)
                     }
                 }
             }
@@ -200,7 +200,7 @@ public class UploadProvider: NSObject {
             return countResult.first!.int64Value
         }
         catch let error as NSError {
-            print("••> Upload count not fetched \(error), \(error.userInfo)")
+            debugPrint("••> Upload count not fetched \(error), \(error.userInfo)")
         }
         return Int64.zero
     }
diff --git a/piwigoKit/Data Cache/User Data/UserProvider.swift b/piwigoKit/Data Cache/User Data/UserProvider.swift
index 37ac21296..8c923ea88 100644
--- a/piwigoKit/Data Cache/User Data/UserProvider.swift	
+++ b/piwigoKit/Data Cache/User Data/UserProvider.swift	
@@ -70,7 +70,7 @@ public class UserProvider: NSObject {
             do {
                 try controller.performFetch()
             } catch {
-                print("••> getUserAccount() unresolved error: \(error)")
+                debugPrint("••> getUserAccount() unresolved error: \(error)")
                 return
             }
             
@@ -89,7 +89,7 @@ public class UserProvider: NSObject {
                 guard let server = serverProvider.getServer(inContext: taskContext, atPath: path),
                       let user = NSEntityDescription.insertNewObject(forEntityName: "User",
                                                                      into: taskContext) as? User else {
-                    print(UserError.creationError.localizedDescription)
+                    debugPrint(UserError.creationError.localizedDescription)
                     return
                 }
                 
@@ -99,7 +99,7 @@ public class UserProvider: NSObject {
                     currentUser = user
                 }
                 catch {
-                    print(error.localizedDescription)
+                    debugPrint(error.localizedDescription)
                     taskContext.delete(user)
                 }
             }
diff --git a/piwigoKit/Network/Extensions/PwgSession+Delegate.swift b/piwigoKit/Network/Extensions/PwgSession+Delegate.swift
index fa7be0c90..09e6245b4 100644
--- a/piwigoKit/Network/Extensions/PwgSession+Delegate.swift
+++ b/piwigoKit/Network/Extensions/PwgSession+Delegate.swift
@@ -12,11 +12,11 @@ import Foundation
 extension PwgSession: URLSessionDelegate {
 
 //    public func urlSession(_ session: URLSession, taskIsWaitingForConnectivity task: URLSessionTask) {
-//        print("    > The upload session is waiting for connectivity (offline mode)")
+//        debugPrint("    > The upload session is waiting for connectivity (offline mode)")
 //    }
         
 //    public func urlSession(_ session: URLSession, task: URLSessionTask, willBeginDelayedRequest: URLRequest, completionHandler: (URLSession.DelayedRequestDisposition, URLRequest?) -> Void) {
-//        print("    > The upload session will begin delayed request (back to online)")
+//        debugPrint("    > The upload session will begin delayed request (back to online)")
 //    }
 
     public func urlSession(_ session: URLSession, didBecomeInvalidWithError error: Error?) {
diff --git a/piwigoKit/Network/Extensions/PwgSession+Image.swift b/piwigoKit/Network/Extensions/PwgSession+Image.swift
index 87cd958ab..def4a4a08 100644
--- a/piwigoKit/Network/Extensions/PwgSession+Image.swift
+++ b/piwigoKit/Network/Extensions/PwgSession+Image.swift
@@ -43,7 +43,7 @@ extension PwgSession
             if imageSize == .fullRes {
                 let cachedFileSize = download.fileURL.fileSize
                 let diff = abs((Double(cachedFileSize) - Double(fileSize)) / Double(fileSize))
-//                print("••> Image \(download.fileURL.lastPathComponent) of \(cachedFileSize) bytes (\((diff * 1000).rounded(.awayFromZero)/10)%) retrieved from cache.")
+//                debugPrint("••> Image \(download.fileURL.lastPathComponent) of \(cachedFileSize) bytes (\((diff * 1000).rounded(.awayFromZero)/10)%) retrieved from cache.")
                 if diff < 0.1 {     // i.e. 10%
                     completion(download.fileURL)
                     return
diff --git a/piwigoKit/Network/Extensions/PwgSession+Utilities.swift b/piwigoKit/Network/Extensions/PwgSession+Utilities.swift
index 650c4bd2a..55e111c4f 100644
--- a/piwigoKit/Network/Extensions/PwgSession+Utilities.swift
+++ b/piwigoKit/Network/Extensions/PwgSession+Utilities.swift
@@ -141,6 +141,7 @@ extension PwgSession {
                     failure(error)
                 }
             } else {
+                user?.setLastUsedToNow()
                 completion()
             }
         } failure: { error in
@@ -330,9 +331,9 @@ extension PwgSession {
         let encodedImageURL = "\(loginPath)\(prefix)\(cleanPath)"
         #if DEBUG
         if encodedImageURL != originalURL {
-            print("=> originalURL:\(String(describing: originalURL))")
-            print("    encodedURL:\(encodedImageURL)")
-            print("    path=\(String(describing: serverURL?.path)), parameterString=\(String(describing: serverURL?.parameterString)), query:\(String(describing: serverURL?.query)), fragment:\(String(describing: serverURL?.fragment))")
+            debugPrint("=> originalURL:\(String(describing: originalURL))")
+            debugPrint("    encodedURL:\(encodedImageURL)")
+            debugPrint("    path=\(String(describing: serverURL?.path)), parameterString=\(String(describing: serverURL?.parameterString)), query:\(String(describing: serverURL?.query)), fragment:\(String(describing: serverURL?.fragment))")
         }
         #endif
         return NSURL(string: encodedImageURL)
diff --git a/piwigoKit/Network/KeychainUtilities.swift b/piwigoKit/Network/KeychainUtilities.swift
index 786d5b102..bb9a8238b 100644
--- a/piwigoKit/Network/KeychainUtilities.swift
+++ b/piwigoKit/Network/KeychainUtilities.swift
@@ -175,10 +175,10 @@ class KeychainUtilities : NSObject {
         #if DEBUG
         if #available(iOSApplicationExtension 11.3, *) {
             let msg = SecCopyErrorMessageString(status, nil)
-            print("••> OSStatus Error #\(status): \(msg as String?)")
+            debugPrint("••> OSStatus Error #\(status): \(msg as String?)")
         } else {
             let url = "https://www.osstatus.com/search/results?platform=all&framework=all&search=\(status)"
-            print("••> OSStatus Error #\(status): \(url)")
+            debugPrint("••> OSStatus Error #\(status): \(url)")
         }
         #endif
     }
diff --git a/piwigoKit/Network/ParseXMLData.swift b/piwigoKit/Network/ParseXMLData.swift
index 1c0ba3aa7..2e6e2b882 100644
--- a/piwigoKit/Network/ParseXMLData.swift
+++ b/piwigoKit/Network/ParseXMLData.swift
@@ -59,7 +59,7 @@ class ParseXMLData: NSObject, XMLParserDelegate {
     // MARK: XML Parser Delegate
     func parser(_ parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attributeDict: [String : String]) {
 
-        print("\n Start elementName: ",elementName)
+        debugPrint("\n Start elementName: ",elementName)
 
         if !self.elementArr.contains(elementName){
             self.elementArr.append(elementName)
@@ -77,7 +77,7 @@ class ParseXMLData: NSObject, XMLParserDelegate {
 
         var attributeCount = attributeDict.count
         for (k,v) in attributeDict{
-            print("key: ",k,"value: ",v)
+            debugPrint("key: ",k,"value: ",v)
             attributeCount = attributeCount - 1
             let comma = attributeCount > 0 ? "," : ""
             self.str = "\(self.str)\"\(k)\":\"\(v)\"\(comma)"
@@ -93,7 +93,7 @@ class ParseXMLData: NSObject, XMLParserDelegate {
 
     func parser(_ parser: XMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?) {
 
-        //print("\n End elementName \n",elementName)
+        //debugPrint("\n End elementName \n",elementName)
         if self.str.last == "#"{ // Detect pattern #
             self.str.removeLast()
         } else{
diff --git a/piwigoKit/Network/pwg.categories/pwg.categories.add.swift b/piwigoKit/Network/pwg.categories/pwg.categories.add.swift
index e32eff255..b54ded47a 100644
--- a/piwigoKit/Network/pwg.categories/pwg.categories.add.swift
+++ b/piwigoKit/Network/pwg.categories/pwg.categories.add.swift
@@ -68,7 +68,7 @@ public struct CategoriesAddJSON: Decodable {
                 errorMessage = "Unexpected error encountered while calling server method with provided parameters."
             }
         } catch let error {
-            print(error.localizedDescription)
+            debugPrint(error.localizedDescription)
         }
     }
 }
diff --git a/piwigoKit/Network/pwg.categories/pwg.categories.calculateOrphans.swift b/piwigoKit/Network/pwg.categories/pwg.categories.calculateOrphans.swift
index d7f9f8fb3..7e8a4b263 100644
--- a/piwigoKit/Network/pwg.categories/pwg.categories.calculateOrphans.swift
+++ b/piwigoKit/Network/pwg.categories/pwg.categories.calculateOrphans.swift
@@ -68,7 +68,7 @@ public struct CategoriesCalcOrphansJSON: Decodable {
                 errorMessage = "Unexpected error encountered while calling server method with provided parameters."
             }
         } catch let error {
-            print(error.localizedDescription)
+            debugPrint(error.localizedDescription)
         }
     }
 }
diff --git a/piwigoKit/Network/pwg.images/pwg.images.upload.swift b/piwigoKit/Network/pwg.images/pwg.images.upload.swift
index cdb9f21de..ffbe65d81 100644
--- a/piwigoKit/Network/pwg.images/pwg.images.upload.swift
+++ b/piwigoKit/Network/pwg.images/pwg.images.upload.swift
@@ -69,7 +69,7 @@ public struct ImagesUploadJSON: Decodable {
                 errorMessage = "Unexpected error encountered while calling server method with provided parameters."
             }
         } catch let error {
-            print(error.localizedDescription)
+            debugPrint(error.localizedDescription)
         }
     }
 }
diff --git a/piwigoKit/Network/pwg.images/pwg.images.uploadAsync.swift b/piwigoKit/Network/pwg.images/pwg.images.uploadAsync.swift
index aa8e2a1cb..28371e3b0 100644
--- a/piwigoKit/Network/pwg.images/pwg.images.uploadAsync.swift
+++ b/piwigoKit/Network/pwg.images/pwg.images.uploadAsync.swift
@@ -48,7 +48,7 @@ public struct ImagesUploadAsyncJSON: Decodable {
             guard let _ = data, let _ = data.id else {
                 // The server returned the list of uploaded chunks
                 chunks = try rootContainer.decode(ImagesUploadAsync.self, forKey: .result)
-//                print("    > \(chunks.message ?? "Done - No message!")")
+//                debugPrint("    > \(chunks.message ?? "Done - No message!")")
                 return
             }
         }
diff --git a/piwigoKit/Supporting Files/URL+AppTools.swift b/piwigoKit/Supporting Files/URL+AppTools.swift
index 6a1b41791..3b4dde9f0 100644
--- a/piwigoKit/Supporting Files/URL+AppTools.swift	
+++ b/piwigoKit/Supporting Files/URL+AppTools.swift	
@@ -57,7 +57,7 @@ extension URL {
             return size(of: contents)
 
         } catch let error {
-            print(error.localizedDescription)
+            debugPrint(error.localizedDescription)
             return UInt64.zero
         }
     }
@@ -69,7 +69,7 @@ extension URL {
             return size(of: onlyPhotos)
 
         } catch let error {
-            print(error.localizedDescription)
+            debugPrint(error.localizedDescription)
             return UInt64.zero
         }
     }
@@ -82,7 +82,7 @@ extension URL {
             return size(of: onlyVideos)
             
         } catch let error {
-            print(error.localizedDescription)
+            debugPrint(error.localizedDescription)
             return UInt64.zero
         }
     }
diff --git a/uploadKit/Extensions/UploadManager+Finisher.swift b/uploadKit/Extensions/UploadManager+Finisher.swift
index 4f2e5b3d7..c014b79ff 100644
--- a/uploadKit/Extensions/UploadManager+Finisher.swift
+++ b/uploadKit/Extensions/UploadManager+Finisher.swift
@@ -14,7 +14,7 @@ extension UploadManager {
     
     // MARK: - Tasks Executed after Uploading
     func finishTransfer(of upload: Upload) {
-        print("\(dbg()) finish transfers of \(upload.objectID.uriRepresentation())")
+        debugPrint("\(dbg()) finish transfers of \(upload.objectID.uriRepresentation())")
 
         // Update upload status
         isFinishing = true
@@ -51,7 +51,7 @@ extension UploadManager {
                     launchTransfer(of: upload)
                 }
             } else {
-                print("\(dbg()) didEndTransfer | STOP (\(countOfBytesToUpload) transferred)")
+                debugPrint("\(dbg()) didEndTransfer | STOP (\(countOfBytesToUpload) transferred)")
             }
         } else if !isPreparing, isUploading.count <= maxNberOfTransfers {
             findNextImageToUpload()
@@ -63,7 +63,7 @@ extension UploadManager {
     /// — Called after having uploaded with pwg.images.upload
     /// — pwg.images.upload does not allow to set the image title
     func setImageParameters(for upload: Upload) {
-        print("\(dbg()) setImageParameters() in", queueName())
+        debugPrint("\(dbg()) setImageParameters() in", queueName())
         
         // Prepare creation date
         let creationDate = DateUtilities.string(from: upload.creationDate)
@@ -90,7 +90,7 @@ extension UploadManager {
         JSONsession.postRequest(withMethod: pwgImagesSetInfo, paramDict: paramsDict,
                                 jsonObjectClientExpectsToReceive: ImagesSetInfoJSON.self,
                                 countOfBytesClientExpectsToReceive: 1000) { jsonData in
-            print("\(self.dbg()) setImageParameters() in", queueName())
+            debugPrint("\(self.dbg()) setImageParameters() in", queueName())
             // Decode the JSON object
             do {
                 // Decode the JSON into codable type ImagesSetInfoJSON.
@@ -138,7 +138,7 @@ extension UploadManager {
      If not, they will be visible after some delay (12 minutes).
      */
     func emptyLounge(for upload: Upload) {
-        print("\(dbg()) emptyLounge() in", queueName())
+        debugPrint("\(dbg()) emptyLounge() in", queueName())
         // Empty lounge without reporting potential error
         guard let user = upload.user else {
             // Should never happen
@@ -171,7 +171,7 @@ extension UploadManager {
         JSONsession.postRequest(withMethod: pwgImagesUploadCompleted, paramDict: paramDict,
                                 jsonObjectClientExpectsToReceive: ImagesUploadCompletedJSON.self,
                                 countOfBytesClientExpectsToReceive: 2500) { jsonData in
-            print("\(self.dbg()) moderateImages() in", queueName())
+            debugPrint("\(self.dbg()) moderateImages() in", queueName())
             do {
                 // Decode the JSON into codable type CommunityUploadCompletedJSON.
                 let decoder = JSONDecoder()
@@ -232,7 +232,7 @@ extension UploadManager {
                         inCategory categoryId: Int32,
                         completionHandler: @escaping (Bool, [Int64]) -> Void) -> (Void) {
         // Launch request
-        print("\(dbg()) moderateImages() in", queueName())
+        debugPrint("\(dbg()) moderateImages() in", queueName())
         let JSONsession = PwgSession.shared
         let paramDict: [String : Any] = ["image_id": imageIds,
                                          "pwg_token": NetworkVars.pwgToken,
@@ -240,7 +240,7 @@ extension UploadManager {
         JSONsession.postRequest(withMethod: kCommunityImagesUploadCompleted, paramDict: paramDict,
                                 jsonObjectClientExpectsToReceive: CommunityImagesUploadCompletedJSON.self,
                                 countOfBytesClientExpectsToReceive: 1000) { jsonData in
-            print("\(self.dbg()) moderateImages() in", queueName())
+            debugPrint("\(self.dbg()) moderateImages() in", queueName())
             do {
                 // Decode the JSON into codable type CommunityUploadCompletedJSON.
                 let decoder = JSONDecoder()
@@ -249,7 +249,7 @@ extension UploadManager {
                 // Piwigo error?
                 if uploadJSON.errorCode != 0 {
                     // Will retry later
-                    print("••> moderateImages(): Piwigo error \(uploadJSON.errorCode) - \(uploadJSON.errorMessage)")
+                    debugPrint("••> moderateImages(): Piwigo error \(uploadJSON.errorCode) - \(uploadJSON.errorMessage)")
                     completionHandler(false, [])
                     return
                 }
diff --git a/uploadKit/Extensions/UploadManager+Prepare.swift b/uploadKit/Extensions/UploadManager+Prepare.swift
index 65dc14947..43e9b12e7 100644
--- a/uploadKit/Extensions/UploadManager+Prepare.swift
+++ b/uploadKit/Extensions/UploadManager+Prepare.swift
@@ -14,7 +14,7 @@ extension UploadManager
 {
     // MARK: - Prepare Image/Video
     func prepare(_ upload: Upload) -> Void {
-        print("\(dbg()) prepare \(upload.objectID.uriRepresentation())")
+        debugPrint("\(dbg()) prepare \(upload.objectID.uriRepresentation())")
 
         // Update upload status
         isPreparing = true
@@ -141,7 +141,7 @@ extension UploadManager
             if NetworkVars.serverFileTypes.contains("jpg"),
                acceptedImageExtensions.contains(fileExt) {
                 // Try conversion to JPEG
-                print("\(dbg()) converting photo \(upload.fileName)…")
+                debugPrint("\(dbg()) converting photo \(upload.fileName)…")
                 
                 // Launch preparation job
                 prepareImage(atURL: fileURL, for: upload)
@@ -177,7 +177,7 @@ extension UploadManager
             // Chek that the video format is accepted by the Piwigo server
             if NetworkVars.serverFileTypes.contains(fileExt) {
                 // Video file format accepted by the Piwigo server
-                print("\(dbg()) preparing video \(upload.fileName)…")
+                debugPrint("\(dbg()) preparing video \(upload.fileName)…")
 
                 // Launch preparation job
                 prepareVideo(atURL: fileURL, for: upload)
@@ -188,7 +188,7 @@ extension UploadManager
             if NetworkVars.serverFileTypes.contains("mp4"),
                acceptedMovieExtensions.contains(fileExt) {
                 // Try conversion to MP4
-                print("\(dbg()) converting video \(upload.fileName)…")
+                debugPrint("\(dbg()) converting video \(upload.fileName)…")
 
                 // Launch conversion job
                 convertVideo(atURL: fileURL, for: upload)
@@ -318,7 +318,7 @@ extension UploadManager
             if NetworkVars.serverFileTypes.contains("jpg"),
                acceptedImageExtensions.contains(fileExt) {
                 // Try conversion to JPEG
-                print("\(dbg()) converting photo \(upload.fileName)…")
+                debugPrint("\(dbg()) converting photo \(upload.fileName)…")
                 
                 // Launch preparation job
                 self.convertImage(atURL: uploadFileURL, for: upload)
@@ -337,7 +337,7 @@ extension UploadManager
             // Chek that the video format is accepted by the Piwigo server
             if NetworkVars.serverFileTypes.contains(fileExt) {
                 // Video file format accepted by the Piwigo server
-                print("\(dbg()) preparing video \(upload.fileName)…")
+                debugPrint("\(dbg()) preparing video \(upload.fileName)…")
                 
                 // Launch preparation job
                 self.prepareVideo(ofAsset: originalAsset, for: upload)
@@ -347,7 +347,7 @@ extension UploadManager
             if NetworkVars.serverFileTypes.contains("mp4"),
                acceptedMovieExtensions.contains(fileExt) {
                 // Try conversion to MP4
-                print("\(dbg()) converting video \(upload.fileName)…")
+                debugPrint("\(dbg()) converting video \(upload.fileName)…")
                 
                 // Launch conversion job
                 self.convertVideo(ofAsset: originalAsset, for: upload)
diff --git a/uploadKit/Extensions/UploadManager+Resume.swift b/uploadKit/Extensions/UploadManager+Resume.swift
index 414ea3e5c..edb0cba2d 100644
--- a/uploadKit/Extensions/UploadManager+Resume.swift
+++ b/uploadKit/Extensions/UploadManager+Resume.swift
@@ -33,7 +33,7 @@ extension UploadManager
             try completed.performFetch()
         }
         catch {
-            print("••> Could not fetch pending uploads: \(error)")
+            debugPrint("••> Could not fetch pending uploads: \(error)")
         }
 
         // Get active upload tasks
@@ -46,15 +46,15 @@ extension UploadManager
                     guard let objectURIstr = task.originalRequest?
                         .value(forHTTPHeaderField: pwgHTTPuploadID) else { continue }
                     guard let objectURI = URL(string: objectURIstr) else {
-                        print("\(self.dbg()) task \(task.taskIdentifier) | no object URI!")
+                        debugPrint("\(self.dbg()) task \(task.taskIdentifier) | no object URI!")
                         continue
                     }
                     guard let uploadID = self.uploadProvider.bckgContext.persistentStoreCoordinator?
                         .managedObjectID(forURIRepresentation: objectURI) else {
-                        print("\(self.dbg()) task \(task.taskIdentifier) | no objectID!")
+                        debugPrint("\(self.dbg()) task \(task.taskIdentifier) | no objectID!")
                         continue
                     }
-                    print("\(self.dbg()) is uploading \(uploadID)")
+                    debugPrint("\(self.dbg()) is uploading \(uploadID)")
                     self.isUploading.insert(uploadID)
                     
                 default:
@@ -62,8 +62,8 @@ extension UploadManager
                 }
             }
             
-            print("\(self.dbg()) \((self.uploads.fetchedObjects ?? []).count) pending upload requests in cache")
-            print("\(self.dbg()) \((self.completed.fetchedObjects ?? []).count) completed upload requests in cache")
+            debugPrint("\(self.dbg()) \((self.uploads.fetchedObjects ?? []).count) pending upload requests in cache")
+            debugPrint("\(self.dbg()) \((self.completed.fetchedObjects ?? []).count) completed upload requests in cache")
             // Resume operations
             self.resumeOperations()
         }
@@ -84,7 +84,7 @@ extension UploadManager
                 UploadVars.dateOfLastPhotoLibraryDeletion = Date().timeIntervalSinceReferenceDate
                 
                 // Suggest to delete assets from the Photo Library
-                print("\(dbg()) \(assetsToDelete.count) upload requests should be deleted")
+                debugPrint("\(dbg()) \(assetsToDelete.count) upload requests should be deleted")
                 deleteAssets(associatedToUploads: assetsToDelete)
             }
         }
diff --git a/uploadKit/Extensions/UploadManager+Tasks.swift b/uploadKit/Extensions/UploadManager+Tasks.swift
index 6c616eaca..521ab7193 100644
--- a/uploadKit/Extensions/UploadManager+Tasks.swift
+++ b/uploadKit/Extensions/UploadManager+Tasks.swift
@@ -34,16 +34,16 @@ extension UploadManager
             try completed.performFetch()
         }
         catch {
-            print("••> Could not fetch pending uploads: \(error)")
+            debugPrint("••> Could not fetch pending uploads: \(error)")
         }
 
         // Update counter and app badge
         self.updateNberOfUploadsToComplete()
 
         // Check current queue
-        print("\(dbg()) findNextImageToUpload() in", queueName())
-        print("\(dbg()) \((self.uploads.fetchedObjects ?? []).count) pending and \((self.completed.fetchedObjects ?? []).count) completed upload requests in cache")
-        print("\(dbg()) preparing:\(isPreparing ? "Yes" : "No"), uploading:\(isUploading.count), finishing:\(isFinishing ? "Yes" : "No")")
+        debugPrint("\(dbg()) findNextImageToUpload() in", queueName())
+        debugPrint("\(dbg()) \((self.uploads.fetchedObjects ?? []).count) pending and \((self.completed.fetchedObjects ?? []).count) completed upload requests in cache")
+        debugPrint("\(dbg()) preparing:\(isPreparing ? "Yes" : "No"), uploading:\(isUploading.count), finishing:\(isFinishing ? "Yes" : "No")")
                 
         // Pause upload manager if:
         /// - app not in the foreground anymore
@@ -241,7 +241,7 @@ extension UploadManager
             try uploads.performFetch()
         }
         catch {
-            print("Error: \(error)")
+            debugPrint("Error: \(error)")
         }
         
         // Update counter and app badge
@@ -277,7 +277,7 @@ extension UploadManager
         if failedUploads.count > 0 {
             // Will relaunch transfers with one which failed
             uploadRequestsToTransfer = Set(failedUploads.map({$0.objectID}))
-            print("\(dbg()) collected \(uploadRequestsToTransfer.count) failed uploads")
+            debugPrint("\(dbg()) collected \(uploadRequestsToTransfer.count) failed uploads")
         }
         
         // Second, find upload requests ready for transfer
@@ -288,7 +288,7 @@ extension UploadManager
             let prepared = preparedUploads.map({$0.objectID})
             uploadRequestsToTransfer = uploadRequestsToTransfer
                 .union(Set(prepared[..<min(maxNberOfUploadsPerBckgTask,prepared.count)]))
-            print("\(dbg()) collected \(min(maxNberOfUploadsPerBckgTask, prepared.count)) prepared uploads")
+            debugPrint("\(dbg()) collected \(min(maxNberOfUploadsPerBckgTask, prepared.count)) prepared uploads")
         }
         
         // Finally, get list of upload requests to prepare
@@ -296,7 +296,7 @@ extension UploadManager
         if diff <= 0 { return }
         let requestsToPrepare = (uploads.fetchedObjects ?? [])
             .filter({$0.state == .waiting && $0.markedForAutoUpload == autoUploadOnly})
-        print("\(dbg()) collected \(min(diff, requestsToPrepare.count)) uploads to prepare")
+        debugPrint("\(dbg()) collected \(min(diff, requestsToPrepare.count)) uploads to prepare")
         let toPrepare = requestsToPrepare.map({$0.objectID})
         uploadRequestsToPrepare = Set(toPrepare[..<min(diff, toPrepare.count)])
     }
@@ -311,16 +311,16 @@ extension UploadManager
                     // Retrieve upload request properties
                     guard let objectURIstr = task.originalRequest?.value(forHTTPHeaderField: pwgHTTPuploadID) else { continue }
                     guard let objectURI = URL(string: objectURIstr) else {
-                        print("\(dbg()) task \(task.taskIdentifier) | no object URI!")
+                        debugPrint("\(dbg()) task \(task.taskIdentifier) | no object URI!")
                         continue
                     }
                     guard let uploadID = uploadProvider.bckgContext
                         .persistentStoreCoordinator?.managedObjectID(forURIRepresentation: objectURI) else {
-                        print("\(dbg()) task \(task.taskIdentifier) | no objectID!")
+                        debugPrint("\(dbg()) task \(task.taskIdentifier) | no objectID!")
                         continue
                     }
                     // Remembers that this upload request is being dealt with
-                    print("\(dbg()) is uploading: \(uploadID)")
+                    debugPrint("\(dbg()) is uploading: \(uploadID)")
                     // Remembers that this upload request is being dealt with
                     self.isUploading.insert(uploadID)
                     
@@ -342,16 +342,16 @@ extension UploadManager
                         // Retrieve upload request properties
                         guard let objectURIstr = task.originalRequest?.value(forHTTPHeaderField: pwgHTTPuploadID) else { continue }
                         guard let objectURI = URL(string: objectURIstr) else {
-                            print("\(dbg()) task \(task.taskIdentifier) | no object URI!")
+                            debugPrint("\(dbg()) task \(task.taskIdentifier) | no object URI!")
                             continue
                         }
                         guard let uploadID = uploadProvider.bckgContext
                             .persistentStoreCoordinator?.managedObjectID(forURIRepresentation: objectURI) else {
-                            print("\(dbg()) task \(task.taskIdentifier) | no objectID!")
+                            debugPrint("\(dbg()) task \(task.taskIdentifier) | no objectID!")
                             continue
                         }
                         // Remembers that this upload request is being dealt with
-                        print("\(dbg()) is uploading: \(uploadID)")
+                        debugPrint("\(dbg()) is uploading: \(uploadID)")
                         // Remembers that this upload request is being dealt with
                         self.isUploading.insert(uploadID)
                         
diff --git a/uploadKit/Extensions/UploadManager+Transfer.swift b/uploadKit/Extensions/UploadManager+Transfer.swift
index 5ae4130e1..4d1bc25e0 100644
--- a/uploadKit/Extensions/UploadManager+Transfer.swift
+++ b/uploadKit/Extensions/UploadManager+Transfer.swift
@@ -17,7 +17,7 @@ extension UploadManager {
     
     // MARK: - Transfer Image if Necessary
     public func launchTransfer(of upload: Upload) -> Void {
-        print("\(dbg()) launch transfer of \(upload.objectID.uriRepresentation())")
+        debugPrint("\(dbg()) launch transfer of \(upload.objectID.uriRepresentation())")
 
         // Update list of transfers
         if isUploading.contains(upload.objectID) { return }
@@ -291,7 +291,7 @@ extension UploadManager {
         let offset = chunkSize * chunk
         let thisChunkSize = length - offset > chunkSize ? chunkSize : length - offset
         var chunkData = imageData.subdata(in: offset..<offset + thisChunkSize)
-        print("\(dbg()) #\(chunk+1) with chunkSize:", chunkSize, "thisChunkSize:", thisChunkSize, "total:", length)
+        debugPrint("\(dbg()) #\(chunk+1) with chunkSize:", chunkSize, "thisChunkSize:", thisChunkSize, "total:", length)
 
         // Prepare URL
         let url = URL(string: NetworkVars.service + "/ws.php?\(pwgImagesUpload)")
@@ -338,7 +338,7 @@ extension UploadManager {
         task.countOfBytesClientExpectsToReceive = 600
         
         // Resume task
-        print("\(dbg()) \(upload.md5Sum) upload task \(task.taskIdentifier) resumed (\(chunk+1)/\(chunks))")
+        debugPrint("\(dbg()) \(upload.md5Sum) upload task \(task.taskIdentifier) resumed (\(chunk+1)/\(chunks))")
         task.resume()
 
         // Release memory
@@ -353,7 +353,7 @@ extension UploadManager {
               let chunkStr = task.originalRequest?.value(forHTTPHeaderField: pwgHTTPchunk), let chunk = Int(chunkStr),
               let chunksStr = task.originalRequest?.value(forHTTPHeaderField: pwgHTTPchunks), let chunks = Int(chunksStr),
               let md5sum = task.originalRequest?.value(forHTTPHeaderField: pwgHTTPmd5sum) else {
-            print("\(dbg()) Could not extract HTTP header fields !!!!!!")
+            debugPrint("\(dbg()) Could not extract HTTP header fields !!!!!!")
             return
         }
 
@@ -363,12 +363,12 @@ extension UploadManager {
             
             // Retrieve upload request properties
             guard let objectURI = URL(string: objectURIstr) else {
-                print("\(dbg()) \(md5sum) | no object URI!")
+                debugPrint("\(dbg()) \(md5sum) | no object URI!")
                 return
             }
             guard let uploadID = uploadProvider.bckgContext
                 .persistentStoreCoordinator?.managedObjectID(forURIRepresentation: objectURI) else {
-                print("\(dbg()) \(md5sum) | no objectID!")
+                debugPrint("\(dbg()) \(md5sum) | no objectID!")
                 return
             }
             do {
@@ -408,7 +408,7 @@ extension UploadManager {
                 return
             }
             catch {
-                print("\(dbg()) \(md5sum) | missing Core Data object!")
+                debugPrint("\(dbg()) \(md5sum) | missing Core Data object!")
                 // In foreground, consider next image
                 self.backgroundQueue.async {
                     self.findNextImageToUpload()
@@ -421,7 +421,7 @@ extension UploadManager {
         if chunk + 1 < chunks { return }
 
         // Delete uploaded files from Piwigo/Uploads directory
-        print("\(dbg()) \(md5sum) | delete left files")
+        debugPrint("\(dbg()) \(md5sum) | delete left files")
         let imageFile = identifier.replacingOccurrences(of: "/", with: "-")
         deleteFilesInUploadsDirectory(withPrefix: imageFile)
     }
@@ -437,12 +437,12 @@ extension UploadManager {
         
         // Retrieve upload request properties
         guard let objectURI = URL(string: objectURIstr) else {
-            print("\(dbg()) \(md5sum) | no object URI!")
+            debugPrint("\(dbg()) \(md5sum) | no object URI!")
             return
         }
         guard let uploadID = uploadProvider.bckgContext
             .persistentStoreCoordinator?.managedObjectID(forURIRepresentation: objectURI) else {
-            print("\(dbg()) \(md5sum) | no objectID!")
+            debugPrint("\(dbg()) \(md5sum) | no objectID!")
             return
         }
         do {
@@ -457,7 +457,7 @@ extension UploadManager {
             if data.isEmpty {
                 // Update upload request status
                 #if DEBUG
-                print("\(dbg()) Empty JSON object!")
+                debugPrint("\(dbg()) Empty JSON object!")
                 #endif
                 upload.setState(.uploadingError, error: PwgSessionError.emptyJSONobject, save: false)
                 self.backgroundQueue.async {
@@ -472,7 +472,7 @@ extension UploadManager {
                 // Update upload request status
                 #if DEBUG
                 let dataStr = String(decoding: data, as: UTF8.self)
-                print("\(dbg()) Invalid JSON object: \(dataStr)")
+                debugPrint("\(dbg()) Invalid JSON object: \(dataStr)")
                 #endif
                 upload.setState(.uploadingError, error: PwgSessionError.invalidJSONobject, save: false)
                 self.backgroundQueue.async {
@@ -549,7 +549,7 @@ extension UploadManager {
         }
         catch {
             // In foreground, consider next image
-            print("\(dbg()) \(md5sum) | missing Core Data object!")
+            debugPrint("\(dbg()) \(md5sum) | missing Core Data object!")
             // In foreground, consider next image
             self.backgroundQueue.async {
                 self.findNextImageToUpload()
@@ -667,7 +667,7 @@ extension UploadManager {
                 }
                 catch let error as NSError {
                     // Disk full? —> to be managed…
-                    print(error)
+                    debugPrint(error)
                     return
                 }
                 
@@ -695,11 +695,11 @@ extension UploadManager {
                 // Adds bytes expected to be sent to counter
                 if isExecutingBackgroundUploadTask {
                     countOfBytesToUpload += httpBody.count
-                    print("\(dbg()) countOfBytesToUpload: \(countOfBytesToUpload)")
+                    debugPrint("\(dbg()) countOfBytesToUpload: \(countOfBytesToUpload)")
                 }
                 
                 // Resume task
-                print("\(dbg()) \(upload.md5Sum) upload task \(task.taskIdentifier) resumed (\(chunk+1)/\(chunks))")
+                debugPrint("\(dbg()) \(upload.md5Sum) upload task \(task.taskIdentifier) resumed (\(chunk+1)/\(chunks))")
                 task.resume()
             }
         }
@@ -716,7 +716,7 @@ extension UploadManager {
               let md5sum = task.originalRequest?.value(forHTTPHeaderField: pwgHTTPmd5sum),
               let chunkStr = task.originalRequest?.value(forHTTPHeaderField: pwgHTTPchunk),
               let chunk = Int(chunkStr) else {
-            print("\(dbg()) Could not extract HTTP header fields !!!!!!")
+            debugPrint("\(dbg()) Could not extract HTTP header fields !!!!!!")
             return
         }
 
@@ -731,16 +731,16 @@ extension UploadManager {
             
             // Retrieve upload request properties
             guard let objectURI = URL(string: objectURIstr) else {
-                print("\(dbg()) \(md5sum) | no object URI!")
+                debugPrint("\(dbg()) \(md5sum) | no object URI!")
                 return
             }
             guard let uploadID = uploadProvider.bckgContext
                 .persistentStoreCoordinator?.managedObjectID(forURIRepresentation: objectURI) else {
-                print("\(dbg()) \(md5sum) | no objectID!")
+                debugPrint("\(dbg()) \(md5sum) | no objectID!")
                 return
             }
             guard let upload = (uploads.fetchedObjects ?? []).first(where: {$0.objectID == uploadID}) else {
-                print("\(dbg()) \(md5sum) | missing Core Data object!")
+                debugPrint("\(dbg()) \(md5sum) | missing Core Data object!")
                 // Investigate next upload request?
                 if self.isExecutingBackgroundUploadTask {
                     // In background task — stop here
@@ -786,7 +786,7 @@ extension UploadManager {
         }
 
         // Delete chunk file uploaded successfully from Piwigo/Uploads directory
-        print("\(dbg()) \(md5sum) | delete chunk \(chunk+1)")
+        debugPrint("\(dbg()) \(md5sum) | delete chunk \(chunk+1)")
         let imageFile = identifier.replacingOccurrences(of: "/", with: "-")
         let chunkFileName = imageFile + "." + numberFormatter.string(from: NSNumber(value: chunk))!
         deleteFilesInUploadsDirectory(withPrefix: chunkFileName)
@@ -802,16 +802,16 @@ extension UploadManager {
         
         // Retrieve upload request properties
         guard let objectURI = URL(string: objectURIstr) else {
-            print("\(dbg()) \(md5sum) | no object URI!")
+            debugPrint("\(dbg()) \(md5sum) | no object URI!")
             return
         }
         guard let uploadID = uploadProvider.bckgContext
             .persistentStoreCoordinator?.managedObjectID(forURIRepresentation: objectURI) else {
-            print("\(dbg()) \(md5sum) | no objectID!")
+            debugPrint("\(dbg()) \(md5sum) | no objectID!")
             return
         }
         guard let upload = (uploads.fetchedObjects ?? []).first(where: {$0.objectID == uploadID}) else {
-            print("\(dbg()) \(md5sum) | missing Core Data object!")
+            debugPrint("\(dbg()) \(md5sum) | missing Core Data object!")
             // Investigate next upload request?
             if self.isExecutingBackgroundUploadTask {
                 // In background task — stop here
@@ -828,7 +828,7 @@ extension UploadManager {
         if data.isEmpty {
             // Update upload request status
             #if DEBUG
-            print("\(dbg()) Empty JSON object!")
+            debugPrint("\(dbg()) Empty JSON object!")
             #endif
             upload.setState(.uploadingError, error: PwgSessionError.emptyJSONobject, save: false)
             self.backgroundQueue.async {
@@ -843,7 +843,7 @@ extension UploadManager {
             // Update upload request status
             #if DEBUG
             let dataStr = String(decoding: data, as: UTF8.self)
-            print("\(dbg()) Invalid JSON object: \(dataStr)")
+            debugPrint("\(dbg()) Invalid JSON object: \(dataStr)")
             #endif
             upload.setState(.uploadingError, error: PwgSessionError.invalidJSONobject, save: false)
             self.backgroundQueue.async {
@@ -860,7 +860,7 @@ extension UploadManager {
 
             // Piwigo error?
             if (uploadJSON.errorCode != 0) {
-                print("\(dbg()) \(md5sum) | Piwigo error \(uploadJSON.errorCode)")
+                debugPrint("\(dbg()) \(md5sum) | Piwigo error \(uploadJSON.errorCode)")
                 let error = PwgSession.shared.localizedError(for: uploadJSON.errorCode,
                                                              errorMessage: uploadJSON.errorMessage)
                 if (400...499).contains(uploadJSON.errorCode) {
@@ -879,7 +879,7 @@ extension UploadManager {
             if let chunks = uploadJSON.chunks, let message = chunks.message {
                 // Upload not completed
                 let chunkList = message.dropFirst(18).components(separatedBy: ",")
-                print("\(dbg()) \(md5sum) | \(chunkList.count) chunks downloaded")
+                debugPrint("\(dbg()) \(md5sum) | \(chunkList.count) chunks downloaded")
                 // Cancel tasks of chunks already uploaded
 //                UploadSessions.shared.cancelTasksOfUpload(witID: objectURIstr,
 //                                                          alreadyUploadedChunks: chunkList,
@@ -949,7 +949,7 @@ extension UploadManager {
             return
         } catch {
             // JSON object cannot be digested, image still ready for upload
-            print("\(dbg()) \(md5sum) | wrong JSON object!")
+            debugPrint("\(dbg()) \(md5sum) | wrong JSON object!")
             upload.setState(.uploadingError, error: UploadError.wrongJSONobject, save: false)
             self.backgroundQueue.async {
                 self.uploadProvider.bckgContext.saveIfNeeded()
@@ -962,11 +962,11 @@ extension UploadManager {
     
     // MARK: - Transfer Failed/Completed
     private func didEndTransfer(for upload: Upload, taskID: Int = Int.max) {
-        print("\(dbg()) didEndTransfer in", queueName())
+        debugPrint("\(dbg()) didEndTransfer in", queueName())
         
         // Error?
         if upload.requestError.isEmpty == false {
-            print("\(dbg()) task \(taskID) returned \(upload.requestError)")
+            debugPrint("\(dbg()) task \(taskID) returned \(upload.requestError)")
             // Cancel related tasks
             if taskID != Int.max {
                 let objectURIstr = upload.objectID.uriRepresentation().absoluteString
@@ -981,7 +981,7 @@ extension UploadManager {
         }
 
         // Update state of upload request
-        print("\(dbg()) transferred \(upload.objectID.uriRepresentation())")
+        debugPrint("\(dbg()) transferred \(upload.objectID.uriRepresentation())")
 
         // Consider next image?
         self.didEndTransfer(for: upload)
@@ -1008,7 +1008,7 @@ extension UploadManager {
         /// We don't use the UUID to be able to test uploads with a simulator.
         let suffix = identifier.replacingOccurrences(of: "/", with: "").map { $0.lowercased() }.joined()
         let boundary = String(repeating: "-", count: 68 - suffix.count) + suffix
-//        print("\(dbg()) \(boundary)")
+//        debugPrint("\(dbg()) \(boundary)")
         return boundary
     }
 
diff --git a/uploadKit/Extensions/UploadManager+Utilities.swift b/uploadKit/Extensions/UploadManager+Utilities.swift
index 6abe17d41..1f3868274 100644
--- a/uploadKit/Extensions/UploadManager+Utilities.swift
+++ b/uploadKit/Extensions/UploadManager+Utilities.swift
@@ -70,7 +70,7 @@ extension UploadManager {
         // Determine MD5 checksum of image file to upload
         let error: NSError?
         (upload.md5Sum, error) = fileURL.MD5checksum()
-        print("\(dbg()) MD5: \(String(describing: upload.md5Sum))")
+        debugPrint("\(dbg()) MD5: \(String(describing: upload.md5Sum))")
         if error != nil {
             // Could not determine the MD5 checksum
             failure(error)
@@ -126,9 +126,9 @@ extension UploadManager {
             
             // For debugging
 //            let leftFiles = try fileManager.contentsOfDirectory(at: self.uploadsDirectory, includingPropertiesForKeys: nil, options: [.skipsHiddenFiles, .skipsSubdirectoryDescendants])
-//            print("\(dbg()) Remaining files in cache: \(leftFiles)")
+//            debugPrint("\(dbg()) Remaining files in cache: \(leftFiles)")
         } catch {
-            print("\(dbg()) could not clear the Uploads folder: \(error)")
+            debugPrint("\(dbg()) could not clear the Uploads folder: \(error)")
         }
 
         // Job done
diff --git a/uploadKit/Extensions/UploadManager+Video.swift b/uploadKit/Extensions/UploadManager+Video.swift
index 56a30e523..2e87ea736 100644
--- a/uploadKit/Extensions/UploadManager+Video.swift
+++ b/uploadKit/Extensions/UploadManager+Video.swift
@@ -141,7 +141,7 @@ extension UploadManager {
             // Determine MD5 checksum
             let error: NSError?
             (upload.md5Sum, error) = originalFileURL.MD5checksum()
-            print("\(self.dbg()) MD5: \(String(describing: upload.md5Sum))")
+            debugPrint("\(self.dbg()) MD5: \(String(describing: upload.md5Sum))")
             if error != nil {
                 // Could not determine the MD5 checksum
                 self.didPrepareVideo(for: upload, error)
@@ -235,12 +235,12 @@ extension UploadManager {
     
     private func retrieveVideo(from imageAsset: PHAsset, with options: PHVideoRequestOptions,
                        completionHandler: @escaping (AVAsset?, PHVideoRequestOptions, Error?) -> Void) {
-        print("\(dbg()) enters retrieveVideoAssetFrom in", queueName())
+        debugPrint("\(dbg()) enters retrieveVideoAssetFrom in", queueName())
 
         // The block Photos calls periodically while downloading the video.
         options.progressHandler = { progress, error, stop, dict in
         #if DEBUG_UPLOAD
-            print(String(format: "downloading Video — progress %lf", progress))
+            debugPrint(String(format: "downloading Video — progress %lf", progress))
         #endif
             // The handler needs to update the user interface => Dispatch to main thread
 //            DispatchQueue.main.async(execute: {
@@ -260,7 +260,7 @@ extension UploadManager {
 //                } else {
 //                    // Updates progress bar(s)
 //                    if self.delegate.responds(to: #selector(imageProgress(_:onCurrent:forTotal:onChunk:forChunks:iCloudProgress:))) {
-//                        print(String(format: "retrieveFullSizeAssetDataFromVideo: %.2f", progress))
+//                        debugPrint(String(format: "retrieveFullSizeAssetDataFromVideo: %.2f", progress))
 //                        self.delegate.imageProgress(image, onCurrent: self.current, forTotal: self.total, onChunk: self.currentChunk, forChunks: self.totalChunks, iCloudProgress: progress)
 //                    }
 //                }
@@ -273,21 +273,21 @@ extension UploadManager {
                                                 resultHandler: { [unowned self] avasset, audioMix, info in
             // ====>> For debugging…
 //            if let metadata = avasset?.metadata {
-//                print("=> Metadata: \(metadata)\r=> Creation date: \(metadata.creationDate() ?? DateUtilities.unknownDate)")
+//                debugPrint("=> Metadata: \(metadata)\r=> Creation date: \(metadata.creationDate() ?? DateUtilities.unknownDate)")
 //            }
 //            if let creationDate = avasset?.creationDate {
-//                print("=> Creation date: \(creationDate)")
+//                debugPrint("=> Creation date: \(creationDate)")
 //            }
-//            print("=> Exportable: \(avasset?.isExportable ?? false ? "Yes" : "No")")
+//            debugPrint("=> Exportable: \(avasset?.isExportable ?? false ? "Yes" : "No")")
 //            if let avasset = avasset {
-//                print("=> Compatibility: \(AVAssetExportSession.exportPresets(compatibleWith: avasset))")
+//                debugPrint("=> Compatibility: \(AVAssetExportSession.exportPresets(compatibleWith: avasset))")
 //            }
 //            if let tracks = avasset?.tracks {
-//                print("=> Tracks: \(tracks)")
+//                debugPrint("=> Tracks: \(tracks)")
 //            }
 //            for track in avasset?.tracks ?? [] {
 //                if track.mediaType == .video {
-//                    print(String(format: "=>       : %.f x %.f", track.naturalSize.width, track.naturalSize.height))
+//                    debugPrint(String(format: "=>       : %.f x %.f", track.naturalSize.width, track.naturalSize.height))
 //                }
 //                var format = ""
 //                for i in 0..<track.formatDescriptions.count {
@@ -305,14 +305,14 @@ extension UploadManager {
 //                        format.append(contentsOf: ",")
 //                    }
 //                }
-//                print("=>       : \(format)")
+//                debugPrint("=>       : \(format)")
 //            }
             // <<==== End of code for debugging
             
             // resultHandler performed on another thread!
             let error = info?[PHImageErrorKey] as? Error
             if self.isExecutingBackgroundUploadTask {
-//                print("\(self.dbg()) exits retrieveVideoAssetFrom in", queueName())
+//                debugPrint("\(self.dbg()) exits retrieveVideoAssetFrom in", queueName())
                 // Any error?
                 guard let error = error else {
                     completionHandler(avasset, options, nil)
@@ -321,7 +321,7 @@ extension UploadManager {
                 completionHandler(nil, options, error)
             } else {
                 self.backgroundQueue.async {
-//                    print("\(self.dbg()) exits retrieveVideoAssetFrom in", queueName())
+//                    debugPrint("\(self.dbg()) exits retrieveVideoAssetFrom in", queueName())
                     // Any error?
                     guard let error = error else {
                         completionHandler(avasset, options, nil)
@@ -414,10 +414,10 @@ extension UploadManager {
             }
 
     //        let commonMetadata = videoAsset.commonMetadata
-    //        print("===>> Common Metadata: \(commonMetadata)")
+    //        debugPrint("===>> Common Metadata: \(commonMetadata)")
     //
     //        let allMetadata = videoAsset.metadata
-    //        print("===>> All Metadata: \(allMetadata)")
+    //        debugPrint("===>> All Metadata: \(allMetadata)")
     //
     //        let makeItem =  AVMutableMetadataItem()
     //        makeItem.identifier = AVMetadataIdentifier.iTunesMetadataArtist
@@ -434,7 +434,7 @@ extension UploadManager {
     //        var newMetadata = commonMetadata
     //        newMetadata.append(makeItem)
     //        newMetadata.append(anotherItem)
-    //        print("===>> new Metadata: \(newMetadata)")
+    //        debugPrint("===>> new Metadata: \(newMetadata)")
     //        exportSession.metadata = newMetadata
 
             // Prepare MIME type
diff --git a/uploadKit/Supporting Files/ImageMetadata.swift b/uploadKit/Supporting Files/ImageMetadata.swift
index eaa03072f..0d432787c 100644
--- a/uploadKit/Supporting Files/ImageMetadata.swift	
+++ b/uploadKit/Supporting Files/ImageMetadata.swift	
@@ -299,7 +299,7 @@ extension Dictionary where Key == CFString, Value == Any {
         // Remove GPS dictionary
         if let GPSdata = properties[kCGImagePropertyGPSDictionary] as? [CFString:Any] {
             properties.removeValue(forKey: kCGImagePropertyGPSDictionary)
-            print("=> removed GPS metadata = \(GPSdata)")
+            debugPrint("=> removed GPS metadata = \(GPSdata)")
         }
         
         // Get other dictionaries with keys of privata data
@@ -325,7 +325,7 @@ extension Dictionary where Key == CFString, Value == Any {
                     // Remove private metadata if any
                     if let value = dictData[key] {
                         dictData.removeValue(forKey: key)
-                        print("=> removed private metadata [\(key) : \(value)]")
+                        debugPrint("=> removed private metadata [\(key) : \(value)]")
                     }
                 }
                 // Update properties
diff --git a/uploadKit/UploadManager.swift b/uploadKit/UploadManager.swift
index 1606cdd2d..37243fc81 100644
--- a/uploadKit/UploadManager.swift
+++ b/uploadKit/UploadManager.swift
@@ -119,7 +119,7 @@ public class UploadManager: NSObject {
             try completed.performFetch()
         }
         catch {
-            print("••> Could not fetch pending uploads: \(error)")
+            debugPrint("••> Could not fetch pending uploads: \(error)")
         }
 
         // Register auto-upload disabler
diff --git a/uploadKit/UploadSessions.swift b/uploadKit/UploadSessions.swift
index 38559ad2a..c70be59ac 100644
--- a/uploadKit/UploadSessions.swift
+++ b/uploadKit/UploadSessions.swift
@@ -201,7 +201,7 @@ public class UploadSessions: NSObject {
                 .filter({ $0.taskIdentifier != exceptedTaskID})
             // Cancel remaining tasks related with this completed upload request
             tasksToCancel.forEach({
-                print("\(DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)) > Cancel upload task \($0.taskIdentifier)")
+                debugPrint("\(DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)) > Cancel upload task \($0.taskIdentifier)")
                 $0.cancel()
             })
         }
@@ -225,7 +225,7 @@ public class UploadSessions: NSObject {
 //                .filter({ alreadyUploadedChunks.contains($0.originalRequest?.value(forHTTPHeaderField: UploadVars.HTTPchunk) ?? "")})
 //            // Cancel queued tasks which are useless
 //            tasksToCancel.forEach({
-//                print("\(DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)) > Cancel upload task \($0.taskIdentifier)")
+//                debugPrint("\(DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)) > Cancel upload task \($0.taskIdentifier)")
 //                $0.cancel()
 //            })
 //        }
@@ -237,20 +237,20 @@ public class UploadSessions: NSObject {
 extension UploadSessions: URLSessionDelegate {
 
 //    public func urlSession(_ session: URLSession, taskIsWaitingForConnectivity task: URLSessionTask) {
-//        print("••> The upload session is waiting for connectivity (offline mode)")
+//        debugPrint("••> The upload session is waiting for connectivity (offline mode)")
 //    }
         
 //    public func urlSession(_ session: URLSession, task: URLSessionTask, willBeginDelayedRequest: URLRequest, completionHandler: (URLSession.DelayedRequestDisposition, URLRequest?) -> Void) {
-//        print("••> The upload session will begin delayed request (back to online)")
+//        debugPrint("••> The upload session will begin delayed request (back to online)")
 //    }
 
     public func urlSession(_ session: URLSession, didBecomeInvalidWithError error: Error?) {
-        print("••> The upload session has been invalidated")
+        debugPrint("••> The upload session has been invalidated")
     }
     
     public func urlSession(_ session: URLSession, didReceive challenge: URLAuthenticationChallenge,
                     completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
-        print("    > Session-level authentication request from the remote server.")
+        debugPrint("    > Session-level authentication request from the remote server.")
         
         // Get protection space for current domain
         let protectionSpace = challenge.protectionSpace
@@ -299,7 +299,7 @@ extension UploadSessions: URLSessionDelegate {
     }
     
     public func urlSessionDidFinishEvents(forBackgroundURLSession session: URLSession) {
-        print("••> Background session \(session.configuration.identifier ?? "") finished events.")
+        debugPrint("••> Background session \(session.configuration.identifier ?? "") finished events.")
         
         // Execute completion handler, i.e. inform iOS that we collect data returned by Piwigo server
         DispatchQueue.main.async {
@@ -315,7 +315,7 @@ extension UploadSessions: URLSessionDelegate {
 extension UploadSessions: URLSessionTaskDelegate {
     
     public func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
-        print("••> Task-level authentication request from the remote server")
+        debugPrint("••> Task-level authentication request from the remote server")
 
         // Check authentication method
         let authMethod = challenge.protectionSpace.authenticationMethod
@@ -343,7 +343,7 @@ extension UploadSessions: URLSessionTaskDelegate {
         // Get upload info from the task
         // The size of the uploaded image is set in the Content-Length field.
         guard let identifier = task.originalRequest?.value(forHTTPHeaderField: pwgHTTPimageID) else {
-                print("••> Could not extract HTTP header fields !!!!!!")
+                debugPrint("••> Could not extract HTTP header fields !!!!!!")
                 return
         }
         
@@ -351,8 +351,8 @@ extension UploadSessions: URLSessionTaskDelegate {
         guard let index = uploadCounters.firstIndex(where: { $0.uid == identifier}) else { return }
         uploadCounters[index].bytesSent += bytesSent
         #if DEBUG
-        print("••> task \(task.taskIdentifier) did send \(totalBytesSent) bytes (\(totalBytesExpectedToSend) bytes expected)")
-        print("••> counter: \(uploadCounters[index].bytesSent) bytes sent, \(uploadCounters[index].totalBytes) bytes expected —> \(uploadCounters[index].progress * 100)%")
+        debugPrint("••> task \(task.taskIdentifier) did send \(totalBytesSent) bytes (\(totalBytesExpectedToSend) bytes expected)")
+        debugPrint("••> counter: \(uploadCounters[index].bytesSent) bytes sent, \(uploadCounters[index].totalBytes) bytes expected —> \(uploadCounters[index].progress * 100)%")
         #endif
         let uploadInfo: [String : Any] = ["localIdentifier" : identifier,
                                           "progressFraction" : uploadCounters[index].progress]
@@ -368,28 +368,28 @@ extension UploadSessions: URLSessionTaskDelegate {
         guard let md5sum = task.originalRequest?.value(forHTTPHeaderField: pwgHTTPmd5sum),
             let chunk = Int((task.originalRequest?.value(forHTTPHeaderField: pwgHTTPchunk))!),
             let chunks = Int((task.originalRequest?.value(forHTTPHeaderField: pwgHTTPchunks))!) else {
-                print("••> Could not extract HTTP header fields !!!!!!")
+                debugPrint("••> Could not extract HTTP header fields !!!!!!")
                 return
         }
 
         #if DEBUG
         // Task did complete without error?
         if let error = error {
-            print("••> Upload task \(task.taskIdentifier) of chunk \(chunk+1)/\(chunks) failed with error \(String(describing: error.localizedDescription)) [\(md5sum)]")
+            debugPrint("••> Upload task \(task.taskIdentifier) of chunk \(chunk+1)/\(chunks) failed with error \(String(describing: error.localizedDescription)) [\(md5sum)]")
         } else {
-            print("••> Upload task \(task.taskIdentifier) of chunk \(chunk+1)/\(chunks) finished transferring data at \(DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)) [\(md5sum)]")
+            debugPrint("••> Upload task \(task.taskIdentifier) of chunk \(chunk+1)/\(chunks) finished transferring data at \(DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)) [\(md5sum)]")
         }
         #endif
         
         // The below code updates the stored cookie with the pwg_id returned by the server.
         // This allows to check that the upload session was well closed by the server.
         // For example by requesting image properties or an image deletion.
-//        print("\(task.response.debugDescription)")
+//        debugPrint("\(task.response.debugDescription)")
 //        if let requestURL = task.originalRequest?.url,
 //           let cookies = HTTPCookieStorage.shared.cookies(for: requestURL), cookies.count > 0,
 //           var properties = cookies[0].properties {
 //            let oldPwgID = cookies[0].value
-//            print("oldPwgID => \(oldPwgID)")
+//            debugPrint("oldPwgID => \(oldPwgID)")
 //
 //            if let response = task.response as? HTTPURLResponse,
 //               let setCookie = response.allHeaderFields["Set-Cookie"] as? String {
@@ -398,7 +398,7 @@ extension UploadSessions: URLSessionTaskDelegate {
 //                    let newPwgID = strPart2[1].components(separatedBy: " ")[0].drop(while: {$0 == ";"})
 //                    properties.updateValue(newPwgID, forKey: .value)
 //                    if let cookie = HTTPCookie(properties: properties) {
-//                        print("newPwgID => \(newPwgID)")
+//                        debugPrint("newPwgID => \(newPwgID)")
 //                        HTTPCookieStorage.shared.setCookie(cookie)
 //                    }
 //                }
@@ -420,7 +420,7 @@ extension UploadSessions: URLSessionTaskDelegate {
                 }
             }
         default:
-            print("!!! unexpected session identifier !!!")
+            debugPrint("!!! unexpected session identifier !!!")
         }
     }
 }
@@ -435,15 +435,15 @@ extension UploadSessions: URLSessionDataDelegate {
             let chunk = Int((dataTask.originalRequest?.value(forHTTPHeaderField: pwgHTTPchunk))!),
             let chunks = Int((dataTask.originalRequest?.value(forHTTPHeaderField: pwgHTTPchunks))!) else {
                 #if DEBUG
-                print("••> Could not extract HTTP header fields !!!!!!")
+                debugPrint("••> Could not extract HTTP header fields !!!!!!")
                 #endif
                 return
         }
         
         #if DEBUG
-        print("••> Upload task \(dataTask.taskIdentifier) of chunk \(chunk+1)/\(chunks) did receive some data at \(DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)) [\(md5sum)]")
+        debugPrint("••> Upload task \(dataTask.taskIdentifier) of chunk \(chunk+1)/\(chunks) did receive some data at \(DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)) [\(md5sum)]")
         let dataStr = String(decoding: data, as: UTF8.self)
-        print("••> JSON: \(dataStr)")
+        debugPrint("••> JSON: \(dataStr)")
         #endif
         
         switch dataTask.taskDescription {

From a175f8efa27f0f71b79f90b97ed3eea9f04df1ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 6 Oct 2024 22:56:36 +0200
Subject: [PATCH 21/34] Adopts preparingThumbnail() method (+iOS 15) and fixes
 issue by replacing hasCGContextSupportedPixelFormat() with
 supportsPixelFormat() on iOS 12-14

---
 piwigo/Image/ImageUtilities.swift             | 277 ++++++++++--------
 .../Macros/UIImage+AppTools.swift             |   4 +-
 2 files changed, 161 insertions(+), 120 deletions(-)

diff --git a/piwigo/Image/ImageUtilities.swift b/piwigo/Image/ImageUtilities.swift
index 737b53a95..50be0f5d5 100644
--- a/piwigo/Image/ImageUtilities.swift
+++ b/piwigo/Image/ImageUtilities.swift
@@ -220,8 +220,31 @@ class ImageUtilities: NSObject {
         }
         return Date(timeIntervalSinceReferenceDate: AppVars.shared.dateOfFirstOptImageV323)
     }()
+    
+    static func optimumSize(ofImage image: UIImage, forPointSize pointSize: CGSize) -> CGSize? {
+        // Check sizes
+        if image.size.width < 1 || image.size.height < 1 { return nil }
+        if pointSize.width < 1 || pointSize.height < 1 { return nil }
+        
+        // Return reduced size or nil if no downsampling should be performed
+        return reducedSize(from: image.size, to: pointSize)
+    }
+        
+    static func reducedSize(from originalSize: CGSize, to pointSize: CGSize) -> CGSize? {
+        // Wanted size too small?
+        if pointSize.width < 1 || pointSize.height < 1 { return nil }
+        
+        // Image smaller than pointSize?
+        let scaleWidth = originalSize.width / pointSize.width
+        let scaleHeight = originalSize.height / pointSize.height
+        let scale = min(scaleWidth, scaleHeight)
+        if scale <= 1.0 { return nil }
+        
+        // Image size larger than pointSize
+        return CGSizeMake(originalSize.width / scale, originalSize.height / scale)
+    }
 
-    static func downsample(imageAt imageURL: URL, to pointSize: CGSize, scale: CGFloat) -> UIImage {
+    static func downsample(imageAt imageURL: URL, to pointSize: CGSize) -> UIImage {
         // Optimised image available?
         let filePath = imageURL.path + CacheVars.shared.optImage
         if let optImage = UIImage(contentsOfFile: filePath) {
@@ -239,74 +262,94 @@ class ImageUtilities: NSObject {
             }
         }
         
-        // Check that the image can be properly downsampled by checking its pixel format.
-        let imageSourceOptions = [kCGImageSourceShouldCache: false] as CFDictionary
-        guard pointSize.equalTo(CGSize.zero) == false,
-              let imageSource = CGImageSourceCreateWithURL(imageURL as CFURL, imageSourceOptions),
-              let imageRef = CGImageSourceCreateImageAtIndex(imageSource, 0, imageSourceOptions),
-              imageRef.hasCGContextSupportedPixelFormat,
-              let downsampledImage = downsampledImage(from: imageSource, to: pointSize, scale: scale)
+        // Downsample and save the returned thumbnail if necessary
+        if #available(iOS 15, *) {
+            // Retrieve image
+            guard let image = UIImage(contentsOfFile: imageURL.path)
+            else {
+                // Delete corrupted cached image file if any
+                try? FileManager.default.removeItem(at: imageURL)
+                return UIImage(named: "unknownImage")!
+            }
+            // Downsample image if needed
+            guard let optSize = optimumSize(ofImage: image, forPointSize: pointSize),
+                  let downsampledImage = image.preparingThumbnail(of: optSize)
+            else {
+                return image
+            }
+            // Save the downsampled image in cache
+            saveDownsampledImage(downsampledImage, atPath: filePath)
+            return downsampledImage
+        }
         else {
-            return couldNotDownsample(imageAt: imageURL)
+            // Retrieve the image source
+            let options = [kCGImageSourceShouldCache: false] as CFDictionary
+            guard let imageSource = CGImageSourceCreateWithURL(imageURL as CFURL, options),
+                  let downsampledImage = downsampledImage(from: imageSource, to: pointSize)
+            else {
+                // Can we use the downloaded file?
+                if let image = UIImage(contentsOfFile: imageURL.path) {
+                    return image
+                } else {
+                    // Delete corrupted cached image file
+                    try? FileManager.default.removeItem(at: imageURL)
+                    return UIImage(named: "unknownImage")!
+                }
+            }
+            saveDownsampledImage(downsampledImage, atPath: filePath)
+            return downsampledImage
         }
-        
-        // Save image in cache
-        saveDownsampledImage(downsampledImage, atPath: filePath)
-        return downsampledImage
     }
     
-    static func downsample(image: UIImage, to pointSize: CGSize, scale: CGFloat) -> UIImage {
-        let imageSourceOptions = [kCGImageSourceShouldCache: false] as CFDictionary
-        guard pointSize.equalTo(CGSize.zero) == false,
-              let imageData = image.jpegData(compressionQuality: 1.0),
-              let imageSource = CGImageSourceCreateWithData(imageData as CFData, imageSourceOptions),
-              let imageRef = CGImageSourceCreateImageAtIndex(imageSource, 0, imageSourceOptions),
-              imageRef.hasCGContextSupportedPixelFormat,
-              let downsampledImage = downsampledImage(from: imageSource, to: pointSize, scale: scale) else {
-            return image
-        }
-        return downsampledImage
+    static func downsample(image: UIImage, to pointSize: CGSize) -> UIImage {
+        // Downsample image if needed
+        if #available(iOS 15, *) {
+            if let optSize = optimumSize(ofImage: image, forPointSize: pointSize),
+               let downsampledImage = image.preparingThumbnail(of: optSize) {
+                return downsampledImage
+            }
+        } else {
+            // Fallback on earlier versions
+            let options = [kCGImageSourceShouldCache: false] as CFDictionary
+            if let imageData = image.jpegData(compressionQuality: 1.0),
+               let imageSource = CGImageSourceCreateWithData(imageData as CFData, options),
+               let downsampledImage = downsampledImage(from: imageSource, to: pointSize) {
+                return downsampledImage
+            }
+        }
+        return image
     }
     
-    static func downsampledImage(from imageSource: CGImageSource, to pointSize: CGSize, scale: CGFloat) -> UIImage? {
-        // The default display scale for a trait collection is 0.0 (indicating unspecified).
-        // We therefore adopt a scale of 1.0 when the display scale is unspecified.
-        let options = [kCGImagePropertyPixelWidth: true,
-                      kCGImagePropertyPixelHeight: true] as CFDictionary
-        var maxPixelSize = Float(max(pointSize.width, pointSize.height) * max(scale, 1.0))
-        if let imageMetadata = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, options) as? [CFString : CFNumber],
-           let width = imageMetadata[kCGImagePropertyPixelWidth] as? Float,
-           let height = imageMetadata[kCGImagePropertyPixelHeight] as? Float,
-           width > 1, height > 1 {
-            if width > height {
-                maxPixelSize *= width / height
-            } else {
-                maxPixelSize *= height / width
-            }
+    static func downsampledImage(from imageSource: CGImageSource, to pointSize: CGSize) -> UIImage? {
+        // Check that it is possible to downsample the image
+        // by checking if it is possible to create a CGImaage from the image.
+        let index = CGImageSourceGetPrimaryImageIndex(imageSource)
+        let options = [kCGImageSourceShouldCache: false,
+                       kCGImagePropertyPixelWidth: true,
+                       kCGImagePropertyPixelHeight: true] as CFDictionary
+        if let imageRef = CGImageSourceCreateImageAtIndex(imageSource, index, options),
+           supportsPixelFormat(ofCGImage: imageRef) == false {
+            return nil
         }
-        let downsampleOptions = [kCGImageSourceCreateThumbnailFromImageAlways: true,
-                                         kCGImageSourceShouldCacheImmediately: true,
-                                   kCGImageSourceCreateThumbnailWithTransform: true,
-                                          kCGImageSourceThumbnailMaxPixelSize: maxPixelSize] as [CFString : Any] as CFDictionary
         
-        if let downsampledImage = CGImageSourceCreateThumbnailAtIndex(imageSource, 0, downsampleOptions as CFDictionary) {
-            return UIImage(cgImage: downsampledImage)
+        // Downsample image if needed
+        if let imageMetadata = CGImageSourceCopyPropertiesAtIndex(imageSource, index, options) as? [CFString : CFNumber],
+           let width = imageMetadata[kCGImagePropertyPixelWidth] as? CGFloat,
+           let height = imageMetadata[kCGImagePropertyPixelHeight] as? CGFloat,
+           let size = reducedSize(from: CGSizeMake(width, height), to: pointSize) {
+            let maxPixelSize = max(size.width, size.height)
+            let downsampleOptions = [kCGImageSourceShouldAllowFloat              : true,
+                                     kCGImageSourceShouldCacheImmediately        : true,
+                                     kCGImageSourceCreateThumbnailWithTransform  : true,
+                                     kCGImageSourceCreateThumbnailFromImageAlways: true,
+                                     kCGImageSourceThumbnailMaxPixelSize         : maxPixelSize] as [CFString : Any]
+            let downsampledImage = CGImageSourceCreateThumbnailAtIndex(imageSource, index, downsampleOptions as CFDictionary)
+            return downsampledImage == nil ? nil : UIImage(cgImage: downsampledImage!)
         }
         return nil
     }
     
-    static func couldNotDownsample(imageAt imageURL: URL) -> UIImage {
-        // Can we use the downloaded file?
-        if let image = UIImage(contentsOfFile: imageURL.path) {
-            return image
-        } else {
-            // Delete corrupted cached image file
-            try? FileManager.default.removeItem(at: imageURL)
-            return UIImage(named: "unknownImage")!
-        }
-    }
-    
-    static func saveDownsampledImage(_ downSampledImage: UIImage, atPath filePath: String) {
+    private static func saveDownsampledImage(_ downSampledImage: UIImage, atPath filePath: String) {
         let fm = FileManager.default
         try? fm.removeItem(atPath: filePath)
         if #available(iOS 17, *) {
@@ -326,6 +369,65 @@ class ImageUtilities: NSObject {
         }
     }
     
+    // https://developer.apple.com/library/archive/documentation/GraphicsImaging/Conceptual/drawingwithquartz2d/dq_context/dq_context.html#//apple_ref/doc/uid/TP30001066-CH203-BCIBHHBB
+    @available(iOS, introduced: 12.0, deprecated: 15.0, message: "")
+    public static func supportsPixelFormat(ofCGImage image: CGImage) -> Bool {
+        guard let colorSpace = image.colorSpace else {
+          return false
+        }
+        #if os(iOS) || os(watchOS) || os(tvOS)
+        let iOS = true
+        #else
+        let iOS = false
+        #endif
+
+        #if os(OSX)
+        let macOS = true
+        #else
+        let macOS = false
+        #endif
+        
+        switch (colorSpace.model, image.bitsPerPixel, image.bitsPerComponent,
+                image.alphaInfo, image.bitmapInfo.contains(.floatComponents)) {
+        case (.unknown, 8, 8, .alphaOnly, _):
+            return macOS || iOS
+        case (.monochrome, 8, 8, .none, _):
+            return macOS || iOS
+        case (.monochrome, 8, 8, .alphaOnly, _):
+            return macOS || iOS
+        case (.monochrome, 16, 16, .none, _):
+            return macOS
+        case (.monochrome, 32, 32, .none, true):
+            return macOS
+        case (.rgb, 16, 5, .noneSkipFirst, _):
+            return macOS || iOS
+        case (.rgb, 32, 8, .noneSkipFirst, _):
+            return macOS || iOS
+        case (.rgb, 32, 8, .noneSkipLast, _):
+            return macOS || iOS
+        case (.rgb, 32, 8, .premultipliedFirst, _):
+            return macOS || iOS
+        case (.rgb, 32, 8, .premultipliedLast, _):
+            return macOS || iOS
+        case (.rgb, 64, 16, .premultipliedLast, _):
+            return macOS
+        case (.rgb, 64, 16, .noneSkipLast, _):
+            return macOS
+        case (.rgb, 128, 32, .noneSkipLast, true):
+            return macOS
+        case (.rgb, 128, 32, .premultipliedLast, true):
+            return macOS
+        case (.cmyk, 32, 8, .none, _):
+            return macOS
+        case (.cmyk, 64, 16, .none, _):
+            return macOS
+        case (.cmyk, 128, 32, .none, true):
+            return macOS
+        default:
+            return false
+        }
+    }
+    
     
     // MARK: - Image Size, URLs
     static func optimumImageSizeForDevice() -> pwgImageSize {
@@ -484,64 +586,3 @@ class ImageUtilities: NSObject {
         return pwgURL as URL?
     }
 }
-
-
-// MARK: - Supported Pixel Formats
-/// https://developer.apple.com/library/archive/documentation/GraphicsImaging/Conceptual/drawingwithquartz2d/dq_context/dq_context.html#//apple_ref/doc/uid/TP30001066-CH203-BCIBHHBB
-extension CGImage {
-    public var hasCGContextSupportedPixelFormat: Bool {
-        guard let colorSpace = self.colorSpace else {
-          return false
-        }
-        #if os(iOS) || os(watchOS) || os(tvOS)
-        let iOS = true
-        #else
-        let iOS = false
-        #endif
-
-        #if os(OSX)
-        let macOS = true
-        #else
-        let macOS = false
-        #endif
-        
-        switch (colorSpace.model, bitsPerPixel, bitsPerComponent, alphaInfo, bitmapInfo.contains(.floatComponents)) {
-        case (.unknown, 8, 8, .alphaOnly, _):
-            return macOS || iOS
-        case (.monochrome, 8, 8, .none, _):
-            return macOS || iOS
-        case (.monochrome, 8, 8, .alphaOnly, _):
-            return macOS || iOS
-        case (.monochrome, 16, 16, .none, _):
-            return macOS
-        case (.monochrome, 32, 32, .none, true):
-            return macOS
-        case (.rgb, 16, 5, .noneSkipFirst, _):
-            return macOS || iOS
-        case (.rgb, 32, 8, .noneSkipFirst, _):
-            return macOS || iOS
-        case (.rgb, 32, 8, .noneSkipLast, _):
-            return macOS || iOS
-        case (.rgb, 32, 8, .premultipliedFirst, _):
-            return macOS || iOS
-        case (.rgb, 32, 8, .premultipliedLast, _):
-            return macOS || iOS
-        case (.rgb, 64, 16, .premultipliedLast, _):
-            return macOS
-        case (.rgb, 64, 16, .noneSkipLast, _):
-            return macOS
-        case (.rgb, 128, 32, .noneSkipLast, true):
-            return macOS
-        case (.rgb, 128, 32, .premultipliedLast, true):
-            return macOS
-        case (.cmyk, 32, 8, .none, _):
-            return macOS
-        case (.cmyk, 64, 16, .none, _):
-            return macOS
-        case (.cmyk, 128, 32, .none, true):
-            return macOS
-        default:
-            return false
-        }
-    }
-}
diff --git a/piwigo/Supporting Files/Macros/UIImage+AppTools.swift b/piwigo/Supporting Files/Macros/UIImage+AppTools.swift
index 5bb151cc1..39b90f49a 100644
--- a/piwigo/Supporting Files/Macros/UIImage+AppTools.swift	
+++ b/piwigo/Supporting Files/Macros/UIImage+AppTools.swift	
@@ -19,12 +19,12 @@ extension UIImage {
         return nil
         #else
         // Check that it is possible to perform a saliency request
-        // by checking if it is possible to create a context from the image.
+        // by checking if it is possible to create a CGImaage from the image.
         let imageSourceOptions = [kCGImageSourceShouldCache: false] as CFDictionary
         guard let imageData = self.jpegData(compressionQuality: 1.0),
               let imageSource = CGImageSourceCreateWithData(imageData as CFData, imageSourceOptions),
               let imageRef = CGImageSourceCreateImageAtIndex(imageSource, 0, imageSourceOptions),
-              imageRef.hasCGContextSupportedPixelFormat,
+              ImageUtilities.supportsPixelFormat(ofCGImage: imageRef),
               let cgImage = self.cgImage
         else {
             return nil

From b0fe71e324c07e290d4f396dd00cff2706d5a9cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sun, 6 Oct 2024 22:58:21 +0200
Subject: [PATCH 22/34] Fixes memory issue encountered when loading
 full-resolution images and adopts new image downsampling methods

---
 .../AlbumCollectionViewCell.swift             | 16 ++++-----
 .../AlbumCollectionViewCellOld.swift          |  6 ++--
 .../Album/AlbumCollection/AlbumDeletion.swift | 12 +++----
 .../Album/AlbumCollection/AlbumRenaming.swift | 10 +++---
 .../AlbumCollection/AlbumTableViewCell.swift  | 12 +++----
 .../AlbumSelector/CategoryTableViewCell.swift |  2 +-
 .../SelectCategoryViewController+Albums.swift | 25 +++++++-------
 .../SelectCategoryViewController+Images.swift | 24 ++++++-------
 .../SelectCategoryViewController.swift        | 26 +++++++-------
 piwigo/Album/AlbumViewController.swift        | 10 +++---
 .../Extensions/AlbumViewController+Add.swift  |  8 ++---
 .../AlbumViewController+Delete.swift          | 20 +++++------
 .../AlbumViewController+Favorite.swift        | 12 +++----
 .../AlbumViewController+Fetch.swift           | 10 +++---
 .../AlbumViewController+Prefetching.swift     |  7 ++--
 .../AlbumViewController+Rotate.swift          | 16 ++++-----
 .../AlbumViewController+Search.swift          |  2 +-
 .../AlbumViewController+Select.swift          | 16 ++++-----
 .../AlbumViewController+Share.swift           |  2 +-
 .../ImageCollectionViewCell.swift             | 14 ++++----
 .../ImageHeaderReusableView.swift             |  2 +-
 .../ImageOldHeaderReusableView.swift          |  2 +-
 .../ImagePreviewViewController.swift          | 12 +++----
 .../TagSelectorViewController.swift           |  6 ++--
 .../ExternalDisplayViewController.swift       | 26 +++++++-------
 .../ImageViewController+AlbumThumnail.swift   |  2 +-
 .../ImageViewController+CopyMove.swift        |  4 +--
 .../ImageViewController+Delete.swift          | 26 +++++++-------
 .../Extensions/ImageViewController+Edit.swift |  2 +-
 .../ImageViewController+Favorites.swift       | 20 +++++------
 .../ImageViewController+Rotate.swift          | 14 ++++----
 .../ImageViewController+Share.swift           | 17 +++++-----
 .../ImageViewController+Video.swift           |  2 +-
 piwigo/Image/ImageDetailViewController.swift  | 34 +++++++++++--------
 piwigo/Image/ImageViewController.swift        | 16 ++++-----
 .../EditImageThumbCollectionViewCell.swift    | 14 ++++----
 .../EditImageParamsViewController.swift       | 10 +++---
 .../ShareImageActivityItemProvider.swift      | 14 ++++----
 .../ShareVideoActivityItemProvider.swift      | 12 +++----
 piwigo/Image/VideoDetailViewController.swift  |  2 +-
 piwigo/Login/LoginViewController.swift        |  2 +-
 .../Appearance/PadTableViewCell.swift         | 10 +++---
 .../Appearance/PhoneTableViewCell.swift       | 10 +++---
 .../Settings/Help/Help01ViewController.swift  |  6 ++--
 .../Settings/Help/Help02ViewController.swift  | 12 +++----
 .../Settings/Help/Help03ViewController.swift  |  6 ++--
 .../Settings/Help/Help04ViewController.swift  |  6 ++--
 .../Settings/Help/Help05ViewController.swift  | 12 +++----
 .../Settings/Help/Help06ViewController.swift  |  6 ++--
 .../Settings/Help/Help07ViewController.swift  | 12 +++----
 .../Settings/Help/Help08ViewController.swift  | 12 +++----
 .../Information/AboutViewController.swift     |  2 +-
 .../DataMigrationViewController.swift         |  2 +-
 .../PrivacyPolicyViewController.swift         |  2 +-
 .../ReleaseNotesViewController.swift          |  2 +-
 .../TroubleshootingViewController.swift       |  2 +-
 .../Information/WhatsNewViewController.swift  |  2 +-
 .../Privacy/AppLockViewController.swift       |  2 +-
 .../Privacy/ShareMetadataViewController.swift |  4 +--
 piwigo/Settings/SettingsViewController.swift  |  2 +-
 .../LocalImagesHeaderReusableView.swift       |  2 +-
 .../LocalImagesViewController.swift           |  2 +-
 .../PasteboardImagesViewController.swift      |  2 +-
 .../LocalAlbumsViewController.swift           |  2 +-
 .../UploadQueueViewController.swift           |  2 +-
 .../UploadQueueViewControllerOld.swift        |  2 +-
 .../PlayerViewControllerCoordinator.swift     |  6 ++--
 uploadKit/Extensions/UploadManager+Auto.swift |  2 +-
 .../Extensions/UploadManager+Finisher.swift   |  6 ++--
 .../Extensions/UploadManager+Resume.swift     |  2 +-
 .../Extensions/UploadManager+Video.swift      |  6 ++--
 uploadKit/UploadManager.swift                 |  2 +-
 72 files changed, 321 insertions(+), 316 deletions(-)

diff --git a/piwigo/Album/AlbumCollection/AlbumCollectionViewCell.swift b/piwigo/Album/AlbumCollection/AlbumCollectionViewCell.swift
index 76e2ba279..04b33d781 100644
--- a/piwigo/Album/AlbumCollection/AlbumCollectionViewCell.swift
+++ b/piwigo/Album/AlbumCollection/AlbumCollectionViewCell.swift
@@ -62,17 +62,17 @@ class AlbumCollectionViewCell: UICollectionViewCell {
         // Retrieve image from cache or download it
         self.albumThumbnail.layoutIfNeeded()   // Ensure imageView in its final size
         let placeHolder = UIImage(named: "placeholder")!
-        let cellSize = self.albumThumbnail.bounds.size
-        let scale = self.albumThumbnail.traitCollection.displayScale
+        let scale = max(albumThumbnail.traitCollection.displayScale, 1.0)
+        let cellSize = CGSizeMake(albumThumbnail.bounds.size.width * scale, albumThumbnail.bounds.size.height * scale)
         let thumbSize = pwgImageSize(rawValue: AlbumVars.shared.defaultAlbumThumbnailSize) ?? .medium
         PwgSession.shared.getImage(withID: albumData?.thumbnailId, ofSize: thumbSize,
                                    atURL: albumData?.thumbnailUrl as? URL,
                                    fromServer: albumData?.user?.server?.uuid,
-                                   placeHolder: placeHolder) { cachedImageURL in
-            let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize, scale: scale)
+                                   placeHolder: placeHolder) { [unowned self] cachedImageURL in
+            let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize)
             self.configImage(cachedImage)
-        } failure: { _ in
-            DispatchQueue.main.async {
+        } failure: { [unowned self] _ in
+            DispatchQueue.main.async { [self] in
                 self.albumThumbnail.image = placeHolder
             }
         }
@@ -126,7 +126,7 @@ class AlbumCollectionViewCell: UICollectionViewCell {
 
     private func configImage(_ image: UIImage) {
         // Process image in the background
-        DispatchQueue.global(qos: .userInitiated).async {
+        DispatchQueue.global(qos: .userInitiated).async { [self] in
             // Process saliency
             var finalImage:UIImage = image
             if #available(iOS 13.0, *) {
@@ -136,7 +136,7 @@ class AlbumCollectionViewCell: UICollectionViewCell {
             }
 
             // Set image
-            DispatchQueue.main.async {
+            DispatchQueue.main.async { [self] in
                 self.albumThumbnail.image = finalImage
             }
         }
diff --git a/piwigo/Album/AlbumCollection/AlbumCollectionViewCellOld.swift b/piwigo/Album/AlbumCollection/AlbumCollectionViewCellOld.swift
index 10ab7fbae..4b09d6cc3 100644
--- a/piwigo/Album/AlbumCollection/AlbumCollectionViewCellOld.swift
+++ b/piwigo/Album/AlbumCollection/AlbumCollectionViewCellOld.swift
@@ -114,7 +114,7 @@ extension AlbumCollectionViewCellOld: UITableViewDelegate
             guard let subAlbumVC = albumSB.instantiateViewController(withIdentifier: "AlbumViewController") as? AlbumViewController
             else { preconditionFailure("Could not load AlbumViewController") }
             subAlbumVC.categoryId = albumData.pwgID
-            pushAlbumDelegate?.pushAlbumView(subAlbumVC, completion: {_ in })
+            pushAlbumDelegate?.pushAlbumView(subAlbumVC, completion: { _ in })
         }
     }
     
@@ -127,9 +127,9 @@ extension AlbumCollectionViewCellOld: UITableViewDelegate
         else { return nil }
 
         // Determine number of orphans if album deleted
-        DispatchQueue.global(qos: .userInteractive).async { [unowned self] in
+        DispatchQueue.global(qos: .userInteractive).async { [self] in
             self.nbOrphans = Int64.min
-            AlbumUtilities.calcOrphans(albumData.pwgID) { nbOrphans in
+            AlbumUtilities.calcOrphans(albumData.pwgID) { [self] nbOrphans in
                 self.nbOrphans = nbOrphans
             } failure: { _ in }
         }
diff --git a/piwigo/Album/AlbumCollection/AlbumDeletion.swift b/piwigo/Album/AlbumCollection/AlbumDeletion.swift
index 7305eab88..8f493c8a6 100644
--- a/piwigo/Album/AlbumCollection/AlbumDeletion.swift
+++ b/piwigo/Album/AlbumCollection/AlbumDeletion.swift
@@ -197,7 +197,7 @@ class AlbumDeletion: NSObject
             .compactMap({Int32($0)})).filter({$0 != albumData.pwgID}).union(Set([Int32.zero]))
         
         // Delete the category
-        PwgSession.checkSession(ofUser: user) { [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             AlbumUtilities.delete(albumData.pwgID, inMode: deletionMode) { [self] in
                 // Auto-upload already disabled by AlbumProvider if necessary
                 // Also remove this album from the auto-upload destination
@@ -214,12 +214,12 @@ class AlbumDeletion: NSObject
                 // Update parent albums data
                 self.fetchAlbumData(ofParentsWithIDs: parentIds)
                 
-            } failure: { error in
+            } failure: { [self] error in
                 let title = NSLocalizedString("deleteCategoryError_title", comment: "Delete Fail")
                 let message = NSLocalizedString("deleteCategoryError_message", comment: "Failed to delete your album")
                 self.deleteAlbumError(error, title: title, message: message)
             }
-        } failure: { error in
+        } failure: { [unowned self] error in
             let title = NSLocalizedString("deleteCategoryError_title", comment: "Delete Fail")
             let message = NSLocalizedString("deleteCategoryError_message", comment: "Failed to delete your album")
             self.deleteAlbumError(error, title: title, message: message)
@@ -243,7 +243,7 @@ class AlbumDeletion: NSObject
                 // Any error?
                 if let error = error as? NSError {
                     DispatchQueue.main.async { [self] in
-                        self.topViewController.hideHUD {
+                        self.topViewController.hideHUD { [self] in
                             // Display error alert after fetching album data
                             let title = NSLocalizedString("loadingHUD_label", comment: "Loading…")
                             let message = NSLocalizedString("CoreDataFetch_AlbumError", comment: "Fetch albums error!")
@@ -257,14 +257,14 @@ class AlbumDeletion: NSObject
         
         // Work completed ► Hide HUDs
         DispatchQueue.main.async { [self] in
-            self.topViewController.updateHUDwithSuccess() {
+            self.topViewController.updateHUDwithSuccess() { [self] in
                 self.topViewController.hideHUD(afterDelay: pwgDelayHUD) { }
             }
         }
     }
     
     private func deleteAlbumError(_ error: NSError, title: String, message: String) {
-        DispatchQueue.main.async {
+        DispatchQueue.main.async { [self] in
             // Session logout required?
             if let pwgError = error as? PwgSessionError,
                [.invalidCredentials, .incompatiblePwgVersion, .invalidURL, .authenticationFailed]
diff --git a/piwigo/Album/AlbumCollection/AlbumRenaming.swift b/piwigo/Album/AlbumCollection/AlbumRenaming.swift
index ecb2b2f7a..62a6e238f 100644
--- a/piwigo/Album/AlbumCollection/AlbumRenaming.swift
+++ b/piwigo/Album/AlbumCollection/AlbumRenaming.swift
@@ -122,7 +122,7 @@ class AlbumRenaming: NSObject
         topViewController.showHUD(withTitle: NSLocalizedString("renameCategoryHUD_label", comment: "Renaming Album…"))
 
         // Rename album, modify comment
-        PwgSession.checkSession(ofUser: user) {
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             AlbumUtilities.setInfos(self.albumData.pwgID, withName: albumName, description: albumComment) { [self] in
                 DispatchQueue.main.async { [self] in
                     // Hide swipe buttons
@@ -146,16 +146,16 @@ class AlbumRenaming: NSObject
                         self.topViewController.hideHUD(afterDelay: pwgDelayHUD) { }
                     }
                 }
-            } failure: { error in
+            } failure: { [self] error in
                 self.renameCategoryError(error, completion: completion)
             }
-        } failure: { error in
+        } failure: { [unowned self] error in
             self.renameCategoryError(error, completion: completion)
         }
     }
     
     private func renameCategoryError(_ error: NSError, completion: @escaping (Bool) -> Void) {
-        DispatchQueue.main.async {
+        DispatchQueue.main.async { [self] in
             // Session logout required?
             if let pwgError = error as? PwgSessionError,
                [.invalidCredentials, .incompatiblePwgVersion, .invalidURL, .authenticationFailed]
@@ -167,7 +167,7 @@ class AlbumRenaming: NSObject
             // Report error
             let title = NSLocalizedString("renameCategoyError_title", comment: "Rename Fail")
             let message = NSLocalizedString("renameCategoyError_message", comment: "Failed to rename your album")
-            self.topViewController.hideHUD() {
+            self.topViewController.hideHUD() { [self] in
                 self.topViewController.dismissPiwigoError(withTitle: title, message: message,
                                                           errorMessage: error.localizedDescription) {
                     completion(true)
diff --git a/piwigo/Album/AlbumCollection/AlbumTableViewCell.swift b/piwigo/Album/AlbumCollection/AlbumTableViewCell.swift
index 0c62b6d35..3c441b11f 100644
--- a/piwigo/Album/AlbumCollection/AlbumTableViewCell.swift
+++ b/piwigo/Album/AlbumCollection/AlbumTableViewCell.swift
@@ -85,17 +85,17 @@ class AlbumTableViewCell: UITableViewCell {
         // Retrieve image from cache or download it
         self.backgroundImage.layoutIfNeeded()   // Ensure imageView in its final size
         let placeHolder = UIImage(named: "placeholder")!
-        let cellSize = self.backgroundImage.bounds.size
-        let scale = self.backgroundImage.traitCollection.displayScale
+        let scale = max(backgroundImage.traitCollection.displayScale, 1.0)
+        let cellSize = CGSizeMake(backgroundImage.bounds.size.width * scale, backgroundImage.bounds.size.height * scale)
         let thumbSize = pwgImageSize(rawValue: AlbumVars.shared.defaultAlbumThumbnailSize) ?? .medium
         PwgSession.shared.getImage(withID: albumData?.thumbnailId, ofSize: thumbSize,
                                    atURL: albumData?.thumbnailUrl as? URL,
                                    fromServer: albumData?.user?.server?.uuid,
-                                   placeHolder: placeHolder) { cachedImageURL in
-            let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize, scale: scale)
+                                   placeHolder: placeHolder) { [unowned self] cachedImageURL in
+            let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize)
             self.configImage(cachedImage)
-        } failure: { _ in
-            DispatchQueue.main.async {
+        } failure: { [unowned self] _ in
+            DispatchQueue.main.async { [self] in
                 self.backgroundImage.image = placeHolder
             }
         }
diff --git a/piwigo/Album/AlbumSelector/CategoryTableViewCell.swift b/piwigo/Album/AlbumSelector/CategoryTableViewCell.swift
index 51d90b120..b5e5f7280 100644
--- a/piwigo/Album/AlbumSelector/CategoryTableViewCell.swift
+++ b/piwigo/Album/AlbumSelector/CategoryTableViewCell.swift
@@ -88,7 +88,7 @@ class CategoryTableViewCell: UITableViewCell, CAAnimationDelegate {
     @objc func tappedLoadView() {
         // Rotate icon
         let sign = buttonState == .showSubAlbum ? +1.0 : -1.0
-        UIView.animate(withDuration: 0.25, delay: 0, options: .curveLinear) { [unowned self] in
+        UIView.animate(withDuration: 0.25, delay: 0, options: .curveLinear) { [self] in
             // Rotate the chevron
             self.showHideSubCategoriesImage.transform = self.showHideSubCategoriesImage.transform.rotated(by: CGFloat(sign * .pi/2.0))
             if self.buttonState == .hideSubAlbum {
diff --git a/piwigo/Album/AlbumSelector/SelectCategoryViewController+Albums.swift b/piwigo/Album/AlbumSelector/SelectCategoryViewController+Albums.swift
index 6c83d4390..a20d5b1ea 100644
--- a/piwigo/Album/AlbumSelector/SelectCategoryViewController+Albums.swift
+++ b/piwigo/Album/AlbumSelector/SelectCategoryViewController+Albums.swift
@@ -20,7 +20,7 @@ extension SelectCategoryViewController {
         NotificationCenter.default.post(name: .pwgAddRecentAlbum, object: nil, userInfo: userInfo)
 
         // Move album
-        PwgSession.checkSession(ofUser: user) {  [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             AlbumUtilities.move(self.inputAlbum.pwgID,
                                 intoAlbumWithId: parentData.pwgID) { [self] in
                 // Remember that the app is fetching all album data
@@ -37,8 +37,8 @@ extension SelectCategoryViewController {
                     // Check error
                     guard let error = error else {
                         // No error ► Hide HUD
-                        self.updateHUDwithSuccess() {
-                            self.hideHUD(afterDelay: pwgDelayHUD) {
+                        self.updateHUDwithSuccess() { [self] in
+                            self.hideHUD(afterDelay: pwgDelayHUD) { [self] in
                                 self.dismiss(animated: true)
                             }
                         }
@@ -47,18 +47,18 @@ extension SelectCategoryViewController {
                     
                     // Show the error
                     DispatchQueue.main.async { [self] in
-                        self.hideHUD {
+                        self.hideHUD { [self] in
                             self.showError(error)
                         }
                     }
                 }
-            } failure: { [unowned self] error in
-                self.hideHUD {
+            } failure: { [self] error in
+                self.hideHUD { [self] in
                     self.showError(error)
                 }
             }
         } failure: { [unowned self] error in
-            self.hideHUD {
+            self.hideHUD { [self] in
                 self.showError(error)
             }
         }
@@ -73,9 +73,8 @@ extension SelectCategoryViewController {
         showHUD(withTitle: NSLocalizedString("categoryImageSetHUD_updating", comment:"Updating Album Thumbnail…"))
         
         // Set image as representative
-        PwgSession.checkSession(ofUser: user) {  [self] in
-            AlbumUtilities.setRepresentative(albumData, with: imageData)
-            {
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
+            AlbumUtilities.setRepresentative(albumData, with: imageData) { [self] in
                 DispatchQueue.main.async { [self] in
                     // Save changes
                     do {
@@ -85,13 +84,13 @@ extension SelectCategoryViewController {
                     }
 
                     // Close HUD
-                    self.updateHUDwithSuccess() {
-                        self.hideHUD(afterDelay: pwgDelayHUD) {
+                    self.updateHUDwithSuccess() { [self] in
+                        self.hideHUD(afterDelay: pwgDelayHUD) { [self] in
                             self.dismiss(animated: true)
                         }
                     }
                 }
-            } failure: { [unowned self] error in
+            } failure: { [self] error in
                 self.hideHUD {
                     self.showError(error)
                 }
diff --git a/piwigo/Album/AlbumSelector/SelectCategoryViewController+Images.swift b/piwigo/Album/AlbumSelector/SelectCategoryViewController+Images.swift
index d98646406..5adddd94b 100644
--- a/piwigo/Album/AlbumSelector/SelectCategoryViewController+Images.swift
+++ b/piwigo/Album/AlbumSelector/SelectCategoryViewController+Images.swift
@@ -20,7 +20,7 @@ extension SelectCategoryViewController {
         // Check image data
         guard let imageData = inputImages.first else {
             // Close HUD
-            updateHUDwithSuccess() {
+            updateHUDwithSuccess() { [self] in
                 // Save changes
                 do {
                     try self.mainContext.save()
@@ -28,8 +28,8 @@ extension SelectCategoryViewController {
                     debugPrint("Could not save copied images \(error), \(error.userInfo)")
                 }
                 // Hide HUD and dismiss album selector
-                self.hideHUD(afterDelay: pwgDelayHUD) {
-                    self.dismiss(animated: true) {
+                self.hideHUD(afterDelay: pwgDelayHUD) { [self] in
+                    self.dismiss(animated: true) { [self] in
                         // Update image data in current view (ImageDetailImage view)
                         self.imageCopiedDelegate?.didCopyImage()
                     }
@@ -47,7 +47,7 @@ extension SelectCategoryViewController {
         }
         onFailure: { [self] error in
             // Close HUD, inform user and save in Core Data store
-            self.hideHUD {
+            self.hideHUD { [self] in
                 self.showError(error)
             }
         }
@@ -68,9 +68,9 @@ extension SelectCategoryViewController {
                                           "multiple_value_mode" : "replace"]
         
         // Send request to Piwigo server
-        PwgSession.checkSession(ofUser: user) {  [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             PwgSession.shared.setInfos(with: paramsDict) { [self] in
-                DispatchQueue.main.async {
+                DispatchQueue.main.async { [self] in
                     // Add image to album
                     albumData.addToImages(imageData)
                     
@@ -103,7 +103,7 @@ extension SelectCategoryViewController {
         // Jobe done?
         guard let imageData = inputImages.first else {
             // Close HUD
-            updateHUDwithSuccess() {
+            updateHUDwithSuccess() { [self] in
                 // Save changes
                 do {
                     try self.mainContext.save()
@@ -112,8 +112,8 @@ extension SelectCategoryViewController {
                 }
 
                 // Hide HUD and dismiss album selector
-                self.hideHUD(afterDelay: pwgDelayHUD) {
-                    self.dismiss(animated: true) {
+                self.hideHUD(afterDelay: pwgDelayHUD) { [self] in
+                    self.dismiss(animated: true) { [self] in
                         // Remove image from ImageViewController
                         self.imageRemovedDelegate?.didRemoveImage()
                     }
@@ -131,7 +131,7 @@ extension SelectCategoryViewController {
         }
         onFailure: { [self] error in
             // Close HUD, inform user and save in Core Data store
-            self.hideHUD {
+            self.hideHUD { [self] in
                 self.showError(error)
             }
         }
@@ -155,9 +155,9 @@ extension SelectCategoryViewController {
                                           "multiple_value_mode" : "replace"]
         
         // Send request to Piwigo server
-        PwgSession.checkSession(ofUser: user) {  [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             PwgSession.shared.setInfos(with: paramsDict) { [self] in
-                DispatchQueue.main.async {
+                DispatchQueue.main.async { [self] in
                     // Add image to target album
                     albumData.addToImages(imageData)
                     
diff --git a/piwigo/Album/AlbumSelector/SelectCategoryViewController.swift b/piwigo/Album/AlbumSelector/SelectCategoryViewController.swift
index 982944060..845568cfe 100644
--- a/piwigo/Album/AlbumSelector/SelectCategoryViewController.swift
+++ b/piwigo/Album/AlbumSelector/SelectCategoryViewController.swift
@@ -366,7 +366,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
         // Use the AlbumProvider to fetch album data recursively. On completion,
         // handle general UI updates and error alerts on the main queue.
         let thumnailSize = pwgImageSize(rawValue: AlbumVars.shared.defaultAlbumThumbnailSize) ?? .thumb
-        PwgSession.checkSession(ofUser: user) { [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             // Fetch albums recursively
             albumProvider.fetchAlbums(forUser: user, inParentWithId: 0, recursively: true,
                                       thumbnailSize: thumnailSize) { [self] error in
@@ -378,7 +378,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
                 }
                 didFetchAlbumsWithError(error: error)
             }
-        } failure: { [self] error in
+        } failure: { [unowned self] error in
             didFetchAlbumsWithError(error: error)
         }
     }
@@ -405,7 +405,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
         super.viewWillTransition(to: size, with: coordinator)
 
         // Reload the tableview on orientation change, to match the new width of the table.
-        coordinator.animate(alongsideTransition: { context in
+        coordinator.animate(alongsideTransition: { [self] _ in
 
             // On iPad, the Settings section is presented in a centered popover view
             if UIDevice.current.userInterfaceIdiom == .pad {
@@ -835,7 +835,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
                 message = String(format: NSLocalizedString("setDefaultCategory_message", comment: "Are you sure you want to set the album %@ as default album?"), albumData.name)
             }
             requestConfirmation(withTitle: title, message: message,
-                                forCategory: albumData, at: indexPath, handler: { _ in
+                                forCategory: albumData, at: indexPath, handler: { [self] _ in
                 // Set new Default Album
                 self.delegate?.didSelectCategory(withId: albumData.pwgID)
                 // Return to Settings
@@ -863,7 +863,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
             let title = NSLocalizedString("moveCategory", comment: "Move Album")
             let message = String(format: NSLocalizedString("moveCategory_message", comment: "Are you sure you want to move \"%@\" into the album \"%@\"?"), inputAlbum.name, albumData.name)
             requestConfirmation(withTitle: title, message: message,
-                                forCategory: albumData, at: indexPath, handler: { _ in
+                                forCategory: albumData, at: indexPath, handler: { [self] _ in
                 // Move album to selected category
                 self.moveCategory(intoCategory: albumData)
             })
@@ -873,7 +873,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
             let title = NSLocalizedString("categoryImageSet_title", comment:"Album Thumbnail")
             let message = String(format: NSLocalizedString("categoryImageSet_message", comment:"Are you sure you want to set this image for the album \"%@\"?"), albumData.name)
             requestConfirmation(withTitle: title, message: message,
-                                forCategory: albumData, at: indexPath, handler: { _ in
+                                forCategory: albumData, at: indexPath, handler: { [self] _ in
                 // Add category to list of recent albums
                 self.setRepresentative(for: albumData)
             })
@@ -897,7 +897,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
             let imageTitle = inputImages.first?.title.string ?? ""
             let message = String(format: NSLocalizedString("copySingleImage_message", comment:"Are you sure you want to copy the photo \"%@\" to the album \"%@\"?"), imageTitle.isEmpty ? inputImages.first?.fileName ?? "-?-" : imageTitle, albumData.name)
             requestConfirmation(withTitle: title, message: message,
-                                forCategory: albumData, at: indexPath, handler: { _ in
+                                forCategory: albumData, at: indexPath, handler: { [self] _ in
                 // Display HUD
                 self.showHUD(withTitle: NSLocalizedString("copySingleImageHUD_copying", comment:"Copying Photo…"))
                 // Copy single image to selected album
@@ -915,7 +915,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
             let imageTitle = inputImages.first?.title.string ?? ""
             let message = String(format: NSLocalizedString("moveSingleImage_message", comment:"Are you sure you want to move the photo \"%@\" to the album \"%@\"?"), imageTitle.isEmpty ? inputImages.first?.fileName ?? "-?-" : imageTitle, albumData.name)
             requestConfirmation(withTitle: title, message: message,
-                                forCategory: albumData, at: indexPath) { _ in
+                                forCategory: albumData, at: indexPath) { [self] _ in
                 // Display HUD
                 self.showHUD(withTitle: NSLocalizedString("moveSingleImageHUD_moving", comment:"Moving Photo…"))
                 // Move single image to selected album
@@ -932,12 +932,12 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
             let title = NSLocalizedString("copyImage_title", comment:"Copy to Album")
             let message = String(format: NSLocalizedString("copySeveralImages_message", comment:"Are you sure you want to copy the photos to the album \"%@\"?"), albumData.name)
             requestConfirmation(withTitle: title, message: message,
-                                forCategory: albumData, at: indexPath, handler: { _ in
+                                forCategory: albumData, at: indexPath, handler: { [self] _ in
                 // Display HUD
                 self.showHUD(withTitle: NSLocalizedString("copySeveralImagesHUD_copying", comment: "Copying Photos…"),
                              inMode: .determinate)
                 // Copy several images to selected album
-                DispatchQueue.global(qos: .userInitiated).async {
+                DispatchQueue.global(qos: .userInitiated).async { [self] in
                     self.copyImages(toAlbum: albumData)
                 }
             })
@@ -952,12 +952,12 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
             let title = NSLocalizedString("moveImage_title", comment:"Move to Album")
             let message = String(format: NSLocalizedString("moveSeveralImages_message", comment:"Are you sure you want to move the photos to the album \"%@\"?"), albumData.name)
             requestConfirmation(withTitle: title, message: message,
-                                forCategory: albumData, at: indexPath) { _ in
+                                forCategory: albumData, at: indexPath) { [self] _ in
                 // Display HUD
                 self.showHUD(withTitle: NSLocalizedString("moveSeveralImagesHUD_moving", comment: "Moving Photos…"),
                              inMode: .determinate)
                 // Move several images to selected album
-                DispatchQueue.global(qos: .userInitiated).async {
+                DispatchQueue.global(qos: .userInitiated).async { [self] in
                     self.moveImages(toAlbum: albumData)
                 }
             }
@@ -1034,7 +1034,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
         }
         
         // Report error
-        self.dismissPiwigoError(withTitle: title, message: message, errorMessage: error?.localizedDescription ?? "") {
+        self.dismissPiwigoError(withTitle: title, message: message, errorMessage: error?.localizedDescription ?? "") { [self] in
             // Forget the choice
             self.selectedCategoryId = Int32.min
             // Save changes if any
diff --git a/piwigo/Album/AlbumViewController.swift b/piwigo/Album/AlbumViewController.swift
index c9b935527..f2dd3c506 100644
--- a/piwigo/Album/AlbumViewController.swift
+++ b/piwigo/Album/AlbumViewController.swift
@@ -569,7 +569,7 @@ class AlbumViewController: UIViewController
         navigationController?.hideHUD { }
         
         // Update the navigation bar on orientation change, to match the new width of the table.
-        coordinator.animate(alongsideTransition: { [self] context in
+        coordinator.animate(alongsideTransition: { [self] _ in
             // Reload collection with appropriate cell sizes
             albumCellSize = getAlbumCellSize()
             imageCellSize = getImageCellSize()
@@ -629,7 +629,7 @@ class AlbumViewController: UIViewController
         
         // Cancel remaining tasks
         let catIDstr = String(self.categoryId)
-        PwgSession.shared.dataSession.getAllTasks { tasks in
+        PwgSession.shared.dataSession.getAllTasks { [unowned self] tasks in
             // Select tasks related with this album if any
             let tasksToCancel = tasks.filter({ $0.originalRequest?
                 .value(forHTTPHeaderField: NetworkVars.HTTPCatID) == catIDstr })
@@ -710,12 +710,12 @@ class AlbumViewController: UIViewController
         }
         
         // Fetch album data and then image data
-        PwgSession.checkSession(ofUser: self.user) {
+        PwgSession.checkSession(ofUser: self.user) { [self] in
             self.fetchAlbumsAndImages { [self] in
                 self.fetchCompleted()
             }
-        } failure: { error in
-            DispatchQueue.main.async {
+        } failure: { [self] error in
+            DispatchQueue.main.async { [self] in
                 // End refreshing if needed
                 self.collectionView?.refreshControl?.endRefreshing()
                 
diff --git a/piwigo/Album/Extensions/AlbumViewController+Add.swift b/piwigo/Album/Extensions/AlbumViewController+Add.swift
index 8a8ec9c77..815877f93 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Add.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Add.swift
@@ -88,11 +88,11 @@ extension AlbumViewController
         showHUD(withTitle: NSLocalizedString("createNewAlbumHUD_label", comment: "Creating Album…"))
 
         // Create album
-        PwgSession.checkSession(ofUser: user) {
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             AlbumUtilities.create(withName: albumName, description: albumComment,
                                   status: "public", inParentWithId: parentId) { [self] newCatId in
                 // Album successfully created ▶ Add new album to cache and update parent albums
-                DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
+                DispatchQueue.global(qos: .userInitiated).async { [self] in
                     self.albumProvider.addAlbum(newCatId, withName: albumName, comment: albumComment,
                                                 intoAlbumWithId: parentId)
                 }
@@ -104,10 +104,10 @@ extension AlbumViewController
                         didCancelTapAddButton()
                     }
                 }
-            } failure: { error in
+            } failure: { [self] error in
                 self.addCategoryError(error)
             }
-        } failure: { error in
+        } failure: { [unowned self] error in
             self.addCategoryError(error)
         }
     }
diff --git a/piwigo/Album/Extensions/AlbumViewController+Delete.swift b/piwigo/Album/Extensions/AlbumViewController+Delete.swift
index 45c61c47e..cd6482393 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Delete.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Delete.swift
@@ -179,7 +179,7 @@ extension AlbumViewController
         ]
 
         // Send request to Piwigo server
-        PwgSession.checkSession(ofUser: user) {  [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             PwgSession.shared.setInfos(with: paramsDict) { [self] in
                 // Remove image from source album
                 imageData.removeFromAlbums(albumData)
@@ -200,7 +200,7 @@ extension AlbumViewController
             } failure: { [self] error in
                 self.removeImages(imagesToRemove, andThenDelete: toDelete, total: total, error: error)
             }
-        } failure: { [self] error in
+        } failure: { [unowned self] error in
             self.removeImages(imagesToRemove, andThenDelete: toDelete, total: total, error: error)
         }
     }
@@ -221,8 +221,8 @@ extension AlbumViewController
         let message = NSLocalizedString("deleteImageFail_message", comment: "Image could not be deleted.")
         if imagesToRemove.count > 1 {
             cancelDismissPiwigoError(withTitle: title, message: message,
-                                     errorMessage: error.localizedDescription) { [unowned self] in
-                navigationController?.hideHUD() { [unowned self] in
+                                     errorMessage: error.localizedDescription) { [self] in
+                navigationController?.hideHUD() { [self] in
                     // Save changes
                     do {
                         try self.mainContext.save()
@@ -232,7 +232,7 @@ extension AlbumViewController
                     // Hide HUD and update buttons
                     updateBarsInSelectMode()
                 }
-            } dismiss: { [unowned self] in
+            } dismiss: { [self] in
                 // Bypass image
                 imagesToRemove.removeFirst()
                 // Continue removing images
@@ -240,8 +240,8 @@ extension AlbumViewController
             }
         } else {
             dismissPiwigoError(withTitle: title, message: message,
-                                     errorMessage: error.localizedDescription) { [unowned self] in
-                navigationController?.hideHUD() { [unowned self] in
+                                     errorMessage: error.localizedDescription) { [self] in
+                navigationController?.hideHUD() { [self] in
                     // Save changes
                     do {
                         try self.mainContext.save()
@@ -274,8 +274,8 @@ extension AlbumViewController
 
         // Let's delete all images at once
         PwgSession.checkSession(ofUser: user) { [unowned self] in
-            ImageUtilities.delete(toDelete) { [unowned self] in
-                DispatchQueue.main.async { [unowned self] in
+            ImageUtilities.delete(toDelete) { [self] in
+                DispatchQueue.main.async { [self] in
                     // Save image IDs for marking Upload requests in the background
                     let imageIDs = Array(toDelete).map({$0.pwgID})
 
@@ -315,7 +315,7 @@ extension AlbumViewController
             } failure: { [self] error in
                 self.deleteImagesError(error)
             }
-        } failure: { [self] error in
+        } failure: { [unowned self] error in
             self.deleteImagesError(error)
         }
     }
diff --git a/piwigo/Album/Extensions/AlbumViewController+Favorite.swift b/piwigo/Album/Extensions/AlbumViewController+Favorite.swift
index dae54071c..9d1c53525 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Favorite.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Favorite.swift
@@ -73,7 +73,7 @@ extension AlbumViewController
         }
 
         // Add image to favorites
-        PwgSession.checkSession(ofUser: user) { [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             ImageUtilities.addToFavorites(imageData) { [self] in
                 DispatchQueue.main.async { [self] in
                     // Update HUD
@@ -101,7 +101,7 @@ extension AlbumViewController
             } failure: { [self] error in
                 self.favoriteError(error, contextually: contextually)
             }
-        } failure: { [self] error in
+        } failure: { [unowned self] error in
             self.favoriteError(error, contextually: contextually)
         }
     }
@@ -176,7 +176,7 @@ extension AlbumViewController
         }
 
         // Remove image to favorites
-        PwgSession.checkSession(ofUser: user) { [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             ImageUtilities.removeFromFavorites(imageData) { [self] in
                 DispatchQueue.main.async { [self] in
                     // Update HUD
@@ -201,7 +201,7 @@ extension AlbumViewController
                     }
                     unfavorite(imagesWithID: remainingIDs, total: total, contextually: contextually)
                 }
-            } failure: { [unowned self] error in
+            } failure: { [self] error in
                 self.unfavoriteError(error, contextually: contextually)
             }
         } failure: { [unowned self] error in
@@ -223,8 +223,8 @@ extension AlbumViewController
             let title = NSLocalizedString("imageFavorites_title", comment: "Favorites")
             let message = NSLocalizedString("imageFavoritesRemoveError_message", comment: "Failed to remove this photo from your favorites.")
             navigationController?.dismissPiwigoError(withTitle: title, message: message,
-                               errorMessage: error.localizedDescription) { [unowned self] in
-                navigationController?.hideHUD() { [unowned self] in
+                               errorMessage: error.localizedDescription) { [self] in
+                navigationController?.hideHUD() { [self] in
                     if contextually {
                         setEnableStateOfButtons(true)
                     } else {
diff --git a/piwigo/Album/Extensions/AlbumViewController+Fetch.swift b/piwigo/Album/Extensions/AlbumViewController+Fetch.swift
index 201c35ee9..c0b9a31fa 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Fetch.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Fetch.swift
@@ -134,7 +134,7 @@ extension AlbumViewController
                 if onPage < newLastPage, query == albumData.query {
                     // Pursue fetch without HUD
                     DispatchQueue.main.async { [self] in
-                        navigationController?.hideHUD {
+                        navigationController?.hideHUD { [self] in
                             // Set navigation bar buttons
                             if self.isSelect {
                                 self.updateBarsInSelectMode()
@@ -190,7 +190,7 @@ extension AlbumViewController
     
     private func removeImageWithIDs(_ imageIDs: Set<Int64>) {
         // Done fetching images ► Remove non-fetched images from album
-        DispatchQueue.main.async {
+        DispatchQueue.main.async { [self] in
             // Remember when images were fetched
             self.albumData.dateGetImages = Date().timeIntervalSinceReferenceDate
             
@@ -217,7 +217,7 @@ extension AlbumViewController
 
     // MARK: - Error Management
     private func showError(_ error: Error?) {
-        DispatchQueue.main.async { [unowned self] in
+        DispatchQueue.main.async { [self] in
             guard let error = error as? NSError else {
                 navigationController?.showHUD(
                     withTitle: NSLocalizedString("internetCancelledConnection_title", comment: "Connection Cancelled"),
@@ -242,7 +242,7 @@ extension AlbumViewController
             else if let err = error as? PwgSessionError, 
                     err == PwgSessionError.missingParameter {
                 // Hide HUD
-                navigationController?.hideHUD() {
+                navigationController?.hideHUD() { [self] in
                     // End refreshing if needed
                     self.collectionView?.refreshControl?.endRefreshing()
                 }
@@ -335,7 +335,7 @@ extension AlbumViewController
             
             // Save changes
             bckgContext.saveIfNeeded()
-            DispatchQueue.main.async {
+            DispatchQueue.main.async { [self] in
                 self.mainContext.saveIfNeeded()
             }
         }
diff --git a/piwigo/Album/Extensions/AlbumViewController+Prefetching.swift b/piwigo/Album/Extensions/AlbumViewController+Prefetching.swift
index 9cefb809c..da7fb71f0 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Prefetching.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Prefetching.swift
@@ -15,7 +15,8 @@ extension AlbumViewController: UICollectionViewDataSourcePrefetching
 {
     func collectionView(_ collectionView: UICollectionView, prefetchItemsAt indexPaths: [IndexPath]) {
 //        debugPrint("••> prefetchingItemsAt \(indexPaths.debugDescription)")
-        let scale = self.traitCollection.displayScale
+        let scale = max(traitCollection.displayScale, 1.0)
+        let cellSize = CGSizeMake(albumCellSize.width * scale, albumCellSize.height * scale)
         for indexPath in indexPaths {
             switch indexPath.section {
             case 0 /* Albums (see XIB file) */:
@@ -28,7 +29,7 @@ extension AlbumViewController: UICollectionViewDataSourcePrefetching
                                            atURL: album.thumbnailUrl as? URL,
                                            fromServer: album.user?.server?.uuid,
                                            placeHolder: albumPlaceHolder) { cachedImageURL in
-                    let _ = ImageUtilities.downsample(imageAt: cachedImageURL, to: self.albumCellSize, scale: scale)
+                    let _ = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize)
                 } failure: { _ in }
             default /* Images */:
                 // Retrieve image data
@@ -44,7 +45,7 @@ extension AlbumViewController: UICollectionViewDataSourcePrefetching
                                            atURL: ImageUtilities.getURL(imageData, ofMinSize: imageSize),
                                            fromServer: imageData.server?.uuid, fileSize: imageData.fileSize,
                                            placeHolder: imagePlaceHolder) { cachedImageURL in
-                    let _ = ImageUtilities.downsample(imageAt: cachedImageURL, to: self.imageCellSize, scale: scale)
+                    let _ = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize)
                 } failure: { _ in }
             }
         }
diff --git a/piwigo/Album/Extensions/AlbumViewController+Rotate.swift b/piwigo/Album/Extensions/AlbumViewController+Rotate.swift
index 54136d333..339eea290 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Rotate.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Rotate.swift
@@ -28,7 +28,7 @@ extension AlbumViewController
         // Rotate image right
         let action = UIAction(title: NSLocalizedString("rotateImage_right", comment: "Clockwise"),
                               image: UIImage(systemName: "rotate.right"),
-                              handler: { _ in
+                              handler: { [self] _ in
             // Rotate images right
             self.rotateSelectionRight()
         })
@@ -40,7 +40,7 @@ extension AlbumViewController
         // Rotate image left
         let action = UIAction(title: NSLocalizedString("rotateImage_left", comment: "Counterclockwise"),
                               image: UIImage(systemName: "rotate.left"),
-                              handler: { _ in
+                              handler: { [self] _ in
             // Rotate images left
             self.rotateSelectionLeft()
         })
@@ -67,7 +67,7 @@ extension AlbumViewController
             // Save changes
 //            bckgContext.saveIfNeeded()
             // Close HUD with success
-            DispatchQueue.main.async {
+            DispatchQueue.main.async { [self] in
                 self.navigationController?.updateHUDwithSuccess() { [self] in
                     navigationController?.hideHUD(afterDelay: pwgDelayHUD) { [self] in
                         // Deselect images
@@ -88,7 +88,7 @@ extension AlbumViewController
             selectedVideosIDs.remove(imageID)
 
             // Update HUD
-            DispatchQueue.main.async {
+            DispatchQueue.main.async { [self] in
                 let progress: Float = 1 - Float(remainingIDs.count) / total
                 self.navigationController?.updateHUD(withProgress: progress)
             }
@@ -99,7 +99,7 @@ extension AlbumViewController
         }
 
         // Send request to Piwigo server
-        PwgSession.checkSession(ofUser: user) { [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             ImageUtilities.rotate(imageData, by: angle) { [self] in
                 // Retrieve updated image data i.e. width, height, URLs
                 /// We retrieve URLs of thumbnails which are not in cache anymore:
@@ -108,7 +108,7 @@ extension AlbumViewController
                 let imageID = imageData.pwgID
                 self.imageProvider.getInfos(forID: imageID, inCategoryId: self.albumData.pwgID) { [self] in
                     // Update HUD
-                    DispatchQueue.main.async {
+                    DispatchQueue.main.async { [self] in
                         // Update progress indicator
                         let progress: Float = 1 - Float(remainingIDs.count) / total
                         self.navigationController?.updateHUD(withProgress: progress)
@@ -137,7 +137,7 @@ extension AlbumViewController
             } failure: { [self] error in
                 rotateImagesInDatabaseError(error)
             }
-        } failure: { [self] error in
+        } failure: { [unowned self] error in
             rotateImagesInDatabaseError(error)
         }
     }
@@ -156,7 +156,7 @@ extension AlbumViewController
             let title = NSLocalizedString("rotateImageFail_title", comment: "Rotation Failed")
             let message = NSLocalizedString("rotateImageFail_message", comment: "Image could not be rotated")
             navigationController?.dismissPiwigoError(withTitle: title, message: message,
-                                    errorMessage: error.localizedDescription) { [unowned self] in
+                                    errorMessage: error.localizedDescription) { [self] in
                 // Hide HUD
                 navigationController?.hideHUD { [self] in
                     // Re-enable buttons
diff --git a/piwigo/Album/Extensions/AlbumViewController+Search.swift b/piwigo/Album/Extensions/AlbumViewController+Search.swift
index db1e39ba6..b8edca0d9 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Search.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Search.swift
@@ -144,7 +144,7 @@ extension AlbumViewController: UISearchBarDelegate
         if albumData.query == query {
             // Restart loading pages of images
             self.fetchImages(withInitialImageIds: self.oldImageIDs, query: query,
-                             fromPage: self.onPage, toPage: self.lastPage) {
+                             fromPage: self.onPage, toPage: self.lastPage) { [self] in
                 self.fetchCompleted()
             }
             return
diff --git a/piwigo/Album/Extensions/AlbumViewController+Select.swift b/piwigo/Album/Extensions/AlbumViewController+Select.swift
index bf7741042..5718aa2ed 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Select.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Select.swift
@@ -296,7 +296,7 @@ extension AlbumViewController
                 PwgSession.checkSession(ofUser: user) {  [self] in
                     retrieveData(ofImagesWithID: imageIDsToRetrieve, among: imageIDs,
                                  beforeAction: action, contextually: contextually)
-                } failure: { [unowned self] error in
+                } failure: { [self] error in
                     retrieveImageDataError(error, contextually: contextually)
                 }
             }
@@ -341,7 +341,7 @@ extension AlbumViewController
                                               inMode: .indeterminate)
             }
             // Prepare items to share in background queue
-            DispatchQueue(label: "org.piwigo.share", qos: .userInitiated).async {
+            DispatchQueue(label: "org.piwigo.share", qos: .userInitiated).async { [self] in
                 self.checkPhotoLibraryAccessBeforeSharing(imagesWithID: imageIDs, contextually: contextually)
             }
         case .copyImages    /* Copy images to Album */:
@@ -364,7 +364,7 @@ extension AlbumViewController
         // Get image ID if any
         var remainingIDs = someIDs
         guard let imageID = remainingIDs.first else {
-            DispatchQueue.main.async {
+            DispatchQueue.main.async { [self] in
                 if action == .share {
                     // Update or display HUD
                     self.performAction(action, withImageIDs: imageIDs, contextually: contextually)
@@ -378,12 +378,12 @@ extension AlbumViewController
         }
         
         // Image data are not complete when retrieved using pwg.categories.getImages
-        imageProvider.getInfos(forID: imageID, inCategoryId: self.albumData.pwgID) {  [self] in
+        imageProvider.getInfos(forID: imageID, inCategoryId: self.albumData.pwgID) { [self] in
             // Image info retrieved
             remainingIDs.remove(imageID)
 
             // Update HUD
-            DispatchQueue.main.async {
+            DispatchQueue.main.async { [self] in
                 let progress: Float = Float(1) - Float(remainingIDs.count) / Float(imageIDs.count)
                 self.navigationController?.updateHUD(withProgress: progress)
             }
@@ -391,7 +391,7 @@ extension AlbumViewController
             // Next image
             retrieveData(ofImagesWithID: remainingIDs, among: imageIDs,
                          beforeAction: action, contextually: contextually)
-        } failure: { [unowned self] error in
+        } failure: { [self] error in
             retrieveImageDataError(error, contextually: contextually)
         }
     }
@@ -410,8 +410,8 @@ extension AlbumViewController
             let title = NSLocalizedString("imageDetailsFetchError_title", comment: "Image Details Fetch Failed")
             let message = NSLocalizedString("imageDetailsFetchError_message", comment: "Fetching the photo data failed.")
             dismissPiwigoError(withTitle: title, message: message,
-                               errorMessage: error.localizedDescription) { [unowned self] in
-                navigationController?.hideHUD() { [unowned self] in
+                               errorMessage: error.localizedDescription) { [self] in
+                navigationController?.hideHUD() { [self] in
                     if contextually {
                         setEnableStateOfButtons(true)
                     } else {
diff --git a/piwigo/Album/Extensions/AlbumViewController+Share.swift b/piwigo/Album/Extensions/AlbumViewController+Share.swift
index 61db9608b..477437cd5 100644
--- a/piwigo/Album/Extensions/AlbumViewController+Share.swift
+++ b/piwigo/Album/Extensions/AlbumViewController+Share.swift
@@ -98,7 +98,7 @@ extension AlbumViewController
 //        debugPrint("••> completed in \(duration.rounded()) ms")
 
         // Close HUD if needed
-        DispatchQueue.main.async {
+        DispatchQueue.main.async { [self] in
             self.navigationController?.hideHUD { [self] in
                 // Check that the items size is acceptable for the device
                 let count = itemsToShare.count
diff --git a/piwigo/Album/ImageCollection/ImageCollectionViewCell.swift b/piwigo/Album/ImageCollection/ImageCollectionViewCell.swift
index 226c9f3cd..2cfa3958f 100644
--- a/piwigo/Album/ImageCollection/ImageCollectionViewCell.swift
+++ b/piwigo/Album/ImageCollection/ImageCollectionViewCell.swift
@@ -142,19 +142,19 @@ class ImageCollectionViewCell: UICollectionViewCell {
         
         // Retrieve image from cache or download it
         let placeHolder = UIImage(named: "unknownImage")!
-        let cellSize = self.bounds.size
-        let scale = self.traitCollection.displayScale
+        let scale = max(traitCollection.displayScale, 1.0)
+        let cellSize = CGSizeMake(self.bounds.size.width * scale, self.bounds.size.height * scale)
         let imageURL = ImageUtilities.getURL(imageData, ofMinSize: size)
         PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: size, atURL: imageURL,
                                    fromServer: imageData.server?.uuid, fileSize: imageData.fileSize,
-                                   placeHolder: placeHolder) { cachedImageURL in
-            let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize, scale: scale)
-            DispatchQueue.main.async {
+                                   placeHolder: placeHolder) { [unowned self] cachedImageURL in
+            let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize)
+            DispatchQueue.main.async { [self] in
                 self.configImage(cachedImage)
             }
-        } failure: { _ in
+        } failure: { [unowned self] _ in
             // No image available
-            DispatchQueue.main.async {
+            DispatchQueue.main.async { [self] in
                 self.configImage(placeHolder)
                 self.noDataLabel?.isHidden = false
                 self.applyColorPalette()
diff --git a/piwigo/Album/ImageCollection/ImageHeaderReusableView.swift b/piwigo/Album/ImageCollection/ImageHeaderReusableView.swift
index b94e38663..d0375cbf2 100644
--- a/piwigo/Album/ImageCollection/ImageHeaderReusableView.swift
+++ b/piwigo/Album/ImageCollection/ImageHeaderReusableView.swift
@@ -56,7 +56,7 @@ class ImageHeaderReusableView: UICollectionReusableView
         } else {
             // Determine location from images in section
             let location = AlbumUtilities.getLocation(of: images)
-            LocationProvider.shared.getPlaceName(for: location) { [unowned self] placeName, streetName in
+            LocationProvider.shared.getPlaceName(for: location) { [self] placeName, streetName in
                 if placeName.isEmpty {
                     self.detailLabel.text = dates.1
                 } else if streetName.isEmpty {
diff --git a/piwigo/Album/ImageCollection/ImageOldHeaderReusableView.swift b/piwigo/Album/ImageCollection/ImageOldHeaderReusableView.swift
index b923c7059..7623ff942 100644
--- a/piwigo/Album/ImageCollection/ImageOldHeaderReusableView.swift
+++ b/piwigo/Album/ImageCollection/ImageOldHeaderReusableView.swift
@@ -57,7 +57,7 @@ class ImageOldHeaderReusableView: UICollectionReusableView
         } else {
             // Determine location from images in section
             let location = AlbumUtilities.getLocation(of: images)
-            LocationProvider.shared.getPlaceName(for: location) { [unowned self] placeName, streetName in
+            LocationProvider.shared.getPlaceName(for: location) { [self] placeName, streetName in
                 if placeName.isEmpty {
                     self.detailLabel.text = dates.1
                 } else if streetName.isEmpty {
diff --git a/piwigo/Album/ImageCollection/ImagePreviewViewController.swift b/piwigo/Album/ImageCollection/ImagePreviewViewController.swift
index 997c6bd57..bf3b74abd 100644
--- a/piwigo/Album/ImageCollection/ImagePreviewViewController.swift
+++ b/piwigo/Album/ImageCollection/ImagePreviewViewController.swift
@@ -19,8 +19,8 @@ class ImagePreviewViewController: UIViewController
         super.init(nibName: nil, bundle: nil)
         
         // Retrieve image
-        let viewSize = view.bounds.size
-        let scale = view.traitCollection.displayScale
+        let scale = max(view.traitCollection.displayScale, 1.0)
+        let viewSize = CGSizeMake(view.bounds.size.width * scale, view.bounds.size.height * scale)
         let sizes = imageData.sizes
         aspectRatio = sizes.medium?.aspectRatio ?? sizes.thumb?.aspectRatio ?? 1.0
         var previewSize = pwgImageSize(rawValue: ImageVars.shared.defaultImagePreviewSize) ?? .medium
@@ -31,7 +31,7 @@ class ImagePreviewViewController: UIViewController
         // Check if we already have the high-resolution image in cache
         if let wantedImage = imageData.cachedThumbnail(ofSize: previewSize) {
             // Show high-resolution image in cache
-            let cachedImage = ImageUtilities.downsample(image: wantedImage, to: viewSize, scale: scale)
+            let cachedImage = ImageUtilities.downsample(image: wantedImage, to: viewSize)
             setImageView(with: cachedImage)
         } else {
             // Display thumbnail image which should be in cache
@@ -48,9 +48,9 @@ class ImagePreviewViewController: UIViewController
 //                        // Show download progress
 //                        self.progressView.progress = fractionCompleted
 //                    }
-                } completion: { cachedImageURL in
-                    let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: viewSize, scale: scale)
-                    DispatchQueue.main.async {
+                } completion: { [unowned self] cachedImageURL in
+                    let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: viewSize)
+                    DispatchQueue.main.async { [self] in
                         // Hide progress view
 //                        self.progressView.isHidden = true
                         // Replace thumbnail with high-resolution image
diff --git a/piwigo/Album/TagSelector/TagSelectorViewController.swift b/piwigo/Album/TagSelector/TagSelectorViewController.swift
index cf8748b21..6cf227da3 100644
--- a/piwigo/Album/TagSelector/TagSelectorViewController.swift
+++ b/piwigo/Album/TagSelector/TagSelectorViewController.swift
@@ -93,14 +93,14 @@ class TagSelectorViewController: UITableViewController {
         
         // Use the TagsProvider to fetch tag data. On completion,
         // handle general UI updates and error alerts on the main queue.
-        PwgSession.checkSession(ofUser: user) {
-            self.tagProvider.fetchTags(asAdmin: false) { error in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
+            self.tagProvider.fetchTags(asAdmin: false) { [self] error in
                 DispatchQueue.main.async { [self] in
                     guard let error = error else { return }
                     didFetchTagsWithError(error)
                 }
             }
-        } failure: { [self] error in
+        } failure: { [unowned self] error in
             didFetchTagsWithError(error)
         }
         
diff --git a/piwigo/ExternalDisplay/ExternalDisplayViewController.swift b/piwigo/ExternalDisplay/ExternalDisplayViewController.swift
index 1ca53fdd0..dd1dcc529 100644
--- a/piwigo/ExternalDisplay/ExternalDisplayViewController.swift
+++ b/piwigo/ExternalDisplay/ExternalDisplayViewController.swift
@@ -92,8 +92,8 @@ class ExternalDisplayViewController: UIViewController {
         }
         
         // Check if we already have the high-resolution image in cache
-        let screenSize = view.bounds.size
-        let scale = view.traitCollection.displayScale
+        let scale = max(view.traitCollection.displayScale, 1.0)
+        let screenSize = CGSizeMake(view.bounds.size.width * scale, view.bounds.size.height * scale)
         let wantedImage = imageData.cachedThumbnail(ofSize: optimumSize)
         if wantedImage == nil {
             // Present the preview image file if available
@@ -120,24 +120,24 @@ class ExternalDisplayViewController: UIViewController {
             // Image of right size for that display
             PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: optimumSize, atURL: imageURL,
                                        fromServer: serverID, fileSize: imageData.fileSize,
-                                       placeHolder: placeHolder) { fractionCompleted in
-                DispatchQueue.main.async {
+                                       placeHolder: placeHolder) { [unowned self] fractionCompleted in
+                DispatchQueue.main.async { [self] in
                     self.progressView.progress = fractionCompleted
                 }
-            } completion: { cachedImageURL in
-                let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: screenSize, scale: scale)
+            } completion: { [unowned self] cachedImageURL in
+                let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: screenSize)
                 DispatchQueue.main.async {
                     self.progressView.progress = 1.0
                     self.presentFinalImage(cachedImage)
                 }
-            } failure: { _ in
+            } failure: { [unowned self] _ in
                 DispatchQueue.main.async {
                     self.progressView.progress = 1.0
                     self.presentFinalImage(imageData.cachedThumbnail(ofSize: thumbSize) ?? placeHolder)
                 }
             }
         } else {
-            let cachedImage = ImageUtilities.downsample(image: wantedImage!, to: screenSize, scale: scale)
+            let cachedImage = ImageUtilities.downsample(image: wantedImage!, to: screenSize)
             self.progressView.progress = 1.0
             self.presentFinalImage(cachedImage)
         }
@@ -147,13 +147,13 @@ class ExternalDisplayViewController: UIViewController {
         // Set image
         UIView.transition(with: imageView, duration: 0.5,
                           options: .transitionCrossDissolve,
-                          animations: {
+                          animations: { [self] in
             self.imageView.image = image
 //            self.imageView.frame = CGRect(origin: .zero, size: image.size)
 //            self.imageView.layoutIfNeeded()
 //            view.layoutIfNeeded()
             },
-        completion: { [unowned self] _ in
+        completion: { [self] _ in
             self.progressView.isHidden = false
             self.videoContainerView.isHidden = true
         })
@@ -163,12 +163,12 @@ class ExternalDisplayViewController: UIViewController {
         // Display final image
         UIView.transition(with: imageView, duration: 0.5,
                           options: .transitionCrossDissolve,
-                          animations: {
+                          animations: { [self] in
             self.imageView.image = image
 //            self.imageView.frame = CGRect(origin: .zero, size: image.size)
 //            self.imageView.layoutIfNeeded()
 //            view.layoutIfNeeded()
-        }, completion: { [unowned self] _ in
+        }, completion: { [self] _ in
             self.progressView.isHidden = true
             self.videoContainerView.isHidden = true
         })
@@ -184,7 +184,7 @@ class ExternalDisplayViewController: UIViewController {
         // Hide image and show video
         UIView.transition(with: videoContainerView, duration: 0.5,
                           options: .transitionCrossDissolve,
-                          animations: {
+                          animations: { [self] in
             self.imageView.image = nil
             self.videoContainerView.isHidden = false
         })
diff --git a/piwigo/Image/Extensions/ImageViewController+AlbumThumnail.swift b/piwigo/Image/Extensions/ImageViewController+AlbumThumnail.swift
index b34273d7f..4da3c85fb 100644
--- a/piwigo/Image/Extensions/ImageViewController+AlbumThumnail.swift
+++ b/piwigo/Image/Extensions/ImageViewController+AlbumThumnail.swift
@@ -17,7 +17,7 @@ extension ImageViewController
         let action = UIAction(title: NSLocalizedString("imageOptions_setAlbumImage",
                                                        comment:"Set as Album Thumbnail"),
                               image: UIImage(systemName: "rectangle.and.paperclip"),
-                              handler: { [unowned self] _ in
+                              handler: { [self] _ in
             // Present album selector for setting album thumbnail
             self.setAsAlbumImage()
         })
diff --git a/piwigo/Image/Extensions/ImageViewController+CopyMove.swift b/piwigo/Image/Extensions/ImageViewController+CopyMove.swift
index 54bebe4b9..fc4d4a31c 100644
--- a/piwigo/Image/Extensions/ImageViewController+CopyMove.swift
+++ b/piwigo/Image/Extensions/ImageViewController+CopyMove.swift
@@ -18,7 +18,7 @@ extension ImageViewController
         // Copy image to album
         let action = UIAction(title: NSLocalizedString("copyImage_title", comment: "Copy to Album"),
                               image: UIImage(systemName: "rectangle.stack.badge.plus"),
-                              handler: { [unowned self] _ in
+                              handler: { [self] _ in
             // Disable buttons during action
             setEnableStateOfButtons(false)
             // Present album selector for copying image
@@ -31,7 +31,7 @@ extension ImageViewController
     func moveAction() -> UIAction {
         let action = UIAction(title: NSLocalizedString("moveImage_title", comment: "Move to Album"),
                               image: UIImage(systemName: "arrowshape.turn.up.right"),
-                              handler: { [unowned self] _ in
+                              handler: { [self] _ in
             // Disable buttons during action
             setEnableStateOfButtons(false)
             
diff --git a/piwigo/Image/Extensions/ImageViewController+Delete.swift b/piwigo/Image/Extensions/ImageViewController+Delete.swift
index 761331175..23d0c0f21 100644
--- a/piwigo/Image/Extensions/ImageViewController+Delete.swift
+++ b/piwigo/Image/Extensions/ImageViewController+Delete.swift
@@ -77,9 +77,9 @@ extension ImageViewController
         // Remove selected category ID from image category list
         guard let imageData = imageData,
               var catIDs = imageData.albums?.compactMap({$0.pwgID}).filter({$0 > 0}) else {
-            dismissPiwigoError(withTitle: NSLocalizedString("deleteImageFail_title", comment: "Delete Failed")) {
+            dismissPiwigoError(withTitle: NSLocalizedString("deleteImageFail_title", comment: "Delete Failed")) { [self] in
                 // Hide HUD
-                self.hideHUD { [unowned self] in
+                self.hideHUD { [self] in
                     // Re-enable buttons
                     self.setEnableStateOfButtons(true)
                 }
@@ -96,7 +96,7 @@ extension ImageViewController
                                           "multiple_value_mode" : "replace"]
         
         // Send request to Piwigo server
-        PwgSession.checkSession(ofUser: user) { [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             PwgSession.shared.setInfos(with: paramsDict) { [self] in
                 // Retrieve album
                 if let albums = imageData.albums,
@@ -116,8 +116,8 @@ extension ImageViewController
                 }
 
                 // Hide HUD
-                self.updateHUDwithSuccess { [unowned self] in
-                    self.hideHUD(afterDelay: pwgDelayHUD) { [unowned self] in
+                self.updateHUDwithSuccess { [self] in
+                    self.hideHUD(afterDelay: pwgDelayHUD) { [self] in
                         // Display preceding/next image or return to album view
                         self.didRemoveImage()
                     }
@@ -125,7 +125,7 @@ extension ImageViewController
             } failure: { [self] error in
                 self.removeImageFromAlbumError(error)
             }
-        } failure: { [self] error in
+        } failure: { [unowned self] error in
             self.removeImageFromAlbumError(error)
         }
     }
@@ -144,9 +144,9 @@ extension ImageViewController
             let title = NSLocalizedString("deleteImageFail_title", comment: "Delete Failed")
             let message = NSLocalizedString("deleteImageFail_message", comment: "Image could not be deleted")
             self.dismissPiwigoError(withTitle: title, message: message,
-                                    errorMessage: error.localizedDescription) { [unowned self] in
+                                    errorMessage: error.localizedDescription) { [self] in
                 // Hide HUD
-                hideHUD { [unowned self] in
+                hideHUD { [self] in
                     // Re-enable buttons
                     setEnableStateOfButtons(true)
                 }
@@ -157,7 +157,7 @@ extension ImageViewController
     func deleteImageFromDatabase() {
         // Remove selected category ID from image category list
         guard let imageData = imageData else {
-            dismissPiwigoError(withTitle: NSLocalizedString("deleteImageFail_title", comment: "Delete Failed")) {
+            dismissPiwigoError(withTitle: NSLocalizedString("deleteImageFail_title", comment: "Delete Failed")) { [self] in
                 // Hide HUD
                 self.hideHUD { [self] in
                     // Re-enable buttons
@@ -171,7 +171,7 @@ extension ImageViewController
         showHUD(withTitle: imageData.isVideo ? NSLocalizedString("deleteSingleVideoHUD_deleting", comment: "Deleting Video…") : NSLocalizedString("deleteSingleImageHUD_deleting", comment: "Deleting Photo…"))
         
         // Send request to Piwigo server
-        PwgSession.checkSession(ofUser: user) { [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             ImageUtilities.delete(Set([imageData])) { [self] in
                 // Save image ID for marking Upload request in the background
                 let imageID = imageData.pwgID
@@ -210,7 +210,7 @@ extension ImageViewController
             } failure: { [self] error in
                 self.deleteImageFromDatabaseError(error)
             }
-        } failure: { [self] error in
+        } failure: { [unowned self] error in
             self.deleteImageFromDatabaseError(error)
         }
     }
@@ -229,7 +229,7 @@ extension ImageViewController
             let title = NSLocalizedString("deleteImageFail_title", comment: "Delete Failed")
             let message = NSLocalizedString("deleteImageFail_message", comment: "Image could not be deleted")
             self.dismissPiwigoError(withTitle: title, message: message,
-                                    errorMessage: error.localizedDescription) { [unowned self] in
+                                    errorMessage: error.localizedDescription) { [self] in
                 // Hide HUD
                 hideHUD { [self] in
                     // Re-enable buttons
@@ -316,7 +316,7 @@ extension ImageViewController: SelectCategoryImageRemovedDelegate
 
         // This changes the View Controller
         // and calls the presentationIndexForPageViewController datasource method
-        pageViewController?.setViewControllers([newImageVC], direction: direction, animated: true) { [unowned self] finished in
+        pageViewController?.setViewControllers([newImageVC], direction: direction, animated: true) { [self] finished in
             // Update image data
             self.imageData = imageData
             // Set title view
diff --git a/piwigo/Image/Extensions/ImageViewController+Edit.swift b/piwigo/Image/Extensions/ImageViewController+Edit.swift
index 8e276627d..9330bd74b 100644
--- a/piwigo/Image/Extensions/ImageViewController+Edit.swift
+++ b/piwigo/Image/Extensions/ImageViewController+Edit.swift
@@ -19,7 +19,7 @@ extension ImageViewController
         let action = UIAction(title: NSLocalizedString("imageOptions_properties",
                                                        comment: "Modify Information"),
                               image: UIImage(systemName: "pencil"),
-                              handler: { _ in
+                              handler: { [self] _ in
             // Edit image informations
             self.editImage()
         })
diff --git a/piwigo/Image/Extensions/ImageViewController+Favorites.swift b/piwigo/Image/Extensions/ImageViewController+Favorites.swift
index bcc18a69d..d3c4e95ff 100644
--- a/piwigo/Image/Extensions/ImageViewController+Favorites.swift
+++ b/piwigo/Image/Extensions/ImageViewController+Favorites.swift
@@ -35,8 +35,8 @@ extension ImageViewController
         favoriteBarButton?.isEnabled = false
 
         // Send request to Piwigo server
-        PwgSession.checkSession(ofUser: user) {
-            ImageUtilities.addToFavorites(imageData) {
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
+            ImageUtilities.addToFavorites(imageData) { [self] in
                 DispatchQueue.main.async { [self] in
                     if let favAlbum = albumProvider.getAlbum(ofUser: user, withId: pwgSmartAlbum.favorites.rawValue) {
                         // Add image to favorites album
@@ -51,10 +51,10 @@ extension ImageViewController
                         favoriteBarButton?.isEnabled = true
                     }
                 }
-            } failure: { error in
+            } failure: { [self] error in
                 self.addToFavoritesError(error)
             }
-        } failure: { error in
+        } failure: { [unowned self] error in
             self.addToFavoritesError(error)
         }
     }
@@ -85,8 +85,8 @@ extension ImageViewController
         favoriteBarButton?.isEnabled = false
 
         // Send request to Piwigo server
-        PwgSession.checkSession(ofUser: user) {
-            ImageUtilities.removeFromFavorites(imageData) { [unowned self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
+            ImageUtilities.removeFromFavorites(imageData) { [self] in
                 DispatchQueue.main.async { [self] in
                     if let favAlbum = albumProvider.getAlbum(ofUser: user, withId: pwgSmartAlbum.favorites.rawValue) {
                         // Remove image from favorites album
@@ -107,16 +107,16 @@ extension ImageViewController
                         }
                     }
                 }
-            } failure: { error in
+            } failure: { [self] error in
                 self.removeFromFavoritesError(error)
             }
-        } failure: { error in
+        } failure: { [unowned self] error in
             self.removeFromFavoritesError(error)
         }
     }
     
     private func removeFromFavoritesError(_ error: NSError) {
-        DispatchQueue.main.async {
+        DispatchQueue.main.async { [self] in
             // Session logout required?
             if let pwgError = error as? PwgSessionError,
                [.invalidCredentials, .incompatiblePwgVersion, .invalidURL, .authenticationFailed]
@@ -129,7 +129,7 @@ extension ImageViewController
             let title = NSLocalizedString("imageFavorites_title", comment: "Favorites")
             let message = NSLocalizedString("imageFavoritesRemoveError_message", comment: "Failed to remove this photo from your favorites.")
             self.dismissPiwigoError(withTitle: title, message: message,
-                                    errorMessage: error.localizedDescription) {
+                                    errorMessage: error.localizedDescription) { [self] in
                 self.favoriteBarButton?.isEnabled = true
             }
         }
diff --git a/piwigo/Image/Extensions/ImageViewController+Rotate.swift b/piwigo/Image/Extensions/ImageViewController+Rotate.swift
index 7e3138a55..06c9210e1 100644
--- a/piwigo/Image/Extensions/ImageViewController+Rotate.swift
+++ b/piwigo/Image/Extensions/ImageViewController+Rotate.swift
@@ -25,7 +25,7 @@ extension ImageViewController
         // Rotate image right
         let action = UIAction(title: NSLocalizedString("rotateImage_right", comment: "Clockwise"),
                               image: UIImage(systemName: "rotate.right"),
-                              handler: { _ in
+                              handler: { [self] _ in
             // Edit image informations
             self.rotateImage(by: -90.0)
         })
@@ -37,7 +37,7 @@ extension ImageViewController
         // Rotate image left
         let action = UIAction(title: NSLocalizedString("rotateImage_left", comment: "Counterclockwise"),
                               image: UIImage(systemName: "rotate.left"),
-                              handler: { _ in
+                              handler: { [self] _ in
             // Edit image informations
             self.rotateImage(by: 90.0)
         })
@@ -60,14 +60,14 @@ extension ImageViewController
         showHUD(withTitle: NSLocalizedString("rotateSingleImageHUD_rotating", comment: "Rotating Photo…"))
         
         // Send request to Piwigo server
-        PwgSession.checkSession(ofUser: user) { [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             ImageUtilities.rotate(imageData, by: angle) { [self] in
                 // Retrieve updated image data i.e. width, height, URLs
                 /// We retrieve URLs of thumbnails which are not in cache anymore:
                 /// - available: https://piwigo…/_data/i/upload/2024/02/17/20240217192937-d5cf80b5-xx.jpg
                 /// - unavailable: https://piwigo…/i.php?/upload/2024/02/17/20240217192937-d5cf80b5-xx.jpg
                 let imageID = imageData.pwgID
-                self.imageProvider.getInfos(forID: imageID, inCategoryId: self.categoryId) {
+                self.imageProvider.getInfos(forID: imageID, inCategoryId: self.categoryId) { [self] in
                     // Download image in cache and present it
                     DispatchQueue.main.async { [self] in
                         if let imageDVC = pageViewController?.viewControllers?.first as? ImageDetailViewController,
@@ -82,7 +82,7 @@ extension ImageViewController
                             }
                             imageDVC.imageData = updatedImage
                             // Rotate image view
-                            imageDVC.rotateImageView(by: angle) {
+                            imageDVC.rotateImageView(by: angle) { [self] in
                                 // Hide HUD
                                 self.updateHUDwithSuccess { [self] in
                                     self.hideHUD(afterDelay: pwgDelayHUD) { [self] in
@@ -99,7 +99,7 @@ extension ImageViewController
             } failure: { [self] error in
                 self.rotateImageInDatabaseError(error)
             }
-        } failure: { [self] error in
+        } failure: { [unowned self] error in
             self.rotateImageInDatabaseError(error)
         }
     }
@@ -127,7 +127,7 @@ extension ImageViewController
 
             // Report error
             self.dismissPiwigoError(withTitle: title, message: message,
-                                    errorMessage: error.localizedDescription) { [unowned self] in
+                                    errorMessage: error.localizedDescription) { [self] in
                 // Hide HUD
                 hideHUD { [self] in
                     // Re-enable buttons
diff --git a/piwigo/Image/Extensions/ImageViewController+Share.swift b/piwigo/Image/Extensions/ImageViewController+Share.swift
index fdb0d91a6..c8b5421c8 100644
--- a/piwigo/Image/Extensions/ImageViewController+Share.swift
+++ b/piwigo/Image/Extensions/ImageViewController+Share.swift
@@ -25,11 +25,11 @@ extension ImageViewController
         // Check autorisation to access Photo Library (camera roll)
         if #available(iOS 14, *) {
             PhotosFetch.shared.checkPhotoLibraryAuthorizationStatus(for: .addOnly, for: self,
-                onAccess: { [unowned self] in
+                onAccess: { [self] in
                     // User allowed to save image in camera roll
                     presentShareImageViewController(withCameraRollAccess: true)
                 },
-                onDeniedAccess: { [unowned self] in
+                onDeniedAccess: { [self] in
                     // User not allowed to save image in camera roll
                     if Thread.isMainThread {
                         presentShareImageViewController(withCameraRollAccess: false)
@@ -42,18 +42,18 @@ extension ImageViewController
         } else {
             // Fallback on earlier versions
             PhotosFetch.shared.checkPhotoLibraryAccessForViewController(nil,
-                onAuthorizedAccess: { [unowned self] in
+                onAuthorizedAccess: { [self] in
                     // User allowed to save image in camera roll
                     presentShareImageViewController(withCameraRollAccess: true)
                 },
-                onDeniedAccess: { [unowned self] in
+                onDeniedAccess: { [self] in
                     // User not allowed to save image in camera roll
                     if Thread.isMainThread {
                         presentShareImageViewController(withCameraRollAccess: false)
                     } else {
-                        DispatchQueue.main.async(execute: { [self] in
+                        DispatchQueue.main.async { [self] in
                             presentShareImageViewController(withCameraRollAccess: false)
-                        })
+                        }
                     }
                 })
         }
@@ -170,15 +170,14 @@ extension ImageViewController: ShareImageActivityItemProviderDelegate
             presentedViewController?.hideHUD { }
         } else {
             presentedViewController?.updateHUDwithSuccess(completion: { [self] in
-                presentedViewController?.hideHUD(completion: {
-                })
+                presentedViewController?.hideHUD(completion: { })
             })
         }
     }
 
     func showError(withTitle title: String, andMessage message: String?) {
         // Display error alert after trying to share image
-        presentedViewController?.dismissPiwigoError(withTitle: title, message: message ?? "") { [unowned self] in
+        presentedViewController?.dismissPiwigoError(withTitle: title, message: message ?? "") { [self] in
             // Closes ActivityView
             presentedViewController?.dismiss(animated: true)
         }
diff --git a/piwigo/Image/Extensions/ImageViewController+Video.swift b/piwigo/Image/Extensions/ImageViewController+Video.swift
index d079a8837..1bc6c90ad 100644
--- a/piwigo/Image/Extensions/ImageViewController+Video.swift
+++ b/piwigo/Image/Extensions/ImageViewController+Video.swift
@@ -105,7 +105,7 @@ extension ImageViewController: PlayerViewControllerCoordinatorDelegate
     func playerViewControllerCoordinator(_ coordinator: PlayerViewControllerCoordinator,
                                          restoreUIForPIPStop completion: @escaping (Bool) -> Void) {
         if coordinator.playerViewControllerIfLoaded?.parent == nil {
-            playbackController.dismissActivePlayerViewController(animated: false) {
+            playbackController.dismissActivePlayerViewController(animated: false) { [self] in
                 if let navigationController = self.navigationController {
                     coordinator.restoreFullScreen(from: navigationController) {
                         completion(true)
diff --git a/piwigo/Image/ImageDetailViewController.swift b/piwigo/Image/ImageDetailViewController.swift
index 53f697ff0..dbae87629 100644
--- a/piwigo/Image/ImageDetailViewController.swift
+++ b/piwigo/Image/ImageDetailViewController.swift
@@ -44,8 +44,8 @@ class ImageDetailViewController: UIViewController
         super.viewDidLoad()
         
         // Get high-resolution image size
-        let viewSize = view.bounds.size
-        let scale = view.traitCollection.displayScale * pwgImageSize.maxZoomScale // to limit photo size in memory
+        let scale = max(view.traitCollection.displayScale, 1.0) * pwgImageSize.maxZoomScale
+        let viewSize = CGSizeMake(view.bounds.size.width * scale, view.bounds.size.height * scale)
         var previewSize = pwgImageSize(rawValue: ImageVars.shared.defaultImagePreviewSize) ?? .medium
         if imageData.isVideo, previewSize == .fullRes {
             previewSize = .xxLarge
@@ -54,7 +54,9 @@ class ImageDetailViewController: UIViewController
         // Check if we already have the high-resolution image in cache
         if let wantedImage = imageData.cachedThumbnail(ofSize: previewSize) {
             // Show high-resolution image in cache
-            let cachedImage = ImageUtilities.downsample(image: wantedImage, to: viewSize, scale: scale)
+            debugPrint("••> wantedImage: \(CFGetRetainCount(wantedImage))")
+            let cachedImage = ImageUtilities.downsample(image: wantedImage, to: viewSize)
+            debugPrint("••> cachedImage: \(CFGetRetainCount(cachedImage))")
             setImageView(with: cachedImage)
         } else {
             // Display thumbnail image which should be in cache
@@ -67,14 +69,15 @@ class ImageDetailViewController: UIViewController
             if let imageURL = self.imageURL {
                 PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: previewSize, atURL: imageURL,
                                            fromServer: imageData.server?.uuid, fileSize: imageData.fileSize,
-                                           placeHolder: placeHolder) { fractionCompleted in
-                    DispatchQueue.main.async {
+                                           placeHolder: placeHolder) { [unowned self] fractionCompleted in
+                    DispatchQueue.main.async { [self] in
                         // Show download progress
                         self.progressView.progress = fractionCompleted
                     }
-                } completion: { cachedImageURL in
-                    let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: viewSize, scale: scale)
-                    DispatchQueue.main.async {
+                } completion: { [unowned self] cachedImageURL in
+                    let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: viewSize)
+                    debugPrint("••> cachedImage: \(CFGetRetainCount(cachedImage))")
+                    DispatchQueue.main.async { [self] in
                         // Hide progress view
                         self.progressView.isHidden = true
                         // Replace thumbnail with high-resolution image
@@ -152,7 +155,7 @@ class ImageDetailViewController: UIViewController
         super.viewWillTransition(to: size, with: coordinator)
 
         // Animate change of view size and reposition image
-        coordinator.animate(alongsideTransition: { [self] context in
+        coordinator.animate(alongsideTransition: { [self] _ in
             // Should we update the description?
             if descContainer.descTextView.text.isEmpty == false {
                 descContainer.config(with: imageData.comment, inViewController: self, forVideo: false)
@@ -173,6 +176,9 @@ class ImageDetailViewController: UIViewController
 
     deinit {
         // Unregister all observers
+        debugPrint("••> ImageDetailViewController released memory")
+        imageData = nil
+        imageView.image = nil
         NotificationCenter.default.removeObserver(self)
     }
     
@@ -204,21 +210,21 @@ class ImageDetailViewController: UIViewController
     
     func rotateImageView(by angle: Double, completion: @escaping () -> Void) {
         // Download high-resolution image
-        let viewSize = view.bounds.size
-        let scale = view.traitCollection.displayScale * pwgImageSize.maxZoomScale // to limit photo size in memory
+        let scale = view.traitCollection.displayScale * pwgImageSize.maxZoomScale
+        let viewSize = CGSizeMake(view.bounds.size.width * scale, view.bounds.size.height * scale)
         let previewSize = pwgImageSize(rawValue: ImageVars.shared.defaultImagePreviewSize) ?? .medium
         let placeHolder = imageView.image ?? UIImage(named: "unknownImage")!
         imageURL = ImageUtilities.getURL(self.imageData, ofMinSize: previewSize)
         if let imageURL = self.imageURL {
             PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: previewSize, atURL: imageURL,
                                        fromServer: imageData.server?.uuid, fileSize: imageData.fileSize,
-                                       placeHolder: placeHolder) { fractionCompleted in
+                                       placeHolder: placeHolder) { [unowned self] fractionCompleted in
                 DispatchQueue.main.async {
                     // Show download progress
                     self.progressView.progress = fractionCompleted
                 }
-            } completion: { cachedImageURL in
-                let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: viewSize, scale: scale)
+            } completion: { [unowned self] cachedImageURL in
+                let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: viewSize)
                 DispatchQueue.main.async { [self] in
                     // Hide progress view
                     self.progressView.isHidden = true
diff --git a/piwigo/Image/ImageViewController.swift b/piwigo/Image/ImageViewController.swift
index 3947afd58..97463c4b2 100644
--- a/piwigo/Image/ImageViewController.swift
+++ b/piwigo/Image/ImageViewController.swift
@@ -200,7 +200,7 @@ class ImageViewController: UIViewController {
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
-        coordinator.animate(alongsideTransition: { [self] context in
+        coordinator.animate(alongsideTransition: { [self] _ in
             // Update image detail view
             updateNavBar()
             setTitleViewFromImageData()
@@ -344,9 +344,9 @@ class ImageViewController: UIViewController {
     private func retrieveImageData(_ imageData: Image, isIncomplete: Bool) {
         // Retrieve image/video infos
         DispatchQueue.global(qos: .userInteractive).async { [self] in
-            PwgSession.checkSession(ofUser: user) { [self] in
+            PwgSession.checkSession(ofUser: user) { [unowned self] in
                 let imageID = imageData.pwgID
-                self.imageProvider.getInfos(forID: imageID, inCategoryId: self.categoryId) {
+                self.imageProvider.getInfos(forID: imageID, inCategoryId: self.categoryId) { [self] in
                     DispatchQueue.main.async { [self] in
                         // Look for the corresponding view controller
                         guard let vcs = self.pageViewController?.viewControllers else { return }
@@ -381,13 +381,13 @@ class ImageViewController: UIViewController {
                             }
                         }
                     }
-                } failure: { error in
+                } failure: { [self] error in
                     // Display error only when image data is incomplete
                     if isIncomplete {
                         self.retrieveImageDataError(error)
                     }
                 }
-            } failure: { [self] error in
+            } failure: { [unowned self] error in
                 // Don't display an error if there is no Internet connection
                 if [NSURLErrorDataNotAllowed, NSURLErrorNotConnectedToInternet, NSURLErrorInternationalRoamingOff].contains(error.code) {
                     return
@@ -419,11 +419,11 @@ class ImageViewController: UIViewController {
     }
 
     func logImageVisitIfNeeded(_ imageID: Int64, asDownload: Bool = false) {
-        PwgSession.checkSession(ofUser: user) {
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             if NetworkVars.saveVisits {
                 PwgSession.shared.logVisitOfImage(withID: imageID, asDownload: asDownload) {
                     // Statistics updated
-                } failure: { error in
+                } failure: { [self] error in
                     // Session logout required?
                     if let pwgError = error as? PwgSessionError,
                        [.invalidCredentials, .incompatiblePwgVersion, .invalidURL, .authenticationFailed]
@@ -435,7 +435,7 @@ class ImageViewController: UIViewController {
                     // Statistics not updated ► No error reported
                 }
             }
-        } failure: { error in
+        } failure: { [unowned self] error in
             // Session logout required?
             if let pwgError = error as? PwgSessionError,
                [.invalidCredentials, .incompatiblePwgVersion, .invalidURL, .authenticationFailed]
diff --git a/piwigo/Image/Parameters/Cells/EditImageThumbCollectionViewCell.swift b/piwigo/Image/Parameters/Cells/EditImageThumbCollectionViewCell.swift
index 060ad4bd5..8ffa03d0e 100644
--- a/piwigo/Image/Parameters/Cells/EditImageThumbCollectionViewCell.swift
+++ b/piwigo/Image/Parameters/Cells/EditImageThumbCollectionViewCell.swift
@@ -115,13 +115,13 @@ class EditImageThumbCollectionViewCell: UICollectionViewCell
         // Get image from cache or download it
         imageThumbnail.layoutIfNeeded()   // Ensure imageView in its final size
         let placeHolder = UIImage(named: "placeholder")!
+        let scale = max(imageThumbnail.traitCollection.displayScale, 1.0)
+        let cellSize = CGSizeMake(imageThumbnail.bounds.size.width * scale, imageThumbnail.bounds.size.height * scale)
         let thumbnailSize = pwgImageSize(rawValue: AlbumVars.shared.defaultAlbumThumbnailSize) ?? .thumb
-        let cellSize = self.imageThumbnail.bounds.size
-        let scale = self.imageThumbnail.traitCollection.displayScale
         PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: thumbnailSize,
                                    atURL: ImageUtilities.getURL(imageData, ofMinSize: thumbnailSize),
                                    fromServer: imageData.server?.uuid, placeHolder: placeHolder) { cachedImageURL in
-            let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize, scale: scale)
+            let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize)
             DispatchQueue.main.async {
                 self.imageThumbnail.image = cachedImage
             }
@@ -156,7 +156,7 @@ class EditImageThumbCollectionViewCell: UICollectionViewCell
             message: "\(NSLocalizedString("renameImage_message", comment: "Enter a new file name for this image")) \"\(imageFile.text ?? "")\":",
             preferredStyle: .alert)
 
-        alert.addTextField(configurationHandler: { [unowned self] textField in
+        alert.addTextField(configurationHandler: { [self] textField in
             textField.placeholder = NSLocalizedString("renameImage_title", comment: "Original File")
             textField.text = imageFile.text
             textField.clearButtonMode = .always
@@ -176,7 +176,7 @@ class EditImageThumbCollectionViewCell: UICollectionViewCell
         renameFileNameAction = UIAlertAction(
             title: NSLocalizedString("renameCategory_button", comment: "Rename"),
             style: .default,
-            handler: { [unowned self] action in
+            handler: { [self] action in
                 // Rename album if possible
                 if let fileName = alert.textFields?.first?.text, fileName.count > 0 {
                     renameImageFile(withName: fileName,
@@ -235,9 +235,9 @@ class EditImageThumbCollectionViewCell: UICollectionViewCell
                 // Successful?
                 if uploadJSON.success {
                     // Filename successfully changed
-                    topViewController?.updateHUDwithSuccess { [unowned self] in
+                    topViewController?.updateHUDwithSuccess { [self] in
                         topViewController?.hideHUD(afterDelay: pwgDelayHUD) { [self] in
-                            DispatchQueue.main.async(execute: { [unowned self] in
+                            DispatchQueue.main.async(execute: { [self] in
                                 // Adopt new original filename
                                 imageFile.text = fileName
 
diff --git a/piwigo/Image/Parameters/EditImageParamsViewController.swift b/piwigo/Image/Parameters/EditImageParamsViewController.swift
index 9d0c174d1..a45429870 100644
--- a/piwigo/Image/Parameters/EditImageParamsViewController.swift
+++ b/piwigo/Image/Parameters/EditImageParamsViewController.swift
@@ -161,7 +161,7 @@ class EditImageParamsViewController: UIViewController
         super.viewWillTransition(to: size, with: coordinator)
         
         // Reload the tableview on orientation change, to match the new width of the table.
-        coordinator.animate(alongsideTransition: { [self] context in
+        coordinator.animate(alongsideTransition: { [self] _ in
             
             // On iPad, the form is presented in a popover view
             if UIDevice.current.userInterfaceIdiom == .pad {
@@ -281,9 +281,9 @@ class EditImageParamsViewController: UIViewController
         
         // Update all images
         let index = 0
-        PwgSession.checkSession(ofUser: user) { [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             updateImageProperties(fromIndex: index)
-        } failure: { [self] error in
+        } failure: { [unowned self] error in
             // Display error
             self.hideHUD {
                 self.showUpdatePropertiesError(error, atIndex: index)
@@ -299,7 +299,7 @@ class EditImageParamsViewController: UIViewController
                 // Save changes
                 try? mainContext.save()
                 // Close HUD
-                self.hideHUD(afterDelay: pwgDelayHUD) { [unowned self] in
+                self.hideHUD(afterDelay: pwgDelayHUD) { [self] in
                     // Return to image preview or album view
                     self.dismiss(animated: true)
                 }
@@ -401,7 +401,7 @@ class EditImageParamsViewController: UIViewController
         }
         
         // Send request to Piwigo server
-        PwgSession.checkSession(ofUser: user) {  [self] in
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             PwgSession.shared.setInfos(with: paramsDict) { [self] in
                 DispatchQueue.main.async { [self] in
                     // Update image title?
diff --git a/piwigo/Image/Share/ShareImageActivityItemProvider.swift b/piwigo/Image/Share/ShareImageActivityItemProvider.swift
index fbfc63b87..fa53d653e 100644
--- a/piwigo/Image/Share/ShareImageActivityItemProvider.swift
+++ b/piwigo/Image/Share/ShareImageActivityItemProvider.swift
@@ -111,10 +111,10 @@ class ShareImageActivityItemProvider: UIActivityItemProvider {
         }
         
         // Notify the delegate on the main thread that the processing is beginning.
-        DispatchQueue.main.async(execute: {
+        DispatchQueue.main.async { [self] in
             let title = NSLocalizedString("downloadingImage", comment: "Downloading Photo")
             self.delegate?.imageActivityItemProviderPreprocessingDidBegin(self, withTitle: title)
-        })
+        }
 
         // Get the maximum accepted image size (infinity for largest)
         let maxSize = activityType?.imageMaxSize() ?? Int.max
@@ -138,13 +138,13 @@ class ShareImageActivityItemProvider: UIActivityItemProvider {
         let sema = DispatchSemaphore(value: 0)
         PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: imageSize, atURL: imageURL,
                                    fromServer: serverID, fileSize: imageData.fileSize,
-                                   placeHolder: placeholderItem as! UIImage) { fractionCompleted in
+                                   placeHolder: placeholderItem as! UIImage) { [unowned self] fractionCompleted in
             // Notify the delegate on the main thread to show how it makes progress.
             self.progressFraction = Float((0.75 * fractionCompleted))
-        } completion: { fileURL in
+        } completion: { [unowned self] fileURL in
             self.cachedFileURL = fileURL
             sema.signal()
-        } failure: { error in
+        } failure: { [unowned self] error in
             // Will notify the delegate on the main thread that the processing is cancelled
             self.alertTitle = NSLocalizedString("shareFailError_title", comment: "Share Fail")
             self.alertMessage = String.localizedStringWithFormat(NSLocalizedString("downloadImageFail_message", comment: "Failed to download image!\n%@"), error.localizedDescription)
@@ -338,9 +338,9 @@ class ShareImageActivityItemProvider: UIActivityItemProvider {
 
     private func preprocessingDidEnd() {
         // Notify the delegate on the main thread that the processing is cancelled.
-        DispatchQueue.main.async(execute: {
+        DispatchQueue.main.async { [self] in
             self.delegate?.imageActivityItemProviderPreprocessingDidEnd(self, withImageID: self.imageData.pwgID, contextually: self.contextually)
-        })
+        }
     }
     
     @objc func cancelDownloadImageTask() {
diff --git a/piwigo/Image/Share/ShareVideoActivityItemProvider.swift b/piwigo/Image/Share/ShareVideoActivityItemProvider.swift
index c59405f92..009471347 100644
--- a/piwigo/Image/Share/ShareVideoActivityItemProvider.swift
+++ b/piwigo/Image/Share/ShareVideoActivityItemProvider.swift
@@ -101,10 +101,10 @@ class ShareVideoActivityItemProvider: UIActivityItemProvider {
         }
         
         // Notify the delegate on the main thread that the processing is beginning.
-        DispatchQueue.main.async(execute: {
+        DispatchQueue.main.async { [self] in
             let title = NSLocalizedString("downloadingVideo", comment: "Downloading Video")
             self.delegate?.imageActivityItemProviderPreprocessingDidBegin(self, withTitle: title)
-        })
+        }
 
         // Get the server ID and optimum available image size
         guard let serverID = imageData.server?.uuid,
@@ -125,13 +125,13 @@ class ShareVideoActivityItemProvider: UIActivityItemProvider {
         let sema = DispatchSemaphore(value: 0)
         PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: imageSize, atURL: imageURL,
                                    fromServer: serverID, fileSize: imageData.fileSize,
-                                   placeHolder: placeholderItem as! UIImage) { fractionCompleted in
+                                   placeHolder: placeholderItem as! UIImage) { [unowned self] fractionCompleted in
             // Notify the delegate on the main thread to show how it makes progress.
             self.progressFraction = Float((0.75 * fractionCompleted))
-        } completion: { fileURL in
+        } completion: { [unowned self] fileURL in
             self.cachedFileURL = fileURL
             sema.signal()
-        } failure: { error in
+        } failure: { [unowned self] error in
             // Will notify the delegate on the main thread that the processing is cancelled
             self.alertTitle = NSLocalizedString("shareFailError_title", comment: "Share Fail")
             self.alertMessage = String.localizedStringWithFormat(NSLocalizedString("downloadVideoFail_message", comment: "Failed to download video!\n%@"), error.localizedDescription)
@@ -320,7 +320,7 @@ class ShareVideoActivityItemProvider: UIActivityItemProvider {
         session.shouldOptimizeForNetworkUse = true
         session.outputURL = imageFileURL
         session.metadataItemFilter = .forSharing()
-        session.exportAsynchronously {
+        session.exportAsynchronously { [self] in
             // Handle export results
             switch session.status {
             case .exporting, .waiting:
diff --git a/piwigo/Image/VideoDetailViewController.swift b/piwigo/Image/VideoDetailViewController.swift
index 149b466a0..bc4947d11 100644
--- a/piwigo/Image/VideoDetailViewController.swift
+++ b/piwigo/Image/VideoDetailViewController.swift
@@ -131,7 +131,7 @@ class VideoDetailViewController: UIViewController
         super.viewWillTransition(to: size, with: coordinator)
 
         // Animate change of view size and reposition video
-        coordinator.animate(alongsideTransition: { [self] context in
+        coordinator.animate(alongsideTransition: { [self] _ in
             // Should we update the description?
             if descContainer.descTextView.text.isEmpty == false {
                 descContainer.config(with: imageData.comment, inViewController: self, forVideo: true)
diff --git a/piwigo/Login/LoginViewController.swift b/piwigo/Login/LoginViewController.swift
index 99856bb77..85af9f4d9 100644
--- a/piwigo/Login/LoginViewController.swift
+++ b/piwigo/Login/LoginViewController.swift
@@ -473,7 +473,7 @@ class LoginViewController: UIViewController {
     func launchApp() {
         isAlreadyTryingToLogin = false
         // Hide HUD and present root album
-        DispatchQueue.main.async { [unowned self] in
+        DispatchQueue.main.async { [self] in
             // Update user account in persistent cache
             // Performed in main thread to avoid concurrency issue with AlbumViewController initialisation
             let _ = self.userProvider.getUserAccount(inContext: mainContext, afterUpdate: true)
diff --git a/piwigo/Settings/Appearance/PadTableViewCell.swift b/piwigo/Settings/Appearance/PadTableViewCell.swift
index bfae914e5..329177ad1 100644
--- a/piwigo/Settings/Appearance/PadTableViewCell.swift
+++ b/piwigo/Settings/Appearance/PadTableViewCell.swift
@@ -24,18 +24,18 @@ class PadTableViewCell: UITableViewCell {
             fatalError("!!! Could not find lightPad image !!!")
         }
         lightImage.layoutIfNeeded() // Ensure buttonView is in its final size.
-        var size = lightImage.bounds.size
-        var scale = lightImage.traitCollection.displayScale
-        lightImage.setImage(ImageUtilities.downsample(imageAt: lightUrl, to: size, scale: scale), for: .normal)
+        var scale = max(lightImage.traitCollection.displayScale, 1.0)
+        var cellSize = CGSizeMake(lightImage.bounds.size.width * scale, lightImage.bounds.size.height * scale)
+        lightImage.setImage(ImageUtilities.downsample(imageAt: lightUrl, to: cellSize), for: .normal)
         
         // iPad - dark mode
         guard let darkUrl = Bundle.main.url(forResource: "darkPad", withExtension: "png") else {
             fatalError("!!! Could not find darkPad image !!!")
         }
         darkImage.layoutIfNeeded() // Ensure buttonView is in its final size.
-        size = darkImage.bounds.size
         scale = darkImage.traitCollection.displayScale
-        darkImage.setImage(ImageUtilities.downsample(imageAt: darkUrl, to: size, scale: scale), for: .normal)
+        cellSize = CGSizeMake(darkImage.bounds.size.width * scale, darkImage.bounds.size.height * scale)
+        darkImage.setImage(ImageUtilities.downsample(imageAt: darkUrl, to: cellSize), for: .normal)
 
         // Labels
         lightLabel.setTitle(NSLocalizedString("settings_lightColor", comment: "Light"), for: .normal)
diff --git a/piwigo/Settings/Appearance/PhoneTableViewCell.swift b/piwigo/Settings/Appearance/PhoneTableViewCell.swift
index 66f930927..5f479e8b4 100644
--- a/piwigo/Settings/Appearance/PhoneTableViewCell.swift
+++ b/piwigo/Settings/Appearance/PhoneTableViewCell.swift
@@ -24,18 +24,18 @@ class PhoneTableViewCell: UITableViewCell {
             fatalError("!!! Could not find lightPhone image !!!")
         }
         lightImage.layoutIfNeeded() // Ensure buttonView is in its final size.
-        var size = lightImage.bounds.size
-        var scale = lightImage.traitCollection.displayScale
-        lightImage.setImage(ImageUtilities.downsample(imageAt: lightUrl, to: size, scale: scale), for: .normal)
+        var scale = max(lightImage.traitCollection.displayScale, 1.0)
+        var cellSize = CGSizeMake(lightImage.bounds.size.width * scale, lightImage.bounds.size.height * scale)
+        lightImage.setImage(ImageUtilities.downsample(imageAt: lightUrl, to: cellSize), for: .normal)
 
         // iPhone - dark mode
         guard let darkUrl = Bundle.main.url(forResource: "darkPhone", withExtension: "png") else {
             fatalError("!!! Could not find darkPhone image !!!")
         }
         darkImage.layoutIfNeeded() // Ensure buttonView is in its final size.
-        size = darkImage.bounds.size
         scale = darkImage.traitCollection.displayScale
-        darkImage.setImage(ImageUtilities.downsample(imageAt: darkUrl, to: size, scale: scale), for: .normal)
+        cellSize = CGSizeMake(darkImage.bounds.size.width * scale, darkImage.bounds.size.height * scale)
+        darkImage.setImage(ImageUtilities.downsample(imageAt: darkUrl, to: cellSize), for: .normal)
 
         // Labels
         lightLabel.setTitle(NSLocalizedString("settings_lightColor", comment: "Light"), for: .normal)
diff --git a/piwigo/Settings/Help/Help01ViewController.swift b/piwigo/Settings/Help/Help01ViewController.swift
index 7c0391939..aaa4ce05a 100644
--- a/piwigo/Settings/Help/Help01ViewController.swift
+++ b/piwigo/Settings/Help/Help01ViewController.swift
@@ -47,9 +47,9 @@ class Help01ViewController: UIViewController {
             fatalError("!!! Could not find help01 image !!!")
         }
         imageView.layoutIfNeeded() // Ensure imageView is in its final size.
-        let size = imageView.bounds.size
-        let scale = imageView.traitCollection.displayScale
-        imageView.image = ImageUtilities.downsample(imageAt: imageUrl, to: size, scale: scale)
+        let scale = max(imageView.traitCollection.displayScale, 1.0)
+        let imageSize = CGSizeMake(imageView.bounds.size.width * scale, imageView.bounds.size.height * scale)
+        imageView.image = ImageUtilities.downsample(imageAt: imageUrl, to: imageSize)
         
         // Remember that this view was watched and when
         AppVars.shared.didWatchHelpViews = AppVars.shared.didWatchHelpViews | helpID
diff --git a/piwigo/Settings/Help/Help02ViewController.swift b/piwigo/Settings/Help/Help02ViewController.swift
index 61935420d..182547bb7 100644
--- a/piwigo/Settings/Help/Help02ViewController.swift
+++ b/piwigo/Settings/Help/Help02ViewController.swift
@@ -68,18 +68,18 @@ class Help02ViewController: UIViewController {
             fatalError("!!! Could not find help02-top image !!!")
         }
         imageViewTop.layoutIfNeeded() // Ensure imageView is in its final size.
-        let topImageSize = imageViewTop.bounds.size
-        let topImageScale = imageViewTop.traitCollection.displayScale
-        imageViewTop.image = ImageUtilities.downsample(imageAt: topImageUrl, to: topImageSize, scale: topImageScale)
+        var scale = max(imageViewTop.traitCollection.displayScale, 1.0)
+        var imageSize = CGSizeMake(imageViewTop.bounds.size.width * scale, imageViewTop.bounds.size.height * scale)
+        imageViewTop.image = ImageUtilities.downsample(imageAt: topImageUrl, to: imageSize)
         
         // Set bottom image view
         guard let botImageUrl = Bundle.main.url(forResource: "help02-bot", withExtension: "png") else {
             fatalError("!!! Could not find help02-bot image !!!")
         }
         imageViewBot.layoutIfNeeded() // Ensure imageView is in its final size.
-        let botImageSize = imageViewBot.bounds.size
-        let botImageScale = imageViewBot.traitCollection.displayScale
-        imageViewBot.image = ImageUtilities.downsample(imageAt: botImageUrl, to: botImageSize, scale: botImageScale)
+        scale = max(imageViewBot.traitCollection.displayScale, 1.0)
+        imageSize = CGSizeMake(imageViewBot.bounds.size.width * scale, imageViewBot.bounds.size.height * scale)
+        imageViewBot.image = ImageUtilities.downsample(imageAt: botImageUrl, to: imageSize)
         
         // Remember that this view was watched and when
         AppVars.shared.didWatchHelpViews = AppVars.shared.didWatchHelpViews | helpID
diff --git a/piwigo/Settings/Help/Help03ViewController.swift b/piwigo/Settings/Help/Help03ViewController.swift
index 8cc339370..3ef14f0a6 100644
--- a/piwigo/Settings/Help/Help03ViewController.swift
+++ b/piwigo/Settings/Help/Help03ViewController.swift
@@ -47,9 +47,9 @@ class Help03ViewController: UIViewController {
             fatalError("!!! Could not find help03 image !!!")
         }
         imageView.layoutIfNeeded() // Ensure imageView is in its final size.
-        let size = imageView.bounds.size
-        let scale = imageView.traitCollection.displayScale
-        imageView.image = ImageUtilities.downsample(imageAt: imageUrl, to: size, scale: scale)
+        let scale = max(imageView.traitCollection.displayScale, 1.0)
+        let imageSize = CGSizeMake(imageView.bounds.size.width * scale, imageView.bounds.size.height * scale)
+        imageView.image = ImageUtilities.downsample(imageAt: imageUrl, to: imageSize)
         
         // Remember that this view was watched and when
         AppVars.shared.didWatchHelpViews = AppVars.shared.didWatchHelpViews | helpID
diff --git a/piwigo/Settings/Help/Help04ViewController.swift b/piwigo/Settings/Help/Help04ViewController.swift
index 17f0da006..de1ecb09b 100644
--- a/piwigo/Settings/Help/Help04ViewController.swift
+++ b/piwigo/Settings/Help/Help04ViewController.swift
@@ -47,9 +47,9 @@ class Help04ViewController: UIViewController {
             fatalError("!!! Could not find help04 image !!!")
         }
         imageView.layoutIfNeeded() // Ensure imageView is in its final size.
-        let size = imageView.bounds.size
-        let scale = imageView.traitCollection.displayScale
-        imageView.image = ImageUtilities.downsample(imageAt: imageUrl, to: size, scale: scale)
+        let scale = max(imageView.traitCollection.displayScale, 1.0)
+        let imageSize = CGSizeMake(imageView.bounds.size.width * scale, imageView.bounds.size.height * scale)
+        imageView.image = ImageUtilities.downsample(imageAt: imageUrl, to: imageSize)
         
         // Remember that this view was watched and when
         AppVars.shared.didWatchHelpViews = AppVars.shared.didWatchHelpViews | helpID
diff --git a/piwigo/Settings/Help/Help05ViewController.swift b/piwigo/Settings/Help/Help05ViewController.swift
index d770a0134..db963dbb8 100644
--- a/piwigo/Settings/Help/Help05ViewController.swift
+++ b/piwigo/Settings/Help/Help05ViewController.swift
@@ -60,18 +60,18 @@ class Help05ViewController: UIViewController {
             fatalError("!!! Could not find help05-top image !!!")
         }
         imageViewTop.layoutIfNeeded() // Ensure imageView is in its final size.
-        let topImageSize = imageViewTop.bounds.size
-        let topImageScale = imageViewTop.traitCollection.displayScale
-        imageViewTop.image = ImageUtilities.downsample(imageAt: topImageUrl, to: topImageSize, scale: topImageScale)
+        var scale = max(imageViewTop.traitCollection.displayScale, 1.0)
+        var imageSize = CGSizeMake(imageViewTop.bounds.size.width * scale, imageViewTop.bounds.size.height * scale)
+        imageViewTop.image = ImageUtilities.downsample(imageAt: topImageUrl, to: imageSize)
         
         // Set bottom image view
         guard let botImageUrl = Bundle.main.url(forResource: "help05-bot", withExtension: "png") else {
             fatalError("!!! Could not find help05-bot image !!!")
         }
         imageViewBot.layoutIfNeeded() // Ensure imageView is in its final size.
-        let botImageSize = imageViewBot.bounds.size
-        let botImageScale = imageViewBot.traitCollection.displayScale
-        imageViewBot.image = ImageUtilities.downsample(imageAt: botImageUrl, to: botImageSize, scale: botImageScale)
+        scale = max(imageViewBot.traitCollection.displayScale, 1.0)
+        imageSize = CGSizeMake(imageViewBot.bounds.size.width * scale, imageViewBot.bounds.size.height * scale)
+        imageViewBot.image = ImageUtilities.downsample(imageAt: botImageUrl, to: imageSize)
         
         // Remember that this view was watched and when
         AppVars.shared.didWatchHelpViews = AppVars.shared.didWatchHelpViews | helpID
diff --git a/piwigo/Settings/Help/Help06ViewController.swift b/piwigo/Settings/Help/Help06ViewController.swift
index c0d223033..2c45de64c 100644
--- a/piwigo/Settings/Help/Help06ViewController.swift
+++ b/piwigo/Settings/Help/Help06ViewController.swift
@@ -47,9 +47,9 @@ class Help06ViewController: UIViewController {
             fatalError("!!! Could not find help06 image !!!")
         }
         imageView.layoutIfNeeded() // Ensure imageView is in its final size.
-        let size = imageView.bounds.size
-        let scale = imageView.traitCollection.displayScale
-        imageView.image = ImageUtilities.downsample(imageAt: imageUrl, to: size, scale: scale)
+        let scale = max(imageView.traitCollection.displayScale, 1.0)
+        let imageSize = CGSizeMake(imageView.bounds.size.width * scale, imageView.bounds.size.height * scale)
+        imageView.image = ImageUtilities.downsample(imageAt: imageUrl, to: imageSize)
         
         // Remember that this view was watched and when
         AppVars.shared.didWatchHelpViews = AppVars.shared.didWatchHelpViews | helpID
diff --git a/piwigo/Settings/Help/Help07ViewController.swift b/piwigo/Settings/Help/Help07ViewController.swift
index bfc951bdd..10e00f797 100644
--- a/piwigo/Settings/Help/Help07ViewController.swift
+++ b/piwigo/Settings/Help/Help07ViewController.swift
@@ -65,18 +65,18 @@ class Help07ViewController: UIViewController {
             fatalError("!!! Could not find help07-top image !!!")
         }
         imageViewTop.layoutIfNeeded() // Ensure imageView is in its final size.
-        let topImageSize = imageViewTop.bounds.size
-        let topImageScale = imageViewTop.traitCollection.displayScale
-        imageViewTop.image = ImageUtilities.downsample(imageAt: topImageUrl, to: topImageSize, scale: topImageScale)
+        var scale = max(imageViewTop.traitCollection.displayScale, 1.0)
+        var imageSize = CGSizeMake(imageViewTop.bounds.size.width * scale, imageViewTop.bounds.size.height * scale)
+        imageViewTop.image = ImageUtilities.downsample(imageAt: topImageUrl, to: imageSize)
         
         // Set bottom image view
         guard let botImageUrl = Bundle.main.url(forResource: "help02-bot", withExtension: "png") else {
             fatalError("!!! Could not find help02-bot image !!!")
         }
         imageViewBot.layoutIfNeeded() // Ensure imageView is in its final size.
-        let botImageSize = imageViewBot.bounds.size
-        let botImageScale = imageViewBot.traitCollection.displayScale
-        imageViewBot.image = ImageUtilities.downsample(imageAt: botImageUrl, to: botImageSize, scale: botImageScale)
+        scale = max(imageViewBot.traitCollection.displayScale, 1.0)
+        imageSize = CGSizeMake(imageViewBot.bounds.size.width * scale, imageViewBot.bounds.size.height * scale)
+        imageViewBot.image = ImageUtilities.downsample(imageAt: botImageUrl, to: imageSize)
         
         // Set legend
         legendBot.attributedText = legendBotAttributedString
diff --git a/piwigo/Settings/Help/Help08ViewController.swift b/piwigo/Settings/Help/Help08ViewController.swift
index 85d435169..de09817ed 100644
--- a/piwigo/Settings/Help/Help08ViewController.swift
+++ b/piwigo/Settings/Help/Help08ViewController.swift
@@ -60,18 +60,18 @@ class Help08ViewController: UIViewController {
             fatalError("!!! Could not find help08-top image !!!")
         }
         imageViewTop.layoutIfNeeded() // Ensure imageView is in its final size.
-        let topImageSize = imageViewTop.bounds.size
-        let topImageScale = imageViewTop.traitCollection.displayScale
-        imageViewTop.image = ImageUtilities.downsample(imageAt: topImageUrl, to: topImageSize, scale: topImageScale)
+        var scale = max(imageViewTop.traitCollection.displayScale, 1.0)
+        var imageSize = CGSizeMake(imageViewTop.bounds.size.width * scale, imageViewTop.bounds.size.height * scale)
+        imageViewTop.image = ImageUtilities.downsample(imageAt: topImageUrl, to: imageSize)
         
         // Set bottom image view
         guard let botImageUrl = Bundle.main.url(forResource: "help08-bot", withExtension: "png") else {
             fatalError("!!! Could not find help08-bot image !!!")
         }
         imageViewBot.layoutIfNeeded() // Ensure imageView is in its final size.
-        let botImageSize = imageViewBot.bounds.size
-        let botImageScale = imageViewBot.traitCollection.displayScale
-        imageViewBot.image = ImageUtilities.downsample(imageAt: botImageUrl, to: botImageSize, scale: botImageScale)
+        scale = max(imageViewBot.traitCollection.displayScale, 1.0)
+        imageSize = CGSizeMake(imageViewBot.bounds.size.width * scale, imageViewBot.bounds.size.height * scale)
+        imageViewBot.image = ImageUtilities.downsample(imageAt: botImageUrl, to: imageSize)
         
         // Remember that this view was watched and when
         AppVars.shared.didWatchHelpViews = AppVars.shared.didWatchHelpViews | helpID
diff --git a/piwigo/Settings/Information/AboutViewController.swift b/piwigo/Settings/Information/AboutViewController.swift
index fec7c4c2b..d2e6f3b33 100644
--- a/piwigo/Settings/Information/AboutViewController.swift
+++ b/piwigo/Settings/Information/AboutViewController.swift
@@ -98,7 +98,7 @@ class AboutViewController: UIViewController, UITextViewDelegate {
         super.viewWillTransition(to: size, with: coordinator)
         
         // Update Piwigo authors label
-        coordinator.animate(alongsideTransition: { (context) in
+        coordinator.animate(alongsideTransition: { [self] _ in
             // Piwigo authors
             self.authorsLabel.text = SettingsUtilities.getAuthors(forView: self.view)
         }, completion: nil)
diff --git a/piwigo/Settings/Information/DataMigrationViewController.swift b/piwigo/Settings/Information/DataMigrationViewController.swift
index acd964591..05d14cd92 100644
--- a/piwigo/Settings/Information/DataMigrationViewController.swift
+++ b/piwigo/Settings/Information/DataMigrationViewController.swift
@@ -53,7 +53,7 @@ class DataMigrationViewController: UIViewController {
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
         
-        coordinator.animate(alongsideTransition: { (context) in
+        coordinator.animate(alongsideTransition: { _ in
         }, completion: nil)
     }
 
diff --git a/piwigo/Settings/Information/PrivacyPolicyViewController.swift b/piwigo/Settings/Information/PrivacyPolicyViewController.swift
index abf2e7285..a50a6db00 100644
--- a/piwigo/Settings/Information/PrivacyPolicyViewController.swift
+++ b/piwigo/Settings/Information/PrivacyPolicyViewController.swift
@@ -89,7 +89,7 @@ class PrivacyPolicyViewController: UIViewController, UITextViewDelegate {
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
         
-        coordinator.animate(alongsideTransition: { (context) in
+        coordinator.animate(alongsideTransition: { _ in
         }, completion: nil)
     }
 
diff --git a/piwigo/Settings/Information/ReleaseNotesViewController.swift b/piwigo/Settings/Information/ReleaseNotesViewController.swift
index 84471c980..3b7591686 100644
--- a/piwigo/Settings/Information/ReleaseNotesViewController.swift
+++ b/piwigo/Settings/Information/ReleaseNotesViewController.swift
@@ -98,7 +98,7 @@ class ReleaseNotesViewController: UIViewController {
         super.viewWillTransition(to: size, with: coordinator)
         
         // Update Piwigo authors label
-        coordinator.animate(alongsideTransition: { (context) in
+        coordinator.animate(alongsideTransition: { [self] _ in
             // Piwigo authors
             self.authorsLabel.text = SettingsUtilities.getAuthors(forView: self.view)
         }, completion: nil)
diff --git a/piwigo/Settings/Information/TroubleshootingViewController.swift b/piwigo/Settings/Information/TroubleshootingViewController.swift
index 6d03f4e0d..0efd96ff8 100644
--- a/piwigo/Settings/Information/TroubleshootingViewController.swift
+++ b/piwigo/Settings/Information/TroubleshootingViewController.swift
@@ -113,7 +113,7 @@ class TroubleshootingViewController: UIViewController {
         super.viewWillTransition(to: size, with: coordinator)
         
         // Update Piwigo authors label
-        coordinator.animate(alongsideTransition: { (context) in
+        coordinator.animate(alongsideTransition: { [self] _ in
             // Piwigo authors
             self.authorsLabel?.text = SettingsUtilities.getAuthors(forView: self.view)
         }, completion: nil)
diff --git a/piwigo/Settings/Information/WhatsNewViewController.swift b/piwigo/Settings/Information/WhatsNewViewController.swift
index 0e5b6ead2..71af7a691 100644
--- a/piwigo/Settings/Information/WhatsNewViewController.swift
+++ b/piwigo/Settings/Information/WhatsNewViewController.swift
@@ -123,7 +123,7 @@ class WhatsNewViewController: UIViewController {
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
         
-        coordinator.animate(alongsideTransition: { (context) in
+        coordinator.animate(alongsideTransition: { _ in
         }, completion: nil)
     }
     
diff --git a/piwigo/Settings/Privacy/AppLockViewController.swift b/piwigo/Settings/Privacy/AppLockViewController.swift
index f8b9dcec9..b9a49e9e6 100644
--- a/piwigo/Settings/Privacy/AppLockViewController.swift
+++ b/piwigo/Settings/Privacy/AppLockViewController.swift
@@ -265,7 +265,7 @@ class AppLockViewController: UIViewController {
         super.viewWillTransition(to: size, with: coordinator)
 
         // Update the constraints on orientation change
-        coordinator.animate(alongsideTransition: { _ in
+        coordinator.animate(alongsideTransition: { [self] _ in
             self.configConstraints()
         })
     }
diff --git a/piwigo/Settings/Privacy/ShareMetadataViewController.swift b/piwigo/Settings/Privacy/ShareMetadataViewController.swift
index cb11dd478..ade5bc2f0 100644
--- a/piwigo/Settings/Privacy/ShareMetadataViewController.swift
+++ b/piwigo/Settings/Privacy/ShareMetadataViewController.swift
@@ -91,8 +91,8 @@ class ShareMetadataViewController: UIViewController, UITableViewDelegate, UITabl
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
 
-        //Reload the tableview on orientation change, to match the new width of the table.
-        coordinator.animate(alongsideTransition: { context in
+        // Reload the tableview on orientation change, to match the new width of the table.
+        coordinator.animate(alongsideTransition: { [self] _ in
             // Reload table view
             self.shareMetadataTableView.reloadData()
         })
diff --git a/piwigo/Settings/SettingsViewController.swift b/piwigo/Settings/SettingsViewController.swift
index d4c914c0c..ea8eb109d 100644
--- a/piwigo/Settings/SettingsViewController.swift
+++ b/piwigo/Settings/SettingsViewController.swift
@@ -310,7 +310,7 @@ class SettingsViewController: UIViewController {
         super.viewWillTransition(to: size, with: coordinator)
         
         //Reload the tableview on orientation change, to match the new width of the table.
-        coordinator.animate(alongsideTransition: { context in
+        coordinator.animate(alongsideTransition: { [self] _ in
             
             // On iPad, the Settings section is presented in a centered popover view
             if UIDevice.current.userInterfaceIdiom == .pad {
diff --git a/piwigo/Upload/Pick Local Images/LocalImagesHeaderReusableView.swift b/piwigo/Upload/Pick Local Images/LocalImagesHeaderReusableView.swift
index 49d99fbb6..2a9fe39e7 100644
--- a/piwigo/Upload/Pick Local Images/LocalImagesHeaderReusableView.swift	
+++ b/piwigo/Upload/Pick Local Images/LocalImagesHeaderReusableView.swift	
@@ -51,7 +51,7 @@ class LocalImagesHeaderReusableView: UICollectionReusableView {
         } else {
             // Determine location from images in section
             let location = getLocation(of: images)
-            LocationProvider.shared.getPlaceName(for: location) { [unowned self] placeName, streetName in
+            LocationProvider.shared.getPlaceName(for: location) { [self] placeName, streetName in
                 if placeName.isEmpty {
                     self.detailLabel.text = dates.1
                 } else if streetName.isEmpty {
diff --git a/piwigo/Upload/Pick Local Images/LocalImagesViewController.swift b/piwigo/Upload/Pick Local Images/LocalImagesViewController.swift
index d50b2e2cd..78c9416c0 100644
--- a/piwigo/Upload/Pick Local Images/LocalImagesViewController.swift	
+++ b/piwigo/Upload/Pick Local Images/LocalImagesViewController.swift	
@@ -320,7 +320,7 @@ class LocalImagesViewController: UIViewController
            let cell = localImagesCollection.visibleCells.first {
             if let indexPath = localImagesCollection.indexPath(for: cell) {
                 // Reload collection with appropriate cell sizes
-                coordinator.animate(alongsideTransition: { context in
+                coordinator.animate(alongsideTransition: { [self] _ in
                     self.updateNavBar()
                     self.imageCellSize = self.getImageCellSize()
                     self.localImagesCollection.reloadData()
diff --git a/piwigo/Upload/Pick Pasteboard Images/PasteboardImagesViewController.swift b/piwigo/Upload/Pick Pasteboard Images/PasteboardImagesViewController.swift
index fc20f04e4..10fef42d8 100644
--- a/piwigo/Upload/Pick Pasteboard Images/PasteboardImagesViewController.swift	
+++ b/piwigo/Upload/Pick Pasteboard Images/PasteboardImagesViewController.swift	
@@ -273,7 +273,7 @@ class PasteboardImagesViewController: UIViewController, UIScrollViewDelegate {
            let cell = localImagesCollection.visibleCells.first {
             if let indexPath = localImagesCollection.indexPath(for: cell) {
                 // Reload the tableview on orientation change, to match the new width of the table.
-                coordinator.animate(alongsideTransition: { context in
+                coordinator.animate(alongsideTransition: { [self] _ in
                     self.updateNavBar()
                     self.imageCellSize = self.getImageCellSize()
                     self.localImagesCollection.reloadData()
diff --git a/piwigo/Upload/Pick Photos Album/LocalAlbumsViewController.swift b/piwigo/Upload/Pick Photos Album/LocalAlbumsViewController.swift
index cc8e76272..b4c7ddeb5 100644
--- a/piwigo/Upload/Pick Photos Album/LocalAlbumsViewController.swift	
+++ b/piwigo/Upload/Pick Photos Album/LocalAlbumsViewController.swift	
@@ -214,7 +214,7 @@ class LocalAlbumsViewController: UIViewController, UITableViewDelegate, UITableV
            let cell = localAlbumsTableView.visibleCells.first {
             if let indexPath = localAlbumsTableView.indexPath(for: cell) {
                 // Reload the tableview on orientation change, to match the new width of the table.
-                coordinator.animate(alongsideTransition: { context in
+                coordinator.animate(alongsideTransition: { [self] _ in
                     self.setTableViewMainHeader()
                     self.localAlbumsTableView.reloadData()
 
diff --git a/piwigo/Upload/Upload Queue/UploadQueueViewController.swift b/piwigo/Upload/Upload Queue/UploadQueueViewController.swift
index d416f200d..65f56c24a 100644
--- a/piwigo/Upload/Upload Queue/UploadQueueViewController.swift	
+++ b/piwigo/Upload/Upload Queue/UploadQueueViewController.swift	
@@ -122,7 +122,7 @@ class UploadQueueViewController: UIViewController, UITableViewDelegate {
            let cell = queueTableView.visibleCells.first {
             if let indexPath = queueTableView.indexPath(for: cell) {
                 // Reload the tableview on orientation change, to match the new width of the table.
-                coordinator.animate(alongsideTransition: { context in
+                coordinator.animate(alongsideTransition: { [self] _ in
                     self.queueTableView.reloadData()
 
                     // Scroll to previous position
diff --git a/piwigo/Upload/Upload Queue/UploadQueueViewControllerOld.swift b/piwigo/Upload/Upload Queue/UploadQueueViewControllerOld.swift
index 8a1be40db..bc5d45a6c 100644
--- a/piwigo/Upload/Upload Queue/UploadQueueViewControllerOld.swift	
+++ b/piwigo/Upload/Upload Queue/UploadQueueViewControllerOld.swift	
@@ -120,7 +120,7 @@ class UploadQueueViewControllerOld: UIViewController, UITableViewDelegate, UITab
            let cell = queueTableView.visibleCells.first {
             if let indexPath = queueTableView.indexPath(for: cell) {
                 // Reload the tableview on orientation change, to match the new width of the table.
-                coordinator.animate(alongsideTransition: { context in
+                coordinator.animate(alongsideTransition: { [self] _ in
                     self.queueTableView.reloadData()
 
                     // Scroll to previous position
diff --git a/piwigo/Video/PlayerViewControllerCoordinator.swift b/piwigo/Video/PlayerViewControllerCoordinator.swift
index fa992665f..615f4a71f 100644
--- a/piwigo/Video/PlayerViewControllerCoordinator.swift
+++ b/piwigo/Video/PlayerViewControllerCoordinator.swift
@@ -362,7 +362,7 @@ class PlayerViewControllerCoordinator: NSObject {
                    try? fm.removeItem(at: self.video.cacheURL)
 
                    // Store video file in cache for reuse
-                   exportSession.exportAsynchronously {
+                   exportSession.exportAsynchronously { [self] in
                        switch exportSession.status {
                        case .waiting:
                            debugPrint("••> Video waiting to export more data… ;-)")
@@ -597,7 +597,7 @@ extension PlayerViewControllerCoordinator: AVPlayerViewControllerDelegate {
     {
         status.insert([.fullScreenActive, .beingPresented])
         
-        coordinator.animate(alongsideTransition: nil) { context in
+        coordinator.animate(alongsideTransition: nil) { [self] context in
             self.status.remove(.beingPresented)
             // You need to check context.isCancelled to determine whether the transition succeeds.
             if context.isCancelled {
@@ -624,7 +624,7 @@ extension PlayerViewControllerCoordinator: AVPlayerViewControllerDelegate {
 
         status.insert([.beingDismissed])
         
-        coordinator.animate(alongsideTransition: nil) { context in
+        coordinator.animate(alongsideTransition: nil) { [self] context in
             self.status.remove(.beingDismissed)
             if !context.isCancelled {
                 self.status.remove(.fullScreenActive)
diff --git a/uploadKit/Extensions/UploadManager+Auto.swift b/uploadKit/Extensions/UploadManager+Auto.swift
index 9a9da0b4a..9a0f269db 100644
--- a/uploadKit/Extensions/UploadManager+Auto.swift
+++ b/uploadKit/Extensions/UploadManager+Auto.swift
@@ -137,7 +137,7 @@ extension UploadManager {
 
         // Remove non-completed upload requests marked for auto-upload from the upload queue
         let toDelete = (uploads.fetchedObjects ?? []).filter({$0.markedForAutoUpload == true})
-        uploadProvider.delete(uploadRequests: toDelete) { [unowned self] error in
+        uploadProvider.delete(uploadRequests: toDelete) { [self] error in
             // Job done in background task
             if self.isExecutingBackgroundUploadTask { return }
 
diff --git a/uploadKit/Extensions/UploadManager+Finisher.swift b/uploadKit/Extensions/UploadManager+Finisher.swift
index c014b79ff..3f0863c08 100644
--- a/uploadKit/Extensions/UploadManager+Finisher.swift
+++ b/uploadKit/Extensions/UploadManager+Finisher.swift
@@ -147,12 +147,12 @@ extension UploadManager {
             self.didFinishTransfer(for: upload, error: nil)
             return
         }
-        PwgSession.checkSession(ofUser: user) {
+        PwgSession.checkSession(ofUser: user) { [unowned self] in
             self.processImages(withIds: "\(upload.imageId)",
-                               inCategory: upload.category) { [unowned self] _ in
+                               inCategory: upload.category) { [self] _ in
                 self.didFinishTransfer(for: upload, error: nil)
             }
-        } failure: { _ in
+        } failure: { [unowned self] _ in
             // Cannot empty the lounge
             // ► The lounge will be emptied later by the app or the server
             // ► Continue upload tasks
diff --git a/uploadKit/Extensions/UploadManager+Resume.swift b/uploadKit/Extensions/UploadManager+Resume.swift
index edb0cba2d..cc8a1bc3e 100644
--- a/uploadKit/Extensions/UploadManager+Resume.swift
+++ b/uploadKit/Extensions/UploadManager+Resume.swift
@@ -114,7 +114,7 @@ extension UploadManager
         toDelete.append(contentsOf: (uploads.fetchedObjects ?? []).filter({$0.requestState == 13}))
         
         // Delete upload requests
-        uploadProvider.delete(uploadRequests: toDelete) { [unowned self] _ in
+        uploadProvider.delete(uploadRequests: toDelete) { [self] _ in
             // Restart activities
             self.findNextImageToUpload()
             
diff --git a/uploadKit/Extensions/UploadManager+Video.swift b/uploadKit/Extensions/UploadManager+Video.swift
index 2e87ea736..0f97a1bf2 100644
--- a/uploadKit/Extensions/UploadManager+Video.swift
+++ b/uploadKit/Extensions/UploadManager+Video.swift
@@ -168,7 +168,7 @@ extension UploadManager {
 
         // Retrieve video data
         let options = getVideoRequestOptions()
-        retrieveVideo(from: imageAsset, with: options) { [unowned self] (avasset, options, error) in
+        retrieveVideo(from: imageAsset, with: options) { [self] (avasset, options, error) in
             // Error?
             if let error = error {
                 self.didPrepareVideo(for: upload, error)
@@ -270,7 +270,7 @@ extension UploadManager {
         // Available export session presets?
         PHImageManager.default().requestAVAsset(forVideo: imageAsset,
                                                 options: options,
-                                                resultHandler: { [unowned self] avasset, audioMix, info in
+                                                resultHandler: { [self] avasset, audioMix, info in
             // ====>> For debugging…
 //            if let metadata = avasset?.metadata {
 //                debugPrint("=> Metadata: \(metadata)\r=> Creation date: \(metadata.creationDate() ?? DateUtilities.unknownDate)")
@@ -446,7 +446,7 @@ extension UploadManager {
             exportSession.outputURL = getUploadFileURL(from: upload, deleted: true)
 
             // Export temporary video for upload
-            exportSession.exportAsynchronously { [unowned self] in
+            exportSession.exportAsynchronously { [self] in
                 guard exportSession.status == .completed,
                       let outputURL = exportSession.outputURL else {
                     // Deletes temporary video file if any
diff --git a/uploadKit/UploadManager.swift b/uploadKit/UploadManager.swift
index 37243fc81..373554e40 100644
--- a/uploadKit/UploadManager.swift
+++ b/uploadKit/UploadManager.swift
@@ -103,7 +103,7 @@ public class UploadManager: NSObject {
         // Update value
         nberOfUploadsToComplete = (uploads.fetchedObjects ?? []).count
         // Update badge and default album view button
-        DispatchQueue.main.async { [unowned self] in
+        DispatchQueue.main.async { [self] in
             // Update app badge and button of root album (or default album)
             let uploadInfo: [String : Any] = ["nberOfUploadsToComplete" : self.nberOfUploadsToComplete]
             NotificationCenter.default.post(name: .pwgLeftUploads, object: nil, userInfo: uploadInfo)

From bee20bf36ad0095aca187a276fa53207a2d648e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Thu, 10 Oct 2024 08:15:07 +0200
Subject: [PATCH 23/34] Manages situations where the server does not provide
 the expected total number of bytes to download

---
 .../xcshareddata/xcschemes/piwigo.xcscheme    | 140 ------------------
 .../Network/Extensions/PwgSession+Image.swift |  37 ++---
 2 files changed, 19 insertions(+), 158 deletions(-)
 delete mode 100644 piwigo.xcodeproj/xcshareddata/xcschemes/piwigo.xcscheme

diff --git a/piwigo.xcodeproj/xcshareddata/xcschemes/piwigo.xcscheme b/piwigo.xcodeproj/xcshareddata/xcschemes/piwigo.xcscheme
deleted file mode 100644
index d2680a74b..000000000
--- a/piwigo.xcodeproj/xcshareddata/xcschemes/piwigo.xcscheme
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1600"
-   version = "2.0">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "NO"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D82B8CBA1A67820A000E47CA"
-               BuildableName = "piwigo.app"
-               BlueprintName = "piwigo"
-               ReferencedContainer = "container:piwigo.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-      shouldUseLaunchSchemeArgsEnv = "NO"
-      disableMainThreadChecker = "YES"
-      codeCoverageEnabled = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AD11E45D24A930B000C8876F"
-               BuildableName = "piwigoWebAPI.xctest"
-               BlueprintName = "piwigoWebAPI"
-               ReferencedContainer = "container:piwigo.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      enableASanStackUseAfterReturn = "YES"
-      enableUBSanitizer = "YES"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugXPCServices = "NO"
-      migratedStopOnEveryIssue = "YES"
-      debugServiceExtension = "internal"
-      enableGPUValidationMode = "1"
-      allowLocationSimulation = "NO"
-      GPUProfilerEnabled = "No">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D82B8CBA1A67820A000E47CA"
-            BuildableName = "piwigo.app"
-            BlueprintName = "piwigo"
-            ReferencedContainer = "container:piwigo.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <CommandLineArguments>
-         <CommandLineArgument
-            argument = "-com.apple.CoreData.concurrencyDebug 1"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = ""
-            isEnabled = "NO">
-         </CommandLineArgument>
-      </CommandLineArguments>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "CGBITMAP_CONTEXT_LOG_ERRORS"
-            value = "1"
-            isEnabled = "NO">
-         </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "IDEPreferLogStreaming"
-            value = "1"
-            isEnabled = "NO">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
-      <LocationScenarioReference
-         identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
-         referenceType = "1">
-      </LocationScenarioReference>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Debug"
-      shouldUseLaunchSchemeArgsEnv = "NO"
-      savedToolIdentifier = "/Applications/Xcode.app/Contents/Applications/Instruments.app/Contents/Resources/templates/Leaks.tracetemplate"
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D82B8CBA1A67820A000E47CA"
-            BuildableName = "piwigo.app"
-            BlueprintName = "piwigo"
-            ReferencedContainer = "container:piwigo.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-      <PreActions>
-         <ExecutionAction
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-            <ActionContent
-               title = "Run Script"
-               scriptText = "# Type a script or drag a script file from your workspace to insert its path.&#10;">
-               <EnvironmentBuildable>
-                  <BuildableReference
-                     BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "D82B8CBA1A67820A000E47CA"
-                     BuildableName = "piwigo.app"
-                     BlueprintName = "piwigo"
-                     ReferencedContainer = "container:piwigo.xcodeproj">
-                  </BuildableReference>
-               </EnvironmentBuildable>
-            </ActionContent>
-         </ExecutionAction>
-      </PreActions>
-   </ArchiveAction>
-</Scheme>
diff --git a/piwigoKit/Network/Extensions/PwgSession+Image.swift b/piwigoKit/Network/Extensions/PwgSession+Image.swift
index def4a4a08..57fce4218 100644
--- a/piwigoKit/Network/Extensions/PwgSession+Image.swift
+++ b/piwigoKit/Network/Extensions/PwgSession+Image.swift
@@ -56,7 +56,8 @@ extension PwgSession
         }
 
         // Download this image in the background thread
-        guard let download = self.activeDownloads[imageURL] else {
+        guard let download = self.activeDownloads[imageURL]
+        else {
 //            debugPrint("••> Launch download of image: \(imageURL)")
             download.task = self.dataSession.downloadTask(with: request)
             download.task?.countOfBytesClientExpectsToSend = Int64((request.allHTTPHeaderFields ?? [:]).count)
@@ -87,9 +88,8 @@ extension PwgSession
     
     public func pauseDownload(atURL imageURL: URL) {
         // Retrieve download instance
-        guard let download = activeDownloads[imageURL] else {
-            return
-        }
+        guard let download = activeDownloads[imageURL]
+        else { return }
         
         // Cancel the download request
         download.task?.cancel(byProducingResumeData: { imageData in
@@ -100,9 +100,8 @@ extension PwgSession
     
     public func cancelDownload(atURL imageURL: URL) {
         // Retrieve download instance
-        guard let download = activeDownloads[imageURL] else {
-            return
-        }
+        guard let download = activeDownloads[imageURL]
+        else { return }
 
         // Cancel the download request
 //        debugPrint("••> Cancel download: \(imageURL)")
@@ -116,9 +115,8 @@ extension PwgSession: URLSessionTaskDelegate {
         // Retrieve the original URL of this task
 //        debugPrint("••> Did complete task #\(task.taskIdentifier) with error: \(error?.localizedDescription ?? "none")")
         guard let imageURL = task.originalRequest?.url ?? task.currentRequest?.url,
-              let download = activeDownloads[imageURL] else {
-            return
-        }
+              let download = activeDownloads[imageURL]
+        else { return }
 
         if let error = error {
             // Return error with failureHandler
@@ -146,14 +144,18 @@ extension PwgSession: URLSessionDownloadDelegate {
 //        debugPrint("••> Progress task #\(downloadTask.taskIdentifier): \(totalBytesWritten) total bytes downloaded from \(String(describing: downloadTask.originalRequest?.url ?? downloadTask.currentRequest?.url))")
 //        activeDownloads.forEach { (key, _) in debugPrint("   Key: \(key)") }
         guard let imageURL = downloadTask.originalRequest?.url ?? downloadTask.currentRequest?.url,
-              let download = activeDownloads[imageURL] else {
-            return
-        }
+              let download = activeDownloads[imageURL]
+        else { return }
 
         // Update progress bar if any
         if let progressHandler = download.progressHandler {
-            download.progress = Float(totalBytesWritten) / Float(totalBytesExpectedToWrite)
-//            debugPrint("••> Progress task #\(downloadTask.taskIdentifier) -> written: \(bytesWritten), totalWritten: \(totalBytesWritten), expected: \(totalBytesExpectedToWrite), progress: \(download.progress)")
+            if totalBytesExpectedToWrite > 0 {
+                download.progress = Float(totalBytesWritten) / Float(totalBytesExpectedToWrite)
+//                debugPrint("••> Progress task #\(downloadTask.taskIdentifier) -> written: \(bytesWritten), totalWritten: \(totalBytesWritten), expected: \(totalBytesExpectedToWrite), progress: \(download.progress)")
+            } else {
+                download.progress = 1.0 - Float(bytesWritten) / Float(totalBytesWritten)
+//                debugPrint("••> Progress task #\(downloadTask.taskIdentifier) -> written: \(bytesWritten), totalWritten: \(totalBytesWritten), expected: \(totalBytesExpectedToWrite), progress: \(download.progress)")
+            }
             progressHandler(download.progress)
         }
     }
@@ -164,9 +166,8 @@ extension PwgSession: URLSessionDownloadDelegate {
 //        debugPrint("••> Task #\(downloadTask.taskIdentifier) did finish downloading to \(location)")
         guard let imageURL = downloadTask.originalRequest?.url ?? downloadTask.currentRequest?.url,
               let download = activeDownloads[imageURL],
-              let fileURL = download.fileURL else {
-            return
-        }
+              let fileURL = download.fileURL
+        else { return }
 
         // Create parent directories if needed
         do {

From 8d6d8575f20d73c5a00bfaffa68b99f30243ebce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Fri, 11 Oct 2024 22:10:38 +0200
Subject: [PATCH 24/34] Checks the session if the connection has changed (WiFi
 <-> cellular)

---
 .../Network/Extensions/PwgSession+Utilities.swift     | 11 +++++++++--
 piwigoKit/Network/PwgSession.swift                    |  5 ++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/piwigoKit/Network/Extensions/PwgSession+Utilities.swift b/piwigoKit/Network/Extensions/PwgSession+Utilities.swift
index 55e111c4f..af49cebde 100644
--- a/piwigoKit/Network/Extensions/PwgSession+Utilities.swift
+++ b/piwigoKit/Network/Extensions/PwgSession+Utilities.swift
@@ -80,14 +80,19 @@ extension PwgSession {
                       failure: @escaping (NSError) -> Void) {
         // Check if the session is still active every 60 seconds or more
         let secondsSinceLastCheck = Date.timeIntervalSinceReferenceDate - (user?.lastUsed ?? 0.0)
-        if secondsSinceLastCheck < 60 {
+        if secondsSinceLastCheck < 60,
+            PwgSession.shared.wasConnectedToWifi == NetworkVars.isConnectedToWiFi() {
             completion()
             return
         }
         
         // Determine if the session is still active
         if #available(iOSApplicationExtension 14.0, *) {
-            logger.notice("Start checking session…")
+            if NetworkVars.isConnectedToWiFi() {
+                logger.notice("Start checking session… (WiFi)")
+            } else {
+                logger.notice("Start checking session… (Cellular)")
+            }
         }
         let oldToken = NetworkVars.pwgToken
         PwgSession.shared.sessionGetStatus { username in
@@ -109,6 +114,7 @@ extension PwgSession {
                             // Update date of accesss to the server by guest
                             user?.setLastUsedToNow()
                             user?.status = NetworkVars.userStatus.rawValue
+                            PwgSession.shared.wasConnectedToWifi = NetworkVars.isConnectedToWiFi()
                             completion()
                         } failure: { error in
                             failure(error)
@@ -123,6 +129,7 @@ extension PwgSession {
                                 // Update date of accesss to the server by user
                                 user?.setLastUsedToNow()
                                 user?.status = NetworkVars.userStatus.rawValue
+                                PwgSession.shared.wasConnectedToWifi = NetworkVars.isConnectedToWiFi()
                                 completion()
                             } failure: { error in
                                 failure(error)
diff --git a/piwigoKit/Network/PwgSession.swift b/piwigoKit/Network/PwgSession.swift
index 91de694af..8a354e9c1 100644
--- a/piwigoKit/Network/PwgSession.swift
+++ b/piwigoKit/Network/PwgSession.swift
@@ -68,7 +68,10 @@ public class PwgSession: NSObject {
     
     // Active downloads
     lazy var activeDownloads: [URL : ImageDownload] = [ : ]
-        
+    
+    // Remember if the session was opened with a WiFi
+    lazy var wasConnectedToWifi = NetworkVars.isConnectedToWiFi()
+    
     // Will accept the image formats supported by UIImage
     lazy var acceptedTypes: String = {
         var acceptedTypes = ""

From 59b255819a1dca488f79a8a0ec98a9669c57b809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Fri, 11 Oct 2024 22:12:36 +0200
Subject: [PATCH 25/34] Fixes lack of debug information

---
 piwigo.xcodeproj/project.pbxproj              |   6 +
 .../xcshareddata/xcschemes/piwigo.xcscheme    | 138 ++++++++++++++++++
 2 files changed, 144 insertions(+)
 create mode 100644 piwigo.xcodeproj/xcshareddata/xcschemes/piwigo.xcscheme

diff --git a/piwigo.xcodeproj/project.pbxproj b/piwigo.xcodeproj/project.pbxproj
index 03d4b57d6..22a3370c9 100644
--- a/piwigo.xcodeproj/project.pbxproj
+++ b/piwigo.xcodeproj/project.pbxproj
@@ -3768,6 +3768,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZEC3W885H6;
@@ -3820,6 +3821,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZU5THW8T5W;
@@ -3946,6 +3948,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 371;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZEC3W885H6;
@@ -4001,6 +4004,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
 				CURRENT_PROJECT_VERSION = 371;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZU5THW8T5W;
@@ -4308,6 +4312,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Eddy Lelievre-Berna (QWTTGCZPSN)";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 551;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = ZEC3W885H6;
 				ENABLE_BITCODE = NO;
@@ -4381,6 +4386,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Pierrick Le Gall (ZU5THW8T5W)";
 				COPY_PHASE_STRIP = YES;
 				CURRENT_PROJECT_VERSION = 551;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = ZU5THW8T5W;
 				ENABLE_BITCODE = NO;
diff --git a/piwigo.xcodeproj/xcshareddata/xcschemes/piwigo.xcscheme b/piwigo.xcodeproj/xcshareddata/xcschemes/piwigo.xcscheme
new file mode 100644
index 000000000..39b21c7a6
--- /dev/null
+++ b/piwigo.xcodeproj/xcshareddata/xcschemes/piwigo.xcscheme
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1600"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "NO"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D82B8CBA1A67820A000E47CA"
+               BuildableName = "piwigo.app"
+               BlueprintName = "piwigo"
+               ReferencedContainer = "container:piwigo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      shouldUseLaunchSchemeArgsEnv = "NO"
+      disableMainThreadChecker = "YES"
+      codeCoverageEnabled = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AD11E45D24A930B000C8876F"
+               BuildableName = "piwigoWebAPI.xctest"
+               BlueprintName = "piwigoWebAPI"
+               ReferencedContainer = "container:piwigo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugXPCServices = "NO"
+      migratedStopOnEveryIssue = "YES"
+      debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
+      allowLocationSimulation = "NO"
+      GPUProfilerEnabled = "No">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D82B8CBA1A67820A000E47CA"
+            BuildableName = "piwigo.app"
+            BlueprintName = "piwigo"
+            ReferencedContainer = "container:piwigo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.concurrencyDebug 1"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = ""
+            isEnabled = "NO">
+         </CommandLineArgument>
+      </CommandLineArguments>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "CGBITMAP_CONTEXT_LOG_ERRORS"
+            value = "1"
+            isEnabled = "NO">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "IDEPreferLogStreaming"
+            value = "1"
+            isEnabled = "NO">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+      <LocationScenarioReference
+         identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+         referenceType = "1">
+      </LocationScenarioReference>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Debug"
+      shouldUseLaunchSchemeArgsEnv = "NO"
+      savedToolIdentifier = "/Applications/Xcode.app/Contents/Applications/Instruments.app/Contents/Resources/templates/Leaks.tracetemplate"
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D82B8CBA1A67820A000E47CA"
+            BuildableName = "piwigo.app"
+            BlueprintName = "piwigo"
+            ReferencedContainer = "container:piwigo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "# Type a script or drag a script file from your workspace to insert its path.&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "D82B8CBA1A67820A000E47CA"
+                     BuildableName = "piwigo.app"
+                     BlueprintName = "piwigo"
+                     ReferencedContainer = "container:piwigo.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
+   </ArchiveAction>
+</Scheme>

From 688579b44d1f6fceaab849464c7d48581d00fc91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Fri, 11 Oct 2024 22:15:22 +0200
Subject: [PATCH 26/34] Switches from full to xxlarge, xlarge, large or medium
 resolution when receiving memory warning (e.g. iPhone 6)

---
 piwigo/Image/ImageDetailViewController.swift | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/piwigo/Image/ImageDetailViewController.swift b/piwigo/Image/ImageDetailViewController.swift
index dbae87629..4d62ec5b1 100644
--- a/piwigo/Image/ImageDetailViewController.swift
+++ b/piwigo/Image/ImageDetailViewController.swift
@@ -173,6 +173,32 @@ class ImageDetailViewController: UIViewController
 //            applyImagePositionInScrollView()
         })
     }
+    
+    override func didReceiveMemoryWarning() {
+        // Replace high-res image by thumbnail image in cache until the next lower version is loaded
+        let placeHolder = UIImage(named: "unknownImage")!
+        let thumbSize = pwgImageSize(rawValue: AlbumVars.shared.defaultThumbnailSize) ?? .thumb
+        self.setImageView(with: self.imageData.cachedThumbnail(ofSize: thumbSize) ?? placeHolder)
+        
+        // Look for the first available image of lower resolution
+        if previewSize == .fullRes {
+            if NetworkVars.hasXXLargeSizeImages {
+                previewSize = .xxLarge
+            } else if NetworkVars.hasXLargeSizeImages {
+                previewSize = .xLarge
+            } else if NetworkVars.hasLargeSizeImages {
+                previewSize = .large
+            } else {
+                previewSize = .medium
+            }
+        }
+        
+        // Store tfor future use
+        ImageVars.shared.defaultImagePreviewSize = previewSize.rawValue
+        
+        // Replace high-resolution image
+        loadAndDisplayHighResImage()
+    }
 
     deinit {
         // Unregister all observers

From 7ffc5cdc42f68b1302588423b98319641fe858c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Fri, 11 Oct 2024 22:28:32 +0200
Subject: [PATCH 27/34] Fixes memory leak and crash, fixes download not resumed

---
 piwigo/Image/ImageDetailViewController.swift | 105 ++++++++++---------
 piwigoKit/Network/ImageDownload.swift        |   1 +
 2 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/piwigo/Image/ImageDetailViewController.swift b/piwigo/Image/ImageDetailViewController.swift
index 4d62ec5b1..d14d06b72 100644
--- a/piwigo/Image/ImageDetailViewController.swift
+++ b/piwigo/Image/ImageDetailViewController.swift
@@ -38,54 +38,19 @@ class ImageDetailViewController: UIViewController
         return view.bounds.size
     }()
     
+    // Cached variables
+    private lazy var scale = CGFloat.zero
+    private lazy var imageSize = CGSize.zero
+    private lazy var previewSize = pwgImageSize(rawValue: ImageVars.shared.defaultImagePreviewSize) ?? .medium
+    
     
     // MARK: - View Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        // Get high-resolution image size
-        let scale = max(view.traitCollection.displayScale, 1.0) * pwgImageSize.maxZoomScale
-        let viewSize = CGSizeMake(view.bounds.size.width * scale, view.bounds.size.height * scale)
-        var previewSize = pwgImageSize(rawValue: ImageVars.shared.defaultImagePreviewSize) ?? .medium
-        if imageData.isVideo, previewSize == .fullRes {
-            previewSize = .xxLarge
-        }
-        
-        // Check if we already have the high-resolution image in cache
-        if let wantedImage = imageData.cachedThumbnail(ofSize: previewSize) {
-            // Show high-resolution image in cache
-            debugPrint("••> wantedImage: \(CFGetRetainCount(wantedImage))")
-            let cachedImage = ImageUtilities.downsample(image: wantedImage, to: viewSize)
-            debugPrint("••> cachedImage: \(CFGetRetainCount(cachedImage))")
-            setImageView(with: cachedImage)
-        } else {
-            // Display thumbnail image which should be in cache
-            let placeHolder = UIImage(named: "unknownImage")!
-            let thumbSize = pwgImageSize(rawValue: AlbumVars.shared.defaultThumbnailSize) ?? .thumb
-            self.setImageView(with: self.imageData.cachedThumbnail(ofSize: thumbSize) ?? placeHolder)
-            
-            // Download high-resolution image
-            imageURL = ImageUtilities.getURL(self.imageData, ofMinSize: previewSize)
-            if let imageURL = self.imageURL {
-                PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: previewSize, atURL: imageURL,
-                                           fromServer: imageData.server?.uuid, fileSize: imageData.fileSize,
-                                           placeHolder: placeHolder) { [unowned self] fractionCompleted in
-                    DispatchQueue.main.async { [self] in
-                        // Show download progress
-                        self.progressView.progress = fractionCompleted
-                    }
-                } completion: { [unowned self] cachedImageURL in
-                    let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: viewSize)
-                    debugPrint("••> cachedImage: \(CFGetRetainCount(cachedImage))")
-                    DispatchQueue.main.async { [self] in
-                        // Hide progress view
-                        self.progressView.isHidden = true
-                        // Replace thumbnail with high-resolution image
-                        self.setImageView(with: cachedImage)
-                    }
-                } failure: { _ in }
-            }
-        }
+        // Initialise scale, size, and display image of default preview size
+        scale = max(view.traitCollection.displayScale, 1.0) * pwgImageSize.maxZoomScale
+        imageSize = CGSizeMake(view.bounds.size.width * scale, view.bounds.size.height * scale)
         
         // Register palette changes
         NotificationCenter.default.addObserver(self, selector: #selector(applyColorPalette),
@@ -99,6 +64,9 @@ class ImageDetailViewController: UIViewController
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        
+        // Load andd display image (resume download if needed)
+        loadAndDisplayHighResImage()
 
         // Configure the description view before layouting subviews
         descContainer.config(with: imageData.comment, inViewController: self, forVideo: false)
@@ -193,7 +161,7 @@ class ImageDetailViewController: UIViewController
             }
         }
         
-        // Store tfor future use
+        // Store for future use
         ImageVars.shared.defaultImagePreviewSize = previewSize.rawValue
         
         // Replace high-resolution image
@@ -210,6 +178,50 @@ class ImageDetailViewController: UIViewController
     
     
     // MARK: - Image Management
+    private func loadAndDisplayHighResImage() {
+        // Check if we already have the high-resolution image in cache
+        if let wantedImage = imageData.cachedThumbnail(ofSize: previewSize) {
+            // Show high-resolution image in cache
+            let cachedImage = ImageUtilities.downsample(image: wantedImage, to: imageSize)
+            setImageView(with: cachedImage)
+        } else {
+            // Display thumbnail image which should be in cache
+            let placeHolder = UIImage(named: "unknownImage")!
+            let thumbSize = pwgImageSize(rawValue: AlbumVars.shared.defaultThumbnailSize) ?? .thumb
+            self.setImageView(with: self.imageData.cachedThumbnail(ofSize: thumbSize) ?? placeHolder)
+            
+            // Download high-resolution image
+            imageURL = ImageUtilities.getURL(self.imageData, ofMinSize: previewSize)
+            if let imageURL = self.imageURL {
+                PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: previewSize, atURL: imageURL,
+                                           fromServer: imageData.server?.uuid, fileSize: imageData.fileSize,
+                                           placeHolder: placeHolder) { [weak self] fractionCompleted in
+                    self?.updateProgressView(with: fractionCompleted)
+                } completion: { [weak self] cachedImageURL in
+                    self?.downsampleImage(atURL: cachedImageURL)
+                } failure: { _ in }
+            }
+        }
+    }
+    
+    private func updateProgressView(with fractionCompleted: Float) {
+//        debugPrint("••> Loading image \(imageData.pwgID): \(fractionCompleted)%")
+        DispatchQueue.main.async { [self] in
+            // Show download progress
+            self.progressView.progress = fractionCompleted
+        }
+    }
+    
+    private func downsampleImage(atURL fileURL: URL) {
+        let cachedImage = ImageUtilities.downsample(imageAt: fileURL, to: imageSize)
+        DispatchQueue.main.async { [self] in
+            // Hide progress view
+            self.progressView.isHidden = true
+            // Replace thumbnail with high-resolution image
+            self.setImageView(with: cachedImage)
+        }
+    }
+
     private func setImageView(with image: UIImage) {
         // Any change?
         if imageView.image?.size == image.size {
@@ -236,9 +248,6 @@ class ImageDetailViewController: UIViewController
     
     func rotateImageView(by angle: Double, completion: @escaping () -> Void) {
         // Download high-resolution image
-        let scale = view.traitCollection.displayScale * pwgImageSize.maxZoomScale
-        let viewSize = CGSizeMake(view.bounds.size.width * scale, view.bounds.size.height * scale)
-        let previewSize = pwgImageSize(rawValue: ImageVars.shared.defaultImagePreviewSize) ?? .medium
         let placeHolder = imageView.image ?? UIImage(named: "unknownImage")!
         imageURL = ImageUtilities.getURL(self.imageData, ofMinSize: previewSize)
         if let imageURL = self.imageURL {
@@ -250,7 +259,7 @@ class ImageDetailViewController: UIViewController
                     self.progressView.progress = fractionCompleted
                 }
             } completion: { [unowned self] cachedImageURL in
-                let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: viewSize)
+                let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: imageSize)
                 DispatchQueue.main.async { [self] in
                     // Hide progress view
                     self.progressView.isHidden = true
diff --git a/piwigoKit/Network/ImageDownload.swift b/piwigoKit/Network/ImageDownload.swift
index 937c661c6..9778151df 100644
--- a/piwigoKit/Network/ImageDownload.swift
+++ b/piwigoKit/Network/ImageDownload.swift
@@ -45,6 +45,7 @@ class ImageDownload {
     }
     
     deinit {
+//        debugPrint("••> release ImageDownload of image \(self.fileURL.lastPathComponent)")
         self.task?.cancel()
     }
 }

From 9c419095d033f7ab8dc1bb3968fdb3449f6ef157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sat, 12 Oct 2024 11:29:38 +0200
Subject: [PATCH 28/34] Fixes memory leak and crash, fixes main thread calls

---
 .../AlbumCollectionViewCell.swift             |  56 +++++----
 .../AlbumCollection/AlbumTableViewCell.swift  |  56 +++++----
 piwigo/Album/AlbumViewController.swift        |   1 +
 .../ImageCollectionViewCell.swift             | 104 ++++++++--------
 .../ImagePreviewViewController.swift          |  22 ++--
 .../ExternalDisplayViewController.swift       | 115 ++++++++++--------
 piwigo/Image/ImageDetailViewController.swift  |  57 ++++-----
 .../EditImageThumbCollectionViewCell.swift    |  27 ++--
 .../ShareImageActivityItemProvider.swift      |  11 +-
 .../ShareVideoActivityItemProvider.swift      |  11 +-
 10 files changed, 251 insertions(+), 209 deletions(-)

diff --git a/piwigo/Album/AlbumCollection/AlbumCollectionViewCell.swift b/piwigo/Album/AlbumCollection/AlbumCollectionViewCell.swift
index 04b33d781..383fc2dac 100644
--- a/piwigo/Album/AlbumCollection/AlbumCollectionViewCell.swift
+++ b/piwigo/Album/AlbumCollection/AlbumCollectionViewCell.swift
@@ -62,22 +62,44 @@ class AlbumCollectionViewCell: UICollectionViewCell {
         // Retrieve image from cache or download it
         self.albumThumbnail.layoutIfNeeded()   // Ensure imageView in its final size
         let placeHolder = UIImage(named: "placeholder")!
-        let scale = max(albumThumbnail.traitCollection.displayScale, 1.0)
-        let cellSize = CGSizeMake(albumThumbnail.bounds.size.width * scale, albumThumbnail.bounds.size.height * scale)
+        let scale = max(self.albumThumbnail.traitCollection.displayScale, 1.0)
+        let cellSize = CGSizeMake(self.albumThumbnail.bounds.size.width * scale, self.albumThumbnail.bounds.size.height * scale)
         let thumbSize = pwgImageSize(rawValue: AlbumVars.shared.defaultAlbumThumbnailSize) ?? .medium
         PwgSession.shared.getImage(withID: albumData?.thumbnailId, ofSize: thumbSize,
                                    atURL: albumData?.thumbnailUrl as? URL,
                                    fromServer: albumData?.user?.server?.uuid,
-                                   placeHolder: placeHolder) { [unowned self] cachedImageURL in
-            let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize)
-            self.configImage(cachedImage)
-        } failure: { [unowned self] _ in
-            DispatchQueue.main.async { [self] in
-                self.albumThumbnail.image = placeHolder
+                                   placeHolder: placeHolder) { [weak self] cachedImageURL in
+            self?.downsampleImage(atURL: cachedImageURL, to: cellSize)
+        } failure: { [weak self] _ in
+            self?.setThumbnailWithImage(placeHolder)
+        }
+    }
+    
+    private func downsampleImage(atURL fileURL: URL, to cellSize: CGSize) {
+        // Process image in the background
+        DispatchQueue.global(qos: .userInitiated).async { [self] in
+            // Downsample image in cache
+            let cachedImage = ImageUtilities.downsample(imageAt: fileURL, to: cellSize)
+            
+            // Process saliency if needed
+            var finalImage:UIImage = cachedImage
+            if #available(iOS 13.0, *) {
+                if let croppedImage = cachedImage.processSaliency() {
+                    finalImage = croppedImage
+                }
             }
+            
+            // Set image
+            self.setThumbnailWithImage(finalImage)
         }
     }
     
+    private func setThumbnailWithImage(_ image: UIImage) {
+        DispatchQueue.main.async { [self] in
+            self.albumThumbnail.image = image
+        }
+    }
+
     func applyColorPalette() {
         backgroundColor = UIColor.piwigoColorBackground()
         contentView.backgroundColor = UIColor.piwigoColorCellBackground()
@@ -124,24 +146,6 @@ class AlbumCollectionViewCell: UICollectionViewCell {
         return text
     }
 
-    private func configImage(_ image: UIImage) {
-        // Process image in the background
-        DispatchQueue.global(qos: .userInitiated).async { [self] in
-            // Process saliency
-            var finalImage:UIImage = image
-            if #available(iOS 13.0, *) {
-                if let croppedImage = image.processSaliency() {
-                    finalImage = croppedImage
-                }
-            }
-
-            // Set image
-            DispatchQueue.main.async { [self] in
-                self.albumThumbnail.image = finalImage
-            }
-        }
-    }
-
     override func prepareForReuse() {
         super.prepareForReuse()
         albumThumbnail.image = nil
diff --git a/piwigo/Album/AlbumCollection/AlbumTableViewCell.swift b/piwigo/Album/AlbumCollection/AlbumTableViewCell.swift
index 3c441b11f..6923f0020 100644
--- a/piwigo/Album/AlbumCollection/AlbumTableViewCell.swift
+++ b/piwigo/Album/AlbumCollection/AlbumTableViewCell.swift
@@ -85,22 +85,44 @@ class AlbumTableViewCell: UITableViewCell {
         // Retrieve image from cache or download it
         self.backgroundImage.layoutIfNeeded()   // Ensure imageView in its final size
         let placeHolder = UIImage(named: "placeholder")!
-        let scale = max(backgroundImage.traitCollection.displayScale, 1.0)
-        let cellSize = CGSizeMake(backgroundImage.bounds.size.width * scale, backgroundImage.bounds.size.height * scale)
+        let scale = max(self.backgroundImage.traitCollection.displayScale, 1.0)
+        let cellSize = CGSizeMake(self.backgroundImage.bounds.size.width * scale, self.backgroundImage.bounds.size.height * scale)
         let thumbSize = pwgImageSize(rawValue: AlbumVars.shared.defaultAlbumThumbnailSize) ?? .medium
         PwgSession.shared.getImage(withID: albumData?.thumbnailId, ofSize: thumbSize,
                                    atURL: albumData?.thumbnailUrl as? URL,
                                    fromServer: albumData?.user?.server?.uuid,
-                                   placeHolder: placeHolder) { [unowned self] cachedImageURL in
-            let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize)
-            self.configImage(cachedImage)
-        } failure: { [unowned self] _ in
-            DispatchQueue.main.async { [self] in
-                self.backgroundImage.image = placeHolder
+                                   placeHolder: placeHolder) { [weak self] cachedImageURL in
+            self?.downsampleImage(atURL: cachedImageURL, to: cellSize)
+        } failure: { [weak self] _ in
+            self?.setBackgroundWithImage(placeHolder)
+        }
+    }
+    
+    private func downsampleImage(atURL fileURL: URL, to cellSize: CGSize) {
+        // Process image in the background
+        DispatchQueue.global(qos: .userInitiated).async { [self] in
+            // Downsample image in cache
+            let cachedImage = ImageUtilities.downsample(imageAt: fileURL, to: cellSize)
+            
+            // Process saliency if needed
+            var finalImage:UIImage = cachedImage
+            if #available(iOS 13.0, *) {
+                if let croppedImage = cachedImage.processSaliency() {
+                    finalImage = croppedImage
+                }
             }
+            
+            // Set image
+            self.setBackgroundWithImage(finalImage)
         }
     }
     
+    private func setBackgroundWithImage(_ image: UIImage) {
+        DispatchQueue.main.async { [self] in
+            self.backgroundImage.image = image
+        }
+    }
+
     private func getDescription(fromAlbumData albumData: Album?) -> NSAttributedString {
         var desc = NSMutableAttributedString()
         // Any provided description?
@@ -206,24 +228,6 @@ class AlbumTableViewCell: UITableViewCell {
         return newFontSize
     }
 
-    private func configImage(_ image: UIImage) {
-        // Process image in the background
-        DispatchQueue.global(qos: .userInitiated).async {
-            // Process saliency
-            var finalImage:UIImage = image
-            if #available(iOS 13.0, *) {
-                if let croppedImage = image.processSaliency() {
-                    finalImage = croppedImage
-                }
-            }
-
-            // Set image
-            DispatchQueue.main.async {
-                self.backgroundImage.image = finalImage
-            }
-        }
-    }
-    
     override func prepareForReuse() {
         super.prepareForReuse()
         backgroundImage.image = nil
diff --git a/piwigo/Album/AlbumViewController.swift b/piwigo/Album/AlbumViewController.swift
index f2dd3c506..b386aa792 100644
--- a/piwigo/Album/AlbumViewController.swift
+++ b/piwigo/Album/AlbumViewController.swift
@@ -663,6 +663,7 @@ class AlbumViewController: UIViewController
 
         // Unregister all observers
         NotificationCenter.default.removeObserver(self)
+        debugPrint("••> AlbumViewController released memory")
     }
     
     
diff --git a/piwigo/Album/ImageCollection/ImageCollectionViewCell.swift b/piwigo/Album/ImageCollection/ImageCollectionViewCell.swift
index 2cfa3958f..8a99b01b6 100644
--- a/piwigo/Album/ImageCollection/ImageCollectionViewCell.swift
+++ b/piwigo/Album/ImageCollection/ImageCollectionViewCell.swift
@@ -147,18 +147,10 @@ class ImageCollectionViewCell: UICollectionViewCell {
         let imageURL = ImageUtilities.getURL(imageData, ofMinSize: size)
         PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: size, atURL: imageURL,
                                    fromServer: imageData.server?.uuid, fileSize: imageData.fileSize,
-                                   placeHolder: placeHolder) { [unowned self] cachedImageURL in
-            let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize)
-            DispatchQueue.main.async { [self] in
-                self.configImage(cachedImage)
-            }
-        } failure: { [unowned self] _ in
-            // No image available
-            DispatchQueue.main.async { [self] in
-                self.configImage(placeHolder)
-                self.noDataLabel?.isHidden = false
-                self.applyColorPalette()
-            }
+                                   placeHolder: placeHolder) { [weak self] cachedImageURL in
+            self?.downsampleImage(atURL: cachedImageURL, to: cellSize)
+        } failure: { [weak self] _ in
+            self?.configImage(placeHolder, withHiddenLabel: false)
         }
     }
     
@@ -203,46 +195,60 @@ class ImageCollectionViewCell: UICollectionViewCell {
         return attributedStr
     }
 
-    private func configImage(_ image: UIImage) {
-        // Set image
-        self.cellImage?.image = image
-
-        // Favorite image position depends on device
-        self.deltaX = CGFloat.zero
-        self.deltaY = CGFloat.zero
-        let imageScale = CGFloat(min(self.bounds.size.width / image.size.width,
-                                     self.bounds.size.height / image.size.height))
-        if UIDevice.current.userInterfaceIdiom == .pad {
-            // Case of an iPad: respect aspect ratio
-            let imageWidth = image.size.width * imageScale
-            self.darkImgWidth?.constant = imageWidth
-            self.deltaX += max(0, (self.bounds.size.width - imageWidth) / 2.0)
+    private func downsampleImage(atURL fileURL: URL, to cellSize: CGSize) {
+        // Process image in the background
+        DispatchQueue.global(qos: .userInitiated).async { [self] in
+            // Downsample image in cache
+            let cachedImage = ImageUtilities.downsample(imageAt: fileURL, to: cellSize)
 
-            let imageHeight = image.size.height * imageScale
-            self.darkImgHeight?.constant = imageHeight
-            self.deltaY += max(0, (self.bounds.size.height - imageHeight) / 2.0)
+            // Set image
+            self.configImage(cachedImage, withHiddenLabel: true)
         }
-        
-        // Update horizontal constraints
-        let horOffset: CGFloat = 3.0 + self.deltaX
-        self.selImgRight?.constant = horOffset
-        self.favLeft?.constant = horOffset
-        self.playLeft?.constant = horOffset
-        
-        // Update vertical constraints
-        let vertOffset: CGFloat = 3.0 + self.deltaY
-        self.playTop?.constant = vertOffset
-        if self.bottomLayer?.isHidden ?? false {
-            // Image title not displayed
-            self.favBottom?.constant = vertOffset
-            self.selImgBot?.constant = vertOffset
-        } else {
-            // Image title displayed
-            let banOffset: CGFloat = max(vertOffset, bannerHeight + 3.0)
-            self.favBottom?.constant = banOffset
-            self.selImgBot?.constant = banOffset
+    }
+    
+    private func configImage(_ image: UIImage, withHiddenLabel isHidden: Bool) {
+        DispatchQueue.main.async { [self] in
+            // Set image and label
+            self.cellImage?.image = image
+            self.noDataLabel?.isHidden = isHidden
+            
+            // Favorite image position depends on device
+            self.deltaX = CGFloat.zero
+            self.deltaY = CGFloat.zero
+            let imageScale = CGFloat(min(self.bounds.size.width / image.size.width,
+                                         self.bounds.size.height / image.size.height))
+            if UIDevice.current.userInterfaceIdiom == .pad {
+                // Case of an iPad: respect aspect ratio
+                let imageWidth = image.size.width * imageScale
+                self.darkImgWidth?.constant = imageWidth
+                self.deltaX += max(0, (self.bounds.size.width - imageWidth) / 2.0)
+                
+                let imageHeight = image.size.height * imageScale
+                self.darkImgHeight?.constant = imageHeight
+                self.deltaY += max(0, (self.bounds.size.height - imageHeight) / 2.0)
+            }
+            
+            // Update horizontal constraints
+            let horOffset: CGFloat = 3.0 + self.deltaX
+            self.selImgRight?.constant = horOffset
+            self.favLeft?.constant = horOffset
+            self.playLeft?.constant = horOffset
+            
+            // Update vertical constraints
+            let vertOffset: CGFloat = 3.0 + self.deltaY
+            self.playTop?.constant = vertOffset
+            if self.bottomLayer?.isHidden ?? false {
+                // Image title not displayed
+                self.favBottom?.constant = vertOffset
+                self.selImgBot?.constant = vertOffset
+            } else {
+                // Image title displayed
+                let banOffset: CGFloat = max(vertOffset, bannerHeight + 3.0)
+                self.favBottom?.constant = banOffset
+                self.selImgBot?.constant = banOffset
+            }
+            applyColorPalette()
         }
-        applyColorPalette()
     }
 
     override func prepareForReuse() {
diff --git a/piwigo/Album/ImageCollection/ImagePreviewViewController.swift b/piwigo/Album/ImageCollection/ImagePreviewViewController.swift
index bf3b74abd..e8fe0b5c2 100644
--- a/piwigo/Album/ImageCollection/ImagePreviewViewController.swift
+++ b/piwigo/Album/ImageCollection/ImagePreviewViewController.swift
@@ -43,24 +43,20 @@ class ImagePreviewViewController: UIViewController
             if let imageURL = ImageUtilities.getURL(imageData, ofMinSize: previewSize) {
                 PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: previewSize, atURL: imageURL,
                                            fromServer: imageData.server?.uuid, fileSize: imageData.fileSize,
-                                           placeHolder: placeHolder) { fractionCompleted in
-//                    DispatchQueue.main.async {
-//                        // Show download progress
-//                        self.progressView.progress = fractionCompleted
-//                    }
-                } completion: { [unowned self] cachedImageURL in
-                    let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: viewSize)
-                    DispatchQueue.main.async { [self] in
-                        // Hide progress view
-//                        self.progressView.isHidden = true
-                        // Replace thumbnail with high-resolution image
-                        self.setImageView(with: cachedImage)
-                    }
+                                           placeHolder: placeHolder) { [weak self] cachedImageURL in
+                    self?.downsampleImage(atURL: cachedImageURL, to: viewSize)
                 } failure: { _ in }
             }
         }
     }
     
+    private func downsampleImage(atURL fileURL: URL, to viewSize: CGSize) {
+        DispatchQueue.main.async { [self] in
+            let cachedImage = ImageUtilities.downsample(imageAt: fileURL, to: viewSize)
+            self.setImageView(with: cachedImage)
+        }
+    }
+    
     private func setImageView(with image: UIImage) {
         imageView.image = image
         imageView.frame.size = image.size
diff --git a/piwigo/ExternalDisplay/ExternalDisplayViewController.swift b/piwigo/ExternalDisplay/ExternalDisplayViewController.swift
index dd1dcc529..86f9d6fba 100644
--- a/piwigo/ExternalDisplay/ExternalDisplayViewController.swift
+++ b/piwigo/ExternalDisplay/ExternalDisplayViewController.swift
@@ -94,52 +94,49 @@ class ExternalDisplayViewController: UIViewController {
         // Check if we already have the high-resolution image in cache
         let scale = max(view.traitCollection.displayScale, 1.0)
         let screenSize = CGSizeMake(view.bounds.size.width * scale, view.bounds.size.height * scale)
-        let wantedImage = imageData.cachedThumbnail(ofSize: optimumSize)
-        if wantedImage == nil {
-            // Present the preview image file if available
-            let thumbSize = pwgImageSize(rawValue: AlbumVars.shared.defaultThumbnailSize) ?? .thumb
-            let previewSize = pwgImageSize(rawValue: ImageVars.shared.defaultImagePreviewSize) ?? .medium
-            if let previewImage = imageData.cachedThumbnail(ofSize: previewSize) {
-                // Is this file of sufficient resolution?
-                if previewSize >= optimumSize {
-                    // Display preview image
-                    presentFinalImage(previewImage)
-                    return
-                } else {
-                    // Present preview image and download file of greater resolution
-                    presentTemporaryImage(previewImage)
-                }
+        if let wantedImage = imageData.cachedThumbnail(ofSize: optimumSize) {
+            let cachedImage = ImageUtilities.downsample(image: wantedImage, to: screenSize)
+            self.presentFinalImage(cachedImage)
+            return
+        }
+        
+        // Download image
+        let thumbSize = pwgImageSize(rawValue: AlbumVars.shared.defaultThumbnailSize) ?? .thumb
+        let previewSize = pwgImageSize(rawValue: ImageVars.shared.defaultImagePreviewSize) ?? .medium
+        if let previewImage = imageData.cachedThumbnail(ofSize: previewSize) {
+            // Is this file of sufficient resolution?
+            if previewSize >= optimumSize {
+                // Display preview image
+                presentFinalImage(previewImage)
+                return
             } else {
-                // Thumbnail image should be available in cache
-                presentTemporaryImage(imageData.cachedThumbnail(ofSize: thumbSize) ?? placeHolder)
+                // Present preview image and download file of greater resolution
+                presentTemporaryImage(previewImage)
             }
+        } else {
+            // Thumbnail image should be available in cache
+            presentTemporaryImage(imageData.cachedThumbnail(ofSize: thumbSize) ?? placeHolder)
+        }
 
-            // Store image URL for being able to pause the download
-            self.imageURL = imageURL
+        // Store image URL for being able to pause the download
+        self.imageURL = imageURL
 
-            // Image of right size for that display
-            PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: optimumSize, atURL: imageURL,
-                                       fromServer: serverID, fileSize: imageData.fileSize,
-                                       placeHolder: placeHolder) { [unowned self] fractionCompleted in
-                DispatchQueue.main.async { [self] in
-                    self.progressView.progress = fractionCompleted
-                }
-            } completion: { [unowned self] cachedImageURL in
-                let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: screenSize)
-                DispatchQueue.main.async {
-                    self.progressView.progress = 1.0
-                    self.presentFinalImage(cachedImage)
-                }
-            } failure: { [unowned self] _ in
-                DispatchQueue.main.async {
-                    self.progressView.progress = 1.0
-                    self.presentFinalImage(imageData.cachedThumbnail(ofSize: thumbSize) ?? placeHolder)
-                }
-            }
-        } else {
-            let cachedImage = ImageUtilities.downsample(image: wantedImage!, to: screenSize)
-            self.progressView.progress = 1.0
-            self.presentFinalImage(cachedImage)
+        // Image of right size for that display
+        PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: optimumSize, atURL: imageURL,
+                                   fromServer: serverID, fileSize: imageData.fileSize,
+                                   placeHolder: placeHolder) { [weak self] fractionCompleted in
+            self?.updateProgressView(with: fractionCompleted)
+        } completion: { [weak self] cachedImageURL in
+            self?.downsampleImage(atURL: cachedImageURL, to: screenSize)
+        } failure: { [weak self] _ in
+            self?.presentFinalImage(imageData.cachedThumbnail(ofSize: thumbSize) ?? placeHolder)
+        }
+    }
+    
+    private func updateProgressView(with fractionCompleted: Float) {
+        DispatchQueue.main.async { [self] in
+            // Show download progress
+            self.progressView.progress = fractionCompleted
         }
     }
     
@@ -159,19 +156,29 @@ class ExternalDisplayViewController: UIViewController {
         })
     }
 
+    private func downsampleImage(atURL fileURL: URL, to screenSize: CGSize) {
+        let cachedImage = ImageUtilities.downsample(imageAt: fileURL, to: screenSize)
+        self.presentFinalImage(cachedImage)
+    }
+    
     private func presentFinalImage(_ image: UIImage) {
-        // Display final image
-        UIView.transition(with: imageView, duration: 0.5,
-                          options: .transitionCrossDissolve,
-                          animations: { [self] in
-            self.imageView.image = image
-//            self.imageView.frame = CGRect(origin: .zero, size: image.size)
-//            self.imageView.layoutIfNeeded()
-//            view.layoutIfNeeded()
-        }, completion: { [self] _ in
-            self.progressView.isHidden = true
-            self.videoContainerView.isHidden = true
-        })
+        DispatchQueue.main.async { [self] in
+            // Download completed
+            self.progressView.progress = 1.0
+            
+            // Display final image
+            UIView.transition(with: imageView, duration: 0.5,
+                              options: .transitionCrossDissolve,
+                              animations: { [self] in
+                self.imageView.image = image
+//                self.imageView.frame = CGRect(origin: .zero, size: image.size)
+//                self.imageView.layoutIfNeeded()
+//                view.layoutIfNeeded()
+            }, completion: { [self] _ in
+                self.progressView.isHidden = true
+                self.videoContainerView.isHidden = true
+            })
+        }
     }
     
     private func presentVideo(_ video: Video) {
diff --git a/piwigo/Image/ImageDetailViewController.swift b/piwigo/Image/ImageDetailViewController.swift
index d14d06b72..cf985348d 100644
--- a/piwigo/Image/ImageDetailViewController.swift
+++ b/piwigo/Image/ImageDetailViewController.swift
@@ -213,7 +213,7 @@ class ImageDetailViewController: UIViewController
     }
     
     private func downsampleImage(atURL fileURL: URL) {
-        let cachedImage = ImageUtilities.downsample(imageAt: fileURL, to: imageSize)
+        let cachedImage = ImageUtilities.downsample(imageAt: fileURL, to: self.imageSize)
         DispatchQueue.main.async { [self] in
             // Hide progress view
             self.progressView.isHidden = true
@@ -253,37 +253,38 @@ class ImageDetailViewController: UIViewController
         if let imageURL = self.imageURL {
             PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: previewSize, atURL: imageURL,
                                        fromServer: imageData.server?.uuid, fileSize: imageData.fileSize,
-                                       placeHolder: placeHolder) { [unowned self] fractionCompleted in
-                DispatchQueue.main.async {
-                    // Show download progress
-                    self.progressView.progress = fractionCompleted
-                }
-            } completion: { [unowned self] cachedImageURL in
-                let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: imageSize)
-                DispatchQueue.main.async { [self] in
-                    // Hide progress view
-                    self.progressView.isHidden = true
-                    
-                    // Rotate image keeping it displayed in fullscreen
-                    let aspectRatio = cachedImage.size.height / cachedImage.size.width
-                    UIView.animate(withDuration: 0.5) { [self] in
-                        let scale = scrollView.minimumZoomScale * aspectRatio
-                        let angleRad = -angle * .pi / 180.0
-                        imageView.transform = CGAffineTransform(rotationAngle: angleRad).scaledBy(x: scale, y: scale)
-                    }
-                    completion: { [self] _ in
-                        // Reset image view with rotated image
-                        didRotateImage = true
-                        self.setImageView(with: cachedImage)
-
-                        // Hide HUD
-                        completion()
-                    }
-                }
+                                       placeHolder: placeHolder) { [weak self] fractionCompleted in
+                self?.updateProgressView(with: fractionCompleted)
+            } completion: { [weak self] cachedImageURL in
+                self?.downsampleImage(atURL: cachedImageURL, rotateBy: angle, completion: completion)
             } failure: { _ in }
         }
     }
     
+    private func downsampleImage(atURL fileURL: URL, rotateBy angle: Double, completion: @escaping () -> Void) {
+        let cachedImage = ImageUtilities.downsample(imageAt: fileURL, to: self.imageSize)
+        DispatchQueue.main.async { [self] in
+            // Hide progress view
+            self.progressView.isHidden = true
+            
+            // Rotate image keeping it displayed in fullscreen
+            let aspectRatio = cachedImage.size.height / cachedImage.size.width
+            UIView.animate(withDuration: 0.5) { [self] in
+                let scale = scrollView.minimumZoomScale * aspectRatio
+                let angleRad = -angle * .pi / 180.0
+                self.imageView.transform = CGAffineTransform(rotationAngle: angleRad).scaledBy(x: scale, y: scale)
+            }
+            completion: { [self] _ in
+                // Reset image view with rotated image
+                self.didRotateImage = true
+                self.setImageView(with: cachedImage)
+
+                // Hide HUD
+                completion()
+            }
+        }
+    }
+    
     /*
      This method calculates the zoom scale for the scroll view.
      A zoom scale of 1 indicates that the content displays at its normal size.
diff --git a/piwigo/Image/Parameters/Cells/EditImageThumbCollectionViewCell.swift b/piwigo/Image/Parameters/Cells/EditImageThumbCollectionViewCell.swift
index 8ffa03d0e..5df80973d 100644
--- a/piwigo/Image/Parameters/Cells/EditImageThumbCollectionViewCell.swift
+++ b/piwigo/Image/Parameters/Cells/EditImageThumbCollectionViewCell.swift
@@ -120,18 +120,27 @@ class EditImageThumbCollectionViewCell: UICollectionViewCell
         let thumbnailSize = pwgImageSize(rawValue: AlbumVars.shared.defaultAlbumThumbnailSize) ?? .thumb
         PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: thumbnailSize,
                                    atURL: ImageUtilities.getURL(imageData, ofMinSize: thumbnailSize),
-                                   fromServer: imageData.server?.uuid, placeHolder: placeHolder) { cachedImageURL in
-            let cachedImage = ImageUtilities.downsample(imageAt: cachedImageURL, to: cellSize)
-            DispatchQueue.main.async {
-                self.imageThumbnail.image = cachedImage
-            }
-        } failure: { _ in
-            DispatchQueue.main.async {
-                self.imageThumbnail.image = placeHolder
-            }
+                                   fromServer: imageData.server?.uuid, placeHolder: placeHolder) { [weak self] cachedImageURL in
+            self?.downsampleImage(atURL: cachedImageURL, to: cellSize)
+        } failure: { [weak self] _ in
+            self?.setThumbnailWithImage(placeHolder)
         }
     }
+    
+    private func downsampleImage(atURL fileURL: URL, to cellSize: CGSize) {
+        // Downsample image
+        let cachedImage = ImageUtilities.downsample(imageAt: fileURL, to: cellSize)
 
+        // Set image thumbnail
+        setThumbnailWithImage(cachedImage)
+    }
+    
+    private func setThumbnailWithImage(_ image: UIImage) {
+        DispatchQueue.main.async {
+            self.imageThumbnail.image = image
+        }
+    }
+    
     override func prepareForReuse() {
         super.prepareForReuse()
 
diff --git a/piwigo/Image/Share/ShareImageActivityItemProvider.swift b/piwigo/Image/Share/ShareImageActivityItemProvider.swift
index fa53d653e..a516cab4c 100644
--- a/piwigo/Image/Share/ShareImageActivityItemProvider.swift
+++ b/piwigo/Image/Share/ShareImageActivityItemProvider.swift
@@ -138,9 +138,9 @@ class ShareImageActivityItemProvider: UIActivityItemProvider {
         let sema = DispatchSemaphore(value: 0)
         PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: imageSize, atURL: imageURL,
                                    fromServer: serverID, fileSize: imageData.fileSize,
-                                   placeHolder: placeholderItem as! UIImage) { [unowned self] fractionCompleted in
+                                   placeHolder: placeholderItem as! UIImage) { [weak self] fractionCompleted in
             // Notify the delegate on the main thread to show how it makes progress.
-            self.progressFraction = Float((0.75 * fractionCompleted))
+            self?.updateProgressView(with: Float((0.75 * fractionCompleted)))
         } completion: { [unowned self] fileURL in
             self.cachedFileURL = fileURL
             sema.signal()
@@ -336,6 +336,13 @@ class ShareImageActivityItemProvider: UIActivityItemProvider {
         return imageFileURL
     }
 
+    private func updateProgressView(with fractionCompleted: Float) {
+        DispatchQueue.main.async { [self] in
+            // Show download progress
+            self.progressFraction = fractionCompleted
+        }
+    }
+    
     private func preprocessingDidEnd() {
         // Notify the delegate on the main thread that the processing is cancelled.
         DispatchQueue.main.async { [self] in
diff --git a/piwigo/Image/Share/ShareVideoActivityItemProvider.swift b/piwigo/Image/Share/ShareVideoActivityItemProvider.swift
index 009471347..92a6b4099 100644
--- a/piwigo/Image/Share/ShareVideoActivityItemProvider.swift
+++ b/piwigo/Image/Share/ShareVideoActivityItemProvider.swift
@@ -125,9 +125,9 @@ class ShareVideoActivityItemProvider: UIActivityItemProvider {
         let sema = DispatchSemaphore(value: 0)
         PwgSession.shared.getImage(withID: imageData.pwgID, ofSize: imageSize, atURL: imageURL,
                                    fromServer: serverID, fileSize: imageData.fileSize,
-                                   placeHolder: placeholderItem as! UIImage) { [unowned self] fractionCompleted in
+                                   placeHolder: placeholderItem as! UIImage) { [weak self] fractionCompleted in
             // Notify the delegate on the main thread to show how it makes progress.
-            self.progressFraction = Float((0.75 * fractionCompleted))
+            self?.updateProgressView(with: Float((0.75 * fractionCompleted)))
         } completion: { [unowned self] fileURL in
             self.cachedFileURL = fileURL
             sema.signal()
@@ -303,6 +303,13 @@ class ShareVideoActivityItemProvider: UIActivityItemProvider {
         return imageFileURL
     }
     
+    private func updateProgressView(with fractionCompleted: Float) {
+        DispatchQueue.main.async { [self] in
+            // Show download progress
+            self.progressFraction = fractionCompleted
+        }
+    }
+    
     private func exportSynchronously(originalAsset: AVAsset, with exportPreset: String) {
         let sema = DispatchSemaphore(value: 0)
         // Create export session

From 0dff635fff76a78cbb26daba53ddd372e81635d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sat, 12 Oct 2024 12:58:18 +0200
Subject: [PATCH 29/34] Simplifies code

---
 .../AlbumCollection/AlbumCollectionViewCell.swift      | 10 +++-------
 piwigo/Album/AlbumCollection/AlbumTableViewCell.swift  | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/piwigo/Album/AlbumCollection/AlbumCollectionViewCell.swift b/piwigo/Album/AlbumCollection/AlbumCollectionViewCell.swift
index 383fc2dac..365e981bd 100644
--- a/piwigo/Album/AlbumCollection/AlbumCollectionViewCell.swift
+++ b/piwigo/Album/AlbumCollection/AlbumCollectionViewCell.swift
@@ -82,15 +82,11 @@ class AlbumCollectionViewCell: UICollectionViewCell {
             let cachedImage = ImageUtilities.downsample(imageAt: fileURL, to: cellSize)
             
             // Process saliency if needed
-            var finalImage:UIImage = cachedImage
             if #available(iOS 13.0, *) {
-                if let croppedImage = cachedImage.processSaliency() {
-                    finalImage = croppedImage
-                }
+                self.setThumbnailWithImage(cachedImage.processSaliency() ?? cachedImage)
+            } else {
+                self.setThumbnailWithImage(cachedImage)
             }
-            
-            // Set image
-            self.setThumbnailWithImage(finalImage)
         }
     }
     
diff --git a/piwigo/Album/AlbumCollection/AlbumTableViewCell.swift b/piwigo/Album/AlbumCollection/AlbumTableViewCell.swift
index 6923f0020..0dcec786b 100644
--- a/piwigo/Album/AlbumCollection/AlbumTableViewCell.swift
+++ b/piwigo/Album/AlbumCollection/AlbumTableViewCell.swift
@@ -105,15 +105,11 @@ class AlbumTableViewCell: UITableViewCell {
             let cachedImage = ImageUtilities.downsample(imageAt: fileURL, to: cellSize)
             
             // Process saliency if needed
-            var finalImage:UIImage = cachedImage
             if #available(iOS 13.0, *) {
-                if let croppedImage = cachedImage.processSaliency() {
-                    finalImage = croppedImage
-                }
+                self.setBackgroundWithImage(cachedImage.processSaliency() ?? cachedImage)
+            } else {
+                self.setBackgroundWithImage(cachedImage)
             }
-            
-            // Set image
-            self.setBackgroundWithImage(finalImage)
         }
     }
     

From 34747639c03f47b8d39ca966f753dd3f5c652974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sat, 12 Oct 2024 13:00:07 +0200
Subject: [PATCH 30/34] Fixes memory leak generated by UIImage.jpegData()

---
 piwigo/Supporting Files/Macros/UIImage+AppTools.swift | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/piwigo/Supporting Files/Macros/UIImage+AppTools.swift b/piwigo/Supporting Files/Macros/UIImage+AppTools.swift
index 39b90f49a..28ec21a60 100644
--- a/piwigo/Supporting Files/Macros/UIImage+AppTools.swift	
+++ b/piwigo/Supporting Files/Macros/UIImage+AppTools.swift	
@@ -19,9 +19,15 @@ extension UIImage {
         return nil
         #else
         // Check that it is possible to perform a saliency request
-        // by checking if it is possible to create a CGImaage from the image.
+        // by checking the pixel format of the image.
         let imageSourceOptions = [kCGImageSourceShouldCache: false] as CFDictionary
-        guard let imageData = self.jpegData(compressionQuality: 1.0),
+        var imageData: Data?
+        if #available(iOS 17, *) {
+            imageData = self.heicData()
+        } else {
+            imageData = self.pngData()
+        }
+        guard let imageData = imageData,
               let imageSource = CGImageSourceCreateWithData(imageData as CFData, imageSourceOptions),
               let imageRef = CGImageSourceCreateImageAtIndex(imageSource, 0, imageSourceOptions),
               ImageUtilities.supportsPixelFormat(ofCGImage: imageRef),

From 1cf78d8ebe66687000537643e68e8130a0c777d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sat, 12 Oct 2024 15:05:52 +0200
Subject: [PATCH 31/34] Adds iPhone 16 models

---
 .../Macros/Device+Model.swift                 | 119 ++++++++++--------
 1 file changed, 66 insertions(+), 53 deletions(-)

diff --git a/piwigo/Supporting Files/Macros/Device+Model.swift b/piwigo/Supporting Files/Macros/Device+Model.swift
index 1db0a207b..98da489ca 100644
--- a/piwigo/Supporting Files/Macros/Device+Model.swift	
+++ b/piwigo/Supporting Files/Macros/Device+Model.swift	
@@ -129,7 +129,15 @@ extension UIDevice {
             return "iPhone 15 Pro"
         case "iPhone16,2":
             return "iPhone 15 Pro Max"
-            
+        case "iPhone17,3":
+            return "iPhone 16"
+        case "iPhone17,4":
+            return "iPhone 16 Plus"
+        case "iPhone17,1":
+            return "iPhone 16 Pro"
+        case "iPhone17,2":
+            return "iPhone 16 Pro Max"
+
         // MARK: iPad
         case "iPad1,1":
             return "iPad"
@@ -325,20 +333,21 @@ extension UIDevice {
         case "iPhone3,1", "iPhone3,2", "iPhone3,3":
             return "5 Mpx"
         case "iPhone4,1",
-            "iPhone5,1", "iPhone5,2", "iPhone5,3", "iPhone5,4",
-            "iPhone6,1", "iPhone6,2", "iPhone7,1", "iPhone7,2":
+             "iPhone5,1", "iPhone5,2", "iPhone5,3", "iPhone5,4",
+             "iPhone6,1", "iPhone6,2", "iPhone7,1", "iPhone7,2":
             return "8 Mpx"
         case "iPhone8,1", "iPhone8,2", "iPhone8,4",
-            "iPhone9,1", "iPhone9,2", "iPhone9,3", "iPhone9,4",
-            "iPhone10,1", "iPhone10,2", "iPhone10,3", "iPhone10,4", "iPhone10,5", "iPhone10,6",
-            "iPhone11,2", "iPhone11,6", "iPhone11,8",
-            "iPhone12,1", "iPhone12,3", "iPhone12,5", "iPhone12,8",
-            "iPhone13,1", "iPhone13,2", "iPhone13,3", "iPhone13,4",
-            "iPhone14,2", "iPhone14,3", "iPhone14,4", "iPhone14,5", "iPhone14,6",
-            "iPhone14,7", "iPhone14,8":
+             "iPhone9,1", "iPhone9,2", "iPhone9,3", "iPhone9,4",
+             "iPhone10,1", "iPhone10,2", "iPhone10,3", "iPhone10,4", "iPhone10,5", "iPhone10,6",
+             "iPhone11,2", "iPhone11,6", "iPhone11,8",
+             "iPhone12,1", "iPhone12,3", "iPhone12,5", "iPhone12,8",
+             "iPhone13,1", "iPhone13,2", "iPhone13,3", "iPhone13,4",
+             "iPhone14,2", "iPhone14,3", "iPhone14,4", "iPhone14,5", "iPhone14,6",
+             "iPhone14,7", "iPhone14,8":
             return "12 Mpx"
         case "iPhone15,2", "iPhone15,3", "iPhone15,4", "iPhone15,5",
-            "iPhone16,1", "iPhone16,2":
+            "iPhone16,1", "iPhone16,2",
+            "iPhone17,1", "iPhone17,2", "iPhone17,3", "iPhone17,4":
             return "48 Mpx"
             
         // MARK: iPad
@@ -347,24 +356,24 @@ extension UIDevice {
         case "iPad2,1", "iPad2,2", "iPad2,3", "iPad2,4":
             return "0.92 Mpx"
         case "iPad2,5", "iPad2,6", "iPad2,7",
-            "iPad3,1", "iPad3,2", "iPad3,3", "iPad3,4", "iPad3,5", "iPad3,6",
-            "iPad4,1", "iPad4,2", "iPad4,4", "iPad4,5", "iPad4,7", "iPad4,8":
+             "iPad3,1", "iPad3,2", "iPad3,3", "iPad3,4", "iPad3,5", "iPad3,6",
+             "iPad4,1", "iPad4,2", "iPad4,4", "iPad4,5", "iPad4,7", "iPad4,8":
             return "5 Mpx"
         case "iPad5,1", "iPad5,2", "iPad5,3", "iPad5,4",
-            "iPad6,7", "iPad6,8", "iPad6,11", "iPad6,12",
-            "iPad7,5", "iPad7,6", "iPad7,11", "iPad7,12",
-            "iPad11,1", "iPad11,2", "iPad11,3", "iPad11,4", "iPad11,6", "iPad11,7":
+             "iPad6,7", "iPad6,8", "iPad6,11", "iPad6,12",
+             "iPad7,5", "iPad7,6", "iPad7,11", "iPad7,12",
+             "iPad11,1", "iPad11,2", "iPad11,3", "iPad11,4", "iPad11,6", "iPad11,7":
             return "8 Mpx"
         case "iPad6,3", "iPad6,4",
-            "iPad7,1", "iPad7,2", "iPad7,3", "iPad7,4",
-            "iPad8,1", "iPad8,2", "iPad8,3", "iPad8,4", "iPad8,5", "iPad8,6",
-            "iPad8,7", "iPad8,8", "iPad8,9", "iPad8,10", "iPad8,11", "iPad8,12",
-            "iPad12,1", "iPad12,2",
-            "iPad13,1", "iPad13,2", "iPad13,4", "iPad13,5", "iPad13,6", "iPad13,7", "iPad13,8",
-            "iPad13,9", "iPad13,10", "iPad13,11", "iPad13,16", "iPad13,17", "iPad13,18", "iPad13,19",
-            "iPad14,1", "iPad14,2", "iPad14,3", "iPad14,4", "iPad14,5", "iPad14,6",
-            "iPad14,8", "iPad14,9", "iPad14,10", "iPad14,11",
-            "iPad16,3", "iPad16,4", "iPad16,5", "iPad16,6":
+             "iPad7,1", "iPad7,2", "iPad7,3", "iPad7,4",
+             "iPad8,1", "iPad8,2", "iPad8,3", "iPad8,4", "iPad8,5", "iPad8,6",
+             "iPad8,7", "iPad8,8", "iPad8,9", "iPad8,10", "iPad8,11", "iPad8,12",
+             "iPad12,1", "iPad12,2",
+             "iPad13,1", "iPad13,2", "iPad13,4", "iPad13,5", "iPad13,6", "iPad13,7", "iPad13,8",
+             "iPad13,9", "iPad13,10", "iPad13,11", "iPad13,16", "iPad13,17", "iPad13,18", "iPad13,19",
+             "iPad14,1", "iPad14,2", "iPad14,3", "iPad14,4", "iPad14,5", "iPad14,6",
+             "iPad14,8", "iPad14,9", "iPad14,10", "iPad14,11",
+             "iPad16,3", "iPad16,4", "iPad16,5", "iPad16,6":
             return "12 Mpx"
             
         // MARK: iPod
@@ -395,21 +404,24 @@ extension UIDevice {
         case "iPhone3,1", "iPhone3,2", "iPhone3,3":
             return "HD, 30 fps"
         case "iPhone4,1",
-            "iPhone5,1", "iPhone5,2", "iPhone5,3", "iPhone5,4",
-            "iPhone6,1", "iPhone6,2",
-            "iPhone7,1", "iPhone7,2":
+             "iPhone5,1", "iPhone5,2", "iPhone5,3", "iPhone5,4",
+             "iPhone6,1", "iPhone6,2",
+             "iPhone7,1", "iPhone7,2":
             return "Full HD, 30 fps"
         case "iPhone8,1", "iPhone8,2", "iPhone8,4",
-            "iPhone9,1", "iPhone9,2", "iPhone9,3", "iPhone9,4":
+             "iPhone9,1", "iPhone9,2", "iPhone9,3", "iPhone9,4":
             return "4K, 30 fps"
         case "iPhone10,1", "iPhone10,2", "iPhone10,3", "iPhone10,4", "iPhone10,5", "iPhone10,6",
-            "iPhone11,2", "iPhone11,6", "iPhone11,8",
-            "iPhone12,1", "iPhone12,3", "iPhone12,5", "iPhone12,8",
-            "iPhone13,1", "iPhone13,2", "iPhone13,3", "iPhone13,4",
-            "iPhone14,2", "iPhone14,3", "iPhone14,4", "iPhone14,5", "iPhone14,6", "iPhone14,7", "iPhone14,8",
-            "iPhone15,2", "iPhone15,3", "iPhone15,4", "iPhone15,5",
-            "iPhone16,1", "iPhone16,2":
+             "iPhone11,2", "iPhone11,6", "iPhone11,8",
+             "iPhone12,1", "iPhone12,3", "iPhone12,5", "iPhone12,8",
+             "iPhone13,1", "iPhone13,2", "iPhone13,3", "iPhone13,4",
+             "iPhone14,2", "iPhone14,3", "iPhone14,4", "iPhone14,5", "iPhone14,6", "iPhone14,7", "iPhone14,8",
+             "iPhone15,2", "iPhone15,3", "iPhone15,4", "iPhone15,5",
+             "iPhone16,1", "iPhone16,2",
+             "iPhone17,3", "iPhone17,4":
             return "4K, 60 fps"
+        case "iPhone17,1", "iPhone17,2":
+            return "4K, 120 fps"
             
         // MARK: iPad
         case "iPad1,1":
@@ -417,26 +429,26 @@ extension UIDevice {
         case "iPad2,1", "iPad2,2", "iPad2,3", "iPad2,4":
             return "VGA, 30 fps"
         case "iPad2,5", "iPad2,6", "iPad2,7",
-            "iPad3,1", "iPad3,2", "iPad3,3", "iPad3,4", "iPad3,5", "iPad3,6",
-            "iPad4,1", "iPad4,2", "iPad4,4", "iPad4,5", "iPad4,7", "iPad4,8",
-            "iPad6,3", "iPad6,4":
+             "iPad3,1", "iPad3,2", "iPad3,3", "iPad3,4", "iPad3,5", "iPad3,6",
+             "iPad4,1", "iPad4,2", "iPad4,4", "iPad4,5", "iPad4,7", "iPad4,8",
+             "iPad6,3", "iPad6,4":
             return "HD, 30 fps"
         case "iPad5,1", "iPad5,2", "iPad5,3", "iPad5,4",
-            "iPad6,7", "iPad6,8", "iPad6,11", "iPad6,12",
-            "iPad7,5", "iPad7,6", "iPad7,11", "iPad7,12",
-            "iPad11,1", "iPad11,2", "iPad11,3", "iPad11,4", "iPad11,6", "iPad11,7":
+             "iPad6,7", "iPad6,8", "iPad6,11", "iPad6,12",
+             "iPad7,5", "iPad7,6", "iPad7,11", "iPad7,12",
+             "iPad11,1", "iPad11,2", "iPad11,3", "iPad11,4", "iPad11,6", "iPad11,7":
             return "Full HD, 30 fps"
         case "iPad7,1", "iPad7,2", "iPad7,3", "iPad7,4",
-            "iPad8,1", "iPad8,2", "iPad8,3", "iPad8,4", "iPad8,5",
-            "iPad8,6", "iPad8,7", "iPad8,8", "iPad8,9", "iPad8,10", "iPad8,11", "iPad8,12",
-            "iPad12,1", "iPad12,2", "iPad13,1", "iPad13,2":
+             "iPad8,1", "iPad8,2", "iPad8,3", "iPad8,4", "iPad8,5",
+             "iPad8,6", "iPad8,7", "iPad8,8", "iPad8,9", "iPad8,10", "iPad8,11", "iPad8,12",
+             "iPad12,1", "iPad12,2", "iPad13,1", "iPad13,2":
             return "4K, 30 fps"
         case "iPad13,4", "iPad13,5", "iPad13,6", "iPad13,7",
-            "iPad13,8", "iPad13,9", "iPad13,10", "iPad13,11",
-            "iPad13,16", "iPad13,17", "iPad13,18", "iPad13,19",
-            "iPad14,1", "iPad14,2", "iPad14,3", "iPad14,4", "iPad14,5", "iPad14,6",
-            "iPad14,8", "iPad14,9", "iPad14,10", "iPad14,11",
-            "iPad16,3", "iPad16,4", "iPad16,5", "iPad16,6":
+             "iPad13,8", "iPad13,9", "iPad13,10", "iPad13,11",
+             "iPad13,16", "iPad13,17", "iPad13,18", "iPad13,19",
+             "iPad14,1", "iPad14,2", "iPad14,3", "iPad14,4", "iPad14,5", "iPad14,6",
+             "iPad14,8", "iPad14,9", "iPad14,10", "iPad14,11",
+             "iPad16,3", "iPad16,4", "iPad16,5", "iPad16,6":
             return "4K, 60 fps"
             
         // MARK: iPod
@@ -489,7 +501,8 @@ extension UIDevice {
              "iPhone14,2", "iPhone14,3", "iPhone14,7", "iPhone14,8",
              "iPhone15,2", "iPhone15,3", "iPhone15,4", "iPhone15,5":
             return 6144
-        case "iPhone16,1", "iPhone16,2":
+        case "iPhone16,1", "iPhone16,2",
+             "iPhone17,1", "iPhone17,2", "iPhone17,3", "iPhone17,4":
             return 8192
 
         // MARK: iPad
@@ -498,7 +511,7 @@ extension UIDevice {
         case "iPad2,1", "iPad2,2", "iPad2,3", "iPad2,4", "iPad2,5", "iPad2,6", "iPad2,7":
             return 512
         case "iPad3,1", "iPad3,2", "iPad3,3", "iPad3,4", "iPad3,5", "iPad3,6",
-            "iPad4,1", "iPad4,2", "iPad4,4", "iPad4,5", "iPad4,7", "iPad4,8":
+             "iPad4,1", "iPad4,2", "iPad4,4", "iPad4,5", "iPad4,7", "iPad4,8":
             return 1024
         case "iPad5,1", "iPad5,2", "iPad5,3", "iPad5,4",
              "iPad6,3", "iPad6,4", "iPad6,11", "iPad6,12",
@@ -522,8 +535,8 @@ extension UIDevice {
         case "iPad13,4", "iPad13,6", "iPad13,8", "iPad13,10",
              "iPad13,16", "iPad13,17",
              "iPad14,3", "iPad14,4", "iPad14,5", "iPad14,6",
-            "iPad14,8","iPad14,9", "iPad14,10", "iPad14,11",
-            "iPad16,3", "iPad16,4", "iPad16,5", "iPad16,6":
+             "iPad14,8","iPad14,9", "iPad14,10", "iPad14,11",
+             "iPad16,3", "iPad16,4", "iPad16,5", "iPad16,6":
             return 8192
         case "iPad13,5", "iPad13,7", "iPad13,9", "iPad13,11":
             return 16384

From cf1c0edb2ef30a9e69b021273c72eb35870799be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sat, 12 Oct 2024 15:29:34 +0200
Subject: [PATCH 32/34] Translates "close" button

---
 .../Help/HelpViewController.storyboard        | 82 ++++++++++---------
 piwigo/Settings/Help/HelpViewController.swift |  3 +
 2 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/piwigo/Settings/Help/HelpViewController.storyboard b/piwigo/Settings/Help/HelpViewController.storyboard
index 1ab4941f1..2e0db2ec2 100644
--- a/piwigo/Settings/Help/HelpViewController.storyboard
+++ b/piwigo/Settings/Help/HelpViewController.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -14,11 +14,11 @@
             <objects>
                 <viewController storyboardIdentifier="HelpViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="KZo-Xn-8N3" customClass="HelpViewController" customModule="piwigo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="zne-FB-LOi">
-                        <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <pageControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="3" translatesAutoresizingMaskIntoConstraints="NO" id="v2A-0U-1lw">
-                                <rect key="frame" x="156.33333333333334" y="866" width="115.66666666666666" height="26"/>
+                                <rect key="frame" x="178.66666666666666" y="872" width="73" height="26"/>
                                 <color key="tintColor" red="1" green="0.47058823529999999" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <color key="pageIndicatorTintColor" systemColor="systemGray5Color"/>
                                 <color key="currentPageIndicatorTintColor" red="1" green="0.47058823529999999" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -27,9 +27,11 @@
                                 </connections>
                             </pageControl>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2E7-Uu-mEb">
-                                <rect key="frame" x="378" y="55" width="30" height="33"/>
+                                <rect key="frame" x="380" y="67" width="30" height="33"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <state key="normal" title="Ok">
+                                <color key="tintColor" red="1" green="0.46666666670000001" blue="0.0039215686269999999" alpha="1" colorSpace="calibratedRGB"/>
+                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                <state key="normal" title="OK">
                                     <color key="titleColor" red="1" green="0.47058823529999999" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 </state>
                                 <connections>
@@ -37,7 +39,7 @@
                                 </connections>
                             </button>
                             <containerView opaque="NO" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wzx-O6-YNR">
-                                <rect key="frame" x="20" y="88" width="388" height="778"/>
+                                <rect key="frame" x="20" y="100" width="390" height="772"/>
                                 <connections>
                                     <segue destination="hMF-co-LFw" kind="embed" id="eI5-1L-cR8"/>
                                 </connections>
@@ -78,11 +80,11 @@
             <objects>
                 <viewController storyboardIdentifier="help03" useStoryboardIdentifierAsRestorationIdentifier="YES" id="9K6-Cd-KL7" customClass="Help03ViewController" customModule="piwigo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="Ixk-9c-yZM">
-                        <rect key="frame" x="0.0" y="0.0" width="428" height="869"/>
+                        <rect key="frame" x="0.0" y="0.0" width="430" height="922"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="1000" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ge9-Dp-NFm" userLabel="HELP #3">
-                                <rect key="frame" x="30" y="0.0" width="368" height="20.333333333333332"/>
+                                <rect key="frame" x="30" y="0.0" width="370" height="20.333333333333332"/>
                                 <attributedString key="attributedText">
                                     <fragment content="legend">
                                         <attributes>
@@ -94,7 +96,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="G33-FO-oKS">
-                                <rect key="frame" x="0.0" y="36.333333333333314" width="428" height="832.66666666666674"/>
+                                <rect key="frame" x="0.0" y="36.333333333333314" width="430" height="885.66666666666674"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="XzR-Yg-uoo"/>
@@ -124,11 +126,11 @@
             <objects>
                 <viewController storyboardIdentifier="help01" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Nez-1y-fpM" customClass="Help01ViewController" customModule="piwigo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" id="ei3-GT-7fz">
-                        <rect key="frame" x="0.0" y="0.0" width="428" height="869"/>
+                        <rect key="frame" x="0.0" y="0.0" width="430" height="922"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="1000" usesAttributedText="YES" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bzQ-eN-DYj" userLabel="HELP #1">
-                                <rect key="frame" x="30" y="0.0" width="368" height="20.333333333333332"/>
+                                <rect key="frame" x="30" y="0.0" width="370" height="20.333333333333332"/>
                                 <color key="tintColor" red="1" green="0.47058823529999999" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <attributedString key="attributedText">
                                     <fragment content="legend">
@@ -141,7 +143,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="gTP-ir-xHk">
-                                <rect key="frame" x="0.0" y="36.333333333333314" width="428" height="832.66666666666674"/>
+                                <rect key="frame" x="0.0" y="36.333333333333314" width="430" height="885.66666666666674"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="wdC-Os-H44"/>
@@ -171,11 +173,11 @@
             <objects>
                 <viewController storyboardIdentifier="help02" useStoryboardIdentifierAsRestorationIdentifier="YES" id="nGz-BW-XsJ" customClass="Help02ViewController" customModule="piwigo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="DhE-Mp-Wpi">
-                        <rect key="frame" x="0.0" y="0.0" width="428" height="869"/>
+                        <rect key="frame" x="0.0" y="0.0" width="430" height="922"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" preservesSuperviewLayoutMargins="YES" usesAttributedText="YES" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UKU-ae-d6K">
-                                <rect key="frame" x="20" y="0.0" width="388" height="20.333333333333332"/>
+                                <rect key="frame" x="20" y="0.0" width="390" height="20.333333333333332"/>
                                 <attributedString key="attributedText">
                                     <fragment content="legend top">
                                         <attributes>
@@ -187,19 +189,19 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="td4-F8-5Eo">
-                                <rect key="frame" x="0.0" y="36.333333333333343" width="428" height="453.33333333333326"/>
+                                <rect key="frame" x="0.0" y="36.333333333333343" width="430" height="455.33333333333326"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="td4-F8-5Eo" secondAttribute="height" multiplier="13700:14506" id="kAr-A0-aPV"/>
                                 </constraints>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="ohK-97-rdx">
-                                <rect key="frame" x="0.0" y="718" width="428" height="151"/>
+                                <rect key="frame" x="0.0" y="770.33333333333337" width="430" height="151.66666666666663"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="ohK-97-rdx" secondAttribute="height" multiplier="13700:4835" id="FGp-Mb-oV0"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" text="legendBot" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2RD-k5-pvP">
-                                <rect key="frame" x="20" y="497.66666666666669" width="388" height="212.33333333333331"/>
+                                <rect key="frame" x="20" y="499.66666666666663" width="390" height="262.66666666666663"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -240,11 +242,11 @@
             <objects>
                 <viewController storyboardIdentifier="help04" useStoryboardIdentifierAsRestorationIdentifier="YES" id="VGV-yb-lKK" customClass="Help04ViewController" customModule="piwigo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="j2I-3A-AD5">
-                        <rect key="frame" x="0.0" y="0.0" width="428" height="869"/>
+                        <rect key="frame" x="0.0" y="0.0" width="430" height="922"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="1000" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zhb-FF-P3o" userLabel="HELP #3">
-                                <rect key="frame" x="30" y="0.0" width="368" height="20.333333333333332"/>
+                                <rect key="frame" x="30" y="0.0" width="370" height="20.333333333333332"/>
                                 <attributedString key="attributedText">
                                     <fragment content="legend">
                                         <attributes>
@@ -256,7 +258,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="cz8-At-lX0">
-                                <rect key="frame" x="0.0" y="36.333333333333314" width="428" height="832.66666666666674"/>
+                                <rect key="frame" x="0.0" y="36.333333333333314" width="430" height="885.66666666666674"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="7Ot-jA-MMS"/>
@@ -286,11 +288,11 @@
             <objects>
                 <viewController storyboardIdentifier="help05" useStoryboardIdentifierAsRestorationIdentifier="YES" id="2Hv-Mu-PEH" customClass="Help05ViewController" customModule="piwigo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="DUM-Ph-jeJ">
-                        <rect key="frame" x="0.0" y="0.0" width="428" height="869"/>
+                        <rect key="frame" x="0.0" y="0.0" width="430" height="922"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" preservesSuperviewLayoutMargins="YES" usesAttributedText="YES" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ubK-e5-1Rt">
-                                <rect key="frame" x="20" y="0.0" width="388" height="20.333333333333332"/>
+                                <rect key="frame" x="20" y="0.0" width="390" height="20.333333333333332"/>
                                 <attributedString key="attributedText">
                                     <fragment content="legend top">
                                         <attributes>
@@ -302,19 +304,19 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Qc7-uf-mw7">
-                                <rect key="frame" x="0.0" y="36.333333333333343" width="428" height="453.33333333333326"/>
+                                <rect key="frame" x="0.0" y="36.333333333333343" width="430" height="455.33333333333326"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="Qc7-uf-mw7" secondAttribute="height" multiplier="13700:14506" id="zPg-KV-Sqa"/>
                                 </constraints>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="l3h-Mi-qdc">
-                                <rect key="frame" x="0.0" y="718" width="428" height="151"/>
+                                <rect key="frame" x="0.0" y="770.33333333333337" width="430" height="151.66666666666663"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="l3h-Mi-qdc" secondAttribute="height" multiplier="13700:4835" id="dPo-ba-w5M"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" text="legendBot" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MCO-fs-FAJ">
-                                <rect key="frame" x="20" y="497.66666666666669" width="388" height="212.33333333333331"/>
+                                <rect key="frame" x="20" y="499.66666666666663" width="390" height="262.66666666666663"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -355,11 +357,11 @@
             <objects>
                 <viewController storyboardIdentifier="help06" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Ca1-cO-DVb" customClass="Help06ViewController" customModule="piwigo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="EeM-2S-WB6">
-                        <rect key="frame" x="0.0" y="0.0" width="428" height="869"/>
+                        <rect key="frame" x="0.0" y="0.0" width="430" height="922"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="1000" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xqr-EG-5O7" userLabel="HELP #3">
-                                <rect key="frame" x="30" y="0.0" width="368" height="20.333333333333332"/>
+                                <rect key="frame" x="30" y="0.0" width="370" height="20.333333333333332"/>
                                 <attributedString key="attributedText">
                                     <fragment content="legend">
                                         <attributes>
@@ -371,7 +373,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Dm6-5K-Ngx">
-                                <rect key="frame" x="0.0" y="36.333333333333314" width="428" height="832.66666666666674"/>
+                                <rect key="frame" x="0.0" y="36.333333333333314" width="430" height="885.66666666666674"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="nFz-al-chT"/>
@@ -401,11 +403,11 @@
             <objects>
                 <viewController storyboardIdentifier="help07" useStoryboardIdentifierAsRestorationIdentifier="YES" id="6MD-My-xuu" customClass="Help07ViewController" customModule="piwigo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="wJC-et-fbk">
-                        <rect key="frame" x="0.0" y="0.0" width="428" height="869"/>
+                        <rect key="frame" x="0.0" y="0.0" width="430" height="922"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" preservesSuperviewLayoutMargins="YES" usesAttributedText="YES" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vFC-Z8-0aM">
-                                <rect key="frame" x="20" y="0.0" width="388" height="20.333333333333332"/>
+                                <rect key="frame" x="20" y="0.0" width="390" height="20.333333333333332"/>
                                 <attributedString key="attributedText">
                                     <fragment content="legend top">
                                         <attributes>
@@ -417,19 +419,19 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="N2H-8c-Oxe" userLabel="help07-top">
-                                <rect key="frame" x="0.0" y="36.333333333333343" width="428" height="453.33333333333326"/>
+                                <rect key="frame" x="0.0" y="36.333333333333343" width="430" height="455.33333333333326"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="N2H-8c-Oxe" secondAttribute="height" multiplier="13700:14506" id="f9x-Po-387"/>
                                 </constraints>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="6DD-ef-j2B">
-                                <rect key="frame" x="0.0" y="718" width="428" height="151"/>
+                                <rect key="frame" x="0.0" y="770.33333333333337" width="430" height="151.66666666666663"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="6DD-ef-j2B" secondAttribute="height" multiplier="13700:4835" id="yQi-at-VQe"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" text="legendBot" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ruf-jb-KlD">
-                                <rect key="frame" x="20" y="497.66666666666669" width="388" height="212.33333333333331"/>
+                                <rect key="frame" x="20" y="499.66666666666663" width="390" height="262.66666666666663"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -470,11 +472,11 @@
             <objects>
                 <viewController storyboardIdentifier="help08" useStoryboardIdentifierAsRestorationIdentifier="YES" id="g6w-Yv-fKa" customClass="Help08ViewController" customModule="piwigo" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="c4u-XD-7JN">
-                        <rect key="frame" x="0.0" y="0.0" width="428" height="869"/>
+                        <rect key="frame" x="0.0" y="0.0" width="430" height="922"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" preservesSuperviewLayoutMargins="YES" usesAttributedText="YES" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tUD-ax-eft">
-                                <rect key="frame" x="20" y="0.0" width="388" height="20.333333333333332"/>
+                                <rect key="frame" x="20" y="0.0" width="390" height="20.333333333333332"/>
                                 <attributedString key="attributedText">
                                     <fragment content="legend top">
                                         <attributes>
@@ -486,19 +488,19 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Ryg-bf-lTP">
-                                <rect key="frame" x="6.6666666666666572" y="36.333333333333343" width="414.66666666666674" height="393.33333333333326"/>
+                                <rect key="frame" x="0.0" y="36.333333333333343" width="430" height="407.66666666666663"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="Ryg-bf-lTP" secondAttribute="height" multiplier="1020:967" id="WoH-cl-Iiw"/>
                                 </constraints>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2ih-HK-Pek">
-                                <rect key="frame" x="6.6666666666666572" y="466" width="414.66666666666674" height="393"/>
+                                <rect key="frame" x="0.0" y="504.33333333333326" width="430" height="407.66666666666674"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="2ih-HK-Pek" secondAttribute="height" multiplier="1020:967" id="4SF-CF-UVf"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" text="legendBot" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ilb-9b-REI">
-                                <rect key="frame" x="20" y="437.66666666666669" width="388" height="20.333333333333314"/>
+                                <rect key="frame" x="20" y="452" width="390" height="44.333333333333314"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -540,7 +542,7 @@
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemGray5Color">
-            <color red="0.89803921568627454" green="0.89803921568627454" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.8980392157" green="0.8980392157" blue="0.91764705879999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/piwigo/Settings/Help/HelpViewController.swift b/piwigo/Settings/Help/HelpViewController.swift
index de760135e..b94a332a0 100644
--- a/piwigo/Settings/Help/HelpViewController.swift
+++ b/piwigo/Settings/Help/HelpViewController.swift
@@ -31,6 +31,9 @@ class HelpViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        // Initialise button
+        closeButton.setTitle(NSLocalizedString("alertOkButton", comment: "OK"), for: .normal)
+        
         // Initialise pages
         for i in displayHelpPagesWithID {
             // Loop over the storyboards

From 3366c44a810f995619f862a006d1c49429bb9eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Sat, 12 Oct 2024 15:42:13 +0200
Subject: [PATCH 33/34] Version 3.2.3 build 595 for TestFlight testing and App
 Store

---
 piwigo/Info.plist    | 2 +-
 piwigoKit/Info.plist | 2 +-
 uploadKit/Info.plist | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/piwigo/Info.plist b/piwigo/Info.plist
index 1e138af96..1cb50773a 100644
--- a/piwigo/Info.plist
+++ b/piwigo/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>594</string>
+	<string>595</string>
 	<key>INIntentsSupported</key>
 	<array>
 		<string>AutoUploadIntent</string>
diff --git a/piwigoKit/Info.plist b/piwigoKit/Info.plist
index f8720b4cd..2e4f193a1 100644
--- a/piwigoKit/Info.plist
+++ b/piwigoKit/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.2.2</string>
 	<key>CFBundleVersion</key>
-	<string>597</string>
+	<string>598</string>
 </dict>
 </plist>
diff --git a/uploadKit/Info.plist b/uploadKit/Info.plist
index 060dcf10a..dbe538f0b 100644
--- a/uploadKit/Info.plist
+++ b/uploadKit/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.3</string>
 	<key>CFBundleVersion</key>
-	<string>415</string>
+	<string>416</string>
 </dict>
 </plist>

From 41f637ed3e4945c79227de986b85ada92afeb727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Leli=C3=A8vre-Berna?= <eddy@lelievre-berna.net>
Date: Wed, 16 Oct 2024 19:32:44 +0200
Subject: [PATCH 34/34] Updates screenshots for App Store

---
 .../piwigoScreenshots/piwigoScreenshots.swift | 84 +++++++++++++++----
 fastlane/Snapfile                             | 19 +++--
 fastlane/metadata/da/release_notes.txt        |  5 +-
 fastlane/metadata/de-DE/release_notes.txt     |  5 +-
 fastlane/metadata/en-US/release_notes.txt     |  5 +-
 fastlane/metadata/es-ES/release_notes.txt     |  5 +-
 fastlane/metadata/fr-FR/release_notes.txt     |  5 +-
 fastlane/metadata/hu/release_notes.txt        |  5 +-
 fastlane/metadata/it/release_notes.txt        |  5 +-
 fastlane/metadata/ja/release_notes.txt        |  5 +-
 fastlane/metadata/nl-NL/release_notes.txt     |  5 +-
 fastlane/metadata/pl/release_notes.txt        |  5 +-
 .../metadata/review_information/notes.txt     |  4 +-
 fastlane/metadata/ru/release_notes.txt        |  5 +-
 fastlane/metadata/sv/release_notes.txt        |  5 +-
 fastlane/metadata/zh-Hans/release_notes.txt   |  5 +-
 fastlane/metadata/zh-Hant/release_notes.txt   |  5 +-
 17 files changed, 94 insertions(+), 83 deletions(-)

diff --git a/Supporting Targets/piwigoScreenshots/piwigoScreenshots.swift b/Supporting Targets/piwigoScreenshots/piwigoScreenshots.swift
index ae9490702..9033631c6 100644
--- a/Supporting Targets/piwigoScreenshots/piwigoScreenshots.swift	
+++ b/Supporting Targets/piwigoScreenshots/piwigoScreenshots.swift	
@@ -43,32 +43,81 @@ class piwigoScreenshots: XCTestCase {
         let deviceType = UIDevice().modelName
         sleep(3);
         
-        // Screenshot #1: swipe left and reveal album actions
-        var index = 1
-        if deviceType.hasPrefix("iPad") {
-            index = 7
+        // Settings
+        let withAlbumDescriptions = false
+        
+        // Screenshot #1:
+        if withAlbumDescriptions {
+            // Swipe left to reveal album actions when displaying albums with description
+            var index = 1
+            if deviceType.hasPrefix("iPad") {
+                index = 7
+            }
+            let collectionCell = app.collectionViews.children(matching: .cell).element(boundBy: index)
+            let tableQuery = collectionCell.children(matching: .other).element.tables.element(boundBy: 0)
+            sleep(4);
+            tableQuery.swipeLeft()
         }
-        let collectionCell = app.collectionViews.children(matching: .cell).element(boundBy: index)
-        let tableQuery = collectionCell.children(matching: .other).element.tables.element(boundBy: 0)
-        sleep(4);
-        tableQuery.swipeLeft()
         snapshot("Image01")
         
         // Screenshot #2: collection of images
         app.collectionViews.children(matching: .cell).element(boundBy: 2).tap()
         sleep(2);
         if deviceType.hasPrefix("iPhone") {
-            app.collectionViews.children(matching: .cell).element(boundBy: 2).swipeUp()
-            sleep(2);
+            if withAlbumDescriptions {
+                app.collectionViews.children(matching: .cell).element(boundBy: 2).swipeUp()
+                sleep(2);
+            } else {
+                switch deviceType {
+                case "iPhone SE (1st generation)":                          // 4-inch
+                    for _ in 1...2 {
+                        app.collectionViews.firstMatch.swipeUp(velocity: 200)
+                        sleep(1)
+                    }
+                case "iPhone SE (3rd generation)":                          // 4.7-inch
+                    for _ in 1...2 {
+                        app.collectionViews.firstMatch.swipeUp(velocity: 200)
+                        sleep(1)
+                    }
+                case "iPhone 8 Plus":                                       // 5.5-inch
+                    for _ in 1...2 {
+                        app.collectionViews.firstMatch.swipeUp(velocity: 200)
+                        sleep(1)
+                    }
+                case "iPhone 14":                                           // 5.8-inch
+                    for _ in 1...2 {
+                        app.collectionViews.firstMatch.swipeUp(velocity: 200)
+                        sleep(1)
+                    }
+                case "iPhone 14 Pro":                                       // 6.1-inch
+                    for _ in 1...2 {
+                        app.collectionViews.firstMatch.swipeUp(velocity: 200)
+                        sleep(1)
+                    }
+                case "iPhone 14 Plus":                                      // 6.5-inch
+                    for _ in 1...2 {
+                        app.collectionViews.firstMatch.swipeUp(velocity: 200)
+                        sleep(1)
+                    }
+                case "iPhone 15 Pro Max":                                   // 6.7-inch
+                    for _ in 1...2 {
+                        app.collectionViews.firstMatch.swipeUp(velocity: 200)
+                        sleep(1)
+                    }
+                default:
+                    break
+                }
+            }
         }
         snapshot("Image02")
-        
+
+        /*
         // Screenshot #3: image previewed
         // https://developer.apple.com/help/app-store-connect/reference/screenshot-specifications
         app.collectionViews.cells["Clos de Vougeot"].tap()
         sleep(3)
         switch deviceType {
-        case "iPhone SE":                                           // 4-inch
+        case "iPhone SE (1st generation)":                          // 4-inch
             app.images.element(boundBy: 0).pinch(withScale: 1.1, velocity: 2.0)
             sleep(1)
             app.images.element(boundBy: 0).tap()
@@ -127,7 +176,7 @@ class piwigoScreenshots: XCTestCase {
         app.navigationBars.buttons.element(boundBy: 0).tap()
         sleep(2)                        // Leave time for animation
         switch deviceType {
-        case "iPhone SE":                                           // 4-inch
+        case "iPhone SE (1st generation)":                          // 4-inch
             for _ in 1...6 {
                 app.collectionViews.firstMatch.swipeUp(velocity: 200)
                 sleep(1)
@@ -196,7 +245,7 @@ class piwigoScreenshots: XCTestCase {
         app.buttons["Select"].tap()
         sleep(1)
         switch deviceType {
-        case "iPhone SE":                                           // 4-inch
+        case "iPhone SE (1st generation)":                          // 4-inch
             app.collectionViews.children(matching: .cell).element(boundBy: 8).tap()
             app.collectionViews.children(matching: .cell).element(boundBy: 9).tap()
             app.collectionViews.children(matching: .cell).element(boundBy: 12).tap()
@@ -278,7 +327,7 @@ class piwigoScreenshots: XCTestCase {
         app.navigationBars["editParams"].buttons["Cancel"].tap()
         sleep(1)                        // Leave time for animation
         switch deviceType {
-        case "iPhone SE":                                           // 4-inch
+        case "iPhone SE (1st generation)":                          // 4-inch
             for _ in 1...6 {
                 app.collectionViews.firstMatch.swipeDown(velocity: 200)
                 sleep(1)
@@ -329,7 +378,7 @@ class piwigoScreenshots: XCTestCase {
         app.collectionViews.cells["Hotel de Coimbra"].tap()
         sleep(2)
         switch deviceType {
-        case "iPhone SE",                                           // 4-inch
+        case "iPhone SE (1st generation)":                          // 4-inch
              "iPhone SE (3rd generation)",                          // 4.7-inch
              "iPhone 8 Plus",                                       // 5.5-inch
              "iPhone 14",                                           // 5.8-inch
@@ -363,7 +412,7 @@ class piwigoScreenshots: XCTestCase {
         app.navigationBars.buttons.element(boundBy: 0).tap()
         sleep(2)                        // Leave time for animation
         switch deviceType {
-        case "iPhone SE",                                           // 4-inch
+        case "iPhone SE (1st generation)":                          // 4-inch
              "iPhone SE (3rd generation)",                          // 4.7-inch
              "iPhone 8 Plus",                                       // 5.5-inch
              "iPhone 14",                                           // 5.8-inch
@@ -458,5 +507,6 @@ class piwigoScreenshots: XCTestCase {
         app.tables["settings"].firstMatch.swipeUp(velocity: 200)
         sleep(2)                        // Leave time for animation
         snapshot("Image10")
+        */
     }
 }
diff --git a/fastlane/Snapfile b/fastlane/Snapfile
index 684efadb1..54b18ad6f 100644
--- a/fastlane/Snapfile
+++ b/fastlane/Snapfile
@@ -48,14 +48,14 @@ devices([
 # "iPhone 8 Plus",							# 5.5-inch  iOS 16.4
 # "iPhone 14",								# 5.8-inch
 # "iPhone 13 Pro",							# Wiki
-# "iPhone 14 Pro",							# 6.1-inch
+# "iPhone 14 Pro",							# 6.3-inch
 # "iPhone 14 Plus",							# 6.5-inch
-# "iPhone 15 Pro Max",						# 6.7-inch
+# "iPhone 15 Pro Max",						# 6.9-inch
 # "iPad Pro (9.7-inch)",					# 9.7-inch  iOS 16.4
 # "iPad Pro (10.5-inch)",					# 10.5-inch
-# "iPad Pro (11-inch) (4th generation)",	# 11-inch
 # "iPad Pro (12.9-inch) (2nd generation)",	# 12.9-inch
- "iPad Pro (12.9-inch) (6th generation)"	# 12.9-inch
+"iPad Pro (11-inch) (4th generation)",	# 11-inch
+"iPad Pro (12.9-inch) (6th generation)"	# 13-inch
 ])
 
 # ["pt", "pt_BR"] # Portuguese with Brazilian locale
@@ -83,16 +83,19 @@ test_without_building(true)
 output_directory("fastlane/screenshots")
 concurrent_simulators(true)
 skip_open_summary(true)
-number_of_retries(1)
+number_of_retries(0)
 
-# Command below fails with iOS +16.1, 17.x:
-#override_status_bar(true)
+# Command below fails with iOS +16.1, 17.x, 18.x:
+# override_status_bar(true)
 # So use SimulatorStatusMagic to configure iOS 16+ simulators
 # See https://github.com/shinydevelopment/SimulatorStatusMagic
 # iOS 16+: Install the SimulatorStatusMagic app in the simulator
 #          and apply the configuration
 # iOS 17+: Compile library with Xcode
-#          Launch the iOS 17+ simulator to configure (piwigo scheme)
+#          Launch the iOS 17+ simulator (piwigo scheme), stop app
+#          Execute: ../SimulatorStatusMagic/build_and_inject.sh booted
+# iOS 18+: Compile library with Xcode
+#          Launch the iOS 18+ simulator (piwigo scheme), stop app
 #          Execute: ../SimulatorStatusMagic/build_and_inject.sh booted
 
 # clear_previous_screenshots(true)
diff --git a/fastlane/metadata/da/release_notes.txt b/fastlane/metadata/da/release_notes.txt
index 98b6f65e0..ce2855fc1 100644
--- a/fastlane/metadata/da/release_notes.txt
+++ b/fastlane/metadata/da/release_notes.txt
@@ -1,4 +1 @@
-• Vedtager album foto sortering muligheder
-• Tilføjer on-the-fly foto sortering muligheder
-• Tilføjer rotation af uploadede fotos (kræver rotateImage plugin)
-• Fejlrettelser
+Fejlrettelser
diff --git a/fastlane/metadata/de-DE/release_notes.txt b/fastlane/metadata/de-DE/release_notes.txt
index 071ecd0c6..a0b592693 100644
--- a/fastlane/metadata/de-DE/release_notes.txt
+++ b/fastlane/metadata/de-DE/release_notes.txt
@@ -1,4 +1 @@
-• Übernimmt die Sortieroptionen für Albenfotos
-• Fügt Optionen für die fliegende Sortierung von Fotos hinzu
-• Rotation der hochgeladenen Fotos (erfordert das rotateImage-Plugin)
-• Fehlerbehebungen
+Fehlerbehebungen
diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt
index ef78387f7..e13dfb474 100644
--- a/fastlane/metadata/en-US/release_notes.txt
+++ b/fastlane/metadata/en-US/release_notes.txt
@@ -1,4 +1 @@
-• Adopts album photo sorting options
-• Adds on-the-fly photo sorting options
-• Adds rotation of uploaded photos (requires the rotateImage plugin)
-• Bug fixes
+Bug fixes
diff --git a/fastlane/metadata/es-ES/release_notes.txt b/fastlane/metadata/es-ES/release_notes.txt
index e5d78cd08..50d916cab 100644
--- a/fastlane/metadata/es-ES/release_notes.txt
+++ b/fastlane/metadata/es-ES/release_notes.txt
@@ -1,4 +1 @@
-• Adoptadas opciones de clasificación de las fotografías de un álbum
-• Añadidas opciones de clasificación de fotografías sobre la marcha
-• Añadida rotación de fotos cargadas
-• Corrección de errores
+Corrección de errores
diff --git a/fastlane/metadata/fr-FR/release_notes.txt b/fastlane/metadata/fr-FR/release_notes.txt
index 56baee64a..cb67fab39 100644
--- a/fastlane/metadata/fr-FR/release_notes.txt
+++ b/fastlane/metadata/fr-FR/release_notes.txt
@@ -1,4 +1 @@
-• Adopte les options de tri des photos des albums
-• Ajoute des options de tri des photos à la volée
-• Ajoute la rotation des photos téléchargées (nécessite le plugin rotateImage)
-• Corrections de bugs
+Correction de bugs
diff --git a/fastlane/metadata/hu/release_notes.txt b/fastlane/metadata/hu/release_notes.txt
index b52ff5865..0abed9f29 100644
--- a/fastlane/metadata/hu/release_notes.txt
+++ b/fastlane/metadata/hu/release_notes.txt
@@ -1,4 +1 @@
-• Elfogadta az album fotók rendezési lehetőségeit
-• Függőleges fotóválogatási lehetőségek hozzáadása
-• Hozzáadja a feltöltött fényképek forgatását
-• Hibajavítások
+Hibajavítások
diff --git a/fastlane/metadata/it/release_notes.txt b/fastlane/metadata/it/release_notes.txt
index 33b0c9f67..dafc85c8a 100644
--- a/fastlane/metadata/it/release_notes.txt
+++ b/fastlane/metadata/it/release_notes.txt
@@ -1,4 +1 @@
-• Adotta opzioni di ordinamento foto album
-• Aggiunge opzioni di ordinamento foto al volo
-• Aggiunge la rotazione delle foto caricate (richiede il plugin rotateimage)
-• Correzioni di bug
+Correzioni di bug
diff --git a/fastlane/metadata/ja/release_notes.txt b/fastlane/metadata/ja/release_notes.txt
index 0d0a34480..4893d4544 100644
--- a/fastlane/metadata/ja/release_notes.txt
+++ b/fastlane/metadata/ja/release_notes.txt
@@ -1,4 +1 @@
-• アルバム写真の並べ替えオプションを採用
-• オンザフライ写真並べ替えオプションの追加
-• アップロードした写真の回転機能を追加
-• バグ修正
+• バグの修正
diff --git a/fastlane/metadata/nl-NL/release_notes.txt b/fastlane/metadata/nl-NL/release_notes.txt
index fb8156184..b3c61b3bd 100644
--- a/fastlane/metadata/nl-NL/release_notes.txt
+++ b/fastlane/metadata/nl-NL/release_notes.txt
@@ -1,4 +1 @@
-• Voegt albumfoto sortering opties
-• Voegt op-the-fly foto sortering opties
-• Voegt rotatie van geüploade foto's toe (vereist de rotateImage plugin)
-• Foutjes verbeterd
+Foutjes verbeterd
diff --git a/fastlane/metadata/pl/release_notes.txt b/fastlane/metadata/pl/release_notes.txt
index 3f704058c..315dfa65f 100644
--- a/fastlane/metadata/pl/release_notes.txt
+++ b/fastlane/metadata/pl/release_notes.txt
@@ -1,4 +1 @@
-• Można dopasować opcje sortowania zdjęć w albumie
-• Dodaje opcje sortowania zdjęć w locie
-• Dodaje możliwość obracania przesyłanych zdjęć
-• Poprawki błędów
+Poprawki błędów
diff --git a/fastlane/metadata/review_information/notes.txt b/fastlane/metadata/review_information/notes.txt
index c602ba3bf..96a76df5f 100644
--- a/fastlane/metadata/review_information/notes.txt
+++ b/fastlane/metadata/review_information/notes.txt
@@ -1,6 +1,6 @@
-This version adopts the album sorting options of the web UI, introduces an option for sorting photos on-the-fly and a command for rotating photos already uploaded to the Piwigo server. The MBProgressHUD library has also been removed and the app now uses no third party library.
+This version brings a command for deleting a selection of photos/videos stored in the device and expands or adds contextual menus for selecting, sharing, deleting or uploading photos. It also fixes the bugs listed in the TestFlight section.
 
-Here is the address of the server requiring the above credentials and allowing to test all functionalities: https://piwigo.lelievre-berna.net/Dev/
+Here is the address of the server requiring the above credentials and allowing to test all functionalities: https://piwigo.lelievre-berna.net/15.x/
 And here are servers you can try without credentials: https://raia.com, https://www.neilfitzgeraldphoto.co.nz/gallery, http://www.dongshawhwei.com/photos.
 
 The privacy policy is provided in the app in Chinese (Simplified), Danish, Dutch,  English, French, German, Hungarian, Indonesian, Italian, Japanese, Polish, Russian, Spanish and Swedish.
diff --git a/fastlane/metadata/ru/release_notes.txt b/fastlane/metadata/ru/release_notes.txt
index ab4b363b4..e2d2aeae9 100644
--- a/fastlane/metadata/ru/release_notes.txt
+++ b/fastlane/metadata/ru/release_notes.txt
@@ -1,4 +1 @@
-• Принимает сортировку фото альбома
-• Добавляет параметры сортировки на лету
-• Добавляет поворот загруженных фотографий (требуется плагин rotateImage)
-• Исправления ошибок
+Исправления ошибок
diff --git a/fastlane/metadata/sv/release_notes.txt b/fastlane/metadata/sv/release_notes.txt
index ae808047e..76691b199 100644
--- a/fastlane/metadata/sv/release_notes.txt
+++ b/fastlane/metadata/sv/release_notes.txt
@@ -1,4 +1 @@
-• Antar sorteringsalternativ för albumfoto
-• Lägger till foton i farten sorteringsalternativ
-• Lägger till rotation av uppladdade bilder (kräver rotateImage plugin)
-• Felrättelser
+Buggfixar
diff --git a/fastlane/metadata/zh-Hans/release_notes.txt b/fastlane/metadata/zh-Hans/release_notes.txt
index 2557f7d17..dc5636570 100644
--- a/fastlane/metadata/zh-Hans/release_notes.txt
+++ b/fastlane/metadata/zh-Hans/release_notes.txt
@@ -1,4 +1 @@
-• 通过相册照片排序选项
-• 添加实时照片排序选项
-• 增加上传照片的旋转(需要 rotateImage 插件)
-• Bug 修复
+小错误修复和界面改进
diff --git a/fastlane/metadata/zh-Hant/release_notes.txt b/fastlane/metadata/zh-Hant/release_notes.txt
index 1439a5bcf..24d62cc8f 100644
--- a/fastlane/metadata/zh-Hant/release_notes.txt
+++ b/fastlane/metadata/zh-Hant/release_notes.txt
@@ -1,4 +1 @@
-• 採用相簿圖片旋轉選項
-• 添加即時(on-the-fly)圖片排序選項
-• 新增旋轉上傳圖片的功能
-• 錯誤修正
+小型錯誤修正及介面改進