-
-
Notifications
You must be signed in to change notification settings - Fork 5
Fix/bugs in apple passkit getPasses #104
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,9 +13,9 @@ class ApplePkPass { | |
| required this.icon, | ||
| }); | ||
|
|
||
| factory ApplePkPass.fromMap(Map<Object, Object?> map) { | ||
| factory ApplePkPass.fromMap(Map<Object?, Object?> map) { | ||
| return ApplePkPass( | ||
| passType: map['passType'] as String, | ||
| passType: PKPassType.fromJson(map['passType'] as String), | ||
| serialNumber: map['serialNumber'] as String, | ||
| passTypeIdentifier: map['passTypeIdentifier'] as String, | ||
| deviceName: map['deviceName'] as String, | ||
|
|
@@ -29,7 +29,7 @@ class ApplePkPass { | |
| } | ||
|
|
||
| /// The pass’s type. | ||
| final String passType; | ||
| final PKPassType passType; | ||
|
|
||
| /// A value that uniquely identifies the pass. | ||
| final String serialNumber; | ||
|
|
@@ -61,13 +61,42 @@ class ApplePkPass { | |
| } | ||
|
|
||
| /// Status after trying to add multiple passes. | ||
| enum PkPassType { | ||
| enum PKPassType { | ||
| /// A nonspecific pass type. | ||
| any, | ||
| any('18446744073709551615'), | ||
|
|
||
| /// A pass that represents a barcode. | ||
| barcode, | ||
| barcode('0'), | ||
|
|
||
| /// A pass that represents a credential that the device stores in the Secure Element. | ||
| secureElement | ||
| } | ||
| secureElement('1'), | ||
|
|
||
| /// Deprecated, but maps to secureElement value | ||
| payment('1'); | ||
|
|
||
| /// Constructor to initialize each enum case with a string representation of the integer value | ||
| const PKPassType(this.value); | ||
|
|
||
| /// A field to store the string value associated with each enum case (representing integers as strings) | ||
| final String value; | ||
|
|
||
| // Factory method to create an enum from a JSON value (string) | ||
| static PKPassType fromJson(String jsonValue) { | ||
| for (PKPassType type in PKPassType.values) { | ||
| if (type.value == jsonValue) { | ||
| return type; | ||
| } | ||
| } | ||
| throw ArgumentError('Invalid PKPassType value: $jsonValue'); | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What do you think of falling back to
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it is a good solution, it removes the necessity for exception handling. |
||
| } | ||
|
|
||
| // Method to convert the enum case back to a string for JSON serialization | ||
| String toJson() { | ||
| return value; | ||
| } | ||
|
|
||
| @override | ||
| String toString() { | ||
| return value; // Return the string representation of the integer value | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Even though the name more closely resembles the iOS name, this is a breaking change. I don't think we should do a bump of the major version for this fix
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you agree I will revert the name change, I think it is ok how it was before
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've already done so