Release v1.1.5

glassfy · Sep 29, 2021 · 4ec2f6a · 4ec2f6a
1 parent 0d22b68
commit 4ec2f6a
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 12 deletions.
diff --git a/Glassfy.podspec b/Glassfy.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Glassfy"
-  s.version          = "1.1.4"
+  s.version          = "1.1.5"
   s.summary          = "Subscription and in-app-purchase service."
   s.license          =  { :type => 'MIT', :file => 'LICENSE' }
   s.source           = { :git => "https://github.com/glassfy/ios-sdk.git", :tag => s.version.to_s }

diff --git a/Glassfy.xcodeproj/project.pbxproj b/Glassfy.xcodeproj/project.pbxproj
@@ -668,7 +668,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.4;
+				MARKETING_VERSION = 1.1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = net.glassfy.sdk;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -695,7 +695,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.4;
+				MARKETING_VERSION = 1.1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = net.glassfy.sdk;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Source/GYManager.m b/Source/GYManager.m
@@ -312,7 +312,7 @@ - (void)handlePurchasedTransaction:(GYTransaction *)t
                                           sku:nil
                                   transaction:t.paymentTransaction
                                    completion:^(GYAPIPermissionsResponse *res, NSError *err) {
-                        t.permissions = res.permissions ?: @[];
+                        t.permissions = [GYPermissions permissionsWithResponse:res];
                         t.receiptValidated = (err.code != GYErrorCodeAppleReceiptStatusError);
                         dispatch_async(dispatch_get_main_queue(), ^{
                             completion(t, err);
@@ -328,7 +328,7 @@ - (void)handlePurchasedTransaction:(GYTransaction *)t
                               sku:sku
                       transaction:t.paymentTransaction
                            completion:^(GYAPIPermissionsResponse *res, NSError *err) {
-                t.permissions = res.permissions ?: @[];
+                t.permissions = [GYPermissions permissionsWithResponse:res];
                 t.receiptValidated = (err.code != GYErrorCodeAppleReceiptStatusError);
                 dispatch_async(dispatch_get_main_queue(), ^{
                     completion(t, err);

diff --git a/Source/GYPermissions.m b/Source/GYPermissions.m
@@ -27,6 +27,15 @@ + (instancetype)permissionsWithResponse:(GYAPIPermissionsResponse *)response
     return installation;
 }
 
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        self.all = @[];
+    }
+    return self;
+}
+
 @end
 
 @implementation GYPermissions

diff --git a/Source/GYTransaction+Private.h b/Source/GYTransaction+Private.h
@@ -6,13 +6,13 @@
 //
 
 #import "GYTransaction.h"
-
+@class GYPermissions;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface GYTransaction (Private)
 @property(nonatomic, assign) BOOL receiptValidated;
-@property(nonatomic, strong) NSArray<GYPermission*> *permissions;
+@property(nonatomic, strong) GYPermissions *permissions;
 
 + (instancetype)transactionWithPaymentTransaction:(SKPaymentTransaction*)transaction;
 @end

diff --git a/Source/GYTransaction.m b/Source/GYTransaction.m
@@ -6,13 +6,14 @@
 //
 
 #import <StoreKit/StoreKit.h>
+#import "GYPermissions+Private.h"
 #import "GYTransaction.h"
 #import "GYTransaction+Private.h"
 
 
 @interface GYTransaction()
 @property(nonatomic, readwrite, strong) SKPaymentTransaction *paymentTransaction;
-@property(nonatomic, readwrite, strong) NSArray<GYPermission*> *permissions;
+@property(nonatomic, readwrite, strong) GYPermissions *permissions;
 @property(nonatomic, assign) BOOL receiptValidated;
 @end
 
@@ -22,7 +23,7 @@ + (instancetype)transactionWithPaymentTransaction:(SKPaymentTransaction*)t
 {
     GYTransaction *transaction = [[self alloc] init];
     transaction.paymentTransaction = t;
-    transaction.permissions = @[];
+    transaction.permissions = [GYPermissions new];
 
     return transaction;
 }

diff --git a/Source/Glassfy.m b/Source/Glassfy.m
@@ -40,7 +40,7 @@ + (Glassfy *)shared
 
 + (NSString *)sdkVersion
 {
-    return @"1.1.4";
+    return @"1.1.5";
 }
 
 + (void)initializeWithAPIKey:(NSString *)apiKey

diff --git a/Source/Public/GYTransaction.h b/Source/Public/GYTransaction.h
@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 @class SKPaymentTransaction;
-@class GYPermission;
+@class GYPermissions;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -16,7 +16,7 @@ NS_SWIFT_NAME(Glassfy.Transaction)
 @property(nonatomic, readonly) SKPaymentTransaction *paymentTransaction;
 @property(nonatomic, readonly) NSString *productIdentifier;
 @property(nonatomic, readonly) BOOL receiptValidated;
-@property(nonatomic, readonly) NSArray<GYPermission *> *permissions;
+@property(nonatomic, readonly) GYPermissions *permissions;
 @end
 
 NS_ASSUME_NONNULL_END