Fix Codacy Issues + remove unused patch

Author: domdomegg

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

@@ -85,8 +85,7 @@ public static AbstractHttpClient createHttpClient() {
         schemeRegistry.register(new Scheme("https", sslSocketFactory, 443));
         ClientConnectionManager cm = new ThreadSafeClientConnManager(params, schemeRegistry);
         params.setParameter(CoreProtocolPNames.USER_AGENT, "Commons/" + APPLICATION_VERSION + " (https://mediawiki.org/wiki/Apps/Commons) Android/" + Build.VERSION.RELEASE);
-        DefaultHttpClient httpclient = new DefaultHttpClient(cm, params);
-        return httpclient;
+        return new DefaultHttpClient(cm, params);
     }
 
     public static MWApi createMWApi() {
@@ -95,8 +94,8 @@ public static MWApi createMWApi() {
 
     @Override
     public void onCreate() {
-        ACRA.init(this);
         super.onCreate();
+        ACRA.init(this);
         // Fire progress callbacks for every 3% of uploaded content
         System.setProperty("in.yuvi.http.fluent.PROGRESS_TRIGGER_THRESHOLD", "3.0");
         api = createMWApi();
@@ -130,15 +129,10 @@ public void onCreate() {
             imageCache = new LruCache<String, Bitmap>(cacheSize) {
                 @Override
                 protected int sizeOf(String key, Bitmap bitmap) {
-                    // bitmap.getByteCount() not available on older androids
                     int bitmapSize;
-                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB_MR1) {
-                        bitmapSize = bitmap.getRowBytes() * bitmap.getHeight();
-                    } else {
-                        bitmapSize = bitmap.getByteCount();
-                    }
-                    // The cache size will be measured in kilobytes rather than
-                    // number of items.
+                    bitmapSize = bitmap.getByteCount();
+
+                    // The cache size will be measured in kilobytes rather than number of items.
                     return bitmapSize / 1024;
                 }
             };

app/src/main/java/fr/free/nrw/commons/HandlerService.java

@@ -29,8 +29,8 @@ public void handleMessage(Message msg) {
 
     @Override
     public void onDestroy() {
-        super.onDestroy();
         threadLooper.quit();
+        super.onDestroy();
     }
 
     public class HandlerServiceLocalBinder extends Binder {

app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java

@@ -225,17 +225,15 @@ private Node findTemplateParameter(Node templateNode, TemplateChildNodeComparato
                 NodeList childNodes = node.getChildNodes();
                 for (int j = 0, childNodesLength = childNodes.getLength(); j < childNodesLength; j++) {
                     Node childNode = childNodes.item(j);
-                    if (childNode.getNodeName().equals("name")) {
-                        if (comparator.match(childNode)) {
-                            // yay! Now fetch the value node.
-                            for (int k = j + 1; k < childNodesLength; k++) {
-                                Node siblingNode = childNodes.item(k);
-                                if (siblingNode.getNodeName().equals("value")) {
-                                    return siblingNode;
-                                }
+                    if (childNode.getNodeName().equals("name") && comparator.match(childNode)) {
+                        // yay! Now fetch the value node.
+                        for (int k = j + 1; k < childNodesLength; k++) {
+                            Node siblingNode = childNodes.item(k);
+                            if (siblingNode.getNodeName().equals("value")) {
+                                return siblingNode;
                             }
-                            throw new IOException("No value node found for matched template parameter.");
                         }
+                        throw new IOException("No value node found for matched template parameter.");
                     }
                 }
             }

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncService.java

@@ -12,6 +12,7 @@ public class ContributionsSyncService extends Service {
 
     @Override
     public void onCreate() {
+        super.onCreate();
         synchronized (sSyncAdapterLock) {
             if (sSyncAdapter == null) {
                 sSyncAdapter = new ContributionsSyncAdapter(getApplicationContext(), true);

app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncService.java

@@ -12,6 +12,7 @@ public class ModificationsSyncService extends Service {
 
     @Override
     public void onCreate() {
+        super.onCreate();
         synchronized (sSyncAdapterLock) {
             if (sSyncAdapter == null) {
                 sSyncAdapter = new ModificationsSyncAdapter(getApplicationContext(), true);

app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java

@@ -109,10 +109,8 @@ public void OnMultipleUploadInitiated() {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        if (requestCode == 1) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                multipleUploadBegins();
-            }
+        if (requestCode == 1 && grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            multipleUploadBegins();
         }
     }
 

sign.sh

@@ -1,2 +1,3 @@
+#!/bin/sh
 jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore /home/nico/d/d/wya/nr-commons.keystore commons/target/commons-1.0-SNAPSHOT.apk nrkeystorealias
 zipalign -f -v 4 commons/target/commons-1.0-SNAPSHOT.apk commons/target/commons-1.0-SNAPSHOT_signed.apk