Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove commented device property from push rules. #1677

Merged
merged 1 commit into from
Jan 9, 2023
Merged

Remove commented device property from push rules. #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions MatrixSDK/JSONModels/MXJSONModels.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,18 +778,12 @@ FOUNDATION_EXPORT NSString *const kMXPushRuleConditionStringSenderNotificationPe
Push rule scope definitions - String version
*/
FOUNDATION_EXPORT NSString *const kMXPushRuleScopeStringGlobal;
FOUNDATION_EXPORT NSString *const kMXPushRuleScopeStringDevice;

/**
`MXPushRulesResponse` represents the response to the /pushRules/ request.
*/
@interface MXPushRulesResponse : MXJSONModel

/**
Set of push rules specific per device.
*/
// @property (nonatomic) NSDictionary *device;

/**
Set of global push rules.
*/
Expand Down
3 changes: 0 additions & 3 deletions MatrixSDK/JSONModels/MXJSONModels.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,6 @@ @interface MXPushRulesResponse ()
@implementation MXPushRulesResponse

NSString *const kMXPushRuleScopeStringGlobal = @"global";
NSString *const kMXPushRuleScopeStringDevice = @"device";

+ (id)modelFromJSON:(NSDictionary *)JSONDictionary
{
Expand All @@ -845,8 +844,6 @@ + (id)modelFromJSON:(NSDictionary *)JSONDictionary
pushRulesResponse.global = [MXPushRulesSet modelFromJSON:JSONDictionary[kMXPushRuleScopeStringGlobal] withScope:kMXPushRuleScopeStringGlobal];
}

// TODO support device rules

pushRulesResponse->JSONDictionary = JSONDictionary;
}

Expand Down
1 change: 1 addition & 0 deletions changelog.d/pr-1677.change
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove commented device property on MXPushRulesRespose.