merge release-1.1.8-iOS into develop

.gitignore

@@ -67,6 +67,8 @@ DerivedData
 Paco-iOS/Paco.xcodeproj/project.xcworkspace/xcuserdata/*
 Paco-iOS/Paco.xcodeproj/project.xcworkspace/xcshareddata/*
 Paco-iOS/Paco.xcodeproj/xcuserdata/*
+Paco-iOS/Paco.xcworkspace/xcuserdata/*
 Paco-iOS/ParseKit/ParseKit.xcodeproj/xcuserdata/*
 Paco-iOS/ParseKit/lib/OCMock/OCMock.xcodeproj/xcuserdata/*
-Paco-iOS/ParseKit/include*
+Paco-iOS/ParseKit/include*
+Paco-iOS/DerivedData/*

Paco-iOS/Paco/config/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,27 +1,68 @@
 {
   "images" : [
     {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "icon_ios7_settings_58.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "icon_ios7_spotlight_80.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
       "size" : "60x60",
       "idiom" : "iphone",
       "filename" : "icon_ios7_iphone_120.png",
       "scale" : "2x"
     },
     {
-      "size" : "76x76",
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
       "idiom" : "ipad",
-      "filename" : "icon_ios7_ipad_76.png",
+      "size" : "20x20",
       "scale" : "1x"
     },
     {
-      "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "icon_ios7_ipad_152.png",
+      "size" : "20x20",
       "scale" : "2x"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "icon_ios7_spotlight_80.png",
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "icon_ios7_settings_29.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "icon_ios7_settings_58.png",
       "scale" : "2x"
     },
     {
@@ -37,21 +78,20 @@
       "scale" : "2x"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "icon_ios7_settings_58.png",
-      "scale" : "2x"
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "icon_ios7_ipad_76.png",
+      "scale" : "1x"
     },
     {
-      "size" : "29x29",
+      "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "icon_ios7_settings_29.png",
-      "scale" : "1x"
+      "filename" : "icon_ios7_ipad_152.png",
+      "scale" : "2x"
     },
     {
-      "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "icon_ios7_settings_58.png",
+      "size" : "83.5x83.5",
       "scale" : "2x"
     }
   ],

Paco-iOS/Paco/config/Images.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Paco-iOS/Paco/config/Images.xcassets/LaunchImage.launchimage/Contents.json

@@ -1,55 +1,163 @@
 {
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
   "images" : [
     {
       "orientation" : "portrait",
+      "filename" : "Default.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "extent" : "full-screen"
+    },
+    {
+      "orientation" : "portrait",
+      "filename" : "Default@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen"
+    },
+    {
+      "orientation" : "portrait",
+      "filename" : "Default-568h@2x.png",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "scale" : "2x",
+      "extent" : "full-screen"
+    },
+    {
+      "orientation" : "portrait",
+      "filename" : "Default-568h@2x.png",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "scale" : "2x",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen"
+    },
+    {
+      "orientation" : "portrait",
+      "filename" : "Default@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "extent" : "full-screen"
+    },
+    {
+      "orientation" : "portrait",
+      "filename" : "Default~ipad.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "extent" : "to-status-bar"
+    },
+    {
+      "orientation" : "portrait",
+      "filename" : "Default~ipad@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "extent" : "to-status-bar"
+    },
+    {
+      "orientation" : "landscape",
+      "filename" : "Default~ipad~landscape.png",
       "idiom" : "ipad",
-      "filename" : "splash_ios_tablet_768x1024.png",
+      "scale" : "1x",
+      "extent" : "to-status-bar"
+    },
+    {
+      "orientation" : "landscape",
+      "filename" : "Default~ipad~landscape@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "extent" : "to-status-bar",
+      "size" : "83.5x83.5"
+    },
+    {
+      "orientation" : "portrait",
+      "filename" : "Default~ipad~nostatusbar.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
       "minimum-system-version" : "7.0",
-      "extent" : "full-screen",
-      "scale" : "1x"
+      "extent" : "full-screen"
     },
     {
       "orientation" : "portrait",
+      "filename" : "Default~ipad~nostatusbar.png",
       "idiom" : "ipad",
-      "filename" : "splash_ios_tablet_768x1024@2x.png",
+      "scale" : "1x",
+      "extent" : "full-screen"
+    },
+    {
+      "orientation" : "portrait",
+      "filename" : "Default~ipad~nostatusbar@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
       "minimum-system-version" : "7.0",
-      "extent" : "full-screen",
-      "scale" : "2x"
+      "extent" : "full-screen"
+    },
+    {
+      "orientation" : "portrait",
+      "filename" : "Default~ipad~nostatusbar@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "extent" : "full-screen"
     },
     {
       "orientation" : "landscape",
+      "filename" : "Default~ipad~landscape~nostatusbar.png",
       "idiom" : "ipad",
-      "filename" : "splash_ios_tablet_1024x768.png",
+      "scale" : "1x",
       "minimum-system-version" : "7.0",
-      "extent" : "full-screen",
-      "scale" : "1x"
+      "extent" : "full-screen"
     },
     {
       "orientation" : "landscape",
+      "filename" : "Default~ipad~landscape~nostatusbar.png",
       "idiom" : "ipad",
-      "filename" : "splash_ios_tablet_1024x768@2x.png",
+      "scale" : "1x",
+      "extent" : "full-screen"
+    },
+    {
+      "orientation" : "landscape",
+      "filename" : "Default~ipad~landscape~nostatusbar@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
       "minimum-system-version" : "7.0",
-      "extent" : "full-screen",
-      "scale" : "2x"
+      "extent" : "full-screen"
+    },
+    {
+      "orientation" : "landscape",
+      "filename" : "Default~ipad~landscape~nostatusbar@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "extent" : "full-screen"
     },
     {
       "orientation" : "portrait",
+      "filename" : "Default-Portrait-736h@3x.png",
       "idiom" : "iphone",
-      "filename" : "splash_ios_mobile_640x960.png",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
+      "subtype" : "736h",
+      "scale" : "3x",
+      "minimum-system-version" : "8.0",
+      "extent" : "full-screen"
+    },
+    {
+      "orientation" : "landscape",
+      "filename" : "Default-Landscape-736h@3x.png",
+      "idiom" : "iphone",
+      "subtype" : "736h",
+      "scale" : "3x",
+      "minimum-system-version" : "8.0",
+      "extent" : "full-screen"
     },
     {
       "orientation" : "portrait",
+      "filename" : "Default-667h@2x.png",
       "idiom" : "iphone",
-      "filename" : "splash_ios_mobile_640x1136.png",
-      "minimum-system-version" : "7.0",
-      "subtype" : "retina4",
-      "scale" : "2x"
+      "subtype" : "667h",
+      "scale" : "2x",
+      "minimum-system-version" : "8.0",
+      "extent" : "full-screen"
     }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+  ]
+}

Paco-iOS/Paco/config/Paco-Info.plist

@@ -21,13 +21,32 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.7</string>
+	<string>1.1.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>com.googleusercontent.apps.619519633889-f79aogqhj44eut1u75e8jaa5eav8p3eu</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.7.1</string>
+	<string>1.1.8.2</string>
+	<key>LSApplicationCategoryType</key>
+	<string></string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>Used to add picture survey responses</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>This app will display your current location</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Used to allow the user to attach a photo from their library as a survey response.</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>fetch</string>
@@ -36,6 +55,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIRequiresFullScreen</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

Paco-iOS/Paco/source/PacoAppDelegate.h

@@ -16,6 +16,7 @@
 #import <UIKit/UIKit.h>
 
 @class PacoMainViewController;
+@protocol OIDAuthorizationFlowSession;
 
 @interface PacoAppDelegate : UIResponder <UIApplicationDelegate>
 
@@ -29,4 +30,12 @@
 
 - (void)processNotificationIfNeeded;
 
+/*! @brief The authorization flow session which receives the return URL from
+ \SFSafariViewController.
+ @discussion We need to store this in the app delegate as it's that delegate which receives the
+ incoming URL on UIApplicationDelegate.application:openURL:options:. This property will be
+ nil, except when an authorization flow is in progress.
+ */
+@property(nonatomic, strong, nullable) id<OIDAuthorizationFlowSession> currentAuthorizationFlow;
+
 @end