Merge pull request #519 from Piwigo/2.12.3

EddyLB · web-flow · commit 4c4878fd7ecb · 2022-08-07T17:31:41.000+02:00
v2.12.3
diff --git a/Supporting Targets/piwigoKit/Info.plist b/Supporting Targets/piwigoKit/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>486</string>
+	<string>487</string>
 </dict>
 </plist>
diff --git a/piwigo.xcodeproj/project.pbxproj b/piwigo.xcodeproj/project.pbxproj
@@ -3197,7 +3197,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.12.2;
+				MARKETING_VERSION = 2.12.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -3259,7 +3259,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.12.2;
+				MARKETING_VERSION = 2.12.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
diff --git a/piwigo/Info.plist b/piwigo/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>486</string>
+	<string>487</string>
 	<key>INIntentsSupported</key>
 	<array>
 		<string>AutoUploadIntent</string>
diff --git 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.
  */
 
-"v2.12.2_text" = "Version 2.12.2\n\n• Fixes a crash occurring on iOS 9-12 when displaying the upload request queue\n• Minor bug fixes and improvements of the interface";
+"v2.12.3_text" = "Version 2.12.3\n\n• Bug fixes";
+
+"v2.12.2_text" = "Version 2.12.2\nAugust 2, 2022\n\n• Fixes a crash occurring on iOS 9-12 when displaying the upload request queue\n• Minor bug fixes and improvements of the interface";
 
 "v2.12.1_text" = "Version 2.12.1\nJuly 10, 2022\n\n• Fixes a crash occurring on iOS 9-13 when changing tags allocated to photos";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "Version 2.12.2\n\n• Løser et nedbrud på iOS 9-12, når du viser upload anmodning kø\n• Mindre fejlrettelser og forbedringer af brugerflade";
+"v2.12.3_text" = "Version 2.12.3\n\n• Fejlrettelser";
+
+"v2.12.2_text" = "Version 2.12.2\n2 august 2022\n\n• Løser et nedbrud på iOS 9-12, når du viser upload anmodning kø\n• Mindre fejlrettelser og forbedringer af brugerflade";
 
 "v2.12.1_text" = "Version 2.12.1\n10 juli 2022\n\n• Retter et nedbrud, der opstår på iOS 9-13 ved ændring af tags tildelt billeder";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "Version 2.12.2\n\n• Behebt einen Absturz, der bei iOS 9.12 auftritt, wenn die Warteschlange für Upload-Anfragen angezeigt wird\n• Kleinere Fehlerbehebungen und Verbesserungen der Schnittstelle";
+"v2.12.3_text" = "Version 2.12.3\n\n• Fehlerbehebungen";
+
+"v2.12.2_text" = "Version 2.12.2\n2. August 2022\n\n• Behebt einen Absturz, der bei iOS 9.12 auftritt, wenn die Warteschlange für Upload-Anfragen angezeigt wird\n• Kleinere Fehlerbehebungen und Verbesserungen der Schnittstelle";
 
 "v2.12.1_text" = "Version 2.12.1\n10. Juli 2022\n\n• Behebt einen Absturz auf iOS 9-13 beim Ändern von Schlagwörtern, die Fotos zugeordnet sind";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "Version 2.12.2\n\n• Fixes a crash occurring on iOS 9-12 when displaying the upload request queue\n• Minor bug fixes and improvements of the interface";
+"v2.12.3_text" = "Version 2.12.3\n\n• Bug fixes";
+
+"v2.12.2_text" = "Version 2.12.2\nAugust 2, 2022\n\n• Fixes a crash occurring on iOS 9-12 when displaying the upload request queue\n• Minor bug fixes and improvements of the interface";
 
 "v2.12.1_text" = "Version 2.12.1\nJuly 10, 2022\n\n• Fixes a crash occurring on iOS 9-13 when changing tags allocated to photos";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "Versión 2.12.2\n\n• Corrige un error que ocurría en iOS 9-12 al mostrar la cola de peticiones de subida\n• Corrección de errores menores y mejoras en la interfaz";
+"v2.12.3_text" = "Versión 2.12.3\n\n• Corrección de errores";
+
+"v2.12.2_text" = "Versión 2.12.2\n2 de agosto de 2022\n\n• Corrige un error que ocurría en iOS 9-12 al mostrar la cola de peticiones de subida\n• Corrección de errores menores y mejoras en la interfaz";
 
 "v2.12.1_text" = "Versión 2.12.1\n10 de julio de 2022\n\n• Corrige un bloqueo en iOS 9-13 al cambiar las etiquetas asignadas a las fotos";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "Version 2.12.2\n\n• Corrige un crash survenant sur iOS 9-12 lors de l'affichage de la file d'attente des demandes de téléchargement\n• Corrections de bugs mineurs et améliorations de l'interface";
