Esri · ldanzinger · Apr 11, 2024 · Jun 22, 2022 · Jun 22, 2022 · Jun 23, 2022
diff --git a/ArcGISRuntimeSDKQt_CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.pro b/ArcGISRuntimeSDKQt_CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DisplayScenesInTabletopAR
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

diff --git a/ArcGISRuntimeSDKQt_CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.pro b/ArcGISRuntimeSDKQt_CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ExploreScenesInFlyoverAR
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

diff --git a/ArcGISRuntimeSDKQt_CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.pro b/ArcGISRuntimeSDKQt_CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app

diff --git a/ArcGISRuntimeSDKQt_CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.pro b/ArcGISRuntimeSDKQt_CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app

diff --git a/...timeSDKQt_CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.pro b/...timeSDKQt_CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = DistanceMeasurementAnalysis
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

diff --git a/ArcGISRuntimeSDKQt_CppSamples/Analysis/Geotriggers/Geotriggers.pro b/ArcGISRuntimeSDKQt_CppSamples/Analysis/Geotriggers/Geotriggers.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = Geotriggers
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

diff --git a/ArcGISRuntimeSDKQt_CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.pro b/ArcGISRuntimeSDKQt_CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = LineOfSightGeoElement
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

diff --git a/ArcGISRuntimeSDKQt_CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.pro b/ArcGISRuntimeSDKQt_CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = LineOfSightLocation
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

diff --git a/ArcGISRuntimeSDKQt_CppSamples/Analysis/StatisticalQuery/StatisticalQuery.pro b/ArcGISRuntimeSDKQt_CppSamples/Analysis/StatisticalQuery/StatisticalQuery.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = StatisticalQuery
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

diff --git a/...SRuntimeSDKQt_CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.pro b/...SRuntimeSDKQt_CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = StatisticalQueryGroupSort
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

diff --git a/ArcGISRuntimeSDKQt_CppSamples/Analysis/ViewshedCamera/ViewshedCamera.pro b/ArcGISRuntimeSDKQt_CppSamples/Analysis/ViewshedCamera/ViewshedCamera.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ViewshedCamera
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

diff --git a/ArcGISRuntimeSDKQt_CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.pro b/ArcGISRuntimeSDKQt_CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ViewshedGeoElement
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

diff --git a/ArcGISRuntimeSDKQt_CppSamples/Analysis/ViewshedLocation/ViewshedLocation.pro b/ArcGISRuntimeSDKQt_CppSamples/Analysis/ViewshedLocation/ViewshedLocation.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = ViewshedLocation
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 #-------------------------------------------------------------------------------

diff --git a/ArcGISRuntimeSDKQt_CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.cpp b/ArcGISRuntimeSDKQt_CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.cpp
@@ -28,8 +28,10 @@
 #include "OAuthClientInfo.h"
 #include "PortalUser.h"
 #include "Error.h"
+#include "ErrorException.h"
 #include "ErrorInformationKeys.h"
 
+#include <QFuture>
 #include <QVariantMap>
 
 using namespace Esri::ArcGISRuntime;
@@ -140,7 +142,11 @@ bool AddItemsToPortal::busy() const
 
 void AddItemsToPortal::authenticatePortal()
 {
-  if (m_portal)
+  if (!m_portal)
+    return;
+  if (m_portal->loadStatus() == LoadStatus::FailedToLoad)
+    m_portal->retryLoad();
+  else
     m_portal->load();
 }
 
@@ -151,10 +157,36 @@ void AddItemsToPortal::addItem()
 
   m_busy = true;
 
-  //! [PortalUser addItemWithUrl]
+  //! [PortalUser addItemWithUrlAsync]
   QUrl localCSV("qrc:/Samples/CloudAndPortal/AddItemsToPortal/add_item_sample.csv");
-  m_user->addPortalItemWithUrl(m_item, localCSV, "add_item_sample.csv" );
-  //! [PortalUser addItemWithUrl]
+  m_user->addPortalItemWithUrlAsync(m_item, localCSV, "add_item_sample.csv" ).then(
+  [this]()
+  {
+    m_busy = false;
+
+    setStatusText("Successfully added item. " + m_item->itemId());
+    m_item->load();
+  })
+  //! [PortalUser addItemWithUrlAsync]
+  .onFailed(
+  [this](const ErrorException& e)
+  {
+    m_busy = false;
+
+    // Check for service error 409 "Conflict" - item already exists
+    const QVariantMap additionalInfo = e.error().additionalInformation();
+    if (additionalInfo.contains(ErrorInformationKeys::serviceError()) &&
+        additionalInfo.value(ErrorInformationKeys::serviceError()).toInt() == 409)
+    {
+      m_alreadyExisted = true;
+      setStatusText("Item already exists; fetching existing item instead. " + m_item->itemId());
+      fetchItem();
+    }
+    else
+    {
+      setStatusText(e.error().message());
+    }
+  });
 }
 
 void AddItemsToPortal::deleteItem()
