godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

-Fixed viewport stretch bugs

Browse Source 
-Fixed input in viewport stretch bugs
-Fixed tilemap pixel overlap (really?)
This commit is contained in:
Juan Linietsky
2014-04-18 11:43:54 -03:00
parent b8593c6f3f
commit 0360b454a4
15 changed files with 83 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/android/java/src/com/android/godot/payments/ConsumeTask.java
View File

@@ -56,7 +56,8 @@ abstract public class ConsumeTask {
protected void onPostExecute(String param){
if(param == null){
success();
success(new PaymentsCache(context).getConsumableValue("ticket", sku));
}else{
error(param);
}
@@ -65,7 +66,7 @@ abstract public class ConsumeTask {
}.execute();
}
abstract protected void success();
abstract protected void success(String ticket);
abstract protected void error(String message);
}

5
platform/android/java/src/com/android/godot/payments/HandlePurchaseTask.java
View File

@@ -28,11 +28,12 @@ abstract public class HandlePurchaseTask {
public void handlePurchaseRequest(int resultCode, Intent data){
// Log.d("XXX", "Handling purchase response");
Log.d("XXX", "Handling purchase response");
// int responseCode = data.getIntExtra("RESPONSE_CODE", 0);
PaymentsCache pc = new PaymentsCache(context);
String purchaseData = data.getStringExtra("INAPP_PURCHASE_DATA");
Log.d("XXX", "Purchase data:" + purchaseData);
// String dataSignature = data.getStringExtra("INAPP_DATA_SIGNATURE");
if (resultCode == Activity.RESULT_OK) {
@@ -61,7 +62,7 @@ abstract public class HandlePurchaseTask {
pc.setConsumableFlag("block", productId, true);
pc.setConsumableValue("token", productId, purchaseToken);
success(purchaseData);
success(productId);
return;
} catch (JSONException e) {
error(e.getMessage());

28
platform/android/java/src/com/android/godot/payments/PaymentsManager.java
View File

@@ -84,8 +84,25 @@ public class PaymentsManager {
new HandlePurchaseTask(activity){
@Override
protected void success(String ticket) {
godotPaymentV3.callbackSuccess(ticket);
protected void success(final String sku) {
new ConsumeTask(mService, activity) {
@Override
protected void success(String ticket) {
// godotPaymentV3.callbackSuccess("");
godotPaymentV3.callbackSuccess(ticket);
}
@Override
protected void error(String message) {
godotPaymentV3.callbackFail();
}
}.consume(sku);
// godotPaymentV3.callbackSuccess(ticket);
//validatePurchase(purchaseToken, sku);
}
@@ -99,7 +116,8 @@ public class PaymentsManager {
protected void canceled() {
godotPaymentV3.callbackCancel();
}}.handlePurchaseRequest(resultCode, data);
}
}.handlePurchaseRequest(resultCode, data);
}
public void validatePurchase(String purchaseToken, final String sku){
@@ -112,8 +130,8 @@ public class PaymentsManager {
new ConsumeTask(mService, activity) {
@Override
protected void success() {
godotPaymentV3.callbackSuccess("");
protected void success(String ticket) {
godotPaymentV3.callbackSuccess(ticket);
}

4
platform/android/java/src/com/android/godot/payments/PurchaseTask.java
View File

@@ -32,7 +32,7 @@ abstract public class PurchaseTask {
private boolean isLooping = false;
public void purchase(final String sku){
// Log.d("XXX", "Starting purchase");
Log.d("XXX", "Starting purchase for: " + sku);
PaymentsCache pc = new PaymentsCache(context);
Boolean isBlocked = pc.getConsumableFlag("block", sku);
// if(isBlocked){
@@ -68,7 +68,7 @@ abstract public class PurchaseTask {
new ConsumeTask(mService, context) {
@Override
protected void success() {
protected void success(String ticket) {
// Log.d("XXX", "Product was erroniously purchased!");
if(isLooping){
// Log.d("XXX", "It is looping");