Added purchase check

app/src/main/java/eu/faircode/email/ActivityBilling.java

@@ -31,6 +31,7 @@ import android.provider.Settings;
 import android.util.Base64;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
@@ -48,6 +49,8 @@ import com.android.billingclient.api.BillingResult;
 import com.android.billingclient.api.ConsumeParams;
 import com.android.billingclient.api.ConsumeResponseListener;
 import com.android.billingclient.api.Purchase;
+import com.android.billingclient.api.PurchaseHistoryRecord;
+import com.android.billingclient.api.PurchaseHistoryResponseListener;
 import com.android.billingclient.api.PurchasesUpdatedListener;
 import com.android.billingclient.api.SkuDetails;
 import com.android.billingclient.api.SkuDetailsParams;
@@ -70,6 +73,7 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
     private List<IBillingListener> listeners = new ArrayList<>();
 
     static final String ACTION_PURCHASE = BuildConfig.APPLICATION_ID + ".ACTION_PURCHASE";
+    static final String ACTION_PURCHASE_CHECK = BuildConfig.APPLICATION_ID + ".ACTION_PURCHASE_CHECK";
     static final String ACTION_ACTIVATE_PRO = BuildConfig.APPLICATION_ID + ".ACTIVATE_PRO";
 
     @Override
@@ -93,6 +97,7 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
         LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
         IntentFilter iff = new IntentFilter();
         iff.addAction(ACTION_PURCHASE);
+        iff.addAction(ACTION_PURCHASE_CHECK);
         iff.addAction(ACTION_ACTIVATE_PRO);
         lbm.registerReceiver(receiver, iff);
 
@@ -114,6 +119,7 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
         super.onDestroy();
     }
 
+    @NonNull
     static String getSkuPro() {
         if (BuildConfig.DEBUG)
             return "android.test.purchased";
@@ -150,6 +156,8 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
             if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
                 if (ACTION_PURCHASE.equals(intent.getAction()))
                     onPurchase(intent);
+                else if (ACTION_PURCHASE_CHECK.equals(intent.getAction()))
+                    onPurchaseCheck(intent);
                 else if (ACTION_ACTIVATE_PRO.equals(intent.getAction()))
                     onActivatePro(intent);
             }
@@ -173,6 +181,26 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
             Helper.view(this, getIntentPro());
     }
 
