From 9446427d0d958d8f114d6b4df2194858a4bf91ed Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 25 Jan 2018 02:26:14 +1000 Subject: [PATCH] Clean up DirectNearbyUpload constructor --- .../main/java/fr/free/nrw/commons/nearby/DirectUpload.java | 6 +----- .../java/fr/free/nrw/commons/nearby/NearbyMapFragment.java | 5 ++--- 2 files changed, 3 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 ff4c09e86..7e6561ab2 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 @@ -19,17 +19,13 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED; public class DirectUpload { - private String title; - private String desc; private ContributionController controller; private Fragment fragment; private SharedPreferences prefs; - DirectUpload(String title, String desc, Fragment fragment, ContributionController controller, SharedPreferences prefs) { - this.title = title; - this.desc = desc; + DirectUpload(Fragment fragment, ContributionController controller, SharedPreferences prefs) { this.fragment = fragment; this.controller = controller; this.prefs = prefs; 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 2b1bdeefd..24fabcd10 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 @@ -407,7 +407,7 @@ public class NearbyMapFragment extends DaggerFragment { fabCamera.setOnClickListener(view -> { Timber.d("Camera button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription()); controller = new ContributionController(this); - DirectUpload directUpload = new DirectUpload(place.getName(), place.getLongDescription(), this, controller, prefs); + DirectUpload directUpload = new DirectUpload(this, controller, prefs); storeSharedPrefs(); directUpload.initiateCameraUpload(); }); @@ -415,7 +415,7 @@ public class NearbyMapFragment extends DaggerFragment { fabGallery.setOnClickListener(view -> { Timber.d("Gallery button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription()); controller = new ContributionController(this); - DirectUpload directUpload = new DirectUpload(place.getName(), place.getLongDescription(), this, controller, prefs); + DirectUpload directUpload = new DirectUpload(this, controller, prefs); storeSharedPrefs(); directUpload.initiateGalleryUpload(); }); @@ -423,7 +423,6 @@ public class NearbyMapFragment extends DaggerFragment { void storeSharedPrefs() { SharedPreferences.Editor editor = directPrefs.edit(); - editor.putString("Title", place.getName()); editor.putString("Desc", place.getLongDescription()); editor.apply();