Merge pull request #218 from Esri/hotfix_v1.1.2

Hotfix v1.1.2
Esri · Nov 8, 2019 · 42fc43d · 42fc43d
2 parents 9f76916 + 9a8a0f0
commit 42fc43d
Show file tree

Hide file tree

Showing 24 changed files with 1,267 additions and 6 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,3 +1,9 @@
+# Release 1.1.2
+
+- Fix for [iPad crash](https://github.com/Esri/data-collection-ios/issues/209).
+- Fix for [illegal attachment name characters](https://github.com/Esri/data-collection-ios/issues/188).
+- Adds [app documentation](/docs/index.md) from the ArcGIS for Developers site.
+
 # Release 1.1.1
 
 - Support for iOS 13

diff --git a/data-collection/Resources/Info.plist b/data-collection/Resources/Info.plist
@@ -17,7 +17,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>1.1.1</string>
+ <string>$(MARKETING_VERSION)</string>
  <key>CFBundleURLTypes</key>
  <array>
  <dict>

diff --git a/data-collection/data-collection.xcodeproj/project.pbxproj b/data-collection/data-collection.xcodeproj/project.pbxproj
@@ -1747,6 +1747,7 @@
  INFOPLIST_FILE = "$(SRCROOT)/Resources/Info.plist";
  IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ MARKETING_VERSION = 1.1.2;
  OTHER_LDFLAGS = "";
  PRODUCT_BUNDLE_IDENTIFIER = "com.esri.arcgisruntime-example-apps.data-collection";
  PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1769,6 +1770,7 @@
  INFOPLIST_FILE = "$(SRCROOT)/Resources/Info.plist";
  IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ MARKETING_VERSION = 1.1.2;
  OTHER_LDFLAGS = "";
  PRODUCT_BUNDLE_IDENTIFIER = "com.esri.arcgisruntime-example-apps.data-collection";
  PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/data-collection/data-collection/Utilities/ImagePickerPermissions.swift b/data-collection/data-collection/Utilities/ImagePickerPermissions.swift
@@ -174,7 +174,16 @@ public struct ImagePickerPermissions {
 
  let viewController = delegate.imagePickerPermissionsRequestsPresentingViewController()
 
- let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
+ let style: UIAlertController.Style
+ if #available(iOS 13.0, *) {
+ // In iOS 12.x, this used to crash without using `.alert` or setting either
+ // a UIBarButtonItem or sourceView and rect. Fixed in iOS 13.
+ style = .actionSheet
+ }
+ else {
+ style = .alert
+ }
+ let alertController = UIAlertController(title: nil, message: nil, preferredStyle: style)
 
  for permission in permissions {
 
@@ -184,9 +193,9 @@ public struct ImagePickerPermissions {
 
  alertController.addAction(alertAction)
  }
- 
+
  alertController.addAction(.cancel())
- 
+
  viewController.present(alertController, animated: true)
  }
 }

diff --git a/...ollection/data-collection/View Controllers/App Container/AppContainerViewController.swift b/...ollection/data-collection/View Controllers/App Container/AppContainerViewController.swift
@@ -124,7 +124,7 @@ class AppContainerViewController: UIViewController {
  }
 
  @IBAction func userTapsRightButton(_ sender: Any) {
- mapViewController?.userRequestsAddNewFeature()
+ mapViewController?.userRequestsAddNewFeature(sender as? UIBarButtonItem)
  }
 
  override func prepare(for segue: UIStoryboardSegue, sender: Any?) {

diff --git a/...collection/View Controllers/Map View Controller/MapViewController+LocationSelection.swift b/...collection/View Controllers/Map View Controller/MapViewController+LocationSelection.swift
@@ -43,7 +43,7 @@ extension MapViewController {
 
  // MARK : New Feature
 
- func userRequestsAddNewFeature() {
+ func userRequestsAddNewFeature(_ barButtonItem: UIBarButtonItem?) {
 
  guard mapViewMode != .disabled else {
  return
@@ -78,6 +78,7 @@ extension MapViewController {
 
  action.addAction(.cancel())
 
+ action.popoverPresentationController?.barButtonItem = barButtonItem
  present(action, animated: true, completion: nil)
  }
  }

diff --git a/...EditStagedPhotoAttachmentViewController/RichPopupEditStagedAttachmentViewController.swift b/...EditStagedPhotoAttachmentViewController/RichPopupEditStagedAttachmentViewController.swift
@@ -106,6 +106,10 @@ class RichPopupEditStagedAttachmentViewController: UITableViewController, UIText
  return true
  }
 
+ func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+ return string.rangeOfCharacter(from: CharacterSet(charactersIn: #"^\:/*?"<>|"#)) == nil
+ }
+
  // MARK: Table View Mapping
 
  private func cellForMappedAttachmentSize(_ desiredSize: AGSPopupAttachmentSize) -> UITableViewCell? {

diff --git a/docs/images/add-feature.png b/docs/images/add-feature.png
diff --git a/docs/images/anatomy-app-context-drawer.png b/docs/images/anatomy-app-context-drawer.png
diff --git a/docs/images/anatomy-identified-feature.png b/docs/images/anatomy-identified-feature.png
diff --git a/docs/images/anatomy-map-view.png b/docs/images/anatomy-map-view.png
diff --git a/docs/images/anatomy-new-feature.png b/docs/images/anatomy-new-feature.png
diff --git a/docs/images/anatomy-offline-extent.png b/docs/images/anatomy-offline-extent.png
diff --git a/docs/images/anatomy-popup-edit.png b/docs/images/anatomy-popup-edit.png
diff --git a/docs/images/anatomy-popup-view-relationships.png b/docs/images/anatomy-popup-view-relationships.png
diff --git a/docs/images/anatomy-popup-view.png b/docs/images/anatomy-popup-view.png
diff --git a/docs/images/anatomy-small-popup-view.png b/docs/images/anatomy-small-popup-view.png
diff --git a/docs/images/configure-url-type.png b/docs/images/configure-url-type.png
diff --git a/docs/images/dataset-schema.png b/docs/images/dataset-schema.png
diff --git a/docs/images/featured-img.png b/docs/images/featured-img.png
diff --git a/docs/images/hamburger.png b/docs/images/hamburger.png
diff --git a/docs/images/identity.png b/docs/images/identity.png
diff --git a/docs/images/zoom-to-location.png b/docs/images/zoom-to-location.png
diff --git a/docs/index.md b/docs/index.md