+"v2.12.3_text" = "Version 2.12.3\n\n• Correction de bugs";
+
+"v2.12.2_text" = "Version 2.12.2\n2 août 2022\n\n• Corrige un crash survenant sur iOS 9-12 lors de l'affichage de la file d'attente des demandes de téléchargement\n• Corrections de bugs mineurs et améliorations de l'interface";
 
 "v2.12.1_text" = "Version 2.12.1\n10 juillet 2022\n\n• Corrige un crash survenant sur iOS 9-13 lors de la modification des balises attribuées aux photos";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "2.12.2 verzió\n\n• Kijavítja az iOS 9–12 rendszeren előforduló összeomlást a feltöltési kéréssor megjelenítésekor\n• Kisebb hibajavítások és fejlesztések a felületen";
+"v2.12.3_text" = "2.12.3 verzió\n\n• Hibajavítások";
+
+"v2.12.2_text" = "2.12.2 verzió\n2022 Augusztus 2\n\n• Kijavítja az iOS 9–12 rendszeren előforduló összeomlást a feltöltési kéréssor megjelenítésekor\n• Kisebb hibajavítások és fejlesztések a felületen";
 
 "v2.12.1_text" = "2.12.1 verzió\n2022 Július 10\n\n• Kijavítja az iOS 9–13 rendszeren előforduló összeomlást, amikor módosítja a fényképekhez rendelt címkéket";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "Version 2.12.2\n\n• Fixes a crash occurring on iOS 9-12 when displaying the upload request queue\n• Minor bug fixes and improvements of the interface";
+"v2.12.3_text" = "Versi 2.12.3\n\n• Perbaikan bug";
+
+"v2.12.2_text" = "Version 2.12.2\nAugust 2, 2022\n\n• Fixes a crash occurring on iOS 9-12 when displaying the upload request queue\n• Minor bug fixes and improvements of the interface";
 
 "v2.12.1_text" = "Version 2.12.1\nJuly 10, 2022\n\n• Fixes a crash occurring on iOS 9-13 when changing tags allocated to photos";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "Versione 2.12.2\n\n• Corregge un arresto anomalo che si verifica su iOS 9-12 quando si visualizza la coda di richiesta di caricamento\n• Correzioni di bug minori e miglioramenti dell'interfaccia";
+"v2.12.3_text" = "Versione 2.12.3\n\n• Correzioni di bug";
+
+"v2.12.2_text" = "Versione 2.12.2\n2 agosto 2022\n\n• Corregge un arresto anomalo che si verifica su iOS 9-12 quando si visualizza la coda di richiesta di caricamento\n• Correzioni di bug minori e miglioramenti dell'interfaccia";
 
 "v2.12.1_text" = "Versione 2.12.1\n10 luglio 2022\n\n• Risolve un arresto anomalo che si verificava su iOS 9-13 durante la modifica dei tag assegnati alle foto";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "バージョン 2.12.2\n\n• アップロードリクエストキューを表示するときにiOS 9-12で発生するクラッシュを修正\n• 軽微なバグの修正とインターフェースの改善";
+"v2.12.3_text" = "バージョン 2.12.3\n\n• バグの修正";
+
+"v2.12.2_text" = "バージョン 2.12.2\n2022年8月2日\n\n• アップロードリクエストキューを表示するときにiOS 9-12で発生するクラッシュを修正\n• 軽微なバグの修正とインターフェースの改善";
 
 "v2.12.1_text" = "バージョン 2.12.1\n2022年7月10日\n\n• 写真に割り当てられたタグを変更するとiOS 9-13でクラッシュする問題を修正。";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "Versie 2.12.2\n\n• Los een crash op die optreedt op iOS 9-12 wanneer de wachtrij voor de upload aanvraag wordt weergegeven\n• Kleine foutjes hersteld en verbetering van de interface";
+"v2.12.3_text" = "Versie 2.12.3\n\n• Foutjes verbeterd";
+
+"v2.12.2_text" = "Versie 2.12.2\n2 augustus 2022\n\n• Los een crash op die optreedt op iOS 9-12 wanneer de wachtrij voor de upload aanvraag wordt weergegeven\n• Kleine foutjes hersteld en verbetering van de interface";
 
 "v2.12.1_text" = "Versie 2.12.1\n10 juli 2022\n\n• Corrigeert een crash die optreedt op iOS 9-13 bij het veranderen van tags toegewezen aan foto's";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "Wersja 2.12.2\n\n• Naprawia awarię w iOS 9-12 podczas wyświetlania kolejki żądań przesyłania\n• Drobne poprawki błędów i ulepszenia interfejsu";
