Nullability and javadocs

.travis.yml

@@ -17,7 +17,7 @@ before_script:
   - adb shell input keyevent 82 &
 
 script:
-   - ./gradlew connectedCheck --project-prop sonatypeUsername=none --project-prop sonatypePassword=none --project-prop sonatypeRepo=none
+   - ./gradlew connectedCheck
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock

library/build.gradle

@@ -35,6 +35,7 @@ android {
 dependencies {
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'
+    compile 'com.android.support:support-annotations:25.3.1'
 }
 
 configurations.archives.extendsFrom configurations.default
@@ -69,8 +70,10 @@ uploadArchives {
     repositories.mavenDeployer {
         beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-        repository(url: sonatypeRepo) {
-            authentication(userName: sonatypeUsername, password: sonatypePassword)
+        if (project.hasProperty('sonatypeRepo')) {
+            repository(url: sonatypeRepo) {
+                authentication(userName: sonatypeUsername, password: sonatypePassword)
+            }
         }
 
         pom.project {

library/src/main/java/com/anjlab/android/iab/v3/BillingProcessor.java

@@ -27,6 +27,7 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -36,6 +37,7 @@
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -49,17 +51,17 @@ public class BillingProcessor extends BillingBase
 	 */
 	public interface IBillingHandler
 	{
-		void onProductPurchased(String productId, TransactionDetails details);
+		void onProductPurchased(String productId, @Nullable TransactionDetails details);
 
 		void onPurchaseHistoryRestored();
 
-		void onBillingError(int errorCode, Throwable error);
+		void onBillingError(int errorCode, @Nullable Throwable error);
 
 		void onBillingInitialized();
 	}
 
-	private static final Date DATE_MERCHANT_LIMIT_1 = new Date(2012, 12, 5); //5th December 2012
-	private static final Date DATE_MERCHANT_LIMIT_2 = new Date(2015, 7, 20); //21st July 2015
+	private static final Date DATE_MERCHANT_LIMIT_1 = new Date(1354694400000L); //5th December 2012
+	private static final Date DATE_MERCHANT_LIMIT_2 = new Date(1437375600000L); //21st July 2015
 
 	private static final int PURCHASE_FLOW_REQUEST_CODE = 32459;
 	private static final String LOG_TAG = "iabv3";
@@ -296,10 +298,14 @@ private boolean loadPurchasesByType(String type, BillingCache cacheStorage)
 		return false;
 	}
 
+	/**
+	 * Attempt to fetch purchases from the server and update our cache if successful
+	 * @return {@code true} if retrieval occurs, {@code false} otherwise
+	 * todo check if loading should return true if response code isn't successful
+	 */
 	public boolean loadOwnedPurchasesFromGoogle()
 	{
-		return isInitialized() &&
-			   loadPurchasesByType(Constants.PRODUCT_TYPE_MANAGED, cachedProducts) &&
+		return loadPurchasesByType(Constants.PRODUCT_TYPE_MANAGED, cachedProducts) &&
 			   loadPurchasesByType(Constants.PRODUCT_TYPE_SUBSCRIPTION, cachedSubscriptions);
 	}
 
@@ -328,7 +334,7 @@ public boolean subscribe(Activity activity, String productId, String developerPa
 	 *
 	 * @param activity the activity calling this method
 	 * @param productId the product id to purchase
-	 * @param extraParamsBundle A bundle object containing extra parameters to pass to
+	 * @param extraParams A bundle object containing extra parameters to pass to
 	 *                          getBuyIntentExtraParams()
 	 * @see <a href="https://developer.android.com/google/play/billing/billing_reference.html#getBuyIntentExtraParams">extra
 	 * params documentation on developer.android.com</a>
@@ -352,7 +358,7 @@ public boolean purchase(Activity activity, String productId, String developerPay
 	 *
 	 * @param activity the activity calling this method
 	 * @param productId the product id to purchase
-	 * @param extraParamsBundle A bundle object containing extra parameters to pass to getBuyIntentExtraParams()
+	 * @param extraParams A bundle object containing extra parameters to pass to getBuyIntentExtraParams()
 	 * @see <a href="https://developer.android.com/google/play/billing/billing_reference.html#getBuyIntentExtraParams">extra
 	 * params documentation on developer.android.com</a>
 	 * @return {@code false} if the billing system is not initialized, {@code productId} is empty or if an exception occurs.
@@ -610,6 +616,7 @@ private boolean purchase(Activity activity, List<String> oldProductIds, String p
 							purchaseType,
 							purchasePayload);
 				}
+				//todo check if null check should be removed or if else should be removed
 				else // API v7+ supported
 				{
 					if (extraParamsBundle == null)
@@ -735,6 +742,7 @@ private boolean checkMerchant(TransactionDetails details)
 		return merchantId.compareTo(developerMerchantId) == 0;
 	}
 
+	@Nullable
 	private TransactionDetails getPurchaseTransactionDetails(String productId, BillingCache cache)
 	{
 		PurchaseInfo details = cache.getDetails(productId);
@@ -865,11 +873,13 @@ public List<SkuDetails> getSubscriptionListingDetails(ArrayList<String> productI
 		return getSkuDetails(productIdList, Constants.PRODUCT_TYPE_SUBSCRIPTION);
 	}
 
+	@Nullable
 	public TransactionDetails getPurchaseTransactionDetails(String productId)
 	{
 		return getPurchaseTransactionDetails(productId, cachedProducts);
 	}
 
+	@Nullable
 	public TransactionDetails getSubscriptionTransactionDetails(String productId)
 	{
 		return getPurchaseTransactionDetails(productId, cachedSubscriptions);

library/src/main/java/com/anjlab/android/iab/v3/PurchaseInfo.java

@@ -48,7 +48,7 @@ public PurchaseInfo(String responseData, String signature)
     }
 
     /**
-     * @deprecated dont call it directly, use {@see purchaseData}} instead.
+     * @deprecated don't call it directly, use {@see purchaseData} instead.
      */
     @Deprecated
     public PurchaseData parseResponseData()

sample/res/values/strings.xml

@@ -2,7 +2,7 @@
 <resources>
 
     <string name="app_name">In-app Billing v3 Sample</string>
-    <string name="wait">wait...</string>
+    <string name="wait">wait…</string>
     <string name="title">Sample Activity #%d</string>
 
 </resources>