Fix for datefragment crashing

harshad1 · Nov 22, 2023 · 26d821b · 26d821b
1 parent 036c582
commit 26d821b
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java b/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java
@@ -343,7 +343,6 @@ private void setDate() {
         };
 
         new DateFragment()
-                .setActivity(getActivity())
                 .setListener(listener)
                 .setCalendar(initDate)
                 .show(((FragmentActivity) getActivity()).getSupportFragmentManager(), "date");
@@ -372,7 +371,6 @@ private void setDueDate(final int offset) {
         };
 
         new DateFragment()
-                .setActivity(getActivity())
                 .setListener(listener)
                 .setCalendar(initDate)
                 .setMessage(getContext().getString(R.string.due_date))
@@ -391,7 +389,6 @@ public static class DateFragment extends DialogFragment {
         private DatePickerDialog.OnClickListener _extraListener;
         private String _extraLabel;
 
-        private Activity _activity;
         private int _year;
         private int _month;
         private int _day;
@@ -417,11 +414,6 @@ public DateFragment setExtraLabel(String label) {
             return this;
         }
 
-        public DateFragment setActivity(Activity activity) {
-            _activity = activity;
-            return this;
-        }
-
         public DateFragment setYear(int year) {
             _year = year;
             return this;
@@ -451,10 +443,10 @@ public DateFragment setCalendar(Calendar calendar) {
 
         @NonNull
         @Override
-        public DatePickerDialog onCreateDialog(Bundle savedInstanceState) {
+        public DatePickerDialog onCreateDialog(final Bundle savedInstanceState) {
             super.onCreateDialog(savedInstanceState);
 
-            DatePickerDialog dialog = new DatePickerDialog(_activity, _listener, _year, _month, _day);
+            final DatePickerDialog dialog = new DatePickerDialog(getContext(), _listener, _year, _month, _day);
 
             if (_message != null && !_message.isEmpty()) {
                 dialog.setMessage(_message);
@@ -466,5 +458,14 @@ public DatePickerDialog onCreateDialog(Bundle savedInstanceState) {
 
             return dialog;
         }
+
+        @Override
+        public void onCreate(final Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            // Do not auto-recreate
+            if (savedInstanceState != null) {
+                dismiss();
+            }
+        }
     }
 }