From 49e05613565f58f410a37bda05d9f5ae7ddc8f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 7 Jul 2016 10:11:31 +0100
Subject: [PATCH] Drop unnecessary elses after returns

---
 .../java/org/fdroid/fdroid/data/LoggingQuery.java   |  3 +--
 .../java/org/fdroid/fdroid/data/QueryBuilder.java   |  3 +--
 .../java/org/fdroid/fdroid/installer/Installer.java | 13 ++++++-------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/data/LoggingQuery.java b/app/src/main/java/org/fdroid/fdroid/data/LoggingQuery.java
index 69e90d880..7b2bda009 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/LoggingQuery.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/LoggingQuery.java
@@ -61,9 +61,8 @@ public class LoggingQuery {
                 logSlowQuery(queryDuration);
             }
             return cursor;
-        } else {
-            return db.rawQuery(query, queryArgs);
         }
+        return db.rawQuery(query, queryArgs);
     }
 
     /**
diff --git a/app/src/main/java/org/fdroid/fdroid/data/QueryBuilder.java b/app/src/main/java/org/fdroid/fdroid/data/QueryBuilder.java
index ac1584a28..13ffb973c 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/QueryBuilder.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/QueryBuilder.java
@@ -147,9 +147,8 @@ abstract class QueryBuilder {
     private String orderBySql() {
         if (orderBys.size() == 0) {
             return "";
-        } else {
-            return " ORDER BY " + TextUtils.join(", ", orderBys);
         }
+        return " ORDER BY " + TextUtils.join(", ", orderBys);
     }
 
     private String groupBySql() {
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java
index ff94f2563..791ca55c3 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java
@@ -91,16 +91,15 @@ public abstract class Installer {
         }
 
         int count = newPermissionCount(apk);
-        if (count > 0) {
-            Uri uri = ApkProvider.getContentUri(apk);
-            Intent intent = new Intent(context, InstallConfirmActivity.class);
-            intent.setData(uri);
-
-            return intent;
-        } else {
+        if (count == 0) {
             // no permission screen needed!
             return null;
         }
+        Uri uri = ApkProvider.getContentUri(apk);
+        Intent intent = new Intent(context, InstallConfirmActivity.class);
+        intent.setData(uri);
+
+        return intent;
     }
 
     private int newPermissionCount(Apk apk) {