Closes #17. Closes #13. Closes #6.

robotmedia · Jul 13, 2011 · 3a5e5f9 · 3a5e5f9
1 parent 43c874f
commit 3a5e5f9
Show file tree

Hide file tree

Showing 30 changed files with 767 additions and 55 deletions.
diff --git a/AndroidBillingLibrary/src/net/robotmedia/billing/BillingController.java b/AndroidBillingLibrary/src/net/robotmedia/billing/BillingController.java
@@ -29,6 +29,7 @@
 import net.robotmedia.billing.model.TransactionManager;
 import net.robotmedia.billing.request.BillingRequest;
 import net.robotmedia.billing.request.ResponseCode;
+import net.robotmedia.billing.request.RestoreTransactions;
 import net.robotmedia.billing.utils.Compatibility;
 import net.robotmedia.billing.utils.Security;
 
@@ -427,6 +428,8 @@ protected static void onPurchaseStateChanged(Context context, String signedData,
 		}
 	}
 
+	private static HashMap<Long, BillingRequest> pendingRequests = new HashMap<Long, BillingRequest>();
+
 	/**
 	 * Called after a {@link net.robotmedia.billing.request.BillingRequest} is
 	 * sent.
@@ -440,14 +443,16 @@ protected static void onRequestSent(long requestId, BillingRequest request) {
 		if (debug) {
 			Log.d(BillingController.class.getSimpleName(), "Request " + requestId + " of type " + request.getRequestType() + " sent");
 		}
-		if (!request.isSuccess() && request.hasNonce()) {
+		if (request.isSuccess()) {
+			pendingRequests.put(requestId, request);
+		} else if (request.hasNonce()) {
 			Security.removeNonce(request.getNonce());
 		}
 	}
 
 	/**
 	 * Called after a {@link net.robotmedia.billing.request.BillingRequest} is
-	 * sent. Mostly used for debugging purposes.
+	 * sent.
 	 * 
 	 * @param context
 	 * @param requestId
@@ -460,6 +465,11 @@ protected static void onResponseCode(Context context, long requestId, int respon
 		if (debug) {
 			Log.d(BillingController.class.getSimpleName(), "Request " + requestId + " received response " + ResponseCode.valueOf(responseCode));
 		}
+		final BillingRequest request = pendingRequests.get(requestId);
+		if (request != null) {
+			pendingRequests.remove(requestId);
+			request.onResponseCode(responseCode);
+		}
 	}
 
 	/**
@@ -639,4 +649,14 @@ private static boolean verifyNonce(JSONObject data) {
 		}
 	}
 
+	/**
+	 * 
+	 * @param restoreTransactions
+	 */
+	public static void onTransactionsRestored(RestoreTransactions restoreTransactions) {
+		for (IBillingObserver o : observers) {
+			o.onTransactionsRestored();
+		}		
+	}
+
 }
diff --git a/AndroidBillingLibrary/src/net/robotmedia/billing/BillingService.java b/AndroidBillingLibrary/src/net/robotmedia/billing/BillingService.java
@@ -23,6 +23,7 @@
 import net.robotmedia.billing.request.RequestPurchase;
 import net.robotmedia.billing.request.RestoreTransactions;
 import net.robotmedia.billing.request.BillingRequest;
+import net.robotmedia.billing.utils.Compatibility;
 
 import com.android.vending.billing.IMarketBillingService;
 
@@ -163,10 +164,10 @@ public void onStart(Intent intent, int startId) {
 	    handleCommand(intent);
 	}
 
