From ef3eda7d1023f538821eeca8fe934b79c11bc389 Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 2 Jan 2018 21:01:00 +1000 Subject: [PATCH] Create boolean for isDirectUpload and pass shared prefs to ShareActivity.java --- .../commons/contributions/ContributionController.java | 5 ++++- .../contributions/ContributionsListFragment.java | 2 +- .../java/fr/free/nrw/commons/nearby/DirectUpload.java | 7 ------- .../fr/free/nrw/commons/nearby/NearbyMapFragment.java | 2 +- .../java/fr/free/nrw/commons/upload/ShareActivity.java | 10 ++++++++++ 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java index c6cedbd84..5614172a8 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java @@ -81,7 +81,7 @@ public class ContributionController { fragment.startActivityForResult(pickImageIntent, SELECT_FROM_GALLERY); } - public void handleImagePicked(int requestCode, Intent data) { + public void handleImagePicked(int requestCode, Intent data, boolean isDirectUpload) { FragmentActivity activity = fragment.getActivity(); Timber.d("handleImagePicked() called with onActivityResult()"); Intent shareIntent = new Intent(activity, ShareActivity.class); @@ -93,6 +93,9 @@ public class ContributionController { shareIntent.setType(activity.getContentResolver().getType(imageData)); shareIntent.putExtra(EXTRA_STREAM, imageData); shareIntent.putExtra(EXTRA_SOURCE, SOURCE_GALLERY); + if (isDirectUpload) { + shareIntent.putExtra("isDirectUpload", true); + } break; case SELECT_FROM_CAMERA: shareIntent.setType("image/jpeg"); //FIXME: Find out appropriate mime type diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index 590d4e6ad..f58e6a9ab 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -105,7 +105,7 @@ public class ContributionsListFragment extends DaggerFragment { if (resultCode == RESULT_OK) { Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s", requestCode, resultCode, data); - controller.handleImagePicked(requestCode, data); + controller.handleImagePicked(requestCode, data, false); } else { Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s", requestCode, resultCode, data); diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java b/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java index 45513e168..792257abb 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java @@ -39,13 +39,6 @@ class DirectUpload { editor.putString("Title", title); editor.putString("Desc", desc); editor.apply(); - - //TODO: Shift this into title/desc screen after upload initiated - sharedPref = fragment.getActivity().getPreferences(Context.MODE_PRIVATE); - String imageTitle = sharedPref.getString("Title", ""); - String imageDesc = sharedPref.getString("Desc", ""); - - Timber.d("After shared prefs, image title: " + imageTitle + " Image desc: " + imageDesc); } void initiateGalleryUpload() { diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java index 43892b817..e2055fa81 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java @@ -411,7 +411,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { if (resultCode == RESULT_OK) { Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s", requestCode, resultCode, data); - controller.handleImagePicked(requestCode, data); + controller.handleImagePicked(requestCode, data, true); } else { Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s", requestCode, resultCode, data); 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 963ae3fd3..ec453a3d2 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 @@ -2,6 +2,7 @@ package fr.free.nrw.commons.upload; import android.Manifest; import android.content.ContentResolver; +import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; @@ -224,6 +225,15 @@ public class ShareActivity } else { source = Contribution.SOURCE_EXTERNAL; } + if (intent.hasExtra("isDirectUpload")) { + Timber.d("This was initiated by a direct upload from Nearby"); + //TODO: Shift this into title/desc screen after upload initiated + SharedPreferences sharedPref = this.getPreferences(Context.MODE_PRIVATE); + String imageTitle = sharedPref.getString("Title", ""); + String imageDesc = sharedPref.getString("Desc", ""); + + Timber.d("In ShareActivity, image title: " + imageTitle + " and image desc: " + imageDesc); + } mimeType = intent.getType(); }