From aac59367dcc4b19d09972dbb4523db98d4a206f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@centrum.cz>
Date: Thu, 14 Sep 2017 13:02:05 +0200
Subject: [PATCH] properly handle the activity window of the snooze time dialog

---
 .../datetimepicker/time/TimePickerDialog.java        | 12 ++++++++++++
 uhabits-android/src/main/AndroidManifest.xml         |  6 +++++-
 .../uhabits/notifications/SnoozeDelayActivity.java   |  9 ++++++---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java b/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
index 0bbb741e2..7cbdd3cd3 100644
--- a/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
+++ b/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
@@ -63,6 +63,7 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
     private static final int PULSE_ANIMATOR_DELAY = 300;
 
     private OnTimeSetListener mCallback;
+    private DialogInterface.OnDismissListener dismissListener;
 
     private HapticFeedbackController mHapticFeedbackController;
 
@@ -998,4 +999,15 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
             return false;
         }
     }
+
+    public void setDismissListener( DialogInterface.OnDismissListener listener ) {
+        dismissListener = listener;
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if( dismissListener != null )
+            dismissListener.onDismiss(dialog);
+    }
 }
diff --git a/uhabits-android/src/main/AndroidManifest.xml b/uhabits-android/src/main/AndroidManifest.xml
index ca802a5d6..99e5b20fb 100644
--- a/uhabits-android/src/main/AndroidManifest.xml
+++ b/uhabits-android/src/main/AndroidManifest.xml
@@ -91,7 +91,11 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".activities.habits.list.ListHabitsActivity"/>
         </activity>
-        <activity android:name=".notifications.SnoozeDelayActivity"></activity>
+        <activity android:name=".notifications.SnoozeDelayActivity"
+            android:excludeFromRecents="true"
+            android:launchMode="singleInstance"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar">
+        </activity>
 
         <receiver
             android:name=".widgets.CheckmarkWidgetProvider"
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayActivity.java
index 7a3d27b5f..a32871f65 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayActivity.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayActivity.java
@@ -18,7 +18,7 @@ import static org.isoron.uhabits.core.ui.ThemeSwitcher.THEME_DARK;
 import static org.isoron.uhabits.core.utils.DateUtils.applyTimezone;
 
 public class SnoozeDelayActivity extends FragmentActivity implements
-        TimePickerDialog.OnTimeSetListener {
+        TimePickerDialog.OnTimeSetListener, DialogInterface.OnDismissListener {
 
     public static final String ACTION_ASK_SNOOZE = "org.isoron.uhabits.ACTION_ASK_SNOOZE";
 
@@ -54,6 +54,7 @@ public class SnoozeDelayActivity extends FragmentActivity implements
                 hour, minute, DateFormat.is24HourFormat(this));
         HabitsApplicationComponent component = ((HabitsApplication) getApplicationContext()).getComponent();
         dialog.setThemeDark(component.getPreferences().getTheme() == THEME_DARK);
+        dialog.setDismissListener(this);
         dialog.show(getSupportFragmentManager(),"timePicker");
     }
 
@@ -73,8 +74,6 @@ public class SnoozeDelayActivity extends FragmentActivity implements
                 this, ReminderReceiver.class );
         intent.putExtra("reminderTime", time);
         sendBroadcast(intent);
-
-        finish();
     }
 
     @Override
@@ -83,7 +82,11 @@ public class SnoozeDelayActivity extends FragmentActivity implements
         Intent intent = new Intent( ReminderReceiver.ACTION_DISMISS_REMINDER, getIntent().getData(),
                 this, ReminderReceiver.class );
         sendBroadcast(intent);
+    }
 
+    @Override
+    public void onDismiss(DialogInterface dialogInterface)
+    {
         finish();
     }
 }