Merge branch '8_2_X' into TIMOB-27435

tidev · Oct 2, 2019 · 0dee4c8 · 0dee4c8
2 parents 80dadf1 + c6a4ba7
commit 0dee4c8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiApp.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiApp.m
@@ -1376,7 +1376,7 @@ + (NSDictionary *)dictionaryWithUserNotification:(UNNotification *)notification
   [event setObject:NULL_IF_NIL(notification.request.content.userInfo) forKey:@"userInfo"];
   [event setObject:NULL_IF_NIL(notification.request.content.categoryIdentifier) forKey:@"category"];
   [event setObject:NULL_IF_NIL(notification.request.content.threadIdentifier) forKey:@"threadIdentifier"];
-  [event setObject:NULL_IF_NIL(notification.request.identifier) forKey:@"identifier"];
+  [event setObject:NULL_IF_NIL(identifier) forKey:@"identifier"];
 
   // iOS 10+ does have "soundName" but "sound" which is a native object. But if we find
   // a sound in the APS dictionary, we can provide that one for parity

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/Modules/TiUIWindowProxy.m b/iphone/TitaniumKit/TitaniumKit/Sources/Modules/TiUIWindowProxy.m
@@ -455,11 +455,23 @@ - (void)updateBarImage
     if (theImage != nil) {
       UIImage *resizableImage = [theImage resizableImageWithCapInsets:UIEdgeInsetsMake(0, 0, 0, 0) resizingMode:UIImageResizingModeStretch];
       ourNB.shadowImage = resizableImage;
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
+      if ([TiUtils isIOSVersionOrGreater:@"13.0"]) {
+        ourNB.standardAppearance.shadowImage = resizableImage;
+        ourNB.scrollEdgeAppearance.shadowImage = resizableImage;
+      }
+#endif
     } else {
       BOOL clipValue = [TiUtils boolValue:[self valueForUndefinedKey:@"hideShadow"] def:NO];
       if (clipValue) {
         //Set an empty Image.
         ourNB.shadowImage = [[[UIImage alloc] init] autorelease];
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
+        if ([TiUtils isIOSVersionOrGreater:@"13.0"]) {
+          ourNB.standardAppearance.shadowColor = nil;
+          ourNB.scrollEdgeAppearance.shadowColor = nil;
+        }
+#endif
       } else {
         ourNB.shadowImage = nil;
       }