From 3c526f34ea5489083366f4ce2852c0265254f6d4 Mon Sep 17 00:00:00 2001
From: Henrik Tunedal <tunedal@gmail.com>
Date: Wed, 16 Feb 2011 22:18:10 +0100
Subject: [PATCH] Prettier error handling in RepoXMLHandler
---
src/org/fdroid/fdroid/RepoXMLHandler.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/org/fdroid/fdroid/RepoXMLHandler.java b/src/org/fdroid/fdroid/RepoXMLHandler.java
index eba7107b0..eed7b8660 100644
--- a/src/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/src/org/fdroid/fdroid/RepoXMLHandler.java
@@ -223,10 +223,10 @@ public class RepoXMLHandler extends DefaultHandler {
public static boolean doUpdates(Context ctx, DB db) {
long startTime = System.currentTimeMillis();
- boolean success = true;
db.beginUpdate();
Vector<DB.Repo> repos = db.getRepos();
for (DB.Repo repo : repos) {
+ boolean success = false;
if (repo.inuse) {
try {
@@ -263,12 +263,12 @@ public class RepoXMLHandler extends DefaultHandler {
jar.close();
if (certs == null) {
Log.d("FDroid", "No signature found in index");
- return success = false;
+ return false;
}
if (certs.length != 1) {
Log.d("FDroid", "Expected one signature - found "
+ certs.length);
- return success = false;
+ return false;
}
byte[] sig = certs[0].getEncoded();
@@ -286,7 +286,7 @@ public class RepoXMLHandler extends DefaultHandler {
if (!ssig.equals(repo.pubkey)) {
Log.d("FDroid", "Index signature mismatch");
- return success = false;
+ return false;
}
} else {
@@ -321,11 +321,12 @@ public class RepoXMLHandler extends DefaultHandler {
repo.pubkey = handler.pubkey;
db.updateRepoByAddress(repo);
}
+ success = true;
} catch (Exception e) {
Log.e("FDroid", "Exception updating from " + repo.address
+ ":\n" + Log.getStackTraceString(e));
- return success = false;
+ return false;
} finally {
ctx.deleteFile("tempindex.xml");
ctx.deleteFile("tempindex.jar");