Merge pull request #78 from zendesk/Release-1.4.0.1

Releasing 1.4.0.1

README.md

@@ -1,6 +1,6 @@
 :warning: *Use of this software is subject to important terms and conditions as set forth in the License file* :warning:
 
-# Zendesk Mobile SDK for iOS 1.3.4.1
+# Zendesk Mobile SDK for iOS 1.4.0.1
 
 Zendesk SDK for mobile is a quick, convenient way to get customer support into your mobile apps. With just a few lines of code, you can provide your end users with an easy way to get in touch from any mobile app.
 

SampleApp/SampleApp.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		837AB70F1A8E511700B86214 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 837AB70E1A8E511700B86214 /* MobileCoreServices.framework */; };
 		83D3E9A01AA9EF36006DB98C /* ZDSampleAppScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83D3E99F1AA9EF36006DB98C /* ZDSampleAppScanViewController.m */; };
+		973AF0231BA1C40B00CF244C /* ZDFlatArticlesTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 973AF0221BA1C40B00CF244C /* ZDFlatArticlesTableViewController.m */; };
 		C333A54319E29F1E0046B858 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C333A54119E29EC40046B858 /* SystemConfiguration.framework */; };
 		C38311B61A1A352B00F7979A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C38311B31A1A352B00F7979A /* main.m */; };
 		C38311C31A1A358500F7979A /* ZDAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C38311BE1A1A358500F7979A /* ZDAppDelegate.m */; };
@@ -29,6 +30,8 @@
 		837AB70E1A8E511700B86214 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		83D3E99E1AA9EF36006DB98C /* ZDSampleAppScanViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZDSampleAppScanViewController.h; path = SampleApp/ZDSampleAppScanViewController.h; sourceTree = "<group>"; };
 		83D3E99F1AA9EF36006DB98C /* ZDSampleAppScanViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ZDSampleAppScanViewController.m; path = SampleApp/ZDSampleAppScanViewController.m; sourceTree = "<group>"; };
+		973AF0211BA1C40B00CF244C /* ZDFlatArticlesTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZDFlatArticlesTableViewController.h; path = SampleApp/ZDFlatArticlesTableViewController.h; sourceTree = "<group>"; };
+		973AF0221BA1C40B00CF244C /* ZDFlatArticlesTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ZDFlatArticlesTableViewController.m; path = SampleApp/ZDFlatArticlesTableViewController.m; sourceTree = "<group>"; };
 		C333A54119E29EC40046B858 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		C38311B31A1A352B00F7979A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = SampleApp/main.m; sourceTree = "<group>"; };
 		C38311B41A1A352B00F7979A /* SampleApp-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "SampleApp-Info.plist"; path = "SampleApp/SampleApp-Info.plist"; sourceTree = "<group>"; };
@@ -96,6 +99,8 @@
 				C38311C21A1A358500F7979A /* ZDSampleViewController.m */,
 				83D3E99E1AA9EF36006DB98C /* ZDSampleAppScanViewController.h */,
 				83D3E99F1AA9EF36006DB98C /* ZDSampleAppScanViewController.m */,
+				973AF0211BA1C40B00CF244C /* ZDFlatArticlesTableViewController.h */,
+				973AF0221BA1C40B00CF244C /* ZDFlatArticlesTableViewController.m */,
 			);
 			name = SampleApp;
 			sourceTree = "<group>";
@@ -251,6 +256,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				C38311C51A1A358500F7979A /* ZDSampleViewController.m in Sources */,
+				973AF0231BA1C40B00CF244C /* ZDFlatArticlesTableViewController.m in Sources */,
 				83D3E9A01AA9EF36006DB98C /* ZDSampleAppScanViewController.m in Sources */,
 				C38311C31A1A358500F7979A /* ZDAppDelegate.m in Sources */,
 				C3A2C8A11ABAD575006EA3E7 /* NSData+ZDKSampleApp.m in Sources */,

SampleApp/SampleApp.xcodeproj/xcshareddata/xcschemes/SampleApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
       <MacroExpansion>
@@ -38,17 +38,21 @@
             ReferencedContainer = "container:SampleApp.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "F160B6CD1949E2D600AEF42D"
@@ -61,12 +65,13 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "F160B6CD1949E2D600AEF42D"

SampleApp/SampleApp/Frameworks/ZendeskSDK.framework/Headers/ZDKConfig.h

@@ -95,6 +95,7 @@ typedef void (^ZDKInitializeSuccess)(void);
 @property (nonatomic, assign, readonly) ZDKAuthenticationType authenticationType;
 
 
