From 0b8646acf050a4bb3ff813245b3c10b8abd6591b Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 26 Feb 2019 07:23:23 +0000 Subject: [PATCH] Revert getQName changes --- app/src/main/java/eu/faircode/netguard/DatabaseHelper.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/netguard/DatabaseHelper.java b/app/src/main/java/eu/faircode/netguard/DatabaseHelper.java index cdd46d91..804a3d73 100644 --- a/app/src/main/java/eu/faircode/netguard/DatabaseHelper.java +++ b/app/src/main/java/eu/faircode/netguard/DatabaseHelper.java @@ -870,10 +870,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { query += " LEFT JOIN access AS a"; query += " ON a.daddr = d.qname AND a.uid = " + uid; query += " WHERE d.resource = '" + ip.replace("'", "''") + "'"; - query += " ORDER BY"; - query += " CASE WHEN a.daddr IS NULL THEN 1 ELSE 0 END"; - query += ", CASE WHEN d.time + d.ttl < " + now + " THEN 1 ELSE 0 END"; - query += ", d.qname"; + query += " ORDER BY CASE WHEN a.daddr IS NULL THEN 1 ELSE 0 END, d.qname"; query += " LIMIT 1"; return db.compileStatement(query).simpleQueryForString(); } catch (SQLiteDoneException ignored) {