Set hidden raw val tag with injected JSON values

.travis.yml

@@ -3,7 +3,7 @@ language: android
 # Setting sudo to required prevents Travis from testing the project in a Docker container.
 sudo: required
 jdk: oraclejdk8
-dist: precise
+dist: trusty
 
 before_cache:
   -rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -36,19 +36,19 @@ android:
     - android-28
 
 licenses:
-    - 'android-sdk-preview-license-.+'
-    - 'android-sdk-license-.+'
-    - 'google-gdk-license-.+'
+  - 'android-sdk-preview-license-.+'
+  - 'android-sdk-license-.+'
+  - 'google-gdk-license-.+'
 
 script:
   - echo "Travis branch is $TRAVIS_BRANCH"
   - echo "Travis branch is in pull request $TRAVIS_PULL+REQUEST"
   - chmod 755 gradlew
   - ls -la
-
+  - travis_wait ./gradlew clean --stacktrace
   #Run All tests Unit and Instrumentation
-  - travis_wait ./gradlew :android-json-form-wizard:jacocoTestReport coveralls --stacktrace
-
+  - travis_wait ./gradlew :android-json-form-wizard:jacocoTestReport --stacktrace
+  - travis_wait ./gradlew :android-json-form-wizard:coveralls
   # Generate javadoc
   - travis_wait ./gradlew javadoc
 

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/GenericTextWatcher.java

@@ -74,9 +74,10 @@ public synchronized void afterTextChanged(Editable editable) {
         String openMrsEntity = (String) mView.getTag(R.id.openmrs_entity);
         String openMrsEntityId = (String) mView.getTag(R.id.openmrs_entity_id);
         Boolean popup = (Boolean) mView.getTag(R.id.extraPopup);
+        popup = popup == null ? false : popup; // Handle nulls as a result of injected values
         ValidationStatus validationStatus = JsonFormFragmentPresenter.validate(formFragment, mView,
                 false);
-        if(validationStatus.isValid()) {
+        if (validationStatus.isValid()) {
             try {
                 api.writeValue(mStepName, key, text, openMrsEntityParent, openMrsEntity,
                         openMrsEntityId, popup);

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/HiddenTextFactory.java

@@ -16,6 +16,7 @@
 import com.vijay.jsonwizard.interfaces.FormWidgetFactory;
 import com.vijay.jsonwizard.interfaces.JsonApi;
 
+import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -79,6 +80,7 @@ protected void attachJson(String stepName, Context context, JsonFormFragment for
         hiddenText.setVisibility(View.GONE);
 
         hiddenText.addTextChangedListener(new GenericTextWatcher(stepName, formFragment, hiddenText));
+
         if (!TextUtils.isEmpty(relevance) && context instanceof JsonApi) {
             hiddenText.setTag(R.id.relevance, relevance);
             ((JsonApi) context).addSkipLogicView(hiddenText);
@@ -93,6 +95,13 @@ protected void attachJson(String stepName, Context context, JsonFormFragment for
             hiddenText.setTag(R.id.calculation, calculation);
             ((JsonApi) context).addCalculationLogicView(hiddenText);
         }
+
+        // Handle setting injected value (if exists) after attaching listener so that changes can be
+        // effected by the listener and calculations applied
+        String value = jsonObject.optString(JsonFormConstants.VALUE);
+        if (StringUtils.isNotBlank(value)) {
+            hiddenText.setText(value);
+        }
     }
 
     protected int getLayout() {

android-json-form-wizard/src/test/java/com/vijay/jsonwizard/customviews/NumericDatePickerTest.java

@@ -111,8 +111,7 @@ public void testNumericDatePickerSetMaxValueThrowsExceptionDateMoreThanMax() {
         Assert.assertEquals(maxTimeStamp, datePicker.getMaxDate());
 
         //Try set a date outside max
-
-        Date dateTwoYearsFromToday = localDate.plusDays(10).toDate();
+        Date dateTwoYearsFromToday = localDate.plusYears(2).toDate();
         datePicker.setDate(dateTwoYearsFromToday);
     }
 

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=1.7.26-SNAPSHOT
+VERSION_NAME=1.7.27-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Native Form Json Wizard