From bcd9dd1bb5aed69450b689e7cf98ab39dd6bc984 Mon Sep 17 00:00:00 2001
From: Rechee <recheejozil@hotmail.com>
Date: Tue, 7 Jan 2020 20:32:41 -0800
Subject: [PATCH] now allowing blank for description

squash! now allowing blank for description
---
 .../activities/habits/edit/views/NameDescriptionPanel.java | 7 ++-----
 .../main/java/org/isoron/uhabits/core/models/Habit.java    | 6 +++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
index ff94a098f..d0527b432 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
@@ -76,7 +76,7 @@ public class NameDescriptionPanel extends FrameLayout
         tvName.setTextColor(PaletteUtils.getColor(getContext(), color));
     }
 
-    @Nullable
+    @NonNull
     public String getDescription()
     {
         return tvDescription.getRealText().trim();
@@ -105,10 +105,7 @@ public class NameDescriptionPanel extends FrameLayout
         setColor(habit.getColor());
         tvName.setText(habit.getName());
         tvQuestion.setRealText(habit.getQuestion());
-        final String description = habit.getDescription();
-        if(description != null) {
-            tvDescription.setRealText(description);
-        }
+        tvDescription.setRealText(habit.getDescription());
     }
 
     public boolean validate()
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
index 20373c129..a290b56d9 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
@@ -142,7 +142,7 @@ public class Habit
         data.color = color;
     }
 
-    @Nullable
+    @NonNull
     public synchronized String getDescription()
     {
         return data.description;
@@ -368,7 +368,7 @@ public class Habit
         @NonNull
         public String name;
 
-        @Nullable
+        @NonNull
         public String description;
 
         @NonNull
@@ -402,7 +402,7 @@ public class Habit
             this.frequency = new Frequency(3, 7);
             this.type = YES_NO_HABIT;
             this.name = "";
-            this.description = null;
+            this.description = "";
             this.question = "";
             this.targetType = AT_LEAST;
             this.targetValue = 100;