Show dialog on main-thread and using modal-utils

hansemannn · Aug 7, 2016 · ef06afc · ef06afc
1 parent 14737ef
commit ef06afc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/iphone/Classes/TiPaypalPaymentProxy.m b/iphone/Classes/TiPaypalPaymentProxy.m
@@ -51,9 +51,10 @@ -(void)show:(id)args
         return;
     }
 
-    [[[[TiApp app] controller] topPresentedController] presentViewController:[self paymentDialog]
-                                                                    animated:[TiUtils boolValue:animated def:YES]
-                                                                  completion:nil];
+    TiThreadPerformOnMainThread(^{
+        [[TiApp app] showModalController:[self paymentDialog]
+                                animated:[TiUtils boolValue:animated def:YES]];
+    }, NO);
 }
 
 -(void)setConfiguration:(id)value
@@ -221,4 +222,4 @@ -(NSDictionary*)confirmationFromPayment:(PayPalPayment*)_payment
     return event;
 }
 
-@end
+@end
diff --git a/iphone/Resources/README.md b/iphone/Resources/README.md
diff --git a/iphone/manifest b/iphone/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 1.0.1
+version: 1.0.2
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: ti.paypal

diff --git a/iphone/titanium.xcconfig b/iphone/titanium.xcconfig
@@ -4,13 +4,13 @@
 // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
 //
 //
-TITANIUM_SDK_VERSION = 5.4.0
+TITANIUM_SDK_VERSION = 5.3.1.GA
 
 
 //
 // THESE SHOULD BE OK GENERALLY AS-IS
 //
-TITANIUM_SDK = /Users/hans/Library/Application Support/Titanium/mobilesdk/osx/5.4.0
+TITANIUM_SDK = ~/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION)
 TITANIUM_BASE_SDK = "$(TITANIUM_SDK)/iphone/include"
 TITANIUM_BASE_SDK2 = "$(TITANIUM_SDK)/iphone/include/TiCore"
 TITANIUM_BASE_SDK3 = "$(TITANIUM_SDK)/iphone/include/JavaScriptCore"