Merge branch 'dev' of github.com:wmathurin/SalesforceMobileSDK-iOS into consumer_key_in_env

Author: wmathurin

libs/SalesforceSDKCommon/SalesforceSDKCommon/Classes/Util/SFTestContext.h

@@ -32,6 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**Helps determine whether we're currently running tests or not.
  */
+__attribute__((deprecated("Deprecated in Salesforce Mobile SDK 13.2 and will be removed in Salesforce Mobile SDK 14.0.")));
 @interface SFTestContext : NSObject {
 
 }

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/SFSDKAsyncProcessListener.h

@@ -23,9 +23,11 @@
  */
 
 #import <Foundation/Foundation.h>
+#import <SalesforceSDKCore/SalesforceSDKConstants.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
+SFSDK_DEPRECATED(13.2, 14.0, "No longer used, will be removed")
 @interface SFSDKAsyncProcessListener : NSObject
 
 /**

native/SampleApps/RestAPIExplorer/RestAPIExplorer/ViewControllers/RootViewController.swift

@@ -643,8 +643,11 @@ class RootViewController: UIViewController {
         }
         alert.addAction(cancel)
         alert.addAction(logout)
-        self.present(alert, animated: true, completion: nil)
-        self.logoutAlert = alert
+        
+        dismissPopover() {
+            self.present(alert, animated: true, completion: nil)
+            self.logoutAlert = alert
+        }
     }
 
     @objc func clearPopoversForPasscode() {
@@ -657,9 +660,9 @@ class RootViewController: UIViewController {
         self.dismissPopover()
     }
 
-    func dismissPopover() {
+    func dismissPopover(completion: (() -> ())? = nil) {
         if let pAction = self.presentedActions {
-            pAction.dismiss(animated: true, completion: nil)
+            pAction.dismiss(animated: true, completion: completion)
         }
     }
 
@@ -867,7 +870,9 @@ extension RootViewController: ActionTableViewDelegate {
             let umvc = SalesforceUserManagementViewController.init(completionBlock: { _ in
                 self.dismiss(animated: true, completion: nil)
             })
-            self.present(umvc, animated: true, completion: nil)
+            dismissPopover {
+                self.present(umvc, animated: true, completion: nil)
+            }
             return
         case .exportCredentials:
             self.exportTestingCredentials()