1 files changed, 17 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java
index 37e05a61d..c9fb990a2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java
@@ -24,6 +24,7 @@ import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.text.format.DateFormat;
 import android.view.LayoutInflater;
@@ -36,6 +37,8 @@ import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.util.Notify;
+import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import org.sufficientlysecure.keychain.util.Log;
 
 import java.util.Calendar;
@@ -72,17 +75,19 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment {
     /**
      * Creates dialog
      */
+    @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final Activity activity = getActivity();
+        Activity activity = getActivity();
+
         mMessenger = getArguments().getParcelable(ARG_MESSENGER);
         long creation = getArguments().getLong(ARG_CREATION);
         long expiry = getArguments().getLong(ARG_EXPIRY);
 
-        Calendar creationCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-        creationCal.setTime(new Date(creation * 1000));
-        final Calendar expiryCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-        expiryCal.setTime(new Date(expiry * 1000));
+        final Calendar creationCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+        creationCal.setTimeInMillis(creation * 1000);
+        Calendar expiryCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+        expiryCal.setTimeInMillis(expiry * 1000);
 
         // date picker works with default time zone, we need to convert from UTC to default timezone
         creationCal.setTimeZone(TimeZone.getDefault());
@@ -123,11 +128,8 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment {
             noExpiry.setChecked(false);
             expiryLayout.setVisibility(View.VISIBLE);
 
-            // convert from UTC to time zone of device
-            Calendar expiryCalTimeZone = (Calendar) expiryCal.clone();
-            expiryCalTimeZone.setTimeZone(TimeZone.getDefault());
             currentExpiry.setText(DateFormat.getDateFormat(
-                    getActivity()).format(expiryCalTimeZone.getTime()));
+                    getActivity()).format(expiryCal.getTime()));
         }
 
         // date picker works based on default time zone
@@ -175,10 +177,13 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment {
                     selectedCal.setTimeZone(TimeZone.getTimeZone("UTC"));
 
                     long numDays = (selectedCal.getTimeInMillis() / 86400000)
-                            - (expiryCal.getTimeInMillis() / 86400000);
+                            - (creationCal.getTimeInMillis() / 86400000);
                     if (numDays <= 0) {
-                        Log.e(Constants.TAG, "Should not happen! Expiry num of days <= 0!");
-                        throw new RuntimeException();
+                        Activity activity = getActivity();
+                        if (activity != null) {
+                            Notify.create(activity, R.string.error_expiry_past, Style.ERROR).show();
+                        }
+                        return;
                     }
                     expiry = selectedCal.getTime().getTime() / 1000;
                 }