Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Sync cancelling subscription with server

Browse source
This commit is contained in:
max-klaus 2020-10-27 18:41:24 +03:00
parent da82ba519e
commit 1b53652adc
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java
View file

@ -557,10 +557,12 @@ public class InAppPurchaseHelper {
// Do we have the live updates? // Do we have the live updates?
boolean subscribedToLiveUpdates = false; boolean subscribedToLiveUpdates = false;
List<Purchase> liveUpdatesPurchases = new ArrayList<>(); List<Purchase> liveUpdatesPurchases = new ArrayList<>();
for (InAppPurchase p : getLiveUpdates().getAllSubscriptions()) { for (InAppSubscription s : getLiveUpdates().getAllSubscriptions()) {
Purchase purchase = getPurchase(p.getSku()); Purchase purchase = getPurchase(s.getSku());
if (purchase != null) { if (purchase != null || s.getState().isActive()) {
liveUpdatesPurchases.add(purchase); if (purchase != null) {
liveUpdatesPurchases.add(purchase);
}
if (!subscribedToLiveUpdates) { if (!subscribedToLiveUpdates) {
subscribedToLiveUpdates = true; subscribedToLiveUpdates = true;
} }

4
OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java
View file

@ -697,6 +697,10 @@ public class InAppPurchases {
public boolean isGone() { public boolean isGone() {
return this == ON_HOLD || this == PAUSED || this == EXPIRED; return this == ON_HOLD || this == PAUSED || this == EXPIRED;
} }
public boolean isActive() {
return this == ACTIVE || this == CANCELLED || this == IN_GRACE_PERIOD;
}
} }
InAppSubscription(@NonNull String skuNoVersion, int version) { InAppSubscription(@NonNull String skuNoVersion, int version) {