Merge pull request #3833 from bbirman/scene-notification

Add default scene for notifications

Author: bbirman

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.m

@@ -41,6 +41,7 @@
 #import "SFSDKMacDetectUtil.h"
 #import "SFSDKSalesforceSDKUpgradeManager.h"
 #import <SalesforceSDKCommon/NSUserDefaults+SFAdditions.h>
+#import "SFSDKWindowManager+Internal.h"
 
 static NSString * const kSFAppFeatureSwiftApp    = @"SW";
 static NSString * const kSFAppFeatureMultiUser   = @"MU";
@@ -665,12 +666,14 @@ - (void)handleSceneDidDisconnect:(NSNotification *)notification {
     [self.snapshotViewControllers removeObject:scene.session.persistentIdentifier];
 }
 
-- (nullable UIScene *)sceneFromNotification:(NSNotification *)notification {
+- (UIScene *)sceneFromNotification:(NSNotification *)notification {
     id object = notification.object;
     if ([object isKindOfClass:[UIScene class]]) {
         return object;
+    } else {
+        [SFSDKCoreLogger w:[self class] message:@"Unable to derive scene from notification, using default"];
+        return [[SFSDKWindowManager sharedManager] defaultScene];
     }
-    return nil;
 }
 
 - (void)handleAuthCompleted:(NSNotification *)notification { }