Merge pull request #186 from ngageoint/revert-157-develop

Revert "Testflight Release 4.3.0"

Author: paulsolt-ofsw

CODEOWNERS

@@ -38,21 +38,14 @@
   },
   "testTargets" : [
     {
-      "parallelizable" : false,
+      "parallelizable" : true,
       "skippedTests" : [
-        "AttachmentFieldViewTests\/testSetOneAttachmentThatIsSyncedAndOneThatIsNot()",
-        "AttachmentFieldViewTests\/testSetOneAttachmentThatIsSyncedAndOneThatIsNotDifferentOrder()",
-        "AttachmentFieldViewTests\/testSetOneAttachmentWithObservationAndTwoLater()",
-        "AttachmentFieldViewTests\/testSetOneAttachmentWithObservationAndTwoLaterThenRemoveFirst()",
-        "AttachmentFieldViewTests\/testSetOneAttachmentWithObservationAndTwoLaterThenRemoveSecond()",
-        "AttachmentFieldViewTests\/testShouldCallTheAttachmentSelectionDelegateOnTap()",
         "AttachmentPushServiceTests",
-        "AuthenticationCoordinatorTests",
         "CanCreateObservationTests\/testInitializeTheCanCreateObservationAndLongPressTheMap()",
-        "EventChooserControllerTests",
         "EventChooserCoordinatorTests",
         "FeedItemsViewControllerNoTimestampTests",
-        "FeedItemsViewControllerNoTimestampTests\/testOneFeedItemNoContent()",
+        "FeedItemsViewControllerNoTimestampTests\/testOneFeedItemWithPrimaryAndSecondaryValueAndIcon()",
+        "FeedItemsViewControllerNoTimestampTests\/testOneFeedItemWithPrimaryValue()",
         "FeedItemsViewControllerWithTimestampTests",
         "FeedItemsViewControllerWithTimestampTests\/testOneFeedItemWithPrimaryAndSecondaryValueAndIconWithoutTimestamp()",
         "MageServerTestsSwift\/testShouldFailWhenAnImageIsrReturned()",
@@ -75,7 +68,6 @@
       "parallelizable" : false,
       "skippedTests" : [
         "GeoPackageImporterTests\/testImportGeoPackageFileIntoLayer()",
-        "GeoPackageImporterUITests\/testShouldHandleGeoPackageImportTwiceOverwrite()",
         "GeoPackageLayerMapTests\/testInitializeTheStaticLayerMapWithANotLoadedLayerThenLoadItButDontAddItToTheMap()",
         "GeoPackageTests\/testAddGeoPackageTileLayerThenReAdd()",
         "GeoPackageTests\/testGetFeatureKeys()"

MAGE.xcodeproj/project.pbxproj

@@ -179,7 +179,7 @@ extension AttachmentCreationCoordinator: AttachmentCreationDelegate {
             MageLogger.misc.debug("Present the gallery")
             var configuration = PHPickerConfiguration(photoLibrary: PHPhotoLibrary.shared())
             configuration.filter = .any(of: [.images, .videos])
-            configuration.selectionLimit = 10;
+            configuration.selectionLimit = 1;
 
             // This is to compensate for iOS not setting all the colors on the PHPicker
             // it only sets the tint color not anything else, so let's make the button actually viewable
@@ -202,7 +202,8 @@ extension AttachmentCreationCoordinator: PHPickerViewControllerDelegate {
             guard let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first else {
                 return
             }
-            let uniqueId = UUID().uuidString
+            let dateFormatter = DateFormatter()
+            dateFormatter.dateFormat = "yyyyMMdd_HHmmss"
             let attachmentsDirectory = documentsDirectory.appendingPathComponent("attachments")
             let requestOptions = PHImageRequestOptions()
             requestOptions.isSynchronous = true
@@ -212,7 +213,7 @@ extension AttachmentCreationCoordinator: PHPickerViewControllerDelegate {
                 guard let data else {
                     return
                 }
-                let scaledImagePath = attachmentsDirectory.appendingPathComponent("MAGE_\(uniqueId).jpeg")
+                let scaledImagePath = attachmentsDirectory.appendingPathComponent("MAGE_\(dateFormatter.string(from: Date())).jpeg")
                 do {
                     try FileManager.default.createDirectory(at: attachmentsDirectory, withIntermediateDirectories: true, attributes: [.protectionKey : FileProtectionType.complete])
                 }
@@ -245,9 +246,10 @@ extension AttachmentCreationCoordinator: PHPickerViewControllerDelegate {
         guard let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first else {
             return
         }
-        let uniqueId = UUID().uuidString
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "yyyyMMdd_HHmmss"
         let attachmentsDirectory = documentsDirectory.appendingPathComponent("attachments")
-        let videoExportPath = attachmentsDirectory.appendingPathComponent("MAGE_\(uniqueId).mp4")
+        let videoExportPath = attachmentsDirectory.appendingPathComponent("MAGE_\(dateFormatter.string(from: Date())).mp4")
         let assetRequestOptions = PHVideoRequestOptions()
         assetRequestOptions.deliveryMode = .highQualityFormat
         assetRequestOptions.isNetworkAccessAllowed = true
@@ -280,7 +282,7 @@ extension AttachmentCreationCoordinator: PHPickerViewControllerDelegate {
             self.addAttachmentForSaving(location: videoExportPath, contentType: "video/mp4")
         }
     }
-    
+
     private func requestAVAssetAsync(forVideo: PHAsset, options: PHVideoRequestOptions?) async throws -> AVAsset? {
         try await withCheckedThrowingContinuation { continuation in
             PHImageManager.default().requestAVAsset(forVideo: forVideo, options: options) { avAsset, audioMix, info in
@@ -292,7 +294,7 @@ extension AttachmentCreationCoordinator: PHPickerViewControllerDelegate {
             }
         }
     }
-    
+
     func galleryPermissionDenied() {
         // The user selected certain photos to share with MAGE and this wasn't one of them
         // prompt the user to pick more photos to share
@@ -314,31 +316,47 @@ extension AttachmentCreationCoordinator: PHPickerViewControllerDelegate {
     }
 
     func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
-        MageLogger.misc.debug("picked photos \(results)")
-        UINavigationBar.appearance().tintColor = self.scheme?.colorScheme.onPrimaryColor // This is to compensate for iOS not setting all the colors on the PHPicker so now we have to set it back
-        
+        MageLogger.misc.debug("picked a photo \(results)")
+        // This is to compensate for iOS not setting all the colors on the PHPicker so now we have to set it back
+        UINavigationBar.appearance().tintColor = self.scheme?.colorScheme.onPrimaryColor
+
         guard !results.isEmpty else {
             picker.dismiss(animated: true, completion: nil)
             return
         }
 
+        let dateFormatter = DateFormatter();
+        dateFormatter.dateFormat = "yyyyMMdd_HHmmss";
+        
         for result in results {
             let itemProvider = result.itemProvider
-            guard let assetIdentifier = result.assetIdentifier else {
-                continue // Skip invalid asset (edge case: potentially deleted during upload)
-            }
 
-            if itemProvider.hasItemConformingToTypeIdentifier(UTType.movie.identifier) {
-                let fetchResult = PHAsset.fetchAssets(withLocalIdentifiers: [assetIdentifier], options: nil)
-                handleVideo(selectedAsset: fetchResult.firstObject, utType: .movie)
-            } else if itemProvider.hasItemConformingToTypeIdentifier(UTType.image.identifier) {
-                let fetchResult = PHAsset.fetchAssets(withLocalIdentifiers: [assetIdentifier], options: nil)
-                handlePhoto(selectedAsset: fetchResult.firstObject, utType: .image)
-            } else {
-                MageLogger.misc.debug("Could not handle asset types: \(itemProvider.registeredTypeIdentifiers)")
+            // find the first type that we can handle
+            for typeIdentifier in itemProvider.registeredTypeIdentifiers {
+                guard let utType = UTType(typeIdentifier) else {
+                    continue
+                }
+                // Matches both com.apple.live-photo-bundle and com.apple.private.live-photo-bundle
+                if utType.conforms(to: .image) || typeIdentifier.contains("live-photo-bundle") {
+                    if let assetIdentifier = result.assetIdentifier {
+                        let options = PHFetchOptions()
+                        options.predicate = NSPredicate(format: "mediaType = %d", PHAssetMediaType.image.rawValue)
+                        let fetchResult = PHAsset.fetchAssets(withLocalIdentifiers: [assetIdentifier], options: nil)
+                        handlePhoto(selectedAsset: fetchResult.firstObject, utType: utType)
+                        picker.dismiss(animated: true, completion: nil)
+                        return
+                    }
+                }
+                // otherwise it should be a movie
+                if utType.conforms(to: .movie), let assetIdentifier = result.assetIdentifier {
+                    let fetchResult = PHAsset.fetchAssets(withLocalIdentifiers: [assetIdentifier], options: nil)
+                    handleVideo(selectedAsset: fetchResult.firstObject, utType: utType)
+                    picker.dismiss(animated: true, completion: nil)
+                    return
+                }
             }
+            MDCSnackbarManager.default.show(MDCSnackbarMessage(text: "Could not handle asset types: \(itemProvider.registeredTypeIdentifiers)"))
         }
-        picker.dismiss(animated: true, completion: nil)
     }
 }
 
@@ -377,18 +395,16 @@ extension AttachmentCreationCoordinator: UIImagePickerControllerDelegate {
     func handleCameraImage(picker: UIImagePickerController, info: [UIImagePickerController.InfoKey : Any]) {
         locationManager?.stopUpdatingHeading();
         locationManager?.stopUpdatingLocation();
-        let uniqueId = UUID().uuidString
-        let date = Date()
         let dateFormatter = DateFormatter();
         dateFormatter.dateFormat = "yyyyMMdd_HHmmss";
 
         if let chosenImage = info[.originalImage] as? UIImage,
            let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first {
             DispatchQueue.global(qos: .userInitiated).async { [self] in
                 let attachmentsDirectory = documentsDirectory.appendingPathComponent("attachments");
-                let fileToWriteTo = attachmentsDirectory.appendingPathComponent("MAGE_\(uniqueId).jpeg");
-                let originalFileToWriteTo = attachmentsDirectory.appendingPathComponent("MAGE_\(uniqueId) \(dateFormatter.string(from: date))_original.jpeg");
-                
+                let fileToWriteTo = attachmentsDirectory.appendingPathComponent("MAGE_\(dateFormatter.string(from: Date())).jpeg");
+                let originalFileToWriteTo = attachmentsDirectory.appendingPathComponent("MAGE_\(dateFormatter.string(from: Date()))_original.jpeg");
+
                 do {
                     try FileManager.default.createDirectory(at: fileToWriteTo.deletingLastPathComponent(), withIntermediateDirectories: true, attributes: [.protectionKey : FileProtectionType.complete]);
                     guard let imageData = chosenImage.qualityScaled() else { return };
@@ -412,13 +428,13 @@ extension AttachmentCreationCoordinator: UIImagePickerControllerDelegate {
                     guard let originalWithGPS = writeMetadataIntoImageData(imagedata: originalImageData, metadata: NSDictionary(dictionary: metadata)) else { return };
                     do {
                         try originalWithGPS.write(to: originalFileToWriteTo, options: .completeFileProtection)
-                        
+
                         try? PHPhotoLibrary.shared().performChangesAndWait {
                             PHAssetChangeRequest.creationRequestForAssetFromImage(atFileURL: originalFileToWriteTo)
                         }
 
                         try FileManager.default.removeItem(at: originalFileToWriteTo);
-                        
+
                     } catch {
                         MageLogger.misc.error("Unable to write image to file \(originalFileToWriteTo): \(error)")
                     }
@@ -516,18 +532,19 @@ extension AttachmentCreationCoordinator: UIImagePickerControllerDelegate {
         }
         return nil;
     }
-    
+
     func handleMovie(picker: UIImagePickerController, info: [UIImagePickerController.InfoKey : Any]) {
         MageLogger.misc.debug("handling movie \(info)")
-        let uniqueId = UUID().uuidString
+        let dateFormatter = DateFormatter();
+        dateFormatter.dateFormat = "yyyyMMdd_HHmmss";
         guard let videoUrl = info[.mediaURL] as? URL else { return }
         guard let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first else { return }
 
         if (picker.sourceType == .camera && UIVideoAtPathIsCompatibleWithSavedPhotosAlbum(videoUrl.path)) {
             UISaveVideoAtPathToSavedPhotosAlbum(videoUrl.path, nil, nil, nil);
         }
         let attachmentsDirectory = documentsDirectory.appendingPathComponent("attachments");
-        let fileToWriteTo = attachmentsDirectory.appendingPathComponent("MAGE_\(uniqueId).mp4");
+        let fileToWriteTo = attachmentsDirectory.appendingPathComponent("MAGE_\(dateFormatter.string(from: Date())).mp4");
 
         let videoQuality: String = videoUploadQuality();
         MageLogger.misc.debug("video quality \(videoQuality)")
@@ -546,22 +563,22 @@ extension AttachmentCreationCoordinator: UIImagePickerControllerDelegate {
                 exportSession.exportAsynchronously {
                     let foo = exportSession.status
                     switch (exportSession.status) {
-                    case .completed:
-                        print("Export complete")
-                        self.addAttachmentForSaving(location: fileToWriteTo, contentType: "video/mp4")
-                    case .failed:
-                        print("Export Failed: \(String(describing: exportSession.error?.localizedDescription))")
-                    case .cancelled:
-                        print("Export cancelled");
-                    case .unknown:
-                        print("Unknown")
-                    case .waiting:
-                        print("Waiting")
-                    case .exporting:
-                        print("Exporting")
-                    @unknown default:
-                        print("Unknown")
-                    }
+                        case .completed:
+                            print("Export complete")
+                            self.addAttachmentForSaving(location: fileToWriteTo, contentType: "video/mp4")
+                        case .failed:
+                            print("Export Failed: \(String(describing: exportSession.error?.localizedDescription))")
+                        case .cancelled:
+                            print("Export cancelled");
+                        case .unknown:
+                            print("Unknown")
+                        case .waiting:
+                            print("Waiting")
+                        case .exporting:
+                            print("Exporting")
+                        @unknown default:
+                            print("Unknown")
+                        }
                 }
             } catch {
                 MageLogger.misc.error("Error creating directory path \(fileToWriteTo.deletingLastPathComponent()): \(error)")
@@ -586,8 +603,12 @@ extension AttachmentCreationCoordinator: UIDocumentPickerDelegate {
     func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
         for url in urls {
             let securityScoped = url.startAccessingSecurityScopedResource()
-            let uniqueId = UUID().uuidString
+            
+            let dateFormatter = DateFormatter();
+            dateFormatter.dateFormat = "yyyyMMdd_HHmmss";
+            
             let uttype = try? url.resourceValues(forKeys: [.contentTypeKey]).contentType
+
             let fileType = uttype?.preferredFilenameExtension ?? url.pathExtension
             let mimeType = uttype?.preferredMIMEType ?? UTType.data.identifier
 
@@ -598,11 +619,11 @@ extension AttachmentCreationCoordinator: UIDocumentPickerDelegate {
             let attachmentsDirectory = documentsDirectory.appendingPathComponent("attachments")
             let urlWithoutExtension = url.deletingPathExtension()
             let filename = urlWithoutExtension.lastPathComponent
-            let fileToWriteTo = attachmentsDirectory.appendingPathComponent("MAGE_\(filename)_\(uniqueId).\(fileType)");
+            let fileToWriteTo = attachmentsDirectory.appendingPathComponent("MAGE_\(filename)_\(dateFormatter.string(from: Date())).\(fileType)");
 
             do {
                 try FileManager.default.createDirectory(at: fileToWriteTo.deletingLastPathComponent(), withIntermediateDirectories: true, attributes: [.protectionKey : FileProtectionType.complete]);
-                
+                                
 
                 do {
                     let attachmentData = try Data(contentsOf: url)
@@ -632,7 +653,7 @@ extension AttachmentCreationCoordinator: AudioRecordingDelegate {
     func recordingAvailable(recording: Recording) {
         MageLogger.misc.debug("Recording available")
         addAttachmentForSaving(location: URL(fileURLWithPath: recording.filePath!), contentType: recording.mediaType!)
-        
+    
         self.audioRecorderViewController?.dismiss(animated: true, completion: nil);
     }
 }

MAGE.xctestplan

@@ -17,7 +17,7 @@ import UIKit
     @objc func addGalleryAttachment();
 }
 
-class AttachmentFieldView : BaseFieldView, UICollectionViewDelegate {
+class AttachmentFieldView : BaseFieldView {
     private var attachments: [AttachmentModel]?;
     private weak var attachmentSelectionDelegate: AttachmentSelectionDelegate?;
     var attachmentCreationCoordinator: AttachmentCreationCoordinator?;
@@ -42,8 +42,10 @@ class AttachmentFieldView : BaseFieldView, UICollectionViewDelegate {
         var cv: UICollectionView = UICollectionView(frame: CGRect.zero, collectionViewLayout: layout);
         cv.configureForAutoLayout();
         cv.register(AttachmentCell.self, forCellWithReuseIdentifier: "AttachmentCell");
-        cv.delegate = self;
+        cv.delegate = attachmentCollectionDataStore;
         cv.dataSource = attachmentCollectionDataStore;
+        cv.accessibilityLabel = "Attachment Collection";
+        cv.accessibilityIdentifier = "Attachment Collection";
         attachmentCollectionDataStore.attachmentCollection = cv;
         return cv;
     }();