From c7b97621c776141c3efc50ce38074e1827a36f10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=82osz=20Sieradzki?= <milosz+github@sieradzki.it>
Date: Fri, 25 Jul 2014 20:17:03 +0200
Subject: [PATCH] Make util class non-instantiatable and non-extendable, flip
 equals() on strings, remove redundant code

---
 src/acr/browser/lightning/Utils.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/acr/browser/lightning/Utils.java b/src/acr/browser/lightning/Utils.java
index 8a2b642..21493f6 100644
--- a/src/acr/browser/lightning/Utils.java
+++ b/src/acr/browser/lightning/Utils.java
@@ -18,7 +18,10 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Utils {
+public final class Utils {
+
+	private Utils() {
+	}
 
 	public static void downloadFile(final Activity activity, final String url, final String userAgent,
 			final String contentDisposition, final boolean privateBrowsing) {
@@ -31,7 +34,7 @@ public class Utils {
 	public static synchronized void addBookmark(Context context, String title, String url) {
 		File book = new File(context.getFilesDir(), "bookmarks");
 		File bookUrl = new File(context.getFilesDir(), "bookurl");
-		if ((title.equals("Bookmarks") || title.equals("History")) && url.startsWith("file://")) {
+		if (("Bookmarks".equals(title) || "History".equals(title)) && url.startsWith("file://")) {
 			return;
 		}
 		try {
@@ -102,8 +105,7 @@ public class Utils {
 	 */
 	public static int convertToDensityPixels(Context context, int densityPixels) {
 		float scale = context.getResources().getDisplayMetrics().density;
-		int pixels = (int) (densityPixels * scale + 0.5f);
-		return pixels;
+		return (int) (densityPixels * scale + 0.5f);
 	}
 
 	public static String getDomainName(String url) {
@@ -169,6 +171,6 @@ public class Utils {
 			}
 		}
 		// The directory is now empty so delete it
-		return dir.delete();
+		return dir != null && dir.delete();
 	}
 }