Merge branch 'hotfix/2.2.1'

Author: normansander

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 Changelog for Critical Maps iOS
 
+## [2.2.1] - 2017-06-07
+### Fixed
+- intended purpose of using the user's location while the app is in the background (NSLocationAlwaysUsageDescription)
+
 ## [2.2.0] - 2017-06-06
 ### Changed
 - temporary API url

CriticalMaps.xcodeproj/project.pbxproj

@@ -402,7 +402,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		AE8C2169D48B35B543C49302 /* [CP] Copy Pods Resources */ = {

CriticalMass/CriticalMaps-Info.plist

@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0.2</string>
+	<string>2.2.0.3</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
@@ -34,7 +34,7 @@
 		<true/>
 	</dict>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>GPS only used when app is active</string>
+	<string>This app needs the access to be able to share your location with other Critical Maps users.</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>fetch</string>

Podfile.lock

@@ -46,4 +46,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: d0ff173bc6ec07b51790de9163b1ee4ca8b6b8fd
 
-COCOAPODS: 1.2.0.beta.1
+COCOAPODS: 1.2.1