Release 3.0.0

clover · Nov 15, 2018 · 044330c · 044330c
1 parent ecf5d5b
commit 044330c
Show file tree

Hide file tree

Showing 21 changed files with 862 additions and 384 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 ## Version 
 
-Current version: 2.0.1
+Current version: 3.0.0
 
 ## Overview
 
@@ -29,5 +29,5 @@ The Android project includes a connector and an example POS. To work with the pr
 * [Release Notes](https://github.com/clover/remote-pay-android/releases)
 * [Secure Network Pay Display](https://docs.clover.com/build/secure-network-pay-display/)
 * [Tutorial for the Android SDK](https://docs.clover.com/build/getting-started-with-cloverconnector/?sdk=android)
-* [API Documentation](https://clover.github.io/remote-pay-android/2.0.0/docs/)
+* [API Documentation](https://clover.github.io/remote-pay-android/3.0.0/docs/)
 * [Clover Developer Community](https://community.clover.com/index.html)
diff --git a/build.gradle b/build.gradle
@@ -12,17 +12,15 @@ buildscript {
     repositories {
         mavenLocal()
         mavenCentral()
-        google()
         jcenter()
     }
 
-  def mavenPlugin = "com.github.dcendents:android-maven-gradle-plugin:2.0"
+  def mavenPlugin = "com.github.dcendents:android-maven-gradle-plugin:1.5"
   dependencies {
-      classpath 'com.android.tools.build:gradle:3.1.2'
-      classpath mavenPlugin
+    classpath 'com.android.tools.build:gradle:2.3.0'
+    classpath mavenPlugin
       classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.5.4'
-      classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:latest.release'
-      classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.10.0'
+    classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.10.0'
   }
 }
 

diff --git a/remote-pay-android-connector/build.gradle b/remote-pay-android-connector/build.gradle
@@ -1,5 +1,5 @@
 group = 'com.clover.sdk'
-version = '2.0.1'
+version = '3.0.0'
 
 apply plugin: 'com.android.library'
 //apply plugin: 'android-maven'
@@ -26,8 +26,8 @@ android {
 defaultTasks 'install'
 
 dependencies {
-  compile 'com.clover:clover-remote-interface:238.1'
-  compile 'com.clover.sdk:clover-android-sdk:210.1'
+  compile 'com.clover:clover-remote-interface:243'
+  compile 'com.clover.sdk:clover-android-sdk:215'
   compile 'com.google.code.gson:gson:2.3.1'
   compile 'com.neovisionaries:nv-websocket-client:1.31'
   testCompile 'junit:junit:4.12'

diff --git a/remote-pay-android-connector/src/main/java/com/clover/remote/client/CloverConnector.java b/remote-pay-android-connector/src/main/java/com/clover/remote/client/CloverConnector.java
diff --git a/...-android-connector/src/main/java/com/clover/remote/client/CloverConnectorBroadcaster.java b/...-android-connector/src/main/java/com/clover/remote/client/CloverConnectorBroadcaster.java
@@ -22,7 +22,9 @@
 import com.clover.remote.client.messages.CloverDeviceErrorEvent;
 import com.clover.remote.client.messages.CloverDeviceEvent;
 import com.clover.remote.client.messages.CustomActivityResponse;
+import com.clover.remote.client.messages.CustomerProvidedDataEvent;
 import com.clover.remote.client.messages.DisplayReceiptOptionsResponse;
+import com.clover.remote.client.messages.InvalidStateTransitionResponse;
 import com.clover.remote.client.messages.PrintJobStatusResponse;
 import com.clover.remote.client.messages.RetrievePaymentResponse;
 import com.clover.remote.client.messages.MessageFromActivity;
@@ -365,6 +367,16 @@ void notifyOnRetrieveDeviceStatusResponse(RetrieveDeviceStatusResponse rdsr) {
     }
   }
 
+  void notifyOnInvalidStateTransitionResponse(InvalidStateTransitionResponse response) {
+    for (ICloverConnectorListener listener : this) {
+      try {
+        listener.onInvalidStateTransitionResponse(response);
+      } catch (Exception ex) {
+        Log.w("Notification error", ex);
+      }
+    }
+  }
+
   void notifyOnResetDeviceResponse(ResetDeviceResponse rdr) {
     for (ICloverConnectorListener listener : this) {
       try {
@@ -395,6 +407,16 @@ void notifyOnPrintJobStatusResponse(PrintJobStatusResponse response){
     }
   }
 
+  void notifyOnCustomerProvidedDataEvent(CustomerProvidedDataEvent event){
+    for(ICloverConnectorListener listener : this){
+      try {
+        listener.onCustomerProvidedData(event);
+      } catch (Exception ex) {
+        Log.w("Notification error", ex);
+      }
+    }
+  }
+
   void notifyOnRetrievePaymentResponse(RetrievePaymentResponse gpr) {
     for (ICloverConnectorListener listener : this) {
       try {

diff --git a/...roid-connector/src/main/java/com/clover/remote/client/DefaultCloverConnectorListener.java b/...roid-connector/src/main/java/com/clover/remote/client/DefaultCloverConnectorListener.java
@@ -22,9 +22,10 @@
 import com.clover.remote.client.messages.CloverDeviceErrorEvent;
 import com.clover.remote.client.messages.CloverDeviceEvent;
 import com.clover.remote.client.messages.CustomActivityResponse;
+import com.clover.remote.client.messages.CustomerProvidedDataEvent;
 import com.clover.remote.client.messages.DisplayReceiptOptionsResponse;
+import com.clover.remote.client.messages.InvalidStateTransitionResponse;
 import com.clover.remote.client.messages.MessageFromActivity;
-import com.clover.remote.client.messages.ConfirmPaymentRequest;
 import com.clover.remote.client.messages.ManualRefundResponse;
 import com.clover.remote.client.messages.PreAuthResponse;
 import com.clover.remote.client.messages.PrintJobStatusResponse;
@@ -62,74 +63,91 @@ public boolean isReady() {
     return ready;
   }
 
-  @Override public void onDeviceDisconnected() {
+  @Override
+  public void onDeviceDisconnected() {
     ready = false;
   }
 
-  @Override public void onDeviceConnected() {
+  @Override
+  public void onDeviceConnected() {
     ready = false;
   }
 
-  @Override public void onDeviceReady(MerchantInfo merchantInfo) {
+  @Override
+  public void onDeviceReady(MerchantInfo merchantInfo) {
     ready = true;
     this.merchantInfo = merchantInfo;
   }
 
-  @Override public void onDeviceActivityStart(CloverDeviceEvent deviceEvent) {
+  @Override
+  public void onDeviceActivityStart(CloverDeviceEvent deviceEvent) {
 
   }
 
-  @Override public void onDeviceActivityEnd(CloverDeviceEvent deviceEvent) {
+  @Override
+  public void onDeviceActivityEnd(CloverDeviceEvent deviceEvent) {
 
   }
 
-  @Override public void onDeviceError(CloverDeviceErrorEvent deviceErrorEvent) {
+  @Override
+  public void onDeviceError(CloverDeviceErrorEvent deviceErrorEvent) {
 
   }
 
-  @Override public void onAuthResponse(AuthResponse response) {
+  @Override
+  public void onAuthResponse(AuthResponse response) {
 
   }
 
-  @Override public void onTipAdjustAuthResponse(TipAdjustAuthResponse response) {
+  @Override
+  public void onTipAdjustAuthResponse(TipAdjustAuthResponse response) {
 
   }
 
-  @Override public void onCapturePreAuthResponse(CapturePreAuthResponse response) {
+  @Override
+  public void onCapturePreAuthResponse(CapturePreAuthResponse response) {
 
   }
 
-  @Override public void onVerifySignatureRequest(VerifySignatureRequest request) {
-    if(cloverConnector != null) {
+  @Override
+  public void onVerifySignatureRequest(VerifySignatureRequest request) {
+    if (cloverConnector != null) {
       cloverConnector.acceptSignature(request);
     }
   }
 
-  @Override public void onCloseoutResponse(CloseoutResponse response) {
+  @Override
+  public void onCloseoutResponse(CloseoutResponse response) {
 
   }
 
-  @Override public void onSaleResponse(SaleResponse response) {
+  @Override
+  public void onSaleResponse(SaleResponse response) {
 
   }
 
-  @Override public void onPreAuthResponse(PreAuthResponse response) {
+  @Override
+  public void onPreAuthResponse(PreAuthResponse response) {
 
   }
 
-  @Override public void onManualRefundResponse(ManualRefundResponse response) {
+  @Override
+  public void onManualRefundResponse(ManualRefundResponse response) {
 
   }
 
-  @Override public void onRefundPaymentResponse(RefundPaymentResponse response) {
+  @Override
+  public void onRefundPaymentResponse(RefundPaymentResponse response) {
 
   }
 
-  @Override public void onTipAdded(TipAddedMessage message) {
+  @Override
+  public void onTipAdded(TipAddedMessage message) {
 
   }
 
-  @Override public void onVoidPaymentResponse(VoidPaymentResponse response) {
+  @Override
+  public void onVoidPaymentResponse(VoidPaymentResponse response) {
 
   }
 
@@ -141,63 +159,86 @@ public boolean isReady() {
 
   }
 
-  @Override public void onPrintManualRefundReceipt(PrintManualRefundReceiptMessage pcm) {
+  @Override
+  public void onPrintManualRefundReceipt(PrintManualRefundReceiptMessage pcm) {
 
   }
 
-  @Override public void onPrintManualRefundDeclineReceipt(PrintManualRefundDeclineReceiptMessage pcdrm) {
+  @Override
+  public void onPrintManualRefundDeclineReceipt(PrintManualRefundDeclineReceiptMessage pcdrm) {
 
   }
 
-  @Override public void onPrintPaymentReceipt(PrintPaymentReceiptMessage pprm) {
+  @Override
+  public void onPrintPaymentReceipt(PrintPaymentReceiptMessage pprm) {
 
   }
 
-  @Override public void onPrintPaymentDeclineReceipt(PrintPaymentDeclineReceiptMessage ppdrm) {
+  @Override
+  public void onPrintPaymentDeclineReceipt(PrintPaymentDeclineReceiptMessage ppdrm) {
 
   }
 
-  @Override public void onPrintPaymentMerchantCopyReceipt(PrintPaymentMerchantCopyReceiptMessage ppmcrm) {
+  @Override
+  public void onPrintPaymentMerchantCopyReceipt(PrintPaymentMerchantCopyReceiptMessage ppmcrm) {
 
   }
 
-  @Override public void onPrintRefundPaymentReceipt(PrintRefundPaymentReceiptMessage pprrm) {
+  @Override
+  public void onPrintRefundPaymentReceipt(PrintRefundPaymentReceiptMessage pprrm) {
 
   }
 
-  @Override public void onRetrievePendingPaymentsResponse(RetrievePendingPaymentsResponse retrievePendingPaymentResponse) {
+  @Override
+  public void onRetrievePendingPaymentsResponse(RetrievePendingPaymentsResponse retrievePendingPaymentResponse) {
 
   }
 
-  @Override public void onReadCardDataResponse(ReadCardDataResponse response) {
+  @Override
+  public void onReadCardDataResponse(ReadCardDataResponse response) {
 
   }
 
-  @Override public void onMessageFromActivity(MessageFromActivity message) {
+  @Override
+  public void onMessageFromActivity(MessageFromActivity message) {
 
   }
 
-  @Override public void onCustomActivityResponse(CustomActivityResponse response) {
+  @Override
+  public void onCustomActivityResponse(CustomActivityResponse response) {
 
   }
 
-  @Override public void onRetrieveDeviceStatusResponse(RetrieveDeviceStatusResponse response){
+  @Override
+  public void onRetrieveDeviceStatusResponse(RetrieveDeviceStatusResponse response) {
+
+  }
+
+  @Override public void onInvalidStateTransitionResponse(InvalidStateTransitionResponse response){
 
   }
 
   @Override public void onResetDeviceResponse(ResetDeviceResponse response){
 
   }
 
-  @Override public void onRetrievePaymentResponse(RetrievePaymentResponse response){
+  @Override
+  public void onRetrievePaymentResponse(RetrievePaymentResponse response) {
+
+  }
+
+  @Override
+  public void onRetrievePrintersResponse(RetrievePrintersResponse response) {
 
   }
 
-   @Override public void onRetrievePrintersResponse(RetrievePrintersResponse response){
+  @Override
+  public void onPrintJobStatusResponse(PrintJobStatusResponse response) {
 
   }
 
-  @Override public void onPrintJobStatusResponse(PrintJobStatusResponse response){
+  @Override
+  public void onCustomerProvidedData(CustomerProvidedDataEvent event) {
 
   }
 

diff --git a/remote-pay-android-connector/src/main/java/com/clover/remote/client/ICloverConnector.java b/remote-pay-android-connector/src/main/java/com/clover/remote/client/ICloverConnector.java
@@ -22,30 +22,29 @@
 import com.clover.remote.client.messages.CapturePreAuthRequest;
 import com.clover.remote.client.messages.CloseoutRequest;
 import com.clover.remote.client.messages.CustomActivityRequest;
-import com.clover.remote.client.messages.OpenCashDrawerRequest;
-import com.clover.remote.client.messages.PrintJobStatusRequest;
-import com.clover.remote.client.messages.PrintRequest;
 import com.clover.remote.client.messages.DisplayReceiptOptionsRequest;
-import com.clover.remote.client.messages.RetrievePaymentRequest;
 import com.clover.remote.client.messages.ManualRefundRequest;
 import com.clover.remote.client.messages.MessageToActivity;
+import com.clover.remote.client.messages.OpenCashDrawerRequest;
 import com.clover.remote.client.messages.PreAuthRequest;
+import com.clover.remote.client.messages.PrintJobStatusRequest;
+import com.clover.remote.client.messages.PrintRequest;
 import com.clover.remote.client.messages.ReadCardDataRequest;
 import com.clover.remote.client.messages.RefundPaymentRequest;
+import com.clover.remote.client.messages.RegisterForCustomerProvidedDataRequest;
 import com.clover.remote.client.messages.RetrieveDeviceStatusRequest;
+import com.clover.remote.client.messages.RetrievePaymentRequest;
 import com.clover.remote.client.messages.RetrievePrintersRequest;
 import com.clover.remote.client.messages.SaleRequest;
+import com.clover.remote.client.messages.SetCustomerInfoRequest;
 import com.clover.remote.client.messages.TipAdjustAuthRequest;
 import com.clover.remote.client.messages.VerifySignatureRequest;
 import com.clover.remote.client.messages.VoidPaymentRefundRequest;
 import com.clover.remote.client.messages.VoidPaymentRequest;
 import com.clover.remote.order.DisplayOrder;
 import com.clover.sdk.v3.payments.Payment;
 
-import android.graphics.Bitmap;
-
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Interface to define the available methods to send requests to a connected Clover device.
@@ -328,4 +327,14 @@ public interface ICloverConnector extends Serializable {
   void displayReceiptOptions(DisplayReceiptOptionsRequest request);
 
 
+  /**
+   * Register an interest in receiving customer provided data.
+   */
+  void registerForCustomerProvidedData(RegisterForCustomerProvidedDataRequest request);
+
+  /**
+   *
+   * @param request
+   */
+  void setCustomerInfo(SetCustomerInfoRequest request);
 }