From fec005304ea20de7fa69a6cadfbf992bd72b0859 Mon Sep 17 00:00:00 2001 From: misaochan Date: Wed, 7 Feb 2018 20:36:41 +1000 Subject: [PATCH] Tidy up DirectUpload - overloaded constructor not necessary --- .../java/fr/free/nrw/commons/nearby/DirectUpload.java | 10 +--------- .../fr/free/nrw/commons/nearby/NearbyMapFragment.java | 4 ++-- 2 files changed, 3 insertions(+), 11 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 be6b68dbc..b58afa82a 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 @@ -13,18 +13,10 @@ import static android.Manifest.permission.READ_EXTERNAL_STORAGE; import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE; import static android.content.pm.PackageManager.PERMISSION_GRANTED; -public class DirectUpload { +class DirectUpload { private ContributionController controller; private Fragment fragment; - private SharedPreferences prefs; - - - DirectUpload(Fragment fragment, ContributionController controller, SharedPreferences prefs) { - this.fragment = fragment; - this.controller = controller; - this.prefs = prefs; - } DirectUpload(Fragment fragment, ContributionController controller) { this.fragment = fragment; 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 e5ae646d9..4eedabf67 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 @@ -410,7 +410,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(this, controller, prefs); + DirectUpload directUpload = new DirectUpload(this, controller); storeSharedPrefs(); directUpload.initiateCameraUpload(); }); @@ -418,7 +418,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(this, controller, prefs); + DirectUpload directUpload = new DirectUpload(this, controller); storeSharedPrefs(); directUpload.initiateGalleryUpload();