Merge pull request #42 from SalavatR/master
Brought stores to a common view, Amazon iap_lib update
This commit is contained in:
commit
78d1c80c19
BIN
extension-iap/lib/android/in-app-purchasing-2.0.76.jar
Normal file
BIN
extension-iap/lib/android/in-app-purchasing-2.0.76.jar
Normal file
Binary file not shown.
@ -4,9 +4,9 @@
|
|||||||
<uses-sdk android:minSdkVersion="{{android.minimum_sdk_version}}" android:targetSdkVersion="{{android.target_sdk_version}}" />
|
<uses-sdk android:minSdkVersion="{{android.minimum_sdk_version}}" android:targetSdkVersion="{{android.target_sdk_version}}" />
|
||||||
<application>
|
<application>
|
||||||
<!-- For Amazon IAP -->
|
<!-- For Amazon IAP -->
|
||||||
<receiver android:name="com.amazon.device.iap.ResponseReceiver" >
|
<receiver android:name = "com.amazon.device.iap.ResponseReceiver" android:permission = "com.amazon.inapp.purchasing.Permission.NOTIFY" >
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="com.amazon.inapp.purchasing.NOTIFY" android:permission="com.amazon.inapp.purchasing.Permission.NOTIFY" />
|
<action android:name = "com.amazon.inapp.purchasing.NOTIFY" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</receiver>
|
</receiver>
|
||||||
</application>
|
</application>
|
||||||
|
@ -11,6 +11,7 @@ import java.util.concurrent.BlockingQueue;
|
|||||||
|
|
||||||
import org.json.JSONException;
|
import org.json.JSONException;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
|
import org.json.JSONArray;
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
@ -173,9 +174,13 @@ public class IapAmazon implements PurchasingListener {
|
|||||||
if (productDataResponse.getRequestStatus() != ProductDataResponse.RequestStatus.SUCCESSFUL) {
|
if (productDataResponse.getRequestStatus() != ProductDataResponse.RequestStatus.SUCCESSFUL) {
|
||||||
listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_ERROR, null, commadPtr);
|
listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_ERROR, null, commadPtr);
|
||||||
} else {
|
} else {
|
||||||
|
for (final String s : productDataResponse.getUnavailableSkus()) {
|
||||||
|
Log.v(TAG, "Unavailable SKU: " + s);
|
||||||
|
}
|
||||||
|
|
||||||
Map<String, Product> products = productDataResponse.getProductData();
|
Map<String, Product> products = productDataResponse.getProductData();
|
||||||
try {
|
try {
|
||||||
JSONObject data = new JSONObject();
|
JSONArray data = new JSONArray();
|
||||||
for (Map.Entry<String, Product> entry : products.entrySet()) {
|
for (Map.Entry<String, Product> entry : products.entrySet()) {
|
||||||
String key = entry.getKey();
|
String key = entry.getKey();
|
||||||
Product product = entry.getValue();
|
Product product = entry.getValue();
|
||||||
@ -189,7 +194,7 @@ public class IapAmazon implements PurchasingListener {
|
|||||||
// Based on return values from getPrice: https://developer.amazon.com/public/binaries/content/assets/javadoc/in-app-purchasing-api/com/amazon/inapp/purchasing/item.html
|
// Based on return values from getPrice: https://developer.amazon.com/public/binaries/content/assets/javadoc/in-app-purchasing-api/com/amazon/inapp/purchasing/item.html
|
||||||
item.put("price", priceString.replaceAll("[^0-9.,]", ""));
|
item.put("price", priceString.replaceAll("[^0-9.,]", ""));
|
||||||
}
|
}
|
||||||
data.put(key, item);
|
data.put(item);
|
||||||
}
|
}
|
||||||
listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_OK, data.toString(), commadPtr);
|
listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_OK, data.toString(), commadPtr);
|
||||||
} catch (JSONException e) {
|
} catch (JSONException e) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user