APL-CORE: October 2021 Release of APL 1.6 compilant core engine (1.6.3)

For more details on this release refer to CHANGELOG.md To learn about APL see: https://developer.amazon.com/docs/alexa-presentation-language/understand-apl.html
alexa · Oct 21, 2021 · c3da7c0 · c3da7c0
1 parent 54b75a8
commit c3da7c0
Show file tree

Hide file tree

Showing 10 changed files with 210 additions and 89 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.6.3]
+
+### Changed
+
+- Bug fixes
+
 ## [1.6.2]
 
 ### Changed

diff --git a/aplcore/include/apl/component/pagercomponent.h b/aplcore/include/apl/component/pagercomponent.h
@@ -42,6 +42,7 @@ class PagerComponent : public ActionableComponent {
     int pagePosition() const override { return getCalculated(kPropertyCurrentPage).asInt(); }
     bool getTags(rapidjson::Value& outMap, rapidjson::Document::AllocatorType& allocator) override;
     void processLayoutChanges(bool useDirtyFlag) override;
+    void release() override;
 
     /// Actionable overrides
     bool isHorizontal() const override { return scrollType() == kScrollTypeHorizontalPager; }

diff --git a/aplcore/include/apl/extension/extensionclient.h b/aplcore/include/apl/extension/extensionclient.h
@@ -194,8 +194,7 @@ class ExtensionClient : public Counter<ExtensionClient>,
     bool mRegistrationProcessed;
     bool mRegistered;
     std::string mUri;
-    RootConfigPtr mRootConfig;
-    SessionPtr mSession;
+    std::weak_ptr<RootConfig> mRootConfig;
     std::string mConnectionToken;
     std::map<std::string, LiveDataRef> mLiveData;
     std::map<id_type, ActionRef> mActionRefs;

diff --git a/aplcore/include/apl/utils/session.h b/aplcore/include/apl/utils/session.h
@@ -79,6 +79,8 @@ class SessionMessage {
 
     SessionMessage(const Context& context, const char *filename, const char *function);
 
+    SessionMessage(const RootConfigPtr& config, const char *filename, const char *function);
+
     ~SessionMessage();
 
     template<class T> friend SessionMessage& operator<<(SessionMessage&& sm, T&& value)
@@ -128,6 +130,8 @@ class SessionMessage {
 /// Report content errors using a context object (which contains a session)
 #define CONSOLE_CTX(CONTEXT) SessionMessage(CONTEXT,__FILENAME__,__func__)
 
+/// Report content errors using a config object pointer (which contains a session)
+#define CONSOLE_CFGP(CONFIG_PTR) SessionMessage(CONFIG_PTR,__FILENAME__,__func__)
 
 } // namespace apl
 

diff --git a/aplcore/src/component/pagercomponent.cpp b/aplcore/src/component/pagercomponent.cpp
@@ -45,6 +45,13 @@ PagerComponent::PagerComponent(const ContextPtr& context,
         : ActionableComponent(context, std::move(properties), path)
 {}
 
+void
+PagerComponent::release()
+{
+    mCurrentAnimation = nullptr;
+    ActionableComponent::release();
+}
+
 inline Object
 defaultWidth(Component& component, const RootConfig& rootConfig) {
     return rootConfig.getDefaultComponentWidth(component.getType());
@@ -295,7 +302,10 @@ PagerComponent::endPageMove(bool fulfilled, const ActionRef& ref, bool fast)
     }
     markDisplayedChildrenStale();
     mPageMoveHandler = nullptr;
-    mCurrentAnimation = nullptr;
+    if (mCurrentAnimation) {
+        mCurrentAnimation->terminate();
+        mCurrentAnimation = nullptr;
+    }
 }
 
 const ComponentPropDefSet*

diff --git a/aplcore/src/engine/rootcontext.cpp b/aplcore/src/engine/rootcontext.cpp
@@ -94,12 +94,10 @@ RootContext::RootContext(const Metrics& metrics, const ContentPtr& content, cons
 }
 
 RootContext::~RootContext() {
-    assert(mCore);
-    mCore->sequencer().terminateSequencer(ConfigChangeCommand::SEQUENCER);
-    clearDirty();
+    mCore->terminate();
     mCore->dirtyVisualContext.clear();
     mTimeManager->terminate();
-    mCore->terminate();
+    clearDirty();
 }
 
 void