From eed0f49ce81ee979e920f4b898c91602b496f2a8 Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 15 Dec 2015 20:01:10 +1300 Subject: [PATCH] Removed upload capability for easier debugging App doesn't actually upload files, so can submit same file over and over. Needed for debugging. Will restore upload functionality prior to release --- .../main/java/fr/free/nrw/commons/MediaWikiImageView.java | 6 +++--- .../java/fr/free/nrw/commons/media/MediaDetailFragment.java | 1 + .../java/fr/free/nrw/commons/upload/UploadController.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/commons/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java b/commons/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java index f733edcf3..b1b08e172 100644 --- a/commons/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java +++ b/commons/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java @@ -151,7 +151,7 @@ public class MediaWikiImageView extends ImageView { // from the network. ImageContainer newContainer = mImageLoader.get(mUrl, new ImageListener() { - @Override + public void onErrorResponse(final VolleyError error) { if(!tryOriginal) { post(new Runnable() { @@ -163,7 +163,7 @@ public class MediaWikiImageView extends ImageView { } - @Override + public void onResponse(final ImageContainer response, boolean isImmediate) { // If this was an immediate response that was delivered inside of a layout // pass do not set the image immediately as it will trigger a requestLayout @@ -171,7 +171,7 @@ public class MediaWikiImageView extends ImageView { // the main thread. if (isImmediate && isInLayoutPass) { post(new Runnable() { - @Override + public void run() { onResponse(response, false); } diff --git a/commons/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/commons/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index e7b608938..9f29ab265 100644 --- a/commons/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/commons/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -186,6 +186,7 @@ public class MediaDetailFragment extends SherlockFragment { @Override protected void onPreExecute() { extractor = new MediaDataExtractor(media.getFilename(), licenseList); + Log.i("Image", "Image name is " + media.getFilename()); } @Override diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java index 0826aef5f..58665dae2 100644 --- a/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -140,7 +140,7 @@ public class UploadController { @Override protected void onPostExecute(Contribution contribution) { super.onPostExecute(contribution); - uploadService.queue(UploadService.ACTION_UPLOAD_FILE, contribution); + //uploadService.queue(UploadService.ACTION_UPLOAD_FILE, contribution); onComplete.onUploadStarted(contribution); } });