Prevent empty diary folder

billthefarmer · Feb 4, 2024 · 79d0239 · 79d0239
1 parent 5f9e9d2
commit 79d0239
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/src/main/java/org/billthefarmer/diary/Diary.java b/src/main/java/org/billthefarmer/diary/Diary.java
@@ -1278,6 +1278,8 @@ private void getPreferences()
                                            DatePickerPreference.DEFAULT_VALUE);
         // Folder
         folder = preferences.getString(Settings.PREF_FOLDER, DIARY);
+        if (folder.isEmpty())
+            folder = DIARY;
 
         // Link template
         template = preferences.getString(Settings.PREF_INDEX_TEMPLATE,

diff --git a/src/main/java/org/billthefarmer/diary/SettingsFragment.java b/src/main/java/org/billthefarmer/diary/SettingsFragment.java
@@ -57,16 +57,18 @@ public void onCreate(Bundle savedInstanceState)
         EditTextPreference folder =
             (EditTextPreference) findPreference(Settings.PREF_FOLDER);
 
+        if (folder.getText().isEmpty())
+            folder.setText(Diary.DIARY);
+
         // Set folder in text view
-        folder.setSummary(preferences.getString(Settings.PREF_FOLDER,
-                                                Diary.DIARY));
+        folder.setSummary(folder.getText());
+
         // Get index preference
         DatePickerPreference entry =
             (DatePickerPreference) findPreference(Settings.PREF_INDEX_PAGE);
 
         // Get value
-        long value = preferences.getLong(Settings.PREF_INDEX_PAGE,
-                                         DatePickerPreference.DEFAULT_VALUE);
+        long value = entry.getValue();
         Date date = new Date(value);
 
         // Set summary
@@ -79,15 +81,13 @@ public void onCreate(Bundle savedInstanceState)
             (EditTextPreference) findPreference(Settings.PREF_INDEX_TEMPLATE);
 
         // Set template in text view
-        link.setSummary(preferences.getString(Settings.PREF_INDEX_TEMPLATE,
-                                              Diary.INDEX_TEMPLATE));
+        link.setSummary(link.getText());
         // Get template preference
         entry =
             (DatePickerPreference) findPreference(Settings.PREF_TEMPLATE_PAGE);
 
         // Get value
-        value = preferences.getLong(Settings.PREF_TEMPLATE_PAGE,
-                                    DatePickerPreference.DEFAULT_VALUE);
+        value = entry.getValue();
         date = new Date(value);
 
         // Set summary
@@ -151,8 +151,11 @@ public void onSharedPreferenceChanged(SharedPreferences preferences,
             EditTextPreference folder =
                 (EditTextPreference) findPreference(key);
 
+            if (folder.getText().isEmpty())
+                folder.setText(Diary.DIARY);
+
             // Set folder in text view
-            folder.setSummary(preferences.getString(key, Diary.DIARY));
+            folder.setSummary(folder.getText());
         }
 
         if (key.equals(Settings.PREF_INDEX_PAGE))
@@ -162,8 +165,7 @@ public void onSharedPreferenceChanged(SharedPreferences preferences,
                 (DatePickerPreference) findPreference(key);
 
             // Get value
-            long value =
-                preferences.getLong(key, DatePickerPreference.DEFAULT_VALUE);
+            long value = entry.getValue();
             Date date = new Date(value);
 
             // Set summary
@@ -179,7 +181,7 @@ public void onSharedPreferenceChanged(SharedPreferences preferences,
                 (EditTextPreference) findPreference(key);
 
             // Set folder in text view
-            link.setSummary(preferences.getString(key, Diary.INDEX_TEMPLATE));
+            link.setSummary(link.getText());
         }
 
         if (key.equals(Settings.PREF_TEMPLATE_PAGE))
@@ -189,8 +191,7 @@ public void onSharedPreferenceChanged(SharedPreferences preferences,
                 (DatePickerPreference) findPreference(key);
 
             // Get value
-            long value =
-                preferences.getLong(key, DatePickerPreference.DEFAULT_VALUE);
+            long value = entry.getValue();
             Date date = new Date(value);
 
             // Set summary