+"v2.12.3_text" = "Wersja 2.12.3\n\n• Poprawki błędów";
+
+"v2.12.2_text" = "Wersja 2.12.2\n2 sierpnia 2022\n\n• Naprawia awarię w iOS 9-12 podczas wyświetlania kolejki żądań przesyłania\n• Drobne poprawki błędów i ulepszenia interfejsu";
 
 "v2.12.1_text" = "Wersja 2.12.1\n10 lipca 2022\n\n• Naprawia awarię w iOS 9-13 występującą podczas zmiany tagów przypisanych do zdjęć";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "Версия 2.12.2\n\n• Исправлена ошибка на iOS 9-12 при отображении очереди запросов на загрузку\n• Исправления мелких ошибок и улучшения интерфейса";
+"v2.12.3_text" = "Версия 2.12.3\n\n• Исправления ошибок";
+
+"v2.12.2_text" = "Версия 2.12.2\n2 августа 2022\n\n• Исправлена ошибка на iOS 9-12 при отображении очереди запросов на загрузку\n• Исправления мелких ошибок и улучшения интерфейса";
 
 "v2.12.1_text" = "Версия 2.12.1\n10 июля 2022\n\n• Исправлена ошибка, возникающая на iOS 9-13 при изменении тегов, выделенных на фотографии";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "Version 2.12.2\n\n• Fixar en krasch som inträffar på iOS 9-12 när du visar uppladdningskön\n• Mindre bugfixar och förbättringar av gränssnittet";
+"v2.12.3_text" = "Version 2.12.3\n\n• Buggfixar";
+
+"v2.12.2_text" = "Version 2.12.2\n2 augusti 2022\n\n• Fixar en krasch som inträffar på iOS 9-12 när du visar uppladdningskön\n• Mindre bugfixar och förbättringar av gränssnittet";
 
 "v2.12.1_text" = "Version 2.12.1\n10 juli 2022\n\n• Fixar en krasch som inträffar på iOS 9-13 vid ändring av taggar som tilldelats foton";
 
diff --git 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.
  */
 
-"v2.12.2_text" = "版本 2.12.2\n\n• 修复了在 iOS 9-12 上显示上传请求队列时发生的崩溃\n• 小错误修复和界面改进";
+"v2.12.3_text" = "版本 2.12.3\n\n• 错误修复";
+
+"v2.12.2_text" = "版本 2.12.2\n2022年8月2日\n\n• 修复了在 iOS 9-12 上显示上传请求队列时发生的崩溃\n• 小错误修复和界面改进";
 
 "v2.12.1_text" = "版本 2.12.1\n\n• 修复了在 iOS 9-13 上更改分配给照片的标签时发生的崩溃";
 
diff --git a/piwigo/Settings/Information/ReleaseNotesViewController.swift b/piwigo/Settings/Information/ReleaseNotesViewController.swift
@@ -162,6 +162,7 @@ class ReleaseNotesViewController: UIViewController {
         let notesAttributedString = NSMutableAttributedString(string: "")
 
         // Release 2.12.x — Bundle string
+        notesAttributedString.append(releaseNotes("v2.12.3_text", comment: "v2.12.3 Release Notes text"))
         notesAttributedString.append(releaseNotes("v2.12.2_text", comment: "v2.12.2 Release Notes text"))
         notesAttributedString.append(releaseNotes("v2.12.1_text", comment: "v2.12.1 Release Notes text"))
         notesAttributedString.append(releaseNotes("v2.12.0_text", comment: "v2.12.0 Release Notes text"))
diff --git a/piwigoKit/Data Cache/DataController.swift b/piwigoKit/Data Cache/DataController.swift
@@ -357,8 +357,7 @@ public class DataController: NSObject {
                 // Replace this implementation with code to handle the error appropriately.
                 // abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
                 let nserror = error as NSError
-                NSLog("Unresolved error \(nserror), \(nserror.userInfo)")
-                abort()
+                fatalError("Unresolved error \(nserror), \(nserror.userInfo)")
             }
         }
     }
@@ -372,16 +371,18 @@ extension NSManagedObjectContext {
             // Execute the request.
             let deleteResult = try execute(batchDeleteRequest) as? NSBatchDeleteResult
             
-            // Extract the IDs of the deleted managed objectss from the request's result.
+            // Extract the IDs of the deleted managed objects from the request's result.
             if let objectIDs = deleteResult?.result as? [NSManagedObjectID] {
                 // Merge the deletions into the app's managed object context.
                 NSManagedObjectContext.mergeChanges(
                     fromRemoteContextSave: [NSDeletedObjectsKey: objectIDs],
-                    into: [self]
+                    into: [DataController.managedObjectContext]
                 )
             }
         } catch {
             // Handle any thrown errors.
+            let nserror = error as NSError
+            fatalError("Unresolved error \(nserror), \(nserror.userInfo)")
         }
     }
 }
