Fixed bug introduced in one of the recent commits which caused old Eu…

…ro-based Gumroad licenses to not be accepted. Not sure when we introduced that bug. The bug was caused by the 'Map non-success server response to error' code being executed after we check the error for the message 'That license does not exist for the provided product.' which is sent by the Gumroad server.
noah-nuebling · Oct 8, 2024 · 1113b33 · 1113b33
1 parent 8e129e2
commit 1113b33
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/App/SupportFiles/Info.plist b/App/SupportFiles/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>22963</string>
+	<string>22966</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/Helper/SupportFiles/Info.plist b/Helper/SupportFiles/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>22963</string>
+	<string>22966</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSBackgroundOnly</key>

diff --git a/Mouse Fix.xcodeproj/xcuserdata/Noah.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Mouse Fix.xcodeproj/xcuserdata/Noah.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -320,8 +320,8 @@
             filePath = "Shared/License/License.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "349"
-            endingLineNumber = "349"
+            startingLineNumber = "351"
+            endingLineNumber = "351"
             landmarkName = "_checkLicense(key:licenseConfig:incrementUsageCount:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -336,8 +336,8 @@
             filePath = "Shared/License/License.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "339"
-            endingLineNumber = "339"
+            startingLineNumber = "341"
+            endingLineNumber = "341"
             landmarkName = "_checkLicense(key:licenseConfig:incrementUsageCount:)"
             landmarkType = "7">
          </BreakpointContent>

diff --git a/Shared/License/License.swift b/Shared/License/License.swift
@@ -257,10 +257,12 @@ extension MFLicenseAndTrialState: Equatable {
                                                                                               "license_key": key,
                                                                                               "increment_uses_count": incrementUsageCount ? "true" : "false"])
 
-                if let message = error?.userInfo["message"] as? NSString,
+                if
+                    let message = serverResponse?["message"] as? NSString,
                     message == "That license does not exist for the provided product." {
-
-                    /// !!! TODO: @bug This is broken now, since we moved the "Map non-success response to error" step below. Dangeroussss. I hope we didn't break anything else during the refactors.
+
+                    /// Validate
+                    assert((serverResponse?["success"] as? Bool) == false)
 
                     /// If license doesn't exist for new product, try old product
                     (serverResponse, error, urlResponse) = await sendDictionaryBasedAPIRequest(requestURL: gumroadAPIURL.appending("/licenses/verify"),