From 78f60271767fe40382908cfbc4ba1aa314cdaf5e Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 16 Apr 2013 20:29:20 +0100
Subject: [PATCH 1/2] Include time of update in logs

---
 src/org/fdroid/fdroid/RepoXMLHandler.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/org/fdroid/fdroid/RepoXMLHandler.java b/src/org/fdroid/fdroid/RepoXMLHandler.java
index 6ad04fd7c..d482cd9ab 100644
--- a/src/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/src/org/fdroid/fdroid/RepoXMLHandler.java
@@ -32,6 +32,7 @@ import java.net.URL;
 import java.security.cert.Certificate;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -76,6 +77,8 @@ public class RepoXMLHandler extends DefaultHandler {
 
     // The date format used in the repo XML file.
     private SimpleDateFormat mXMLDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+    private static final SimpleDateFormat logDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
     private int totalAppCount;
 
     public RepoXMLHandler(DB.Repo repo, List<DB.App> apps, ProgressListener listener) {
@@ -332,7 +335,8 @@ public class RepoXMLHandler extends DefaultHandler {
 
                 // This is a signed repo - we download the jar file,
                 // check the signature, and extract the index...
-                Log.d("FDroid", "Getting signed index from " + repo.address);
+                Log.d("FDroid", "Getting signed index from " + repo.address + " at " + 
+                    logDateFormat.format(new Date(System.currentTimeMillis())));
                 String address = repo.address + "/index.jar";
                 PackageManager pm = ctx.getPackageManager();
                 try {

From 49706c12d1408649aae6b413d620edf2ffde1b72 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 16 Apr 2013 20:31:51 +0100
Subject: [PATCH 2/2] No need to re-check compatibility if ALL repos were
 unchanged (by etag)

---
 src/org/fdroid/fdroid/UpdateService.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/org/fdroid/fdroid/UpdateService.java b/src/org/fdroid/fdroid/UpdateService.java
index 0233f77c9..27164e3f6 100644
--- a/src/org/fdroid/fdroid/UpdateService.java
+++ b/src/org/fdroid/fdroid/UpdateService.java
@@ -147,6 +147,7 @@ public class UpdateService extends IntentService implements ProgressListener {
             List<DB.App> apps = new ArrayList<DB.App>();
             List<Integer> keeprepos = new ArrayList<Integer>();
             boolean success = true;
+            boolean changes = false;
             for (DB.Repo repo : repos) {
                 if (repo.inuse) {
 
@@ -156,7 +157,11 @@ public class UpdateService extends IntentService implements ProgressListener {
                     String err = RepoXMLHandler.doUpdate(getBaseContext(),
                             repo, apps, newetag, keeprepos, this);
                     if (err == null) {
-                        repo.lastetag = newetag.toString();
+                        String nt = newetag.toString();
+                        if(!nt.equals(repo.lastetag)) {
+                            repo.lastetag = newetag.toString();
+                            changes = true;
+                        }
                     } else {
                         success = false;
                         err = "Update failed for " + repo.address + " - " + err;
@@ -169,7 +174,7 @@ public class UpdateService extends IntentService implements ProgressListener {
                 }
             }
 
-            if (success) {
+            if (changes && success) {
                 sendStatus(STATUS_INFO, getString(R.string.status_checking_compatibility));
                 List<DB.App> acceptedapps = new ArrayList<DB.App>();
                 List<DB.App> prevapps = ((FDroidApp) getApplication()).getApps();
@@ -239,7 +244,7 @@ public class UpdateService extends IntentService implements ProgressListener {
 
             }
 
-            if (success && notify) {
+            if (success && changes && notify) {
                 Log.d("FDroid", "Updates before:" + prevUpdates + ", after: "
                         + newUpdates);
                 if (newUpdates > prevUpdates) {