checkstyle: Add curly checks

F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java

@@ -229,19 +229,25 @@ public final class QRCodeEncoder {
     private static String guessAppropriateEncoding(CharSequence contents) {
         // Very crude at the moment
         for (int i = 0; i < contents.length(); i++) {
-            if (contents.charAt(i) > 0xFF) { return "UTF-8"; }
+            if (contents.charAt(i) > 0xFF) {
+                return "UTF-8";
+            }
         }
         return null;
     }
 
     private static String trim(String s) {
-        if (s == null) { return null; }
+        if (s == null) {
+            return null;
+        }
         String result = s.trim();
         return result.length() == 0 ? null : result;
     }
 
     private static String escapeMECARD(String input) {
-        if (input == null || (input.indexOf(':') < 0 && input.indexOf(';') < 0)) { return input; }
+        if (input == null || (input.indexOf(':') < 0 && input.indexOf(';') < 0)) {
+            return input;
+        }
         int length = input.length();
         StringBuilder result = new StringBuilder(length);
         for (int i = 0; i < length; i++) {

F-Droid/src/org/fdroid/fdroid/AppDetails.java

@@ -1043,16 +1043,24 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
     }
 
     @Override
-    public App getApp() { return app; }
+    public App getApp() {
+        return app;
+    }
 
     @Override
-    public ApkListAdapter getApks() { return adapter; }
+    public ApkListAdapter getApks() {
+        return adapter;
+    }
 
     @Override
-    public Signature getInstalledSignature() { return mInstalledSignature; }
+    public Signature getInstalledSignature() {
+        return mInstalledSignature;
+    }
 
     @Override
-    public String getInstalledSignatureId() { return mInstalledSigID; }
+    public String getInstalledSignatureId() {
+        return mInstalledSigID;
+    }
 
     public static class AppDetailsSummaryFragment extends Fragment {
 
@@ -1089,13 +1097,21 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
             data = (AppDetailsData) activity;
         }
 
-        protected App getApp() { return data.getApp(); }
+        protected App getApp() {
+            return data.getApp();
+        }
 
-        protected ApkListAdapter getApks() { return data.getApks(); }
+        protected ApkListAdapter getApks() {
+            return data.getApks();
+        }
 
-        protected Signature getInstalledSignature() { return data.getInstalledSignature(); }
+        protected Signature getInstalledSignature() {
+            return data.getInstalledSignature();
+        }
 
-        protected String getInstalledSignatureId() { return data.getInstalledSignatureId(); }
+        protected String getInstalledSignatureId() {
+            return data.getInstalledSignatureId();
+        }
 
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -1442,9 +1458,13 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
                 .build();
         }
 
-        private App getApp() { return data.getApp(); }
+        private App getApp() {
+            return data.getApp();
+        }
 
-        private ApkListAdapter getApks() { return data.getApks(); }
+        private ApkListAdapter getApks() {
+            return data.getApks();
+        }
 
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -1666,9 +1686,13 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
             installListener.removeApk(getApp().id);
         }
 
-        protected App getApp() { return data.getApp(); }
+        protected App getApp() {
+            return data.getApp();
+        }
 
