Merge branch 'master' into TIMOB-27248

tidev · Jul 26, 2019 · 2de0368 · 2de0368
2 parents c79da12 + 5cce76e
commit 2de0368
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js
@@ -3901,7 +3901,7 @@ AndroidBuilder.prototype.generateAndroidManifest = function generateAndroidManif
 	// Must be done last so app developer can override manifest settings such as <activity/>, <receiver/>, etc.
 	finalAndroidManifest.merge(tiappAndroidManifest);
 
-	if (this.realTargetSDK >= 24 && !finalAndroidManifest.application.hasOwnProperty('resizeableActivity')) {
+	if (this.realTargetSDK >= 24 && !Object.prototype.hasOwnProperty.call(finalAndroidManifest.application, 'resizeableActivity')) {
 		finalAndroidManifest.application.resizeableActivity = true;
 	}
 

diff --git a/iphone/Classes/CalendarModule.m b/iphone/Classes/CalendarModule.m
@@ -225,7 +225,10 @@ - (void)requestAuthorization:(JSValue *)callback forEntityType:(EKEntityType)ent
                                } else {
                                  propertiesDict = [TiUtils dictionaryWithCode:[error code] message:[TiUtils messageFromError:error]];
                                }
-                               [callback callWithArguments:@[ propertiesDict ]];
+                               TiThreadPerformOnMainThread(^{
+                                 [callback callWithArguments:@[ propertiesDict ]];
+                               },
+                                   [NSThread isMainThread]);
                              }];
   },
       NO);