Update for PSPDFKit 5.1 for iOS. Also removes interface orientation lock.

Author: steipete

Classes/ComPspdfkitModule.m

@@ -54,10 +54,6 @@ static BOOL PSTReplaceMethodWithBlock(Class c, SEL origSEL, SEL newSEL, id block
     return YES;
 }
 
-@interface TIPSPDFViewControllerProxy (PSPDFInternal)
-@property(atomic, assign) UIInterfaceOrientation lockedInterfaceOrientationValue;
-@end
-
 @interface TiRootViewController (PSPDFInternal)
 - (void)refreshOrientationWithDuration:(NSTimeInterval)duration;
 - (void)pspdf_refreshOrientationWithDuration:(NSTimeInterval)duration; // will be added dynamically

Classes/PSPDFUtils.m

@@ -88,12 +88,7 @@ + (void)applyOptions:(NSDictionary *)options onObject:(id)object {
 
             // special case handling for annotation name list
             if ([key isEqual:@"editableAnnotationTypes"] && [obj isKindOfClass:NSArray.class]) {
-                obj = [NSMutableOrderedSet orderedSetWithArray:obj];
-            }
-
-            // processed later
-            else if ([key isEqual:@"lockedInterfaceOrientation"]) {
-                return; // continue in a block
+                obj = [NSMutableSet setWithArray:obj];
             }
 
             else if ([key.lowercaseString hasSuffix:@"size"] && [obj isKindOfClass:NSArray.class] && [obj count] == 2) {

Classes/TIPSPDFViewController.m

@@ -19,10 +19,6 @@ @interface PSPDFViewController (Internal)
 - (void)delegateDidShowController:(id)viewController embeddedInController:(id)controller options:(NSDictionary *)options animated:(BOOL)animated;
 @end
 
-@interface TIPSPDFViewControllerProxy (PSPDFInternal)
-@property (atomic, assign, readonly) UIInterfaceOrientation lockedInterfaceOrientationValue;
-@end
-
 @implementation TIPSPDFViewController
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////

Classes/TIPSPDFViewControllerProxy.h

@@ -109,9 +109,6 @@
 /// Expose the scrollingEnabled property
 - (void)setScrollingEnabled:(id)args;
 
-// -1 will reset the lock
-- (void)setLockedInterfaceOrientation:(id)arg;
-
 // Save changed annotations.
 - (void)saveAnnotations:(id)args;
 

Classes/TIPSPDFViewControllerProxy.m

@@ -50,24 +50,20 @@ @interface TIPSPDFViewControllerProxy ()
 
 @property (nonatomic) KrollCallback  *didTapOnAnnotationCallback;
 @property (nonatomic, weak) TiProxy *parentProxy;
-@property (atomic, assign) UIInterfaceOrientation lockedInterfaceOrientationValue;
 @property (atomic) UIColor *linkAnnotationBorderBackedColor;
 @property (atomic) UIColor *linkAnnotationHighlightBackedColor;
 
 @end
 
 @implementation TIPSPDFViewControllerProxy
 
-@synthesize lockedInterfaceOrientationValue = _lockedInterfaceOrientationValue;
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Lifecycle
 
 - (id)initWithPDFController:(TIPSPDFViewController *)pdfController context:(id<TiEvaluator>)context parentProxy:(TiProxy *)parentProxy {
     if ((self = [super _initWithPageContext:context])) {
         PSTiLog(@"init TIPSPDFViewControllerProxy");
         self.parentProxy = parentProxy;
-        self.lockedInterfaceOrientationValue = -1;
         self.controller = pdfController;
         self.controller.delegate = self;
         // As long as pdfController exists, we're not getting released.
@@ -137,7 +133,7 @@ - (void)setLinkAnnotationHighlightColor:(id)arg {
 - (void)setEditableAnnotationTypes:(id)arg {
     ENSURE_UI_THREAD(setEditableAnnotationTypes, arg);
 
-    NSMutableOrderedSet *editableAnnotationTypes = [NSMutableOrderedSet orderedSet];
+    NSMutableSet *editableAnnotationTypes = [NSMutableSet set];
     if ([arg isKindOfClass:NSArray.class]) {
         for (__strong NSString *item in arg) {
             item = PSSafeCast(item, NSString.class);
@@ -146,8 +142,10 @@ - (void)setEditableAnnotationTypes:(id)arg {
             }
         }
     }
-    self.controller.document.editableAnnotationTypes = editableAnnotationTypes;
-    [self.controller reloadData];
+
+    [self.controller updateConfigurationWithBuilder:^(PSPDFConfigurationBuilder *builder) {
+        builder.editableAnnotationTypes = editableAnnotationTypes;
+    }];
 }
 
 - (void)setThumbnailFilterOptions:(id)arg {
@@ -276,14 +274,6 @@ - (void)setDidTapOnAnnotationCallback:(KrollCallback *)callback {
     }
 }
 
-- (id)currentInterfaceOrientation {
-    __block UIInterfaceOrientation interfaceOrientation;
-    dispatch_sync(dispatch_get_main_queue(), ^{
-        interfaceOrientation = self.controller.interfaceOrientation;
-    });
-    return @(interfaceOrientation);
-}
-
 - (void)saveAnnotations:(id)args {
     ENSURE_UI_THREAD(saveAnnotations, args);
 
@@ -333,14 +323,20 @@ - (void)setOpenInOptions:(id)arg {
 - (void)hidePopover:(id)args {
     ENSURE_UI_THREAD(hidePopover, args);
 
-    BOOL animated = [args count] == 1 && [args[0] boolValue];
+    BOOL const animated = [args count] == 1 && [args[0] boolValue];
     [self.controller.presentedViewController dismissViewControllerAnimated:animated completion:NULL];
 }
 
+#define PSPDF_SILENCE_CALL_TO_UNKNOWN_SELECTOR(expression) \
+_Pragma("clang diagnostic push") \
+_Pragma("clang diagnostic ignored \"-Warc-performSelector-leaks\"") \
+expression \
+_Pragma("clang diagnostic pop")
+
 - (void)showBarButton:(SEL)barButtonSEL action:(id)action {
     dispatch_async(dispatch_get_main_queue(), ^{
-        UIBarButtonItem *barButtonItem = [self.controller performSelector:barButtonSEL];
-        id sender = action ? [action[0] view] : self;
+        PSPDF_SILENCE_CALL_TO_UNKNOWN_SELECTOR(UIBarButtonItem *barButtonItem = [self.controller performSelector:barButtonSEL];)
+        id const sender = action ? [action[0] view] : self;
         tipspdf_targetActionBlock(barButtonItem.target, barButtonItem.action)(sender);
     });
 }

example/app.js

@@ -94,7 +94,6 @@ modalButton.addEventListener('click', function(e) {
     var pdfController = pspdfkit.showPDFAnimated('PSPDFKit.pdf', 4, // animation option: 0 = no animation, 1 = default animation, 2 = UIModalTransitionStyleCoverVertical, 3 =  UIModalTransitionStyleFlipHorizontal, 4 =  UIModalTransitionStyleCrossDissolve
     // http://developer.apple.com/library/ios/#documentation/uikit/reference/UIViewController_Class/Reference/Reference.html
     {
-        lockedInterfaceOrientation : 3, // lock to one interface orientation. optional.
         pageMode : 0, // PSPDFPageModeSingle
         pageTransition : 2, // PSPDFPageCurlTransition
         linkAction : 3, // PSPDFLinkActionInlineBrowser (new default)
@@ -133,10 +132,6 @@ modalButton.addEventListener('click', function(e) {
     // get current document path
     //var documentPath = pdfController.documentPath;
 
-    //UIDeviceOrientationPortrait = 1, UIDeviceOrientationPortraitUpsideDown = 2, UIDeviceOrientationLandscapeLeft = 3, UIDeviceOrientationLandscapeRight = 4, -1 to remove lock.
-    // there's also currentInterfaceOrientation to query the current state.'
-    //pdfController.lockedInterfaceOrientation = 3;
-
     //pdfController.showCloseButton = false;
 
     // Changes the link annotation colors to a light red (first hex pair is optional alpha) (or use "clear" to hide)