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

Android subscription upgrade/downgrade #188

Merged
merged 4 commits into from
Jun 11, 2018
Merged

Android subscription upgrade/downgrade #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
099f79c
Android subscription upgrade/downgrade
vshab Jun 10, 2018
ed331e8
Fix type comparation
vshab Jun 10, 2018
11f68de
Make oldSku optional in TS definition
vshab Jun 11, 2018
11b989a
Make oldSku optional in JSDoc
vshab Jun 11, 2018
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ Lastly, this module also supports types for typescript users from `0.2.5`.
| getSubscriptions | `string[]` Subscription IDs/skus | `Promise<Subscription[]>` | Get a list of subscriptions. Note: On iOS this method has the same output as `getProducts`. Because iOS does not differentiate between IAP products and subscriptions. |
| getPurchaseHistory | | `Promise<Purchase[]>` | Gets an invetory of purchases made by the user regardless of consumption status (where possible) |
| getAvailablePurchases | | `Promise<Purchase[]>` | Get all purchases made by the user (either non-consumable, or haven't been consumed yet)
| buySubscription | `string` Subscription ID/sku | `Promise<Purchase>` | Create (buy) a subscription to a sku |
| buySubscription | `string` Subscription ID/sku, `string` Old Subscription ID/sku (on Android) | `Promise<Purchase>` | Create (buy) a subscription to a sku. For upgrading/downgrading subscription on Android pass second parameter with current subscription ID, on iOS this is handled automatically by store. |
| buyProduct | `string` Product ID/sku | `Promise<Purchase>` | Buy a product |
| buyProductWithoutFinishTransaction | `string` Product ID/sku | `Promise<Purchase>` | Buy a product without finish transaction call (iOS only) |
| finishTransaction | `void` | `void` | Send finishTransaction call to Apple IAP server. Call this function after receipt validation process |
Expand Down
14 changes: 10 additions & 4 deletions android/src/main/java/com/dooboolab/RNIap/RNIapModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,19 +308,25 @@ public void onPurchaseHistoryResponse(@BillingClient.BillingResponse int respons
}

@ReactMethod
public void buyItemByType(String type, String sku, Promise promise) {
public void buyItemByType(String type, String sku, String oldSku, Promise promise) {
final Activity activity = getCurrentActivity();
if (activity == null) {
promise.reject(E_UNKNOWN, "getCurrentActivity returned null");
} else {
addPromiseForKey(PROMISE_BUY_ITEM, promise);
BillingFlowParams flowParams = BillingFlowParams.newBuilder()
.setSku(sku)
BillingFlowParams.Builder builder = BillingFlowParams.newBuilder();

if (type.equals(BillingClient.SkuType.SUBS) && oldSku != null && !oldSku.isEmpty()) {
// Subscription upgrade/downgrade
builder.addOldSku(oldSku);
}

BillingFlowParams flowParams = builder.setSku(sku)
.setType(type)
.build();

int responseCode = mBillingClient.launchBillingFlow(activity,flowParams);
Log.d(TAG, "buyItemByType (type: " + type + ", sku: " + sku + ") responseCode: " + responseCode + "(" + getBillingResponseCodeName(responseCode) + ")");
Log.d(TAG, "buyItemByType (type: " + type + ", sku: " + sku + ", oldSku: " + oldSku + ") responseCode: " + responseCode + "(" + getBillingResponseCodeName(responseCode) + ")");
if (responseCode != BillingClient.BillingResponse.OK) {
rejectPromisesWithBillingError(PROMISE_BUY_ITEM,responseCode);
}
Expand Down
3 changes: 2 additions & 1 deletion index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ export function getAvailablePurchases() : Promise<Purchase[]>;
/**
* Create a subscription to a sku
* @param {string} sku The product's sku/ID
* @param {string} [oldSku] Optional old product's ID for upgrade/downgrade (Android only)
* @returns {Promise<Purchase>}
*/
export function buySubscription(sku: string) : Promise<SubscriptionPurchase>;
export function buySubscription(sku: string, oldSku?: string) : Promise<SubscriptionPurchase>;

/**
* Buy a product
Expand Down
5 changes: 3 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,12 @@ export const getAvailablePurchases = () => Platform.select({
/**
* Create a subscription to a sku
* @param {string} sku The product's sku/ID
* @param {string} [oldSku] Optional old product's ID for upgrade/downgrade (Android only)
* @returns {Promise<SubscriptionPurchase>}
*/
export const buySubscription = (sku) => Platform.select({
export const buySubscription = (sku, oldSku) => Platform.select({
ios: () => RNIapIos.buyProduct(sku),
android: () => RNIapModule.buyItemByType(ANDROID_ITEM_TYPE_SUBSCRIPTION, sku)
android: () => RNIapModule.buyItemByType(ANDROID_ITEM_TYPE_SUBSCRIPTION, sku, oldSku)
})();

/**
Expand Down