# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1417725951 -3600
# Node ID 27ccad26a8302cf1047ef70abbae31cc6c4d3da4
# Parent  90ea68d4f92f729f8f3765d1b40b780b62a2f0b8
Fixed resource expiration

diff -r 90ea68d4f92f -r 27ccad26a830 ARClient/Form1.cs
--- a/ARClient/Form1.cs	Sat Nov 08 22:43:51 2014 +0100
+++ b/ARClient/Form1.cs	Thu Dec 04 21:45:51 2014 +0100
@@ -366,8 +366,7 @@
 						if (current.Serial >= resource.Serial) return false;
 						if (!current.CanUpdate(resource.Key)) return false;
 					} else {
-						if (!quick && resource.Value == null) return false;
-						if (!quick && resource.Expired) return false;
+						if (resource.CanDelete) return false;
 						current = null;
 					}
 					if (!quick && !resource.VerifySignature()) return false;
diff -r 90ea68d4f92f -r 27ccad26a830 ARClient/MARC.cs
--- a/ARClient/MARC.cs	Sat Nov 08 22:43:51 2014 +0100
+++ b/ARClient/MARC.cs	Thu Dec 04 21:45:51 2014 +0100
@@ -140,7 +140,13 @@
 		public Boolean Expired {
 			get {
 				long currentTime = DateTimeToUnix(DateTime.UtcNow);
-				return (Serial + 365 * 24 * 60 * 60 < currentTime) || ((Expiration ?? UInt32.MaxValue) < currentTime);
+				return (Serial < currentTime - 365 * 24 * 60 * 60) || ((Expiration ?? long.MaxValue) < currentTime);
+			}
+		}
+		public Boolean CanDelete {
+			get {
+				long currentTime = DateTimeToUnix(DateTime.UtcNow);
+				return Serial < currentTime - 5 * 365 * 24 * 60 * 60;
 			}
 		}
 		public Boolean CanUpdate(MARCKey key) {