Chore/legacy message

.github/workflows/secret.scan.yml

@@ -0,0 +1,32 @@
+name: CB Secret PR Scan
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  scan:
+    name: Secret PR Scan
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get the file name changed in the PR
+        id: pr_files
+        run: |
+          changed_files=$(curl -s -H "Authorization: token ${{
+          secrets.GITHUB_TOKEN }}" \
+            -H "Accept: application/vnd.github.v3+json" \
+            https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files | jq -r '.[].filename')
+          echo "Changed files: $changed_files"
+
+          echo "CHANGED_FILES<<EOF"$'\n'"$changed_files"$'\n'EOF >> $GITHUB_OUTPUT
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: gitleaks/gitleaks-action@v2
+        env:
+          GITLEAKS_ENABLE_UPLOAD_ARTIFACT: false
+          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          GITLEAKS_LICENSE: '${{ secrets.GITLEAKS_LICENSE }}'
+          GITLEAKS_ENABLE_SUMMARY: false

app/build.gradle

@@ -1,27 +1,26 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     defaultConfig {
         applicationId "com.chargebee.example"
-        minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 3
+        minSdkVersion 24
+        targetSdkVersion 33
+        versionCode 6
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -41,7 +40,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.1.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     implementation 'com.google.code.gson:gson:2.8.8'
 

app/src/main/AndroidManifest.xml

@@ -17,12 +17,13 @@
         <activity android:name="com.chargebee.example.token.TokenizeActivity" />
         <activity android:name="com.chargebee.example.plan.PlanInJavaActivity">
         </activity>
-        <activity android:name=".billing.BillingActivity"/>
-        <activity android:name=".items.ItemsActivity"/>
-        <activity android:name=".items.ItemActivity"/>
-        <activity android:name=".plan.PlansActivity"/>
-        <activity android:name=".subscription.SubscriptionActivity"/>
-        <activity android:name="com.chargebee.example.MainActivity">
+        <activity android:name="com.chargebee.example.billing.BillingActivity"/>
+        <activity android:name="com.chargebee.example.items.ItemsActivity"/>
+        <activity android:name="com.chargebee.example.items.ItemActivity"/>
+        <activity android:name="com.chargebee.example.plan.PlansActivity"/>
+        <activity android:name="com.chargebee.example.subscription.SubscriptionActivity"/>
+        <activity android:name="com.chargebee.example.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/chargebee/example/ExampleApplication.kt

@@ -2,22 +2,112 @@ package com.chargebee.example
 
 import android.app.Application
 import android.content.Context
-import android.net.ConnectivityManager
-import com.chargebee.android.Chargebee
+import android.content.SharedPreferences
+import android.util.Log
+import com.chargebee.android.billingservice.CBCallback
+import com.chargebee.android.billingservice.CBPurchase
+import com.chargebee.android.billingservice.OneTimeProductType
+import com.chargebee.android.billingservice.ProductType
+import com.chargebee.android.exceptions.CBException
+import com.chargebee.android.models.CBProduct
+import com.chargebee.android.models.NonSubscription
+import com.chargebee.android.network.CBCustomer
+import com.chargebee.android.network.ReceiptDetail
+import com.chargebee.example.util.NetworkUtil
 
-class ExampleApplication: Application() {
+class ExampleApplication : Application(), NetworkUtil.NetworkListener {
+    private lateinit var networkUtil: NetworkUtil
+    private var sharedPreference: SharedPreferences? = null
+    lateinit var mContext: Context
+    private val customer = CBCustomer(
+        id = "sync_receipt_android",
+        firstName = "Test",
+        lastName = "Purchase",
+        email = "testreceipt@gmail.com"
+    )
 
     override fun onCreate() {
         super.onCreate()
+        mContext = this
+        networkUtil = NetworkUtil(mContext, this)
+        networkUtil.registerCallbackEvents()
+        sharedPreference = mContext.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+    }
+
+    override fun onNetworkConnectionAvailable() {
+        val productId = sharedPreference?.getString("productId", "")
+        if (productId?.isNotEmpty() == true) {
+            val productList = ArrayList<String>()
+            productList.add(productId)
+            retrieveProducts(productList)
+        }
+    }
+
+    override fun onNetworkConnectionLost() {
+        Log.e(javaClass.simpleName, "Network connectivity not available")
+    }
 
-        if (isInternetAvailable(this))
-        // Please add site/app details as required
-        Chargebee.configure(site = "", publishableApiKey= "",sdkKey= "", packageName = this.packageName)
+    private fun retrieveProducts(productIdList: ArrayList<String>) {
+        CBPurchase.retrieveProducts(
+            this,
+            productIdList,
+            object : CBCallback.ListProductsCallback<ArrayList<CBProduct>> {
+                override fun onSuccess(productIDs: ArrayList<CBProduct>) {
+                    if (productIDs.first().type == ProductType.SUBS)
+                        validateReceipt(mContext, productIDs.first())
+                    else
+                        validateNonSubscriptionReceipt(mContext, productIDs.first())
+                }
 
+                override fun onError(error: CBException) {
+                    Log.e(javaClass.simpleName, "Exception:  $error")
+                }
+            })
     }
 
-    private fun isInternetAvailable(context: Context): Boolean {
-        val conMgr = context.getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager
-        return conMgr.activeNetworkInfo != null
+    private fun validateReceipt(context: Context, product: CBProduct) {
+
+        CBPurchase.validateReceipt(
+            context = context,
+            product = product,
+            customer = customer,
+            completionCallback = object : CBCallback.PurchaseCallback<String> {
+                override fun onSuccess(result: ReceiptDetail, status: Boolean) {
+                    // Clear the local cache once receipt validation success
+                    val editor = sharedPreference?.edit()
+                    editor?.clear()?.apply()
+                    Log.i(javaClass.simpleName, "Subscription ID:  ${result.subscription_id}")
+                    Log.i(javaClass.simpleName, "Plan ID:  ${result.plan_id}")
+                    Log.i(javaClass.simpleName, "Customer ID:  ${result.customer_id}")
+                    Log.i(javaClass.simpleName, "Status:  $status")
+                }
+
+                override fun onError(error: CBException) {
+                    Log.e(javaClass.simpleName, "Exception :$error")
+                }
+            })
+    }
+
+    private fun validateNonSubscriptionReceipt(context: Context, product: CBProduct) {
+        CBPurchase.validateReceiptForNonSubscriptions(
+            context = context,
+            product = product,
+            customer = customer,
+            productType = OneTimeProductType.CONSUMABLE,
+            completionCallback = object : CBCallback.OneTimePurchaseCallback {
+                override fun onSuccess(result: NonSubscription, status: Boolean) {
+                    // Clear the local cache once receipt validation success
+                    val editor = sharedPreference?.edit()
+                    editor?.clear()?.apply()
+                    Log.i(javaClass.simpleName, "Subscription ID:  ${result.invoiceId}")
+                    Log.i(javaClass.simpleName, "Plan ID:  ${result.chargeId}")
+                    Log.i(javaClass.simpleName, "Customer ID:  ${result.customerId}")
+                    Log.i(javaClass.simpleName, "Status:  $status")
+                }
+
+                override fun onError(error: CBException) {
+                    Log.e(javaClass.simpleName, "Exception :$error")
+                }
+            })
     }
 }

app/src/main/java/com/chargebee/example/MainActivity.kt

@@ -17,7 +17,7 @@ import com.chargebee.android.Chargebee
 import com.chargebee.android.billingservice.CBCallback
 import com.chargebee.android.billingservice.CBPurchase
 import com.chargebee.android.exceptions.CBException
-import com.chargebee.android.exceptions.CBProductIDResult
+import com.chargebee.android.exceptions.ChargebeeResult
 import com.chargebee.android.models.CBProduct
 import com.chargebee.example.adapter.ListItemsAdapter
 import com.chargebee.example.addon.AddonActivity
@@ -38,12 +38,12 @@ import kotlinx.coroutines.launch
 
 class MainActivity : BaseActivity(), ListItemsAdapter.ItemClickListener {
     private var mItemsRecyclerView: RecyclerView? = null
-    private var list  = arrayListOf<String>()
+    private var list = arrayListOf<String>()
     var listItemsAdapter: ListItemsAdapter? = null
     var featureList = mutableListOf<CBMenu>()
     var mContext: Context? = null
     private val gson = Gson()
-    private var mBillingViewModel : BillingViewModel? = null
+    private var mBillingViewModel: BillingViewModel? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -73,9 +73,18 @@ class MainActivity : BaseActivity(), ListItemsAdapter.ItemClickListener {
             Log.i(javaClass.simpleName, "Google play product identifiers:  $it")
             alertListProductId(it)
         }
+
+        this.mBillingViewModel!!.restorePurchaseResult.observeForever {
+            hideProgressDialog()
+            if (it.isNotEmpty()) {
+                alertSuccess("${it.size} purchases restored successfully")
+            } else {
+                alertSuccess("Purchases not found to restore")
+            }
+        }
     }
 
-    private fun setListAdapter(){
+    private fun setListAdapter() {
         featureList = CBMenu.values().toMutableList()
         listItemsAdapter = ListItemsAdapter(featureList, this)
         val layoutManager: RecyclerView.LayoutManager = LinearLayoutManager(applicationContext)
@@ -85,7 +94,7 @@ class MainActivity : BaseActivity(), ListItemsAdapter.ItemClickListener {
     }
 
     override fun onItemClick(view: View?, position: Int) {
-        when(CBMenu.valueOf(featureList.get(position).toString()).value){
+        when (CBMenu.valueOf(featureList.get(position).toString()).value) {
             CBMenu.Configure.value -> {
                 if (view != null) {
                     onClickConfigure(view)
@@ -132,8 +141,13 @@ class MainActivity : BaseActivity(), ListItemsAdapter.ItemClickListener {
             CBMenu.GetEntitlements.value -> {
                 getSubscriptionId()
             }
-            else ->{
-                Log.i(javaClass.simpleName, " Not implemented" )
+            CBMenu.RestorePurchase.value -> {
+                mBillingViewModel?.restorePurchases(this)
+            }
+            CBMenu.ManageSubscription.value ->
+                Chargebee.showManageSubscriptionsSettings(context = this, productId = "chargebee.pro.mobile",packageName = this.packageName)
+            else -> {
+                Log.i(javaClass.simpleName, " Not implemented")
             }
         }
     }
@@ -148,9 +162,9 @@ class MainActivity : BaseActivity(), ListItemsAdapter.ItemClickListener {
         val builder = AlertDialog.Builder(this)
         val inflater = layoutInflater
         val dialogLayout = inflater.inflate(R.layout.activity_configure, null)
-        val siteNameEditText  = dialogLayout.findViewById<EditText>(R.id.etv_siteName)
-        val apiKeyEditText  = dialogLayout.findViewById<EditText>(R.id.etv_apikey)
-        val sdkKeyEditText  = dialogLayout.findViewById<EditText>(R.id.etv_sdkkey)
+        val siteNameEditText = dialogLayout.findViewById<EditText>(R.id.etv_siteName)
+        val apiKeyEditText = dialogLayout.findViewById<EditText>(R.id.etv_apikey)
+        val sdkKeyEditText = dialogLayout.findViewById<EditText>(R.id.etv_sdkkey)
         builder.setView(dialogLayout)
         builder.setPositiveButton("Initialize") { _, i ->
 
@@ -159,11 +173,20 @@ class MainActivity : BaseActivity(), ListItemsAdapter.ItemClickListener {
                 ) && !TextUtils.isEmpty(sdkKeyEditText.text.toString())
             )
                 Chargebee.configure(
-                    siteNameEditText.text.toString(),
-                    apiKeyEditText.text.toString(),
-                    true,
-                    sdkKeyEditText.text.toString(), this.packageName
-                )
+                    site = siteNameEditText.text.toString(),
+                    publishableApiKey = apiKeyEditText.text.toString(),
+                    sdkKey = sdkKeyEditText.text.toString(),
+                    packageName = this.packageName
+                ) {
+                    when (it) {
+                        is ChargebeeResult.Success -> {
+                            Log.i(javaClass.simpleName, "Configured")
+                        }
+                        is ChargebeeResult.Error -> {
+                            Log.e(javaClass.simpleName, " Failed")
+                        }
+                    }
+                }
         }
         builder.show()
     }
@@ -182,28 +205,29 @@ class MainActivity : BaseActivity(), ListItemsAdapter.ItemClickListener {
         }
         dialog.show()
     }
-    private fun getProductIdList(productIdList: ArrayList<String>){
+
+    private fun getProductIdList(productIdList: ArrayList<String>) {
         CBPurchase.retrieveProducts(
             this,
             productIdList,
             object : CBCallback.ListProductsCallback<ArrayList<CBProduct>> {
                 override fun onSuccess(productIDs: ArrayList<CBProduct>) {
                     CoroutineScope(Dispatchers.Main).launch {
                         if (productIDs.size > 0) {
-                                launchProductDetailsScreen(gson.toJson(productIDs))
+                            launchProductDetailsScreen(gson.toJson(productIDs))
                         } else {
                             alertSuccess("Items not available to buy")
                         }
                     }
                 }
+
                 override fun onError(error: CBException) {
                     Log.e(javaClass.simpleName, "Error:  ${error.message}")
                     showDialog(getCBError(error))
                 }
             })
     }
 
-
     private fun alertListProductId(list: Array<String>) {
         val builder = AlertDialog.Builder(this)
         builder.setTitle("Chargebee Product IDs")
@@ -215,7 +239,7 @@ class MainActivity : BaseActivity(), ListItemsAdapter.ItemClickListener {
                     javaClass.simpleName,
                     " Item clicked :" + list[which] + " position :" + which
                 )
-                val productIdList =  ArrayList<String>()
+                val productIdList = ArrayList<String>()
                 productIdList.add(list[which].trim())
                 getProductIdList(productIdList)
             }