From 901112b29da9a9a9f7f4b99c4e941e816cd13a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 7 Dec 2013 12:25:48 +0100
Subject: [PATCH 1/2] Update UIL

---
 extern/Universal-Image-Loader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extern/Universal-Image-Loader b/extern/Universal-Image-Loader
index 66042fe4a..2a8a184d4 160000
--- a/extern/Universal-Image-Loader
+++ b/extern/Universal-Image-Loader
@@ -1 +1 @@
-Subproject commit 66042fe4a38d5e96030144546290ba0404d24e28
+Subproject commit 2a8a184d40b16756fd80edc342550bb2335d6461

From 23dcfadefa438e6f38e307aea4db8e10540c8b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 7 Dec 2013 13:00:10 +0100
Subject: [PATCH 2/2] Don't crash if an apk exists for a non-existing app

---
 src/org/fdroid/fdroid/DB.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java
index 73236124e..c4aebe5e0 100644
--- a/src/org/fdroid/fdroid/DB.java
+++ b/src/org/fdroid/fdroid/DB.java
@@ -898,6 +898,10 @@ public class DB {
             while (!c.isAfterLast()) {
                 String id = c.getString(0);
                 App app = apps.get(id);
+                if (app == null) {
+                    c.moveToNext();
+                    continue;
+                }
                 boolean compatible = c.getInt(10) == 1;
                 int repoid = c.getInt(11);
                 if (compatible || incompatibleVersions) {