diff --git a/piwigoKit/Data Cache/Uploads Data/UploadsProvider.swift b/piwigoKit/Data Cache/Uploads Data/UploadsProvider.swift
@@ -356,7 +356,10 @@ public class UploadsProvider: NSObject {
     public func delete(uploadRequests: [NSManagedObjectID],
                        completionHandler: @escaping (Error?) -> Void) {
         
-        guard uploadRequests.isEmpty == false else { return }
+        guard uploadRequests.isEmpty == false else {
+            completionHandler(nil)
+            return
+        }
         
         // Create the queue context.
         var taskContext: NSManagedObjectContext
diff --git a/piwigoKit/Upload/UploadManager+Auto.swift b/piwigoKit/Upload/UploadManager+Auto.swift
@@ -142,29 +142,27 @@ extension UploadManager {
         let objectIDs = uploadsProvider.getRequests(inStates: states, markedForAutoUpload: true).1
 
         // Remove non-completed upload requests marked for auto-upload from the upload queue
-        if objectIDs.isEmpty == false {
-            uploadsProvider.delete(uploadRequests: objectIDs) { error in
-                // Job done in background task
-                if self.isExecutingBackgroundUploadTask { return }
+        uploadsProvider.delete(uploadRequests: objectIDs) { [unowned self] error in
+            // Job done in background task
+            if self.isExecutingBackgroundUploadTask { return }
 
-                // Error encountered?
-                guard let error = error else {
-                    // Restart UploadManager activities
-                    if UploadManager.shared.isPaused {
-                        UploadManager.shared.isPaused = false
-                        UploadManager.shared.backgroundQueue.async {
-                            UploadManager.shared.findNextImageToUpload()
-                        }
+            // Error encountered?
+            guard let error = error else {
+                // Restart UploadManager activities
+                if UploadManager.shared.isPaused {
+                    UploadManager.shared.isPaused = false
+                    UploadManager.shared.backgroundQueue.async {
+                        UploadManager.shared.findNextImageToUpload()
                     }
-                    return
-                }
-                
-                // Error encountered, inform user
-                DispatchQueue.main.async {
-                    let userInfo: [String : Any] = ["message" : error.localizedDescription];
-                    NotificationCenter.default.post(name: .pwgAppendAutoUploadRequestsFailed,
-                                                    object: nil, userInfo: userInfo)
                 }
+                return
+            }
+            
+            // Error encountered, inform user
+            DispatchQueue.main.async {
+                let userInfo: [String : Any] = ["message" : error.localizedDescription];
+                NotificationCenter.default.post(name: .pwgAppendAutoUploadRequestsFailed,
+                                                object: nil, userInfo: userInfo)
             }
         }
     }
diff --git a/piwigoKit/Upload/UploadManager.swift b/piwigoKit/Upload/UploadManager.swift
@@ -1338,7 +1338,7 @@ public class UploadManager: NSObject {
         if assetsToDelete.count == 0 { return }
         
         // Delete images from Photo Library
-        DispatchQueue.main.async(execute: {
+        DispatchQueue.main.async {
             PHPhotoLibrary.shared().performChanges({
                 // Delete images from the library
                 PHAssetChangeRequest.deleteAssets(assetsToDelete as NSFastEnumeration)
@@ -1348,7 +1348,7 @@ public class UploadManager: NSObject {
                     self.uploadsProvider.delete(uploadRequests: uploadIDs) { _ in }
                 }
             })
-        })
+        }
     }
     
     public func didDeletePiwigoImage(withID imageId: Int) {
@@ -1446,19 +1446,18 @@ public class UploadManager: NSObject {
         var objectIDsToDelete: [NSManagedObjectID] = imagesToUpload.1
         
         // Remove upload requests of files from intent and clipboard
-        for (index, imageID) in imagesToUpload.0.enumerated() {
-            if imageID.hasPrefix(kIntentPrefix) || imageID.hasPrefix(kClipboardPrefix) {
-                assetIDsToDelete.remove(at: index)
-                objectIDsToDelete.remove(at: index)
-            }
+        while let index = assetIDsToDelete.firstIndex(where: { $0.hasPrefix(kIntentPrefix) || $0.hasPrefix(kClipboardPrefix)}) {
+            assetIDsToDelete.remove(at: index)
+            objectIDsToDelete.remove(at: index)
         }
         
         // Fetch available assets
         let availableAssets = PHAsset.fetchAssets(withLocalIdentifiers: assetIDsToDelete, options: nil)
         
-        // Build list of missing assets
-        availableAssets.enumerateObjects { asset, index, _ in
-            if assetIDsToDelete.contains(asset.localIdentifier) {
+        // Remove available assets
+        availableAssets.enumerateObjects { asset, _, _ in
+            if let index = assetIDsToDelete.firstIndex(where: { $0 == asset.localIdentifier }) {
+                assetIDsToDelete.remove(at: index)
                 objectIDsToDelete.remove(at: index)
             }
         }
