From bfcb7fb6f2b8168687169e697d351ac9ed955886 Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 15 Jul 2016 00:08:53 +1200 Subject: [PATCH] Rearranging code --- .../nrw/commons/upload/ShareActivity.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) 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 3e61dbd34..a2341a217 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 @@ -101,6 +101,25 @@ public class ShareActivity } } + private void uploadBegins() { + + Toast startingToast = Toast.makeText(getApplicationContext(), R.string.uploading_started, Toast.LENGTH_LONG); + startingToast.show(); + + if (cacheFound == false) { + //Has to be called after apiCall.request() + app.cacheData.cacheCategory(); + Log.d(TAG, "Cache the categories found"); + } + + uploadController.startUpload(title, mediaUri, description, mimeType, source, new UploadController.ContributionUploadProgress() { + public void onUploadStarted(Contribution contribution) { + ShareActivity.this.contribution = contribution; + showPostUpload(); + } + }); + } + private void showPostUpload() { if(categorizationFragment == null) { categorizationFragment = new CategorizationFragment(); @@ -277,25 +296,6 @@ public class ShareActivity } } - private void uploadBegins() { - - Toast startingToast = Toast.makeText(getApplicationContext(), R.string.uploading_started, Toast.LENGTH_LONG); - startingToast.show(); - - if (cacheFound == false) { - //Has to be called after apiCall.request() - app.cacheData.cacheCategory(); - Log.d(TAG, "Cache the categories found"); - } - - uploadController.startUpload(title, mediaUri, description, mimeType, source, new UploadController.ContributionUploadProgress() { - public void onUploadStarted(Contribution contribution) { - ShareActivity.this.contribution = contribution; - showPostUpload(); - } - }); - } - @Override public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {