From b76ecf74f829bdbbd127da473a907a794a8b97cd Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 1 Jan 2018 20:28:41 +1000 Subject: [PATCH] Switch to uploading from gallery --- .../java/fr/free/nrw/commons/nearby/DirectUpload.java | 2 +- .../fr/free/nrw/commons/nearby/NearbyMapFragment.java | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) 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 a6357436a..e879ac70e 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 @@ -45,7 +45,7 @@ class DirectUpload { Timber.d("After shared prefs, image title: " + imageTitle + " Image desc: " + imageDesc); } - void initiateUpload(Context context) { + void initiateGalleryUpload(Context context) { Activity activity = (Activity) context; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { 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 bb63cfc78..da191c44e 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 @@ -383,19 +383,16 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { distance.setText(place.distance.toString()); fabCamera.setOnClickListener(view -> { - //TODO: Change this to activate camera upload (see ContributionsListFragment). Insert shared preference. - Timber.d("Image title: " + place.getName() + "Image desc: " + place.getLongDescription()); - DirectUpload directUpload = new DirectUpload(place.getName(), place.getLongDescription(), this); - directUpload.storeSharedPrefs(getActivity()); - directUpload.initiateUpload(getActivity()); }); fabGallery.setOnClickListener(view -> { - //TODO: Change this to activate gallery upload (see ContributionsListFragment). Insert shared preference. Timber.d("Image title: " + place.getName() + "Image desc: " + place.getLongDescription()); - openWebView(place.siteLinks.getWikidataLink()); + + DirectUpload directUpload = new DirectUpload(place.getName(), place.getLongDescription(), this); + directUpload.storeSharedPrefs(getActivity()); + directUpload.initiateGalleryUpload(getActivity()); }); }