Handle case when both: question text and hint are empty

getodk · Feb 6, 2018 · c26c8b5 · c26c8b5
1 parent cf326ba
commit c26c8b5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/QuestionWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/QuestionWidget.java
@@ -143,13 +143,14 @@ private MediaLayout createQuestionMediaLayout(FormEntryPrompt prompt) {
         questionText.setTypeface(null, Typeface.BOLD);
         questionText.setTextColor(ContextCompat.getColor(getContext(), R.color.primaryTextColor));
         questionText.setPadding(0, 0, 0, 7);
-        questionText.setText(promptText == null ? "" : TextUtils.textToHtml(FormEntryPromptUtils.markQuestionIfIsRequired(promptText, prompt.isRequired())));
+        questionText.setText(TextUtils.textToHtml(FormEntryPromptUtils.markQuestionIfIsRequired(promptText, prompt.isRequired())));
         questionText.setMovementMethod(LinkMovementMethod.getInstance());
 
         // Wrap to the size of the parent view
         questionText.setHorizontallyScrolling(false);
 
-        if (promptText == null || promptText.length() == 0) {
+        if ((prompt.getLongText() == null || promptText.length() == 0)
+                && !(prompt.isRequired() && (prompt.getHelpText() == null || prompt.getHelpText().isEmpty()))) {
             questionText.setVisibility(GONE);
         }