Skip to content

Commit

Permalink
Renaming PurchaseList to Purchases
Browse files Browse the repository at this point in the history
  • Loading branch information
@alessandrojp
alessandrojp committed Dec 13, 2016
1 parent 0d618e3 commit 2073aba
Show file tree
Hide file tree
Showing 12 changed files with 73 additions and 73 deletions.
10 changes: 5 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,9 @@ PurchaseType purchaseType = PurchaseType.IN_APP; // PurchaseType.SUBSCRIPTIONS f
mBillingProcessor.getInventory(purchaseType, new InventoryHandler() {
@Override
public void onSuccess(PurchaseList purchaseList) {
public void onSuccess(Purchases purchases) {
// Do your stuff with the list of purchases
List<Purchase> purchases = purchaseList.getAll();
List<Purchase> purchaseList = purchases.getAll();
}
@Override
Expand All @@ -231,11 +231,11 @@ ArrayList<String> itemIds = new ArrayList<>();
itemIds.add("item_id_2");
itemIds.add("item_id_1");
mBillingProcessor.getItemDetailList(purchaseType, itemIds, new ItemDetailListHandler() {
mBillingProcessor.getItemDetails(purchaseType, itemIds, new ItemDetailListHandler() {
@Override
public void onSuccess(ItemDetailList itemDetailList) {
public void onSuccess(ItemDetails itemDetails) {
// Do your stuff with the list of item details
List<Item> items = itemList.getAll();
List<Item> items = itemDetails.getAll();
}
@Override
Expand Down
12 changes: 6 additions & 6 deletions extension-rxjava/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# RxJava adapter for Easy Checkout Library
# RxJava extension for Easy Checkout Library
[![Build Status](https://travis-ci.org/alessandrojp/easy-checkout.svg)](https://travis-ci.org/alessandrojp/easy-checkout)
[![Bintray](https://img.shields.io/bintray/v/alessandrojp/android/easy-checkout.svg)](https://bintray.com/alessandrojp/android/easy-checkout/view)
[![License](http://img.shields.io/:license-apache-brightgreen.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
Expand Down Expand Up @@ -206,9 +206,9 @@ mBillingProcessor.getInventory(purchaseType)
.subscribeOn(Schedulers.io())
.subscribe(new Action1<PurchaseList>() {
@Override
public void call(PurchaseList purchaseList) {
public void call(Purchases purchases) {
// Do your stuff with the list of purchases
List<Purchase> purchases = purchaseList.getAll();
List<Purchase> purchaseList = purchases.getAll();
}
}, new Action1<Throwable>() {
@Override
Expand All @@ -228,14 +228,14 @@ ArrayList<String> itemIds = new ArrayList<>();
itemIds.add("item_id_1");
itemIds.add("item_id_2");

mBillingProcessor.getItemDetailList(purchaseType, itemIds)
mBillingProcessor.getItemDetails(purchaseType, itemIds)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(new Action1<ItemDetailList>() {
@Override
public void call(ItemDetailList itemList) {
public void call(ItemDetails itemDetails) {
// Do your stuff with the list of item details
List<Item> items = itemList.getAll();
List<Item> items = itemDetails.getAll();
}
}, new Action1<Throwable>() {
@Override
Expand Down
30 changes: 15 additions & 15 deletions ...ion-rxjava/src/main/java/jp/alessandro/android/iab/rxjava/BillingProcessorObservable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
import jp.alessandro.android.iab.BillingContext;
import jp.alessandro.android.iab.BillingException;
import jp.alessandro.android.iab.BillingProcessor;
import jp.alessandro.android.iab.ItemDetailList;
import jp.alessandro.android.iab.PurchaseList;
import jp.alessandro.android.iab.ItemDetails;
import jp.alessandro.android.iab.Purchases;
import jp.alessandro.android.iab.PurchaseType;
import jp.alessandro.android.iab.handler.ConsumeItemHandler;
import jp.alessandro.android.iab.handler.InventoryHandler;
import jp.alessandro.android.iab.handler.ItemDetailListHandler;
import jp.alessandro.android.iab.handler.ItemDetailsHandler;
import jp.alessandro.android.iab.handler.PurchaseHandler;
import jp.alessandro.android.iab.handler.StartActivityHandler;
import rx.Emitter;
Expand Down Expand Up @@ -177,14 +177,14 @@ public void onError(BillingException e) {
*
* @param purchaseType IN_APP or SUBSCRIPTION
*/
public Observable<PurchaseList> getInventory(final PurchaseType purchaseType) {
return Observable.fromEmitter(new Action1<Emitter<PurchaseList>>() {
public Observable<Purchases> getInventory(final PurchaseType purchaseType) {
return Observable.fromEmitter(new Action1<Emitter<Purchases>>() {
@Override
public void call(final Emitter<PurchaseList> emitter) {
public void call(final Emitter<Purchases> emitter) {
mBillingProcessor.getInventory(purchaseType, new InventoryHandler() {
@Override
public void onSuccess(PurchaseList purchaseList) {
emitter.onNext(purchaseList);
public void onSuccess(Purchases purchases) {
emitter.onNext(purchases);
emitter.onCompleted();
}

Expand All @@ -198,21 +198,21 @@ public void onError(BillingException e) {
}

/**
* Get a list of available SKUs details
* Get item details (SKU)
* This will be executed from Work Thread
* See http://developer.android.com/google/play/billing/billing_integrate.html#QueryDetails
*
* @param purchaseType IN_APP or SUBSCRIPTION
* @param itemIds list of SKU ids to be loaded
*/
public Observable<ItemDetailList> getItemDetailList(final PurchaseType purchaseType, final ArrayList<String> itemIds) {
return Observable.fromEmitter(new Action1<Emitter<ItemDetailList>>() {
public Observable<ItemDetails> getItemDetails(final PurchaseType purchaseType, final ArrayList<String> itemIds) {
return Observable.fromEmitter(new Action1<Emitter<ItemDetails>>() {
@Override
public void call(final Emitter<ItemDetailList> emitter) {
mBillingProcessor.getItemDetailList(purchaseType, itemIds, new ItemDetailListHandler() {
public void call(final Emitter<ItemDetails> emitter) {
mBillingProcessor.getItemDetails(purchaseType, itemIds, new ItemDetailsHandler() {
@Override
public void onSuccess(ItemDetailList itemDetailList) {
emitter.onNext(itemDetailList);
public void onSuccess(ItemDetails itemDetails) {
emitter.onNext(itemDetails);
emitter.onCompleted();
}

Expand Down
20 changes: 10 additions & 10 deletions library/src/main/java/jp/alessandro/android/iab/BaseProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

import jp.alessandro.android.iab.handler.ErrorHandler;
import jp.alessandro.android.iab.handler.InventoryHandler;
import jp.alessandro.android.iab.handler.ItemDetailListHandler;
import jp.alessandro.android.iab.handler.ItemDetailsHandler;
import jp.alessandro.android.iab.handler.PurchaseHandler;
import jp.alessandro.android.iab.handler.StartActivityHandler;
import jp.alessandro.android.iab.logger.Logger;
Expand Down Expand Up @@ -104,19 +104,19 @@ public void onError() {
}

/**
* Get a list of available SKUs details
* Get item details (SKU)
* See http://developer.android.com/google/play/billing/billing_integrate.html#QueryDetails
*
* @param itemIds list of SKU ids to be loaded
* @param handler callback called asynchronously
*/
public void getItemDetailList(final ArrayList<String> itemIds, final ItemDetailListHandler handler) {
public void getItemDetails(final ArrayList<String> itemIds, final ItemDetailsHandler handler) {
executeInServiceOnWorkThread(new ServiceBinder.Handler() {
@Override
public void onBind(IInAppBillingService service) {
try {
ItemGetter getter = new ItemGetter(mContext);
ItemDetailList details = getter.get(service, mItemType, itemIds);
ItemDetails details = getter.get(service, mItemType, itemIds);
postListSuccess(details, handler);
} catch (BillingException e) {
postOnError(e, handler);
Expand All @@ -143,8 +143,8 @@ public void getInventory(final InventoryHandler handler) {
public void onBind(IInAppBillingService service) {
try {
PurchaseGetter getter = new PurchaseGetter(mContext);
PurchaseList purchaseList = getter.get(service, mItemType);
postInventorySuccess(purchaseList, handler);
Purchases purchases = getter.get(service, mItemType);
postInventorySuccess(purchases, handler);
} catch (BillingException e) {
postOnError(e, handler);
}
Expand Down Expand Up @@ -281,20 +281,20 @@ public void run() {
});
}

private void postListSuccess(final ItemDetailList itemDetailList, final ItemDetailListHandler handler) {
private void postListSuccess(final ItemDetails itemDetails, final ItemDetailsHandler handler) {
postEventHandler(new Runnable() {
@Override
public void run() {
handler.onSuccess(itemDetailList);
handler.onSuccess(itemDetails);
}
});
}

private void postInventorySuccess(final PurchaseList purchaseList, final InventoryHandler handler) {
private void postInventorySuccess(final Purchases purchases, final InventoryHandler handler) {
postEventHandler(new Runnable() {
@Override
public void run() {
handler.onSuccess(purchaseList);
handler.onSuccess(purchases);
}
});
}
Expand Down
10 changes: 5 additions & 5 deletions library/src/main/java/jp/alessandro/android/iab/BillingProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

import jp.alessandro.android.iab.handler.ConsumeItemHandler;
import jp.alessandro.android.iab.handler.InventoryHandler;
import jp.alessandro.android.iab.handler.ItemDetailListHandler;
import jp.alessandro.android.iab.handler.ItemDetailsHandler;
import jp.alessandro.android.iab.handler.PurchaseHandler;
import jp.alessandro.android.iab.handler.StartActivityHandler;

Expand Down Expand Up @@ -164,21 +164,21 @@ public void getInventory(PurchaseType purchaseType, InventoryHandler handler) {
}

/**
* Get a list of available SKUs details
* Get item details (SKU)
* This will be executed from Work Thread
* See http://developer.android.com/google/play/billing/billing_integrate.html#QueryDetails
*
* @param purchaseType IN_APP or SUBSCRIPTION
* @param itemIds list of SKU ids to be loaded
* @param handler callback called asynchronously
*/
public void getItemDetailList(PurchaseType purchaseType, ArrayList<String> itemIds, ItemDetailListHandler handler) {
public void getItemDetails(PurchaseType purchaseType, ArrayList<String> itemIds, ItemDetailsHandler handler) {
synchronized (this) {
checkIfIsNotReleased();
if (purchaseType == PurchaseType.SUBSCRIPTION) {
mSubscriptionProcessor.getItemDetailList(itemIds, handler);
mSubscriptionProcessor.getItemDetails(itemIds, handler);
} else {
mItemProcessor.getItemDetailList(itemIds, handler);
mItemProcessor.getItemDetails(itemIds, handler);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...lessandro/android/iab/ItemDetailList.java → ...p/alessandro/android/iab/ItemDetails.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
import java.util.List;
import java.util.Map;

public class ItemDetailList {
public class ItemDetails {

private final Map<String, Item> mMap = new LinkedHashMap<>();

public ItemDetailList() {
public ItemDetails() {
}

public boolean hasItemId(String itemId) {
Expand All @@ -42,7 +42,7 @@ public Item getByItemId(String itemId) {
return mMap.get(itemId);
}

public int size() {
public int getSize() {
return mMap.size();
}

Expand Down
16 changes: 8 additions & 8 deletions library/src/main/java/jp/alessandro/android/iab/ItemGetter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class ItemGetter {
* @return
* @throws BillingException
*/
public ItemDetailList get(IInAppBillingService service, String itemType,
ArrayList<String> itemIdList) throws BillingException {
public ItemDetails get(IInAppBillingService service, String itemType,
ArrayList<String> itemIdList) throws BillingException {
Bundle bundle = new Bundle();
bundle.putStringArrayList(Constants.RESPONSE_ITEM_ID_LIST, itemIdList);
try {
Expand All @@ -63,7 +63,7 @@ public ItemDetailList get(IInAppBillingService service, String itemType,
}
}

private ItemDetailList getItemsFromResponse(Bundle skuDetails) throws BillingException {
private ItemDetails getItemsFromResponse(Bundle skuDetails) throws BillingException {
int response = skuDetails.getInt(Constants.RESPONSE_CODE);
if (response == Constants.BILLING_RESPONSE_RESULT_OK) {
return getDetailsList(skuDetails);
Expand All @@ -72,20 +72,20 @@ private ItemDetailList getItemsFromResponse(Bundle skuDetails) throws BillingExc
}
}

private ItemDetailList getDetailsList(Bundle skuDetails) throws BillingException {
ItemDetailList itemDetailList = new ItemDetailList();
private ItemDetails getDetailsList(Bundle skuDetails) throws BillingException {
ItemDetails itemDetails = new ItemDetails();
List<String> detailsList = skuDetails.getStringArrayList(Constants.RESPONSE_DETAILS_LIST);
if (detailsList == null) {
return itemDetailList;
return itemDetails;
}
for (String response : detailsList) {
try {
Item product = Item.parseJson(response);
itemDetailList.put(product);
itemDetails.put(product);
} catch (JSONException e) {
throw new BillingException(Constants.ERROR_BAD_RESPONSE, e.getMessage());
}
}
return itemDetailList;
return itemDetails;
}
}
4 changes: 2 additions & 2 deletions library/src/main/java/jp/alessandro/android/iab/ItemProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ public void onError() {

private String getToken(IInAppBillingService service, String itemId) throws BillingException {
PurchaseGetter getter = new PurchaseGetter(mContext);
PurchaseList purchaseList = getter.get(service, Constants.ITEM_TYPE_INAPP);
Purchase purchase = purchaseList.getByPurchaseId(itemId);
Purchases purchases = getter.get(service, Constants.ITEM_TYPE_INAPP);
Purchase purchase = purchases.getByPurchaseId(itemId);

if (purchase == null || TextUtils.isEmpty(purchase.getToken())) {
throw new BillingException(Constants.ERROR_PURCHASE_DATA,
Expand Down
22 changes: 11 additions & 11 deletions library/src/main/java/jp/alessandro/android/iab/PurchaseGetter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ class PurchaseGetter {
* @return
* @throws BillingException
*/
public PurchaseList get(IInAppBillingService service, String itemType) throws BillingException {
PurchaseList purchaseList = new PurchaseList();
public Purchases get(IInAppBillingService service, String itemType) throws BillingException {
Purchases purchases = new Purchases();
String continueToken = null;
do {
Bundle bundle = getPurchasesBundle(service, itemType, continueToken);
checkResponse(bundle, purchaseList);
checkResponse(bundle, purchases);
continueToken = bundle.getString(Constants.RESPONSE_INAPP_CONTINUATION_TOKEN);
} while (!TextUtils.isEmpty(continueToken));
return purchaseList;
return purchases;
}

private Bundle getPurchasesBundle(IInAppBillingService service, String itemType,
Expand All @@ -76,7 +76,7 @@ private Bundle getPurchasesBundle(IInAppBillingService service, String itemType,
}
}

private void checkResponse(Bundle data, PurchaseList purchasesList) throws BillingException {
private void checkResponse(Bundle data, Purchases purchasesList) throws BillingException {
int response = data.getInt(Constants.RESPONSE_CODE);
if (response == Constants.BILLING_RESPONSE_RESULT_OK) {
ArrayList<String> purchaseList =
Expand All @@ -92,7 +92,7 @@ private void checkResponse(Bundle data, PurchaseList purchasesList) throws Billi
}

private void checkPurchaseList(ArrayList<String> purchaseList, ArrayList<String> signatureList,
PurchaseList purchasesList) throws BillingException {
Purchases purchasesList) throws BillingException {
if ((purchaseList == null) || (signatureList == null)) {
throw new BillingException(Constants.ERROR_PURCHASE_DATA,
Constants.ERROR_MSG_GET_PURCHASES_SIGNATURE);
Expand All @@ -106,27 +106,27 @@ private void checkPurchaseList(ArrayList<String> purchaseList, ArrayList<String>

private void verifyAllPurchases(ArrayList<String> purchaseList,
ArrayList<String> signatureList,
PurchaseList purchasesList) throws BillingException {
Purchases purchasesList) throws BillingException {
for (int i = 0; i < purchaseList.size(); i++) {
String purchaseData = purchaseList.get(i);
String signature = signatureList.get(i);
verifyBeforeAddPurchase(purchasesList, purchaseData, signature);
}
}

private void verifyBeforeAddPurchase(PurchaseList purchaseList, String purchaseData,
private void verifyBeforeAddPurchase(Purchases purchases, String purchaseData,
String signature) throws BillingException {
if (!TextUtils.isEmpty(purchaseData)) {
if (Security.verifyPurchase(purchaseData, mLogger, mSignatureBase64, purchaseData, signature)) {
addPurchase(purchaseList, purchaseData, signature);
addPurchase(purchases, purchaseData, signature);
} else {
mLogger.w(Logger.TAG, String.format(
"Purchase not valid. PurchaseData: %s, signature: %s", purchaseData, signature));
}
}
}

private void addPurchase(PurchaseList purchaseList,
private void addPurchase(Purchases purchases,
String purchaseData,
String signature) throws BillingException {
Purchase purchase;
Expand All @@ -139,6 +139,6 @@ private void addPurchase(PurchaseList purchaseList,
throw new BillingException(Constants.ERROR_PURCHASE_DATA,
Constants.ERROR_MSG_PURCHASE_TOKEN);
}
purchaseList.put(purchase);
purchases.put(purchase);
}
}
Loading

0 comments on commit 2073aba

Please sign in to comment.