@@ -163,35 +195,39 @@ void AddItemsToPortal::deleteItem()
     return;
 
   m_busy = true;
-  m_user->deletePortalItem(m_item);
-}
 
-void AddItemsToPortal::connectUserSignals()
-{
-  if (!m_user)
-    return;
+  m_user->deletePortalItemAsync(m_item).then(
+  [this]()
+  {
+    m_busy = false;
+    m_itemDeleted = true;
 
-  connect(m_user, &PortalUser::errorOccurred, this, [this](const Error& error)
+    emit itemDeletedChanged();
+    emit portalItemIdChanged();
+    emit portalItemTitleChanged();
+    emit portalItemTypeNameChanged();
+
+    setStatusText("Successfully deleted item. " + m_item->itemId());
+  }).onFailed(
+  [this](const ErrorException& e)
   {
     m_busy = false;
-    setStatusText(QString(error.message() + ": " + error.additionalMessage()));
 
-    // Check for service error 409 "Conflict" - item already exists
-    const QVariantMap additionalInfo = error.additionalInformation();
-    if (additionalInfo.contains(ErrorInformationKeys::serviceError()) &&
-        additionalInfo.value(ErrorInformationKeys::serviceError()).toInt() == 409)
-    {
-      m_alreadyExisted = true;
-      m_user->fetchContent();
-      m_busy = true;
-    }
+    setStatusText(e.error().message());
   });
+}
 
-  connect(m_user, &PortalUser::fetchContentCompleted, this, [this](bool success)
+void AddItemsToPortal::fetchItem()
+{
+  if (!m_user || !m_item)
+    return;
+
+  m_busy = true;
+
+  m_user->fetchContentAsync().then(
+  [this]()
   {
     m_busy = false;
-    if (!success)
-      return;
 
     for (PortalItem* item : *m_user->items())
     {
@@ -203,37 +239,20 @@ void AddItemsToPortal::connectUserSignals()
       }
     }
   });
+}
 
-  //! [PortalUser addPortalItemCompleted]
-  connect(m_user, &PortalUser::addPortalItemCompleted, this, [this](bool success)
-  {
-    m_busy = false;
-
-    if (!success)
-      return;
-
-    setStatusText("Successfully added item.");
-    m_item->load();
-  });
-  //! [PortalUser addPortalItemCompleted]
+void AddItemsToPortal::connectUserSignals()
+{
+  if (!m_user)
+    return;
 
-  connect(m_user, &PortalUser::deletePortalItemCompleted, this, [this](bool success)
+  connect(m_user, &PortalUser::errorOccurred, this, [this](const Error& error)
   {
     m_busy = false;
-
-    if (!success)
-      return;
-
-    m_itemDeleted = true;
-    emit itemDeletedChanged();
-    emit portalItemIdChanged();
-    emit portalItemTitleChanged();
-    emit portalItemTypeNameChanged();
-    setStatusText("Successfully deleted item " + m_item->itemId());
+    setStatusText(QString(error.message() + ": " + error.additionalMessage()));
   });
 }
 
-
 void AddItemsToPortal::setStatusText(const QString &statusText)
 {
   m_statusText = statusText;

diff --git a/ArcGISRuntimeSDKQt_CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.h b/ArcGISRuntimeSDKQt_CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.h
@@ -59,6 +59,7 @@ class AddItemsToPortal : public QQuickItem
   void busyChanged();
 
 private:
+  void fetchItem();
   bool portalLoaded() const;
   bool portalItemLoaded() const;
   QString portalItemId() const;

diff --git a/ArcGISRuntimeSDKQt_CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.pro b/ArcGISRuntimeSDKQt_CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample

diff --git a/ArcGISRuntimeSDKQt_CppSamples/CloudAndPortal/AddItemsToPortal/README.md b/ArcGISRuntimeSDKQt_CppSamples/CloudAndPortal/AddItemsToPortal/README.md
@@ -19,16 +19,16 @@ Portals allow you to share and publish data with others. For example, you may cr
 1. A `Portal` is created with a `Credential` using `OAuthModeUser`. The `Portal` instance is loaded and the OAuth sign in page is displayed. The user must now provide credentials.
 2. Once the sign-in process is complete, a `PortalItem` of type `CSV` is created using this `Portal` instance.
 3. When the portal is successfully loaded, the `PortalUser` object is obtained from the `Portal`.
-5. When the "Add Item" button is clicked, the item is added via the `PortalUser`'s `addPortalItemWithUrl` method. The `PortalItem` and the local URL of the CSV file are supplied as parameters.
+5. When the "Add Item" button is clicked, the item is added via the `PortalUser`'s `addPortalItemWithUrlAsync` method. The `PortalItem` and the local URL of the CSV file are supplied as parameters.
 6. When the item has been successfully added, it is loaded in order to retrieve online properties such as the `itemId`.'
-7. When the "Delete Item" button is clicked, the item is passed as a parameter for the portalUser's `deleteItem` method.
+7. When the "Delete Item" button is clicked, the item is passed as a parameter for the portalUser's `deleteItemAsync` method.
 
 ## Relevant API
 
 * Portal
 * PortalItem
-* PortalUser::addPortalItemWithUrl
-* PortalUser::deleteItem
+* PortalUser::addPortalItemWithUrlAsync
+* PortalUser::deleteItemAsync
 
 ## Tags
 

diff --git a/...amples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.cpp b/...amples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.cpp
@@ -31,6 +31,8 @@
 #include "PortalTypes.h"
 #include "Error.h"
 
+#include <QFuture>
+
 using namespace Esri::ArcGISRuntime;
 
 IntegratedWindowsAuthentication::IntegratedWindowsAuthentication(QObject* parent /* = nullptr */):
@@ -76,7 +78,6 @@ void IntegratedWindowsAuthentication::searchIwaSecurePortal(const QString& url)
   m_iwaSecurePortal = new Portal(url, true, this);
 
   connect(m_iwaSecurePortal, &Portal::doneLoading, this, &IntegratedWindowsAuthentication::securePortalDoneLoading);
-  connect(m_iwaSecurePortal, &Portal::findItemsCompleted, this, &IntegratedWindowsAuthentication::searchItemsCompleted);
 
   m_loadingIndicator = true;
   emit isLoadingChanged();
@@ -124,7 +125,11 @@ void IntegratedWindowsAuthentication::securePortalDoneLoading(const Error& loadE
     return;
   }
 
-  m_iwaSecurePortal->findItems(*query);
+  m_iwaSecurePortal->findItemsAsync(*query).then(
+  [this](PortalQueryResultSetForItems* result)
+  {
+    searchItemsCompleted(result);
+  });
 }
 
 void IntegratedWindowsAuthentication::searchItemsCompleted(PortalQueryResultSetForItems* result)

diff --git a/...amples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.pro b/...amples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.pro
@@ -27,7 +27,7 @@ QT += opengl qml quick
 TEMPLATE = app
 TARGET = IntegratedWindowsAuthentication
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 # path of the toolkit relative to the sample

diff --git a/ArcGISRuntimeSDKQt_CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.cpp b/ArcGISRuntimeSDKQt_CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.cpp
@@ -87,6 +87,14 @@ bool PortalUserInfo::loaded()
   return false;
 }
 
+bool PortalUserInfo::loginDismissed()
+{
+  if (m_portal)
+    return m_portal->loadError().message() == "Code unauthorized." || m_portal->loadError().message() == "User canceled error.";
+
+  return false;
+}
+
 QString PortalUserInfo::fullName() const
 {
   if (m_user)
@@ -207,8 +215,6 @@ void PortalUserInfo::onPortalLoadStatusChanged(LoadStatus loadStatus)
     case LoadStatus::Loading:
         break;
     case LoadStatus::FailedToLoad:
-        if (m_portal)
-            m_portal->retryLoad();
         break;
     case LoadStatus::NotLoaded:
         break;
@@ -219,4 +225,5 @@ void PortalUserInfo::onPortalLoadStatusChanged(LoadStatus loadStatus)
   }
 
   emit loadedChanged();
+  emit isLoginDismissed();
 }