From ea43e1a796e02b851903539b18eaf25db734dd4f Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Tue, 21 Mar 2017 20:31:10 +0000 Subject: [PATCH] Fix Codacy Issues + remove unused patch --- .../free/nrw/commons/CommonsApplication.java | 16 +++++--------- .../fr/free/nrw/commons/HandlerService.java | 2 +- .../free/nrw/commons/MediaDataExtractor.java | 16 +++++++------- .../ContributionsSyncService.java | 1 + .../ModificationsSyncService.java | 1 + .../commons/upload/MultipleShareActivity.java | 6 ++---- sign.sh | 1 + upload-to-commons.patch | 21 ------------------- 8 files changed, 18 insertions(+), 46 deletions(-) delete mode 100644 upload-to-commons.patch diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java index 916ea38cd..ffee57283 100644 --- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java +++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java @@ -85,8 +85,7 @@ public class CommonsApplication extends Application { 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 class CommonsApplication extends Application { @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 class CommonsApplication extends Application { imageCache = new LruCache(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; } }; diff --git a/app/src/main/java/fr/free/nrw/commons/HandlerService.java b/app/src/main/java/fr/free/nrw/commons/HandlerService.java index 81313fd50..0a31b2d8b 100644 --- a/app/src/main/java/fr/free/nrw/commons/HandlerService.java +++ b/app/src/main/java/fr/free/nrw/commons/HandlerService.java @@ -29,8 +29,8 @@ public abstract class HandlerService extends Service { @Override public void onDestroy() { - super.onDestroy(); threadLooper.quit(); + super.onDestroy(); } public class HandlerServiceLocalBinder extends Binder { diff --git a/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java b/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java index 67ec50a38..f5d153e5a 100644 --- a/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java +++ b/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java @@ -225,17 +225,15 @@ public class MediaDataExtractor { 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."); } } } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncService.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncService.java index b87076dcc..3af92935c 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncService.java +++ b/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); diff --git a/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncService.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncService.java index 555048542..b664aaaa4 100644 --- a/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncService.java +++ b/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); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java index ef5d45541..a39ca0d6c 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java @@ -109,10 +109,8 @@ public class MultipleShareActivity @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(); } } diff --git a/sign.sh b/sign.sh index 797a891a9..acdedd983 100755 --- a/sign.sh +++ b/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 diff --git a/upload-to-commons.patch b/upload-to-commons.patch deleted file mode 100644 index 44b554ad3..000000000 --- a/upload-to-commons.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java -index 3fe594d..8306000 100644 ---- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java -+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java -@@ -45,11 +45,12 @@ public class CommonsApplication extends Application { - - private MWApi api; - private Account currentAccount = null; // Unlike a savings account... -- public static final String API_URL = "https://test.wikipedia.org/w/api.php"; -- public static final String IMAGE_URL_BASE = "https://upload.wikimedia.org/wikipedia/test"; -- public static final String HOME_URL = "https://test.wikipedia.org/wiki/"; -+ public static final String API_URL = "https://commons.wikimedia.org/w/api.php"; -+ public static final String IMAGE_URL_BASE = "https://upload.wikimedia.org/wikipedia/commons"; -+ public static final String HOME_URL = "https://commons.wikimedia.org/wiki/"; -+ - public static final String EVENTLOG_URL = "https://www.wikimedia.org/beacon/event"; -- public static final String EVENTLOG_WIKI = "testwiki"; -+ public static final String EVENTLOG_WIKI = "commonswiki"; - - public static final Object[] EVENT_UPLOAD_ATTEMPT = {"MobileAppUploadAttempts", 5334329L}; - public static final Object[] EVENT_LOGIN_ATTEMPT = {"MobileAppLoginAttempts", 5257721L};