Correctly handled service disconnection, informing Unity and disposing objects.

Author: AliA74

JavaPlugin/build.gradle

@@ -5,7 +5,7 @@ buildscript {
 		jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
     }
 }
 
@@ -20,12 +20,12 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 33
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -35,6 +35,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
+
+    lintOptions {
+        tasks.lint.enabled = false
+    }
 
     buildTypes {
         release {

JavaPlugin/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
     <application>
         <activity
             android:name=".BazaarIABProxyActivity"
-            android:label="BazaarIAB" >
+            android:label="BazaarIAB" android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

JavaPlugin/src/main/java/com/bazaar/BazaarIABPlugin.java

@@ -83,6 +83,12 @@ public void onIabSetupFinished(IabResult result)
 					mHelper = null;
 				}
 			}
+
+			public void onServiceDisconnected()
+			{
+				//inform Unity about service disconnect, client should reconnect again
+				UnitySendMessage(BazaarUnityCallbacks.SERVICE_DISCONNECTED, "");
+			}
 		});
 	}
 

JavaPlugin/src/main/java/com/bazaar/BazaarUnityCallbacks.java

@@ -14,4 +14,6 @@ public class BazaarUnityCallbacks {
     public static final String PURCHASE_SUCCEEDED = "purchaseSucceeded";
     public static final String CONSUME_PURCHASE_FAILED = "consumePurchaseFailed";
     public static final String CONSUME_PURCHASE_SUCCEEDED = "consumePurchaseSucceeded";
+
+    public static final String SERVICE_DISCONNECTED = "serviceDisconnected";
 }

JavaPlugin/src/main/java/com/bazaar/util/BroadcastIAB.java

@@ -5,6 +5,7 @@
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.RemoteException;
 import com.bazaar.util.communication.BillingSupportCommunication;
@@ -79,7 +80,12 @@ public class BroadcastIAB extends IAB {
     boolean connect(Context context, OnConnectListener listener) {
 
         try {
-            PackageInfo pInfo = context.getPackageManager().getPackageInfo(BAZAAR_PACKAGE_NAME, 0);
+            int flags = 0;
+            if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+            {
+                flags = PackageManager.MATCH_ALL;
+            }
+            PackageInfo pInfo = context.getPackageManager().getPackageInfo(BAZAAR_PACKAGE_NAME, flags);
             int versionCode;
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
                 versionCode = (int) pInfo.getLongVersionCode();

JavaPlugin/src/main/java/com/bazaar/util/IabHelper.java

@@ -22,6 +22,8 @@
 import android.os.Handler;
 import android.os.RemoteException;
 import android.text.TextUtils;
+import android.util.Log;
+
 import com.bazaar.util.communication.BillingSupportCommunication;
 import com.bazaar.util.communication.OnConnectListener;
 import java.util.ArrayList;
@@ -120,6 +122,8 @@ public class IabHelper {
     public static final String GET_SKU_DETAILS_ITEM_LIST = "ITEM_ID_LIST";
     public static final String GET_SKU_DETAILS_ITEM_TYPE_LIST = "ITEM_TYPE_LIST";
 
+    public static final String TAG = "[BazaarAIB][Plugin]";
+
     /**
      * Creates an instance. After creation, it will not yet be ready to use. You must perform
      * setup by calling {@link #startSetup} and wait for setup to complete. This constructor does not
@@ -161,8 +165,11 @@ public interface OnIabSetupFinishedListener {
          * @param result The result of the setup process.
          */
         public void onIabSetupFinished(IabResult result);
+
+        public void onServiceDisconnected();
     }
 
+
     /**
      * Starts the setup process. This will start up the setup process asynchronously.
      * You will be notified through the listener when the setup process is complete.
@@ -180,9 +187,22 @@ public void startSetup(final OnIabSetupFinishedListener listener) {
 
         OnConnectListener connectListener = new OnConnectListener() {
             @Override
-            public void connected(IAB iabService) {
+            public void connected(IAB iabService)
+            {
                 checkBillingSupported(listener, iabService);
             }
+
+            @Override
+            public void disconnected(IAB iabService)
+            {
+                //dispose current connection and helper
+                if(iabConnection == iabService)
+                {
+                    dispose();
+
+                    listener.onServiceDisconnected();
+                }
+            }
         };
 
         IAB serviceIAB = new ServiceIAB(logger);

JavaPlugin/src/main/java/com/bazaar/util/ServiceIAB.java

@@ -9,6 +9,7 @@
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
@@ -59,13 +60,14 @@ public boolean connect(Context context, final OnConnectListener listener) {
             @Override
             public void onServiceDisconnected(ComponentName name) {
                 logger.logDebug("Billing service disconnected.");
-                mService = null;
+                listener.disconnected(myIabService);
             }
 
             @Override
             public void onServiceConnected(ComponentName name, IBinder service) {
                 logger.logDebug("Billing service connected.");
-                if (disposed()) {
+                if (disposed())
+                {
                     return;
                 }
                 mSetupDone = true;
@@ -78,8 +80,13 @@ public void onServiceConnected(ComponentName name, IBinder service) {
         Intent serviceIntent = new Intent("ir.cafebazaar.pardakht.InAppBillingService.BIND");
         serviceIntent.setPackage(BAZAAR_PACKAGE_NAME);
 
+        int flags = 0;
+        if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+        {
+            flags = PackageManager.MATCH_ALL;
+        }
         PackageManager pm = context.getPackageManager();
-        List<ResolveInfo> intentServices = pm.queryIntentServices(serviceIntent, 0);
+        List<ResolveInfo> intentServices = pm.queryIntentServices(serviceIntent, flags);
         if (!intentServices.isEmpty()) {
             // service available to handle that Intent
             return context.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);

JavaPlugin/src/main/java/com/bazaar/util/communication/OnConnectListener.java

@@ -4,4 +4,6 @@
 
 public interface OnConnectListener {
     void connected(IAB iabService);
+
+    void disconnected(IAB iabService);
 }