Removed Yinbi #271
Merged
Removed Yinbi #271
Conversation
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
oxtoacart
commented
Aug 2, 2021
| android:screenOrientation="portrait" | ||
| /> | ||
|
|
||
| <activity |
There was a problem hiding this comment.
Drive-by, this was unused anyway.
oxtoacart
commented
Aug 2, 2021
| @@ -486,12 +485,6 @@ private void openPaymentProvider(final String email, final boolean bulkCodes) { | |||
| case "paymentwall": | |||
| activityClass = PaymentWallActivity_.class; | |||
| break; | |||
| case "bulk-codes": | |||
There was a problem hiding this comment.
Bulk-codes are for Yinbi only.
oxtoacart
commented
Aug 2, 2021
| @@ -236,7 +235,7 @@ private String getFormattedPrice(Map<String, Long> price, boolean formatFloat) { | |||
| } | |||
| } else { | |||
| if (formatFloat) { | |||
| formattedPrice = String.valueOf(String.format(Locale.getDefault(), "%.2f", currencyPrice / 100f)); | |||
| formattedPrice = String.format(Locale.getDefault(), "%.2f", currencyPrice / 100f); | |||
oxtoacart
commented
Aug 2, 2021
| @@ -116,7 +115,7 @@ public Integer numYears() { | |||
| public String formatRenewalBonusExpected(Context context) { | |||
| Integer bonusMonths = renewalBonusExpected.get("months"); | |||
| Integer bonusDays = renewalBonusExpected.get("days"); | |||
| List<String> bonusParts = new ArrayList(); | |||
| List<String> bonusParts = new ArrayList<>(); | |||
oxtoacart
commented
Aug 2, 2021
| @@ -57,7 +56,7 @@ public ProPlan(String id, Map<String, Long> price, Map<String, Long> priceWithou | |||
| this.id = id; | |||
| this.price = price; | |||
| this.priceWithoutTax = priceWithoutTax; | |||
| this.tax = new HashMap<String, Long>(); | |||
| this.tax = new HashMap<>(); | |||
oxtoacart
commented
Aug 2, 2021
| @@ -68,7 +67,7 @@ public ProPlan(String id, Map<String, Long> price, Map<String, Long> priceWithou | |||
| if (specificPriceWithoutTax == null) { | |||
| specificPriceWithoutTax = priceWithTax; | |||
| } | |||
| Long tax = priceWithTax - specificPriceWithoutTax; | |||
| long tax = priceWithTax - specificPriceWithoutTax; | |||
oxtoacart
commented
Aug 2, 2021
| @@ -265,7 +264,7 @@ public void formatCost() { | |||
| } | |||
|
|
|||
| public String getFormatPriceWithBonus(Context context, boolean useNumber) { | |||
| String durationFormat = ""; | |||
| String durationFormat; | |||
Crdzbird
approved these changes
Aug 2, 2021
|
Thanks @Crdzbird ! |
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
For getlantern/engineering#653. Although we mostly respect the yinbiEnabled setting from the pro-server, our account menu does not respect that flag. I confirmed with @atavism and @Derekf5 that we don't need to display anything Yinbi related in the application anymore, including popup ads, so I've removed everything Yinbi related.
Since this touches the plans/checkout flow, I tested purchasing using Stripe and confirmed that it works.