chore(android): remove unnecessary dependency to oscore and oscordova (#72)

* chore(android): remove unnecessary dependencies to `oscore` and `oscordova`

References: https://outsystemsrd.atlassian.net/browse/RMET-4900

* chore(release): raise to version 1.2.14

Author: alexgerardojacinto

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 The changes documented here do not include those from the original repository.
 
+## 1.2.14
+
+### Chores
+
+- (android) remove unecessary dependency to `oscore` and `oscordova` on Android (https://outsystemsrd.atlassian.net/browse/RMET-4900)
+
 ## 1.2.13
 
 ### Chores

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.outsystems.payments",
-  "version": "1.2.12",
+  "version": "1.2.14",
   "description": "OutSystems-owned plugin for mobile payments",
   "keywords": [
     "ecosystem:cordova",

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin id="com.outsystems.payments" version="1.2.12" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="com.outsystems.payments" version="1.2.14" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
   <name>OSPayments</name>
   <description>OutSystems-owned plugin for mobile payments</description>
   <author>OutSystems Inc</author>

src/android/com/outsystems/payments/OSPayments.kt

@@ -3,7 +3,6 @@ package com.outsystems.payments
 import android.app.Activity
 import android.content.Intent
 import com.google.gson.Gson
-import com.outsystems.plugins.oscordova.CordovaImplementation
 import com.outsystems.plugins.payments.controller.OSPMTGooglePayManager
 import com.outsystems.plugins.payments.controller.OSPMTGooglePlayHelper
 import com.outsystems.plugins.payments.controller.OSPMTController
@@ -13,12 +12,16 @@ import com.outsystems.plugins.payments.model.PaymentDetails
 import com.outsystems.plugins.payments.model.Tokenization
 import org.apache.cordova.CallbackContext
 import org.apache.cordova.CordovaInterface
+import org.apache.cordova.CordovaPlugin
 import org.apache.cordova.CordovaWebView
+import org.apache.cordova.PluginResult
+import org.apache.cordova.PluginResult.Status
 import org.json.JSONArray
+import org.json.JSONObject
 
-class OSPayments : CordovaImplementation() {
+class OSPayments : CordovaPlugin() {
 
-    override var callbackContext: CallbackContext? = null
+    var callbackContext: CallbackContext? = null
     private lateinit var googlePayManager: OSPMTGooglePayManager
     private lateinit var paymentsController: OSPMTController
     private lateinit var googlePlayHelper: OSPMTGooglePlayHelper
@@ -47,9 +50,9 @@ class OSPayments : CordovaImplementation() {
 
     override fun initialize(cordova: CordovaInterface, webView: CordovaWebView) {
         super.initialize(cordova, webView)
-        googlePayManager = OSPMTGooglePayManager(getActivity())
+        googlePayManager = OSPMTGooglePayManager(cordova.activity)
         googlePlayHelper = OSPMTGooglePlayHelper()
-        paymentsController = OSPMTController(googlePayManager, buildPaymentConfigurationInfo(getActivity()), googlePlayHelper)
+        paymentsController = OSPMTController(googlePayManager, buildPaymentConfigurationInfo(cordova.activity), googlePlayHelper)
     }
 
     override fun execute(action: String, args: JSONArray, callbackContext: CallbackContext): Boolean {
@@ -70,7 +73,7 @@ class OSPayments : CordovaImplementation() {
     }
 
     private fun setupConfiguration(args: JSONArray) {
-        paymentsController.setupConfiguration(getActivity(), args.get(0).toString(),
+        paymentsController.setupConfiguration(cordova.activity, args.get(0).toString(),
             {
                 sendPluginResult(it, null)
             },
@@ -81,7 +84,7 @@ class OSPayments : CordovaImplementation() {
     }
 
     private fun checkWalletSetup(){
-        paymentsController.verifyIfWalletIsSetup(getActivity(),
+        paymentsController.verifyIfWalletIsSetup(cordova.activity,
             {
                 sendPluginResult(it, null)
             }, {
@@ -91,12 +94,12 @@ class OSPayments : CordovaImplementation() {
     }
 
     private fun setDetailsAndTriggerPayment(args: JSONArray){
-        setAsActivityResultCallback()
+        cordova.setActivityResultCallback(this)
 
         paymentDetails = buildPaymentDetails(args)
 
         if(paymentDetails != null){
-            paymentsController.setDetailsAndTriggerPayment(getActivity(), paymentDetails!!, args.getString(1))
+            paymentsController.setDetailsAndTriggerPayment(cordova.activity, paymentDetails!!, args.getString(1))
         }
         else{
             sendPluginResult(null, Pair(formatErrorCode(OSPMTError.INVALID_PAYMENT_DETAILS.code), OSPMTError.INVALID_PAYMENT_DETAILS.description))
@@ -126,11 +129,6 @@ class OSPayments : CordovaImplementation() {
         // Not used in this project.
     }
 
-    override fun areGooglePlayServicesAvailable(): Boolean {
-        // Not used in this project.
-        return false
-    }
-
     private fun formatErrorCode(code: Int): String {
         return ERROR_FORMAT_PREFIX + code.toString().padStart(4, '0')
     }
@@ -163,12 +161,26 @@ class OSPayments : CordovaImplementation() {
     private fun buildPaymentDetails(args: JSONArray) : PaymentDetails? {
         return try {
             gson.fromJson(args.getString(0), PaymentDetails::class.java)
-        } catch (e: Exception){
+        } catch (_: Exception){
             null
         }
     }
 
     private fun getStringResourceId(activity: Activity, typeAndName: String): Int {
         return activity.resources.getIdentifier(typeAndName, "string", activity.packageName)
     }
+
+    private fun <T> sendPluginResult(resultVariable: T, error: Pair<String, String>?) {
+        var pluginResult: PluginResult?
+        resultVariable?.let {
+            pluginResult = PluginResult(Status.OK, resultVariable.toString())
+            this.callbackContext?.sendPluginResult(pluginResult)
+            return
+        }
+        val jsonResult = JSONObject()
+        jsonResult.put("code", error?.first)
+        jsonResult.put("message", error?.second ?: "No Results")
+        pluginResult = PluginResult(Status.ERROR, jsonResult)
+        this.callbackContext?.sendPluginResult(pluginResult)
+    }
 }

src/android/com/outsystems/payments/build.gradle

@@ -24,8 +24,6 @@ repositories{
 }
 
 dependencies {
-    implementation("com.github.outsystems:oscore-android:1.2.0@aar")
-    implementation("com.github.outsystems:oscordova-android:2.0.1@aar")
     implementation("com.github.outsystems:ospayments-android:1.1.3@aar")
 
     implementation 'com.stripe:stripe-android:20.5.0'