Merge pull request #192 from OceanLabs/address-fix

Address fix

Author: SCSharp

KitePrintSDK/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 5.8.4
+- Added: Check for address required fields and alert message when trying to proceed to checkout without filling in an address
+
 ### 5.8.3
 - Fixed: Previous versions of the sdk that stored unencrypted data should now be compatible with current versions of the sdk and encrypt the existing data
 

KitePrintSDK/src/main/java/ly/kite/KiteSDK.java

@@ -110,7 +110,7 @@ public class KiteSDK
   static public  final boolean DISPLAY_PRODUCTS                                    = false;
 
 
-  static public  final String SDK_VERSION                                          = "5.8.3";
+  static public  final String SDK_VERSION                                          = "5.8.4";
 
   static public  final String IMAGE_CATEGORY_APP                                   = "app";
   static public  final String IMAGE_CATEGORY_PRODUCT_ITEM                          = "product_item";

KitePrintSDK/src/main/java/ly/kite/address/Address.java

@@ -416,6 +416,26 @@ public boolean equals( Object otherObject )
              Country.areBothNullOrEqual( mCountry, otherAddress.mCountry ) );
     }
 
+    public boolean isFilledIn() {
+      if(mRecipientName == null || mRecipientName.length() < 1) {
+        return false;
+      }
+
+      if(mLine1 == null || mLine1.length() < 1) {
+        return false;
+      }
+
+      if(mCity == null || mCity.length() < 1) {
+        return false;
+      }
+
+      if(mZIPOrPostalCode == null || mZIPOrPostalCode.length() < 1) {
+        return false;
+      }
+
+      return true;
+    }
+
 
   ////////// Inner Class(es) //////////
 

KitePrintSDK/src/main/java/ly/kite/address/AddressEditActivity.java

@@ -296,6 +296,15 @@ public void onSaveClicked()
       return;
       }
 
+    // Get and verify the city
+
+    String city = mAddressCityEditText.getText().toString();
+
+    if ( city.trim().length() == 0 )
+    {
+      displayModalDialog( R.string.alert_dialog_title_oops, R.string.alert_dialog_message_no_city, R.string.OK, null, 0, null );
+      return;
+    }
 
     // Get and verify the post code
 

KitePrintSDK/src/main/java/ly/kite/checkout/ShippingActivity.java

@@ -322,7 +322,11 @@ public void onClick( View view )
    *****************************************************/
   private void onShippingAddress( Address shippingAddress )
     {
-    mAddressPickerButton.setText( shippingAddress.toMultiLineText() );
+    if(shippingAddress != null && shippingAddress.isFilledIn()) {
+      mAddressPickerButton.setText(shippingAddress.toMultiLineText());
+    } else {
+      mAddressPickerButton.setText( getString(R.string.shipping_delivery_address_button_text));
+    }
     }
 
 

KitePrintSDK/src/main/java/ly/kite/journey/basket/BasketActivity.java

@@ -423,7 +423,7 @@ protected void onRightClicked()
 
     // Make sure we have a shipping address
 
-    if ( mShippingAddress == null )
+    if ( mShippingAddress == null || !mShippingAddress.isFilledIn())
       {
       showErrorDialog( R.string.alert_dialog_title_invalid_delivery_address, R.string.alert_dialog_message_invalid_delivery_address );
 
@@ -697,7 +697,11 @@ private void onNewShippingDetails()
    *****************************************************/
   private void onShippingAddress()
     {
-    mDeliveryAddressTextView.setText( mShippingAddress.toSingleLineText() );
+    if(mShippingAddress != null && mShippingAddress.isFilledIn()) {
+      mDeliveryAddressTextView.setText(mShippingAddress.toSingleLineText());
+    } else {
+      mDeliveryAddressTextView.setText(getString(R.string.shipping_delivery_address_button_text));
+    }
 
     checkRequestPrices();
     }

KitePrintSDK/src/main/res/values-da/strings.xml

@@ -88,6 +88,7 @@
     <string name="alert_dialog_message_no_line1">Udfyld venligst linje 1 i adressen</string>
     <string name="alert_dialog_message_no_postal_code">Udfyld venligst dit postnummer / ZIP kode</string>
     <string name="alert_dialog_message_no_email_address">Indtast venligst en e-mail adresse</string>
+    <string name="alert_dialog_message_no_city">Udfyld venligst din by</string>
 
     <string name="alert_dialog_title_invalid_delivery_address">Ugyldig leveringsadresse</string>
     <string name="alert_dialog_message_invalid_delivery_address">Vælg venligst en leveringsadresse</string>

KitePrintSDK/src/main/res/values-de/strings.xml

@@ -90,6 +90,7 @@
     <string name="alert_dialog_message_no_line1">Bitte fülle Zeile 1 der Adresse aus.</string>
     <string name="alert_dialog_message_no_postal_code">Bitte gib die Postleitzahl ein.</string>
     <string name="alert_dialog_message_no_email_address">Bitte gib deine E-Mail-Adresse ein.</string>
+    <string name="alert_dialog_message_no_city">Bitte geben Du Ihre Stadt.</string>
 
     <string name="alert_dialog_title_invalid_delivery_address">Ungültige Lieferadresse</string>
     <string name="alert_dialog_message_invalid_delivery_address">Bitte eine Lieferadresse auswählen.</string>

KitePrintSDK/src/main/res/values-es/strings.xml

@@ -94,6 +94,7 @@
     <string name="alert_dialog_message_no_line1">Por favor, rellene la línea 1 de la dirección</string>
     <string name="alert_dialog_message_no_postal_code">Introduzca su código postal</string>
     <string name="alert_dialog_message_no_email_address">Por favor introduzca un correo eléctronico</string>
+    <string name="alert_dialog_message_no_city">Por favor, ingrese su ciudad</string>
 
     <string name="alert_dialog_title_invalid_delivery_address">Dirección de entrega no válida</string>
     <string name="alert_dialog_message_invalid_delivery_address">Por favor, elija una dirección de entrega</string>

KitePrintSDK/src/main/res/values-fr/strings.xml

@@ -91,6 +91,7 @@
     <string name="alert_dialog_message_no_line1">Veuillez remplir la ligne 1 de l\'adresse</string>
     <string name="alert_dialog_message_no_postal_code">Veuillez remplir votre code postal</string>
     <string name="alert_dialog_message_no_email_address">Veuillez remplir votre adresse email</string>
+    <string name="alert_dialog_message_no_city">Merci de remplir votre ville</string>
 
     <string name="alert_dialog_title_invalid_delivery_address">Adresse de livraison invalide</string>
     <string name="alert_dialog_message_invalid_delivery_address">S\'il vous plaît choisir une adresse de livraison</string>