Fix redraw deadlock on AutoResizingTableHeaderView and AutoResizingTa…

…bleFooterView with double assigment of height
iZettle · Aug 19, 2019 · b6ed7cc · b6ed7cc
1 parent b208df2
commit b6ed7cc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.10.4
+- Bugfix: Fix issue with ui refresh deadlock
+
 ## 1.10.3
 - Bugfix: Fix table section header/footer height calculation on iOS 10
 

diff --git a/Form.xcodeproj/project.pbxproj b/Form.xcodeproj/project.pbxproj
@@ -843,6 +843,7 @@
 				INFOPLIST_FILE = Form/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 1.10.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Form;
 				PRODUCT_NAME = Form;
 				SKIP_INSTALL = YES;
@@ -863,6 +864,7 @@
 				INFOPLIST_FILE = Form/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 1.10.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Form;
 				PRODUCT_NAME = Form;
 				SKIP_INSTALL = YES;

diff --git a/Form/Info.plist b/Form/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.10.3</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Form/UITableView+Utilities.swift b/Form/UITableView+Utilities.swift
@@ -80,9 +80,10 @@ private class AutoResizingTableHeaderView: AutoResizingTableSubviewBase {
     override func layoutSubviews() {
         super.layoutSubviews()
 
-        frame.size.height = embeddedView.bounds.height
-        if frame.size.height == 0 { // 0 has special meaning, not what we want
+        if embeddedView.bounds.height == 0 { // 0 has special meaning, not what we want
             frame.size.height = .headerFooterAlmostZero
+        } else {
+            frame.size.height = embeddedView.bounds.height
         }
 
         tableView?.tableHeaderView = self
@@ -93,9 +94,10 @@ private class AutoResizingTableFooterView: AutoResizingTableSubviewBase {
     override func layoutSubviews() {
         super.layoutSubviews()
 
-        frame.size.height = embeddedView.bounds.height
-        if frame.size.height == 0 { // 0 has special meaning, not what we want
+        if embeddedView.bounds.height == 0 { // 0 has special meaning, not what we want
             frame.size.height = .headerFooterAlmostZero
+        } else {
+            frame.size.height = embeddedView.bounds.height
         }
 
         tableView?.tableFooterView = self