+
 /**
  *  Override the default locale specified via the SDK admin.
  *  A request is made to check the language is supported. If it is not supported, or the request fails, the default
@@ -130,8 +131,8 @@ typedef void (^ZDKInitializeSuccess)(void);
  *  @param applicationId The application id of your SDK app, as found in the web interface.
  *  @param zendeskUrl    The full URL of your Zendesk instance, https://{subdomain}.zendesk.com
  *  @param oAuthClientId The oAuthClientId required as part of the authentication process
- *  @param successBlock  Callback executed on successful initialization of the SDK.
- *  @param errorBlock    Callback executed if initialization fails.
+ *  @param successBlock  Callback executed on successful initialization of the SDK. Can be nil.
+ *  @param errorBlock    Callback executed if initialization fails. Can be nil.
  */
 - (void) initializeWithAppId:(NSString *)applicationId
                   zendeskUrl:(NSString *)zendeskUrl
@@ -193,24 +194,47 @@ typedef void (^ZDKInitializeSuccess)(void);
 
 /**
  *  Register the device for push notifications.
+ *  Deprecated as 1.4.0.1, please use enablePushWithDeviceID or enablePushWithUAChannelID.
  *
  *  @since 1.2.0.1
  *
- *  @param identitfier The device identifier
+ *  @param identifier The device identifier
  *  @param callback    Callback that will provide a newly created device ZDKPushRegistrationResponse.
  */
-- (void) enablePush:(NSString *)identitfier callback:(ZDKPushRegistrationCallback)callback;
+- (void) enablePush:(NSString *)identifier callback:(ZDKPushRegistrationCallback)callback __deprecated_msg("As of version 1.4.0.1, please use enablePushWithDeviceID or enablePushWithUAChannelID");
+
+
+/**
+ *  Register the device for push notifications with APNS ID.
+ *
+ *  @param identifier The APNS device identifier.
+ *  @param callback   Callback that will provide a newly created device ZDKPushRegistrationResponse.
+ *
+ *  @since 1.4.0.1
+ */
+- (void) enablePushWithDeviceID:(NSString *)identifier callback:(ZDKPushRegistrationCallback)callback;
+
+
+/**
+ *  Register the device for push notifications with Urban Airship channel ID.
+ *
+ *  @param identifier The Urban Airship channel ID
+ *  @param callback   Callback that will provide a newly created device ZDKPushRegistrationResponse.
+ *
+ *  @since 1.4.0.1
+ */
+- (void) enablePushWithUAChannelID:(NSString *)identifier callback:(ZDKPushRegistrationCallback)callback;
 
 
 /**
  *  Unregister the device for push notifications.
  *
  *  @since 1.2.0.1
  *
- *  @param identitfier The device identifier
+ *  @param identifier The device identifier
  *  @param callback    Callback that provides the HTTP status code for the deletion request.
  */
-- (void) disablePush:(NSString *)identitfier callback:(ZDKPushDeletionCallback)callback;
+- (void) disablePush:(NSString *)identifier callback:(ZDKPushDeletionCallback)callback;
 
 
 @end

SampleApp/SampleApp/Frameworks/ZendeskSDK.framework/Headers/ZDKCreateRequestView.h

@@ -34,6 +34,13 @@
  */
 @property (nonatomic, strong) ZDKUITextView *textView;
 
+/**
+ * Text field for email input. Only shown if using anonymous and conversations disabled.
+ *
+ *  @since 1.4.0.1
+ */
+@property (nonatomic, strong) UITextField *emailField;
+
 /**
  *  Button to allow user to attach images
  *
@@ -76,6 +83,12 @@
  */
 @property (nonatomic, strong) UIFont *textEntryFont UI_APPEARANCE_SELECTOR;
 
