Feature/180 custom visitor ID #181
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import Foundation | ||
| import PiwikTracker | ||
|
|
||
| class UserIDViewController: UIViewController { | ||
| @IBOutlet weak var userIDTextField: UITextField! | ||
| @IBOutlet weak var signinButton: UIButton! | ||
| @IBOutlet weak var signoutButton: UIButton! | ||
|
|
||
| @IBAction func signinAction(_ sender: UIButton) { | ||
| if (self.userIDTextField.text != nil) && (self.userIDTextField.text?.characters.count)! > 0 { | ||
| PiwikTracker.shared?.visitorId = self.userIDTextField.text | ||
| toggleState() | ||
| } | ||
| } | ||
|
|
||
| @IBAction func signOutAction(_ sender: UIButton) { | ||
| PiwikTracker.shared?.visitorId = nil | ||
| toggleState() | ||
| } | ||
|
|
||
| override func viewDidLoad() { | ||
| toggleState() | ||
| } | ||
|
|
||
| private func toggleState() { | ||
| self.userIDTextField.text = PiwikTracker.shared?.visitorId | ||
|
|
||
| self.signinButton.isEnabled = !isVisitorIdValid() | ||
| self.signoutButton.isEnabled = !self.signinButton.isEnabled | ||
| } | ||
|
|
||
| private func isVisitorIdValid() -> Bool { | ||
| let currentVisitorId = PiwikTracker.shared?.visitorId | ||
|
|
||
| return (currentVisitorId != nil) && (currentVisitorId?.characters.count)! > 0 | ||
| } | ||
| } | ||
This file contains 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 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 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 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 |
|---|---|---|
|
|
@@ -60,10 +60,20 @@ internal struct PiwikUserDefaults { | |
|
|
||
| var clientId: String? { | ||
| get { | ||
| return userDefaults.string(forKey: PiwikUserDefaults.Key.clientID) | ||
| } | ||
| set { | ||
| userDefaults.setValue(newValue, forKey: PiwikUserDefaults.Key.clientID) | ||
| userDefaults.synchronize() | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. If you change it this way, it will change the behavior of all old implementations. For all old Implementations the There was a problem hiding this comment. Good point. I've adjusted this in a9e9bf3. I left my changes for using the correct "key name", but changing what value the key is using so it's using the old one. This should retain the existing functionality but be more clear in the future. There was a problem hiding this comment. Yeah, I think that's the best solution in this case. It's a bit of a pity that it got introduced in the first place. Thanks for changing it this way. |
||
|
|
||
| var visitorId: String? { | ||
| get { | ||
| return userDefaults.string(forKey: PiwikUserDefaults.Key.visitorID); | ||
| } | ||
| set { | ||
| userDefaults.setValue(newValue, forKey: PiwikUserDefaults.Key.visitorID); | ||
| userDefaults.synchronize() | ||
| } | ||
| } | ||
|
|
@@ -75,6 +85,7 @@ extension PiwikUserDefaults { | |
| static let currentVisitTimestamp = "PiwikCurrentVisitTimestampKey" | ||
| static let previousVistsTimestamp = "PiwikPreviousVistsTimestampKey" | ||
| static let firstVistsTimestamp = "PiwikFirstVistsTimestampKey" | ||
| static let clientID = "PiwikClientIDKey" | ||
| static let visitorID = "PiwikVisitorIDKey" | ||
| static let optOut = "PiwikOptOutKey" | ||
| } | ||
|
|
||
This file contains 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 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
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.
Great! Thanks for adding this to the Example Application!