Merge pull request #20 from SafetyCulture/fix-retain-cycle-between-so…

…ft-ask-view-and-manager (FIX) Retain Cycle Between SoftAskView and Manager
SafetyCulture · Feb 24, 2022 · 43f27a6 · 43f27a6
2 parents 7ae4922 + 27345c1
commit 43f27a6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/PleaseAllow.xcodeproj/project.pbxproj b/PleaseAllow.xcodeproj/project.pbxproj
@@ -466,6 +466,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.safetyculture.PleaseAllow;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -491,6 +492,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.safetyculture.PleaseAllow;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/PleaseAllow/Info.plist b/PleaseAllow/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/PleaseAllow/PermissionManagers/PermissionManager.swift b/PleaseAllow/PermissionManagers/PermissionManager.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 /// Common Protocol for all Permissions
-public protocol PermissionManager {
+public protocol PermissionManager: AnyObject {
     /// Returns the `MangerType` for the current Permission Manager
     var type            : PermissionManagerType      { get }
 
@@ -84,7 +84,7 @@ extension PermissionManager {
      The completion to be called when the request manager is finished with the request
      */
 
-    internal mutating func request(handler: Please.Reply? = nil) {
+  internal func request(handler: Please.Reply? = nil) {
         resultHandler = handler
         guard isAvailable && canRequest else { return }
 

diff --git a/PleaseAllow/SoftAsk/SoftAskView.swift b/PleaseAllow/SoftAsk/SoftAskView.swift
@@ -26,7 +26,8 @@ open class DeniedAlert: SoftAskView {
 private var sharedWindow: UIWindow?
 
 open class SoftAskView {
-    private var manager: PermissionManager?
+
+    private weak var manager: PermissionManager?
 
     internal var softAskViewController: SoftAskViewController!