From 4bcc9d7ddd664f2c6640c83d95327c700f968230 Mon Sep 17 00:00:00 2001 From: misaochan Date: Wed, 14 Dec 2016 16:46:10 +1300 Subject: [PATCH] Fix ExistingFileAsync call in ShareActivity --- .../fr/free/nrw/commons/upload/ExistingFileAsync.java | 3 +-- .../java/fr/free/nrw/commons/upload/ShareActivity.java | 9 +-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java index 8e7513de2..5c42c18b1 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java @@ -14,6 +14,7 @@ import fr.free.nrw.commons.CommonsApplication; /** * Sends asynchronous queries to the Commons MediaWiki API to check that file doesn't already exist + * Returns true if file exists, false if it doesn't */ public class ExistingFileAsync extends AsyncTask { @@ -46,11 +47,9 @@ public class ExistingFileAsync extends AsyncTask { Log.d(TAG, "Searching Commons API for existing file: " + result.toString()); } catch (IOException e) { Log.e(TAG, "IO Exception: ", e); - //Return empty arraylist return false; } - //ArrayList categoryNodes = result.getNodes("/api/query/search/p/@title"); ArrayList resultNodes = result.getNodes("/api/query/allimages/"); boolean fileExists = !resultNodes.isEmpty(); Log.d(TAG, "File already exists in Commons:" + fileExists); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java index 3a777b7b0..bd2d4e868 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java @@ -251,14 +251,7 @@ public class ShareActivity //FIXME: Replace hardcoded string with call to Commons API instead (use TitleCategories.java as template) ExistingFileAsync fileAsyncTask = new ExistingFileAsync(fileSHA1); - fileAsyncTask.execute(url1, url2, url3); - - - - String debugSHA1 = "801957214aba50cb63bb6eb1b0effa50188900ba"; - - boolean fileSHA1Found = fileSHA1.equals(debugSHA1); - Log.d(TAG, "File found in Commons: " + fileSHA1Found); + fileAsyncTask.execute(); } catch (IOException e) { Log.d(TAG, "IO Exception: ", e);