From 8415cc2e0a5c4ae72b806443ab01b0abfd71aabf Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 25 Sep 2012 22:20:30 +0100
Subject: [PATCH] Fix recently introduced automatic repo scan bug
---
src/org/fdroid/fdroid/UpdateService.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/org/fdroid/fdroid/UpdateService.java b/src/org/fdroid/fdroid/UpdateService.java
index 9d3961998..2775e3589 100644
--- a/src/org/fdroid/fdroid/UpdateService.java
+++ b/src/org/fdroid/fdroid/UpdateService.java
@@ -88,15 +88,19 @@ public class UpdateService extends IntentService {
// See if it's time to actually do anything yet...
if (receiver == null) {
- long lastUpdate = prefs.getLong("lastUpdateCheck",
- System.currentTimeMillis());
+ long lastUpdate = prefs.getLong("lastUpdateCheck", 0);
String sint = prefs.getString("updateInterval", "0");
int interval = Integer.parseInt(sint);
- if (interval == 0)
+ if (interval == 0) {
+ Log.d("FDroid", "Skipping update - disabled");
return;
- if (lastUpdate + (interval * 60 * 60) > System
- .currentTimeMillis())
+ }
+ long elapsed = System.currentTimeMillis() - lastUpdate;
+ if (elapsed < interval * 60 * 60) {
+ Log.d("FDroid", "Skipping update - done " + elapsed
+ + "ms ago, interval is " + interval + " hours");
return;
+ }
}
boolean notify = prefs.getBoolean("updateNotify", false);