-	@Override
+	// @Override // Avoid compile errors on pre-2.0
 	public int onStartCommand(Intent intent, int flags, int startId) {
 	    handleCommand(intent);
-	    return START_NOT_STICKY;
+	    return Compatibility.START_NOT_STICKY;
 	}
 
 	private void handleCommand(Intent intent) {

diff --git a/AndroidBillingLibrary/src/net/robotmedia/billing/IBillingObserver.java b/AndroidBillingLibrary/src/net/robotmedia/billing/IBillingObserver.java
@@ -55,4 +55,9 @@ public interface IBillingObserver {
 	 */
 	public void onPurchaseRefunded(String itemId);
 
+	/**
+	 * Called after a restore transactions request has been successfully received by the server. 
+	 */
+	public void onTransactionsRestored();
+
 }
diff --git a/AndroidBillingLibrary/src/net/robotmedia/billing/model/Transaction.java b/AndroidBillingLibrary/src/net/robotmedia/billing/model/Transaction.java
@@ -22,8 +22,8 @@ public class Transaction {
 
     public enum PurchaseState {
         // Responses to requestPurchase or restoreTransactions.
-    	PURCHASED,    // 0: The charge failed on the server.
-        CANCELLED,   // 1: User was charged for the order.
+    	PURCHASED,    // 0: User was charged for the order.
+        CANCELLED,   // 1: The charge failed on the server.
     	REFUNDED;    // 2: User received a refund for the order.
 
         // Converts from an ordinal value to the PurchaseState

diff --git a/AndroidBillingLibrary/src/net/robotmedia/billing/request/BillingRequest.java b/AndroidBillingLibrary/src/net/robotmedia/billing/request/BillingRequest.java
@@ -27,33 +27,53 @@ public abstract class BillingRequest {
     private static final String KEY_API_VERSION = "API_VERSION";
     private static final String KEY_PACKAGE_NAME = "PACKAGE_NAME";
     private static final String KEY_RESPONSE_CODE = "RESPONSE_CODE";
-    private static final String KEY_REQUEST_ID = "REQUEST_ID";
+    protected static final String KEY_REQUEST_ID = "REQUEST_ID";
 	private static final String KEY_NONCE = "NONCE";
     public static final long IGNORE_REQUEST_ID = -1;
 
-    public abstract String getRequestType();
-    protected abstract void addParams(Bundle request);
-    protected abstract void processOkResponse(Bundle response);
+    private String packageName;
+    private boolean success;
+    private long nonce;
 
-    public boolean hasNonce() {
-    	return false;
+    public BillingRequest(String packageName) {
+    	this.packageName = packageName;
     }
 
-    private String packageName;
-    private boolean success;
-	private long nonce;	
+    protected void addParams(Bundle request) {
+    	// Do nothing by default
+    }
 
     public long getNonce() {
 		return nonce;
 	}
-	public void setNonce(long nonce) {
-		this.nonce = nonce;
-	}
-	public BillingRequest(String packageName) {
-    	this.packageName = packageName;
+	public abstract String getRequestType();	
+
+    public boolean hasNonce() {
+    	return false;
+    }
+	public boolean isSuccess() {
+    	return success;
+    }
+	protected Bundle makeRequestBundle() {
+        final Bundle request = new Bundle();
+        request.putString(KEY_BILLING_REQUEST, getRequestType());
+        request.putInt(KEY_API_VERSION, 1);
+        request.putString(KEY_PACKAGE_NAME, packageName);
+        if (hasNonce()) {
+    		request.putLong(KEY_NONCE, nonce);
+        }
+        return request;
     }
 
-	public long run(IMarketBillingService mService) throws RemoteException {
+	public void onResponseCode(int responseCode) {
+    	// Do nothing by default
+	}
+
+    protected void processOkResponse(Bundle response) {    	
+    	// Do nothing by default
+    }
+
+    public long run(IMarketBillingService mService) throws RemoteException {
         final Bundle request = makeRequestBundle();
         addParams(request);
         final Bundle response = mService.sendBillingRequest(request);
@@ -64,18 +84,11 @@ public long run(IMarketBillingService mService) throws RemoteException {
         	return IGNORE_REQUEST_ID;
         }
 	}
-
-    protected Bundle makeRequestBundle() {
-        final Bundle request = new Bundle();
-        request.putString(KEY_BILLING_REQUEST, getRequestType());
-        request.putInt(KEY_API_VERSION, 1);
-        request.putString(KEY_PACKAGE_NAME, packageName);
-        if (hasNonce()) {
-    		request.putLong(KEY_NONCE, nonce);
-        }
-        return request;
-    }
-
+
+    public void setNonce(long nonce) {
+		this.nonce = nonce;
+	}
+
     protected boolean validateResponse(Bundle response) {
     	final int responseCode = response.getInt(KEY_RESPONSE_CODE);
     	success = ResponseCode.isResponseOk(responseCode);
@@ -85,8 +98,4 @@ protected boolean validateResponse(Bundle response) {
     	return success;
     }
 
-    public boolean isSuccess() {
-    	return success;
-    }
-
 }
diff --git a/AndroidBillingLibrary/src/net/robotmedia/billing/request/CheckBillingSupported.java b/AndroidBillingLibrary/src/net/robotmedia/billing/request/CheckBillingSupported.java
@@ -29,9 +29,6 @@ public String getRequestType() {
 		return "CHECK_BILLING_SUPPORTED";
 	}
 
-	@Override
-	protected void addParams(Bundle request) {}
-
 	@Override
 	protected void processOkResponse(Bundle response) {
 		final boolean supported = this.isSuccess();

diff --git a/AndroidBillingLibrary/src/net/robotmedia/billing/request/ConfirmNotifications.java b/AndroidBillingLibrary/src/net/robotmedia/billing/request/ConfirmNotifications.java
@@ -37,8 +37,5 @@ public String getRequestType() {
 	protected void addParams(Bundle request) {
 		request.putStringArray(KEY_NOTIFY_IDS, notifyIds);
 	}
-
-	@Override
-	protected void processOkResponse(Bundle response) {}
 
 }
diff --git a/AndroidBillingLibrary/src/net/robotmedia/billing/request/GetPurchaseInformation.java b/AndroidBillingLibrary/src/net/robotmedia/billing/request/GetPurchaseInformation.java
@@ -39,9 +39,5 @@ public String getRequestType() {
 	protected void addParams(Bundle request) {
 		request.putStringArray(KEY_NOTIFY_IDS, notifyIds);
 	}
-
-	@Override
-	protected void processOkResponse(Bundle response) {
-	}
 
 }
diff --git a/AndroidBillingLibrary/src/net/robotmedia/billing/request/RestoreTransactions.java b/AndroidBillingLibrary/src/net/robotmedia/billing/request/RestoreTransactions.java
@@ -15,7 +15,7 @@
 
 package net.robotmedia.billing.request;
 
-import android.os.Bundle;
+import net.robotmedia.billing.BillingController;
 
 public class RestoreTransactions extends BillingRequest {
 
@@ -29,11 +29,13 @@ public RestoreTransactions(String packageName) {
 	public String getRequestType() {
 		return "RESTORE_TRANSACTIONS";
 	}
-
-	@Override
-	protected void addParams(Bundle request) {}
-
+
 	@Override
-	protected void processOkResponse(Bundle response) {}
+	public void onResponseCode(int responseCode) {
+		super.onResponseCode(responseCode);
+		if (ResponseCode.isResponseOk(responseCode)) {
+			BillingController.onTransactionsRestored(this);
+		}
+	}
 
 }
diff --git a/AndroidBillingLibrary/src/net/robotmedia/billing/utils/Compatibility.java b/AndroidBillingLibrary/src/net/robotmedia/billing/utils/Compatibility.java
@@ -15,15 +15,18 @@
 
 package net.robotmedia.billing.utils;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 import android.app.Activity;
+import android.app.Service;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.util.Log;
 
 public class Compatibility {
     private static Method startIntentSender;
+    public static int START_NOT_STICKY;
     @SuppressWarnings("rawtypes")
 	private static final Class[] START_INTENT_SENDER_SIG = new Class[] {
         IntentSender.class, Intent.class, int.class, int.class, int.class
@@ -34,7 +37,13 @@ public class Compatibility {
 	};
 
 	private static void initCompatibility() {
-        try {
+		try {
+			final Field field = Service.class.getField("START_NOT_STICKY");
+			START_NOT_STICKY = field.getInt(null);
+		} catch (Exception e) {
+			START_NOT_STICKY = 2;			
+		}
+		try {
         	startIntentSender = Activity.class.getMethod("startIntentSender",
                     START_INTENT_SENDER_SIG);
         } catch (SecurityException e) {

diff --git a/AndroidBillingLibraryTest/src/net/robotmedia/billing/BillingControllerTest.java b/AndroidBillingLibraryTest/src/net/robotmedia/billing/BillingControllerTest.java
@@ -15,14 +15,19 @@
 
 package net.robotmedia.billing;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import net.robotmedia.billing.model.BillingDB;
 import net.robotmedia.billing.model.BillingDBTest;
 import net.robotmedia.billing.model.Transaction;
 import net.robotmedia.billing.model.TransactionTest;
+import net.robotmedia.billing.request.RestoreTransactions;
+import android.app.PendingIntent;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.SmallTest;
 
 public class BillingControllerTest extends AndroidTestCase {
 
@@ -99,4 +104,27 @@ public void testGetTransactionsString() throws Exception {
 		final List<Transaction> transactions2 = BillingController.getTransactions(getContext(), TransactionTest.TRANSACTION_1.productId);
 		assertEquals(transactions2.size(), 1);
 	}
+
+	@SmallTest
+	public void testOnTransactionRestored() throws Exception {
+		final Set<Boolean> flags = new HashSet<Boolean>();
+		final IBillingObserver observer = new IBillingObserver() {
+
+			@Override
+			public void onTransactionsRestored() {
+				flags.add(true);
+			}
+
+			public void onPurchaseRefunded(String itemId) {}
+			public void onPurchaseIntent(String itemId, PendingIntent purchaseIntent) {}
+			public void onPurchaseExecuted(String itemId) {}
+			public void onPurchaseCancelled(String itemId) {}
+			public void onBillingChecked(boolean supported) {}
+		};
+		BillingController.registerObserver(observer);
+		final RestoreTransactions request = new RestoreTransactions(getContext().getPackageName());
+		BillingController.onTransactionsRestored(request);
+		assertEquals(flags.size(), 1);
+		BillingController.unregisterObserver(observer);
+	}
 }
diff --git a/AndroidBillingLibraryTest/src/net/robotmedia/billing/MockBillingActivity.java b/AndroidBillingLibraryTest/src/net/robotmedia/billing/MockBillingActivity.java
@@ -53,4 +53,9 @@ public String getPublicKey() {
 		return null;
 	}
 
+	@Override
+	public void onTransactionsRestored() {
+		// TODO Auto-generated method stub
+	}
+
 }
diff --git a/AndroidBillingLibraryTest/src/net/robotmedia/billing/utils/CompatibilityTest.java b/AndroidBillingLibraryTest/src/net/robotmedia/billing/utils/CompatibilityTest.java
@@ -0,0 +1,14 @@
+package net.robotmedia.billing.utils;
+
+import android.app.Service;
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+public class CompatibilityTest extends AndroidTestCase {
+
+	@SmallTest
+	public void testStartNotSticky() throws Exception {
+		assertEquals(Compatibility.START_NOT_STICKY, Service.START_NOT_STICKY);
+	}
+
+}
diff --git a/DungeonsRedux/.classpath b/DungeonsRedux/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="src" path="AndroidBillingLibrary_src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/DungeonsRedux/.gitignore b/DungeonsRedux/.gitignore
@@ -0,0 +1,2 @@
+bin
+gen