+/**
+ *  For for the email filed
+ *
+ *  @since 1.4.0.1
+ */
+@property (nonatomic, strong) UIFont *emailFieldFont UI_APPEARANCE_SELECTOR;
 
 /**
  *  Attachment button image.

SampleApp/SampleApp/Frameworks/ZendeskSDK.framework/Headers/ZDKHelpCenter.h

@@ -26,7 +26,6 @@
 @interface ZDKHelpCenter : NSObject <ZDKHelpCenterConversationsUIDelegate>
 
 
-
 /**
  *  Displays the Help Center view on top the navigation controller that is passed in.
  *
@@ -85,7 +84,6 @@
                    filterByArticleLabels:(NSArray *)labels
                              layoutGuide:(ZDKLayoutGuide)aGuide;
 
-
 /**
  *  Modally display the Help Center view on top of the navigation controller that is passed in.
  *
@@ -117,4 +115,74 @@
 + (void) setNavBarConversationsUIType:(ZDKNavBarConversationsUIType)uiType;
 
 
+/**
+ *  Displays the Help Center sections view for a given category ID on top the navigation controller that is passed in.
+ *
+ *  @since 1.3.1.1
+ *
+ *  @param navController The UINavigationController from which to present the help center view controller.
+ *  @param categoryId    The ID of the parent Help Center category which the displayed sections belong to.
+ *  @param categoryName  The categoryName to display in the title bar. The categoryName will default to "Support" if set to nil.
+ *  @param aGuide        Should the request list respect top and bottom layout guide? Pass in
+ *                       one of the const values, ZDKLayoutRespectAll, ZDKLayoutRespectNone,
+ *                       ZDKLayoutRespectTop and ZDKLayoutRespectBottom.
+ */
++ (void) showHelpCenterWithNavController:(UINavigationController *)navController
+                      filterByCategoryId:(NSString *)categoryId
+                            categoryName:(NSString *)categoryName
+                             layoutGuide:(ZDKLayoutGuide)aGuide;
+
+
+/**
+ *  Displays the Help Center articles view on top the navigation controller that is passed in.
+ *
+ *  @since 1.3.1.1
+ *
+ *  @param navController The UINavigationController from which to present the help center view controller.
+ *  @param sectionId     The ID of the parent Help Center section which the displayed articles belong to.
+ *  @param sectionName   The sectionName to display in the title bar. The sectionName will default to "Support" if set to nil.
+ *  @param aGuide        Should the request list respect top and bottom layout guide? Pass in
+ *                       one of the const values, ZDKLayoutRespectAll, ZDKLayoutRespectNone,
+ *                       ZDKLayoutRespectTop and ZDKLayoutRespectBottom.
+ */
++ (void) showHelpCenterWithNavController:(UINavigationController *)navController
+                       filterBySectionId:(NSString *)sectionId
+                             sectionName:(NSString *)sectionName
+                             layoutGuide:(ZDKLayoutGuide)aGuide;
+
+/**
+ *  Modally display the Help Center view on top of the navigation controller that is passed in for a given category ID.
+ *
+ *  @since 1.3.1.1
+ *
+ *  @param navController The UINavigationController from which to present the help center view controller.
+ *  @param categoryId    The ID of the parent Help Center category which the displayed sections belong to.
+ *  @param categoryName  The categoryName to display in the title bar. The categoryName will default to "Support" if set to nil.
+ *  @param aGuide        Should the request list respect top and bottom layout guide? Pass in
+ *                       one of the const values, ZDKLayoutRespectAll, ZDKLayoutRespectNone,
+ *                       ZDKLayoutRespectTop and ZDKLayoutRespectBottom.
+ */
++ (void) presentHelpCenterWithNavController:(UINavigationController *)navController
+                      filterByCategoryId:(NSString *)categoryId
+                            categoryName:(NSString *)categoryName
+                             layoutGuide:(ZDKLayoutGuide)aGuide;
+
+
+/**
+ *  Modally display the Help Center view on top of the navigation controller that is passed in for a given section ID.
+ *
+ *  @since 1.3.1.1
+ *
+ *  @param navController The UINavigationController from which to present the help center view controller.
+ *  @param sectionId     The ID of the parent Help Center section which the displayed articles belong to.
+ *  @param sectionName   The sectionName to display in the title bar. The sectionName will default to "Support" if set to nil.
+ *  @param aGuide        Should the request list respect top and bottom layout guide? Pass in
+ *                       one of the const values, ZDKLayoutRespectAll, ZDKLayoutRespectNone,
+ *                       ZDKLayoutRespectTop and ZDKLayoutRespectBottom.
+ */
++ (void) presentHelpCenterWithNavController:(UINavigationController *)navController
+                       filterBySectionId:(NSString *)sectionId
+                             sectionName:(NSString *)sectionName
+                             layoutGuide:(ZDKLayoutGuide)aGuide;
+
 @end

SampleApp/SampleApp/Frameworks/ZendeskSDK.framework/Headers/ZDKHelpCenterArticle.h

@@ -74,7 +74,7 @@
 @property (strong, nonatomic) NSString *article_details;
 
 /**
- *  A string containing the category and section an article belongs to.
+ *  A string containing the category and section an article belongs to. This can be nil.
  *
  *  @since 0.9.3.1
  */
@@ -160,7 +160,7 @@
  *
  *  @return An array of ZDKHelpCenterArticle objects.
  */
-+ (NSArray *) parseArticles:(NSDictionary *)json;
++ (NSArray *) parseArticles:(NSDictionary *)json __deprecated_msg("As of version 1.4.0.1");
 
 
 /**
@@ -170,7 +170,7 @@
  *
  *  @return An array of ZDKHelpCenterArticle objects.
  */
-+ (NSArray *) parseArticleSearchResults:(NSDictionary *)json;
++ (NSArray *) parseArticleSearchResults:(NSDictionary *)json __deprecated_msg("As of version 1.4.0.1");
 
 
 /**
@@ -181,7 +181,7 @@
  *  @param root Root key in json
  *  @return An array of ZDKHelpCenter Article objects.
  */
-+ (NSArray *) parseArticlesWithRootKey:(NSDictionary *)json withRootKey:(NSString *)root;
++ (NSArray *) parseArticlesWithRootKey:(NSDictionary *)json withRootKey:(NSString *)root __deprecated_msg("As of version 1.4.0.1");
 
 
 @end