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

add original_purchase_date #164

Merged
merged 7 commits into from
Jun 25, 2020
Merged

add original_purchase_date #164

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
00bcde4
added original purchase date to purchaser info
aboedo Jun 19, 2020
5bfaa2a
fixed case where originalPurchaseDate was "null"
aboedo Jun 19, 2020
6bfa15b
fix test that was timezone-bound
aboedo Jun 19, 2020
a42089e
simplified expressions
aboedo Jun 19, 2020
c08f96a
linting
aboedo Jun 19, 2020
61025ca
added one more test case for managementURL in case it's missing
aboedo Jun 20, 2020
ce73bef
small cleanup since optString returns a string and not an optional
aboedo Jun 24, 2020
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
Prev Previous commit
Next Next commit
linting
  • Loading branch information
@aboedo
aboedo committed Jun 19, 2020
commit c08f96ad7de3324b37782502077bd5f649eef017
4 changes: 3 additions & 1 deletion purchases/src/main/kotlin/com/revenuecat/purchases/utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,9 @@ internal fun String.sha1() =
}

internal fun JSONObject.getNullableString(name: String): String? = this.getString(name).takeUnless { this.isNull(name) }
internal fun JSONObject.optNullableString(name: String): String? = this.optString(name)?.takeUnless { this.isNull(name) }
internal fun JSONObject.optNullableString(name: String): String? = this.optString(name)?.takeUnless {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think optString returns "" if the JSON doesn't contain the name, which is very very annoying

Copy link
Member Author

@aboedo aboedo Jun 20, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch. I got bit by looking at the search result
image

but not reading in the actual doc

Returns the value mapped by name if it exists, coercing it if necessary, or the empty string if no such mapping exists.

Fixing

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the method actually does work, though, because of the takeUnless, which checks if the object isNull. That check will return true if the key isn't found in the JSON https://developer.android.com/reference/org/json/JSONObject#isNull(java.lang.String)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added an extra test case to make sure (also tested manually)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. optString will never return null though, so ?. should be . right?

this.isNull(name)
}

/** @suppress */
internal object SkuDetailsParceler : Parceler<SkuDetails> {
Expand Down