-        protected ApkListAdapter getApks() { return data.getApks(); }
+        protected ApkListAdapter getApks() {
+            return data.getApks();
+        }
 
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {

F-Droid/src/org/fdroid/fdroid/ProgressListener.java

@@ -41,7 +41,9 @@ public interface ProgressListener {
         }
 
         @Override
-        public int describeContents() { return 0; }
+        public int describeContents() {
+            return 0;
+        }
 
         @Override
         public void writeToParcel(Parcel dest, int flags) {
@@ -70,7 +72,9 @@ public interface ProgressListener {
          * so we pass that through to the downloader when we set the progress listener. This way,
          * we can ask the event for the name of the repo.
          */
-        public Bundle getData() { return data; }
+        public Bundle getData() {
+            return data;
+        }
     }
 
 }

F-Droid/src/org/fdroid/fdroid/RepoUpdater.java

@@ -70,11 +70,17 @@ public class RepoUpdater {
         this.progressListener = progressListener;
     }
 
-    public boolean hasChanged() { return hasChanged; }
+    public boolean hasChanged() {
+        return hasChanged;
+    }
 
-    public List<App> getApps() { return apps; }
+    public List<App> getApps() {
+        return apps;
+    }
 
-    public List<Apk> getApks() { return apks; }
+    public List<Apk> getApks() {
+        return apks;
+    }
 
     private URL getIndexAddress() throws MalformedURLException {
         String urlString = repo.address + "/index.jar";
@@ -219,7 +225,9 @@ public class RepoUpdater {
         return values;
     }
 
-    public RepoUpdateRememberer getRememberer() { return rememberer; }
+    public RepoUpdateRememberer getRememberer() {
+        return rememberer;
+    }
 
     public static class RepoUpdateRememberer {
 

F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java

@@ -63,19 +63,33 @@ public class RepoXMLHandler extends DefaultHandler {
         description = null;
     }
 
-    public List<App> getApps() { return apps; }
+    public List<App> getApps() {
+        return apps;
+    }
 
-    public List<Apk> getApks() { return apksList; }
+    public List<Apk> getApks() {
+        return apksList;
+    }
 
-    public int getMaxAge() { return maxage; }
+    public int getMaxAge() {
+        return maxage;
+    }
 
-    public int getVersion() { return version; }
+    public int getVersion() {
+        return version;
+    }
 
-    public String getDescription() { return description; }
+    public String getDescription() {
+        return description;
+    }
 
-    public String getName() { return name; }
+    public String getName() {
+        return name;
+    }
 
-    public String getSigningCertFromIndexXml() { return signingCertFromIndexXml; }
+    public String getSigningCertFromIndexXml() {
+        return signingCertFromIndexXml;
+    }
 
     @Override
     public void characters(char[] ch, int start, int length) {

F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java

@@ -43,5 +43,7 @@ class HoneycombClipboard extends ClipboardCompat {
 class OldClipboard extends ClipboardCompat {
 
     @Override
-    public String getText() { return null; }
+    public String getText() {
+        return null;
+    }
 }

F-Droid/src/org/fdroid/fdroid/data/App.java

@@ -424,5 +424,7 @@ public class App extends ValueObject implements Comparable<App> {
         return new AppFilter().filter(this);
     }
 
-    public String getSuggestedVersion() { return suggestedVersion; }
+    public String getSuggestedVersion() {
+        return suggestedVersion;
+    }
 }

F-Droid/src/org/fdroid/fdroid/data/AppProvider.java

@@ -539,17 +539,23 @@ public class AppProvider extends FDroidProvider {
     }
 
     @Override
-    protected String getTableName() { return DBHelper.TABLE_APP; }
+    protected String getTableName() {
+        return DBHelper.TABLE_APP;
+    }
 
     @Override
-    protected String getProviderName() { return "AppProvider"; }
+    protected String getProviderName() {
+        return "AppProvider";
+    }
 
     public static String getAuthority() {
         return AUTHORITY + "." + PROVIDER_NAME;
     }
 
     @Override
-    protected UriMatcher getMatcher() { return matcher; }
+    protected UriMatcher getMatcher() {
+        return matcher;
+    }
 
     private AppQuerySelection queryCanUpdate() {
         final String ignoreCurrent = " fdroid_app.ignoreThisUpdate != fdroid_app.suggestedVercode ";

F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java

@@ -100,13 +100,21 @@ public class NewRepoConfig {
 
     }
 
-    public String getBssid() { return bssid; }
+    public String getBssid() {
+        return bssid;
+    }
 
-    public String getSsid() { return ssid; }
+    public String getSsid() {
+        return ssid;
+    }
 
-    public int getPort() { return port; }
+    public int getPort() {
+        return port;
+    }
 
-    public String getRepoUriString() { return uriString; }
+    public String getRepoUriString() {
+        return uriString;
+    }
 
     public Uri getRepoUri() {
         if (uriString == null) {
@@ -115,17 +123,29 @@ public class NewRepoConfig {
         return Uri.parse(uriString);
     }
 
-    public String getHost() { return host; }
+    public String getHost() {
+        return host;
+    }
 
-    public String getFingerprint() { return fingerprint; }
+    public String getFingerprint() {
+        return fingerprint;
+    }
 
-    public boolean isValidRepo() { return isValidRepo; }
+    public boolean isValidRepo() {
+        return isValidRepo;
+    }
 
-    public boolean isFromSwap() { return fromSwap; }
+    public boolean isFromSwap() {
+        return fromSwap;
+    }
 
-    public boolean preventFurtherSwaps() { return preventFurtherSwaps; }
+    public boolean preventFurtherSwaps() {
+        return preventFurtherSwaps;
+    }
 
-    public String getErrorMessage() { return errorMessage; }
+    public String getErrorMessage() {
+        return errorMessage;
+    }
 
     /** Sanitize and format an incoming repo URI for function and readability */
     public static String sanitizeRepoUri(Uri uri) {

F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java

@@ -33,9 +33,13 @@ public class QuerySelection {
         this.selection = selection;
     }
 
-    public String[] getArgs() { return args; }
+    public String[] getArgs() {
+        return args;
+    }
 
-    public String getSelection() { return selection; }
+    public String getSelection() {
+        return selection;
+    }
 
     public boolean hasSelection() {
         return !TextUtils.isEmpty(selection);

F-Droid/src/org/fdroid/fdroid/data/Repo.java

@@ -89,12 +89,18 @@ public class Repo extends ValueObject {
         }
     }
 
-    public long getId() { return id; }
+    public long getId() {
+        return id;
+    }
 
-    public String getName() { return name; }
+    public String getName() {
+        return name;
+    }
 
     @Override
-    public String toString() { return address; }
+    public String toString() {
+        return address;
+    }
 
     public boolean isSigned() {
         return !TextUtils.isEmpty(this.pubkey);

F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java

@@ -281,9 +281,15 @@ public class ApkDownloader implements AsyncDownloader.Listener {
         }
     }
 
-    public Apk getApk() { return curApk; }
+    public Apk getApk() {
+        return curApk;
+    }
 
-    public int getBytesRead() { return dlWrapper != null ? dlWrapper.getBytesRead() : 0; }
+    public int getBytesRead() {
+        return dlWrapper != null ? dlWrapper.getBytesRead() : 0;
+    }
 
-    public int getTotalBytes() { return dlWrapper != null ? dlWrapper.getTotalBytes() : 0; }
+    public int getTotalBytes() {
+        return dlWrapper != null ? dlWrapper.getTotalBytes() : 0;
+    }
 }

F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java

@@ -168,8 +168,8 @@ public class HttpDownloader extends Downloader {
         try {
             if (stream != null)
                 stream.close();
+        } catch (IOException e) {
         }
-        catch (IOException e) { }
 
         connection.disconnect();
     }

F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java

@@ -44,7 +44,9 @@ public class BluetoothServer extends Thread {
         start();
     }
 
-    public boolean isRunning() { return isRunning; }
+    public boolean isRunning() {
+        return isRunning;
+    }
 
     public void close() {
 

F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java

@@ -154,8 +154,9 @@ public final class Request {
                 baos.write(b);
             }
 
-            try { Thread.sleep(100); }
-            catch (Exception e) { }
+            try {
+                Thread.sleep(100);
+            } catch (Exception e) { }
         }
 
         return line;

F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java

@@ -44,7 +44,9 @@ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter {
     }
 
     @Override
-    public int getCount() { return TabManager.INDEX_COUNT; }
+    public int getCount() {
+        return TabManager.INDEX_COUNT;
+    }
 
     @Override
     public String getPageTitle(int i) {

config/checkstyle/checkstyle.xml

@@ -68,9 +68,9 @@
         <module name="RedundantModifier" />
 
         <module name="AvoidNestedBlocks" />
-        <!--<module name="LeftCurly" />-->
+        <module name="LeftCurly" />
         <!--<module name="NeedBraces" />-->
-        <!--<module name="RightCurly" />-->
+        <module name="RightCurly" />
 
         <module name="EmptyStatement" />
         <!--<module name="HiddenField" />-->