From 37dc064b28e5d4ce9ab2ca112c21078a99a979da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Cu=C3=B1ado?= Date: Fri, 2 Jun 2023 13:13:08 +0200 Subject: [PATCH 1/3] chore: adding logs --- .../handpoint/cordova/HandpointHelper.java | 66 ++++++------------- 1 file changed, 19 insertions(+), 47 deletions(-) diff --git a/src/android/com/handpoint/cordova/HandpointHelper.java b/src/android/com/handpoint/cordova/HandpointHelper.java index 0a47e73..5b5740a 100644 --- a/src/android/com/handpoint/cordova/HandpointHelper.java +++ b/src/android/com/handpoint/cordova/HandpointHelper.java @@ -1,48 +1,8 @@ package com.handpoint.cordova; import android.content.Context; - -import com.handpoint.api.HandpointCredentials; import com.handpoint.api.Hapi; -import com.handpoint.api.HapiFactory; -import com.handpoint.api.HapiManager; -import com.handpoint.api.Settings; -import com.handpoint.api.shared.AuthenticationResponse; -import com.handpoint.api.shared.CardBrands; -import com.handpoint.api.shared.ConnectionMethod; -import com.handpoint.api.shared.ConnectionStatus; -import com.handpoint.api.shared.ConverterUtil; -import com.handpoint.api.shared.Currency; import com.handpoint.api.shared.Device; -import com.handpoint.api.shared.DeviceStatus; -import com.handpoint.api.shared.EventHandler; -import com.handpoint.api.shared.Events; -import com.handpoint.api.shared.HardwareStatus; -import com.handpoint.api.shared.LogLevel; -import com.handpoint.api.shared.NetworkStatus; -import com.handpoint.api.shared.PrintError; -import com.handpoint.api.shared.ReportConfiguration; -import com.handpoint.api.shared.SignatureRequest; -import com.handpoint.api.shared.StatusInfo; -import com.handpoint.api.shared.TransactionResult; -import com.handpoint.api.shared.TransactionType; -import com.handpoint.api.shared.TypeOfResult; -import com.handpoint.api.shared.auth.HapiMPosAuthResponse; -import com.handpoint.api.shared.i18n.SupportedLocales; -import com.handpoint.api.shared.options.MerchantAuthOptions; -import com.handpoint.api.shared.options.MoToOptions; -import com.handpoint.api.shared.options.Options; -import com.handpoint.api.shared.options.RefundOptions; -import com.handpoint.api.shared.options.SaleOptions; -import com.handpoint.api.shared.OperationStartResult; -import com.handpoint.api.shared.options.RefundReversalOptions; -import com.handpoint.api.shared.options.SaleReversalOptions; - -import org.apache.cordova.CallbackContext; -import org.apache.cordova.PluginResult; -import org.json.JSONException; -import org.json.JSONObject; - import java.lang.reflect.Method; import java.math.BigInteger; import java.util.HashMap; @@ -50,6 +10,11 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; +import org.apache.cordova.CallbackContext; +import org.json.JSONObject; + + + public class HandpointHelper implements Events.PosRequired, Events.Status, Events.Log, Events.TransactionStarted, Events.AuthStatus, Events.MessageHandling, Events.PrinterEvents, Events.ReportResult, Events.CardLanguage, @@ -495,12 +460,18 @@ public void setLocale(CallbackContext callbackContext, JSONObject params) throws @Override public void endOfTransaction(TransactionResult transactionResult, Device device) { SDKEvent event = new SDKEvent("endOfTransaction"); - event.put("transactionResult", transactionResult); - event.put("device", device); - PluginResult result = new PluginResult(PluginResult.Status.OK, event.toJSONObject()); - result.setKeepCallback(true); - if (this.callbackContext != null) { - this.callbackContext.sendPluginResult(result); + // print transaction result before serializing it + if (transactionResult != null) { + Logger.getLogger("App-Detailed-Logger").warning("***[APP] -> endOfTransaction received: " + transactionResult.toJSON()); + event.put("transactionResult", transactionResult); + event.put("device", device); + PluginResult result = new PluginResult(PluginResult.Status.OK, event.toJSONObject()); + result.setKeepCallback(true); + if (this.callbackContext != null) { + this.callbackContext.sendPluginResult(result); + } + } else { + Logger.getLogger("App-Detailed-Logger").warning("***[APP] -> endOfTransaction received: null"); } } @@ -887,6 +858,7 @@ public void getPaxModel(CallbackContext callbackContext, JSONObject params) thro } } + @Override protected void finalize() { this.api.unregisterEventsDelegate(this); } @@ -896,4 +868,4 @@ private void setEventsHandler() { this.api.registerEventsDelegate(this); } -} \ No newline at end of file +} From ab5b4a33af21ecf1ba505df6220ed7df5c72f87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Cu=C3=B1ado?= Date: Fri, 2 Jun 2023 13:13:40 +0200 Subject: [PATCH 2/3] chore: 4.1.7-RC.0 --- package.json | 2 +- src/android/pax.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 7d1558a..e58a633 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-plugin-handpoint", - "version": "4.1.6-RC.0", + "version": "4.1.7-RC.0", "description": "Cordova Handpoint SDK Plugin", "cordova": { "id": "cordova-plugin-handpoint", diff --git a/src/android/pax.gradle b/src/android/pax.gradle index 6aa137a..fd18161 100644 --- a/src/android/pax.gradle +++ b/src/android/pax.gradle @@ -18,8 +18,8 @@ repositories{ dependencies { implementation 'com.google.code.gson:gson:2.8.5' implementation 'org.slf4j:slf4j-android:1.7.25' - implementation ('com.handpoint.api:private-sdk:7.1001.4-RC.0') { changing = true } - implementation ('com.handpoint.api:applicationprovider:7.1001.4-RC.0') { changing = true } + implementation ('com.handpoint.api:private-sdk:7.1001.4-RC.1') { changing = true } + implementation ('com.handpoint.api:applicationprovider:7.1001.4-RC.1') { changing = true } } android { From 19bca22e09162d2d1e94185d7a7c978d221adac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Cu=C3=B1ado?= Date: Fri, 2 Jun 2023 13:17:28 +0200 Subject: [PATCH 3/3] chore: keep the import statements --- .../handpoint/cordova/HandpointHelper.java | 45 ++++++++++++++++--- src/android/pax.gradle | 4 +- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/src/android/com/handpoint/cordova/HandpointHelper.java b/src/android/com/handpoint/cordova/HandpointHelper.java index 5b5740a..88f2f14 100644 --- a/src/android/com/handpoint/cordova/HandpointHelper.java +++ b/src/android/com/handpoint/cordova/HandpointHelper.java @@ -1,8 +1,48 @@ package com.handpoint.cordova; import android.content.Context; + +import com.handpoint.api.HandpointCredentials; import com.handpoint.api.Hapi; +import com.handpoint.api.HapiFactory; +import com.handpoint.api.HapiManager; +import com.handpoint.api.Settings; +import com.handpoint.api.shared.AuthenticationResponse; +import com.handpoint.api.shared.CardBrands; +import com.handpoint.api.shared.ConnectionMethod; +import com.handpoint.api.shared.ConnectionStatus; +import com.handpoint.api.shared.ConverterUtil; +import com.handpoint.api.shared.Currency; import com.handpoint.api.shared.Device; +import com.handpoint.api.shared.DeviceStatus; +import com.handpoint.api.shared.EventHandler; +import com.handpoint.api.shared.Events; +import com.handpoint.api.shared.HardwareStatus; +import com.handpoint.api.shared.LogLevel; +import com.handpoint.api.shared.NetworkStatus; +import com.handpoint.api.shared.PrintError; +import com.handpoint.api.shared.ReportConfiguration; +import com.handpoint.api.shared.SignatureRequest; +import com.handpoint.api.shared.StatusInfo; +import com.handpoint.api.shared.TransactionResult; +import com.handpoint.api.shared.TransactionType; +import com.handpoint.api.shared.TypeOfResult; +import com.handpoint.api.shared.auth.HapiMPosAuthResponse; +import com.handpoint.api.shared.i18n.SupportedLocales; +import com.handpoint.api.shared.options.MerchantAuthOptions; +import com.handpoint.api.shared.options.MoToOptions; +import com.handpoint.api.shared.options.Options; +import com.handpoint.api.shared.options.RefundOptions; +import com.handpoint.api.shared.options.SaleOptions; +import com.handpoint.api.shared.OperationStartResult; +import com.handpoint.api.shared.options.RefundReversalOptions; +import com.handpoint.api.shared.options.SaleReversalOptions; + +import org.apache.cordova.CallbackContext; +import org.apache.cordova.PluginResult; +import org.json.JSONException; +import org.json.JSONObject; + import java.lang.reflect.Method; import java.math.BigInteger; import java.util.HashMap; @@ -10,11 +50,6 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import org.apache.cordova.CallbackContext; -import org.json.JSONObject; - - - public class HandpointHelper implements Events.PosRequired, Events.Status, Events.Log, Events.TransactionStarted, Events.AuthStatus, Events.MessageHandling, Events.PrinterEvents, Events.ReportResult, Events.CardLanguage, diff --git a/src/android/pax.gradle b/src/android/pax.gradle index fd18161..6aa137a 100644 --- a/src/android/pax.gradle +++ b/src/android/pax.gradle @@ -18,8 +18,8 @@ repositories{ dependencies { implementation 'com.google.code.gson:gson:2.8.5' implementation 'org.slf4j:slf4j-android:1.7.25' - implementation ('com.handpoint.api:private-sdk:7.1001.4-RC.1') { changing = true } - implementation ('com.handpoint.api:applicationprovider:7.1001.4-RC.1') { changing = true } + implementation ('com.handpoint.api:private-sdk:7.1001.4-RC.0') { changing = true } + implementation ('com.handpoint.api:applicationprovider:7.1001.4-RC.0') { changing = true } } android {