+    private void onPurchaseCheck(Intent intent) {
+        billingClient.queryPurchaseHistoryAsync(BillingClient.SkuType.INAPP, new PurchaseHistoryResponseListener() {
+            @Override
+            public void onPurchaseHistoryResponse(BillingResult result, List<PurchaseHistoryRecord> records) {
+                String text = getBillingResponseText(result);
+                Log.i("IAB history response=" + text);
+
+                if (result.getResponseCode() == BillingClient.BillingResponseCode.OK) {
+                    for (PurchaseHistoryRecord record : records)
+                        Log.i("IAB history=" + record.toString());
+
+                    queryPurchases();
+
+                    ToastEx.makeText(ActivityBilling.this, R.string.title_setup_done, Toast.LENGTH_LONG).show();
+                } else
+                    notifyError(text);
+            }
+        });
+    }
+
     private void onActivatePro(Intent intent) {
         try {
             Uri data = intent.getParcelableExtra("uri");
@@ -208,6 +236,9 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
             Log.i("IAB connected response=" + text);
 
             if (result.getResponseCode() == BillingClient.BillingResponseCode.OK) {
+                for (IBillingListener listener : listeners)
+                    listener.onConnected();
+
                 backoff = 4;
                 queryPurchases();
             } else
@@ -216,8 +247,12 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
 
         @Override
         public void onBillingServiceDisconnected() {
+            for (IBillingListener listener : listeners)
+                listener.onDisconnected();
+
             backoff *= 2;
             Log.i("IAB disconnected retry in " + backoff + " s");
+
             new Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
@@ -251,6 +286,10 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
     }
 
     interface IBillingListener {
+        void onConnected();
+
+        void onDisconnected();
+
         void onSkuDetails(String sku, String price);
 
         void onPurchasePending(String sku);
@@ -265,10 +304,13 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
         listeners.add(listener);
 
         if (billingClient != null)
-            if (billingClient.isReady())
+            if (billingClient.isReady()) {
+                listener.onConnected();
                 queryPurchases();
-            else
+            } else {
+                listener.onDisconnected();
                 billingClient.startConnection(billingClientStateListener);
+            }
 
         owner.getLifecycle().addObserver(new LifecycleObserver() {
             @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
@@ -294,6 +336,7 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
             for (Purchase purchase : purchases)
                 try {
                     query.remove(purchase.getSku());
+
                     boolean purchased = (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED);
                     long time = purchase.getPurchaseTime();
                     Log.i("IAB SKU=" + purchase.getSku() + " purchased=" + purchased + " time=" + new Date(time));
@@ -312,25 +355,27 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
                     if (!purchased)
                         continue;
 
-                    byte[] decodedKey = Base64.decode(getString(R.string.public_key), Base64.DEFAULT);
+                    if (getSkuPro().equals(purchase.getSku())) {
-                    KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+                        byte[] decodedKey = Base64.decode(getString(R.string.public_key), Base64.DEFAULT);
-                    PublicKey publicKey = keyFactory.generatePublic(new X509EncodedKeySpec(decodedKey));
+                        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
-                    Signature sig = Signature.getInstance("SHA1withRSA");
+                        PublicKey publicKey = keyFactory.generatePublic(new X509EncodedKeySpec(decodedKey));
-                    sig.initVerify(publicKey);
+                        Signature sig = Signature.getInstance("SHA1withRSA");
-                    sig.update(purchase.getOriginalJson().getBytes());
+                        sig.initVerify(publicKey);
-                    if (sig.verify(Base64.decode(purchase.getSignature(), Base64.DEFAULT))) {
+                        sig.update(purchase.getOriginalJson().getBytes());
-                        if (getSkuPro().equals(purchase.getSku())) {
+                        if (sig.verify(Base64.decode(purchase.getSignature(), Base64.DEFAULT))) {
-                            if (purchase.isAcknowledged()) {
+                            if (getSkuPro().equals(purchase.getSku())) {
-                                Log.i("IAB valid signature");
+                                if (purchase.isAcknowledged()) {
-                                editor.putBoolean("pro", true);
+                                    Log.i("IAB valid signature");
-                            } else
+                                    editor.putBoolean("pro", true);
-                                acknowledgePurchase(purchase);
+                                } else
-                        }
+                                    acknowledgePurchase(purchase);
+                            }
 
-                    } else {
+                        } else {
-                        Log.w("IAB invalid signature");
+                            Log.w("IAB invalid signature");
-                        editor.putBoolean("pro", false);
+                            editor.putBoolean("pro", false);
-                        notifyError("Invalid purchase");
+                            notifyError("Invalid purchase");
+                        }
                     }
                 } catch (Throwable ex) {
                     Log.e(ex);

app/src/main/java/eu/faircode/email/FragmentPro.java

@@ -45,6 +45,7 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
     private Button btnPurchase;
     private TextView tvPrice;
     private TextView tvPriceHint;
+    private Button btnCheck;
 
     @Override
     @Nullable
@@ -59,6 +60,7 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
         btnPurchase = view.findViewById(R.id.btnPurchase);
         tvPrice = view.findViewById(R.id.tvPrice);
         tvPriceHint = view.findViewById(R.id.tvPriceHint);
+        btnCheck = view.findViewById(R.id.btnCheck);
 
         tvList.setText(HtmlHelper.fromHtml(
                 "<a href=\"" + BuildConfig.PRO_FEATURES_URI + "\">" + Html.escapeHtml(getString(R.string.title_pro_list)) + "</a>"));
@@ -68,16 +70,26 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
             @Override
             public void onClick(View view) {
                 LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
-                lbm.sendBroadcast(new Intent(ActivityView.ACTION_PURCHASE));
+                lbm.sendBroadcast(new Intent(ActivityBilling.ACTION_PURCHASE));
             }
         });
 
         tvPriceHint.setMovementMethod(LinkMovementMethod.getInstance());
 
+        btnCheck.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
+                lbm.sendBroadcast(new Intent(ActivityBilling.ACTION_PURCHASE_CHECK));
+            }
+        });
+
         tvPending.setVisibility(View.GONE);
         tvActivated.setVisibility(View.GONE);
         btnPurchase.setEnabled(false);
         tvPrice.setText(null);
+        btnCheck.setEnabled(false);
+        btnCheck.setVisibility(Helper.isPlayStoreInstall(getContext()) ? View.VISIBLE : View.GONE);
 
         return view;
     }
@@ -87,6 +99,16 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
         super.onActivityCreated(savedInstanceState);
 
         addBillingListener(new ActivityBilling.IBillingListener() {
+            @Override
+            public void onConnected() {
+                btnCheck.setEnabled(true);
+            }
+
+            @Override
+            public void onDisconnected() {
+                btnCheck.setEnabled(false);
+            }
+
             @Override
             public void onSkuDetails(String sku, String price) {
                 if (ActivityBilling.getSkuPro().equals(sku)) {

app/src/main/res/layout/fragment_pro.xml

@@ -97,6 +97,18 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvHint" />
+
+            <Button
+                android:id="@+id/btnCheck"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:minWidth="0dp"
+                android:minHeight="0dp"
+                android:text="@string/title_check"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tvPriceHint" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>