From 0f2737445288d81e8219d07e638eb24d87bfab65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 29 Dec 2015 12:55:29 +0100
Subject: [PATCH] checkstyle: forbid inner assignments

---
 F-Droid/src/org/fdroid/fdroid/Hasher.java                   | 6 ++++--
 .../org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java   | 3 ++-
 config/checkstyle/checkstyle.xml                            | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/Hasher.java b/F-Droid/src/org/fdroid/fdroid/Hasher.java
index 126eb2980..51164acc7 100644
--- a/F-Droid/src/org/fdroid/fdroid/Hasher.java
+++ b/F-Droid/src/org/fdroid/fdroid/Hasher.java
@@ -72,14 +72,16 @@ public class Hasher {
                     digest.update(buffer, 0, read);
                 }
             } catch (Exception e) {
-                return hashCache = "";
+                hashCache = "";
+                return hashCache;
             } finally {
                 Utils.closeQuietly(input);
             }
         } else {
             digest.update(array);
         }
-        return hashCache = hex(digest.digest());
+        hashCache = hex(digest.digest());
+        return hashCache;
     }
 
     // Compare the calculated hash to another string, ignoring case,
diff --git a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java
index 1906cc180..5a77f547b 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java
@@ -83,7 +83,8 @@ public class AsyncDownloaderFromAndroid implements AsyncDownloader {
         }
 
         // Check if the download is complete
-        if ((downloadManagerId = isDownloadComplete(context, uniqueDownloadId)) > 0) {
+        downloadManagerId = isDownloadComplete(context, uniqueDownloadId);
+        if (downloadManagerId > 0) {
             // clear the download
             dm.remove(downloadManagerId);
 
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 63eb9cb6c..57b1bcb29 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -89,7 +89,7 @@
         <module name="EmptyStatement" />
         <!--<module name="HiddenField" />-->
         <module name="IllegalInstantiation" />
-        <!--<module name="InnerAssignment" />-->
+        <module name="InnerAssignment" />
         <module name="DefaultComesLast" />
         <!--<module name="MissingSwitchDefault" />-->
         <module name="FallThrough" />