From 73327192f9dbcbe6431066f513184ae6a1008fed Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 2 Jan 2018 21:22:09 +1000 Subject: [PATCH] Tidy up and create framework for autofilling EditText --- .../java/fr/free/nrw/commons/nearby/DirectUpload.java | 9 --------- .../java/fr/free/nrw/commons/upload/ShareActivity.java | 5 +++-- .../fr/free/nrw/commons/upload/SingleUploadFragment.java | 6 ++++++ 3 files changed, 9 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 6dfcf6eef..50b60f26d 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,15 +39,6 @@ class DirectUpload { editor.putString("Title", title); editor.putString("Desc", desc); editor.apply(); - - /** - //TODO remove this - sharedPref = fragment.getActivity().getSharedPreferences(Context.MODE_PRIVATE); - String imageTitle = sharedPref.getString("Title", ""); - String imageDesc = sharedPref.getString("Desc", ""); - - Timber.d("In DirectUpload, image title: " + imageTitle + " and image desc: " + imageDesc); - */ } void initiateGalleryUpload() { 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 d1fb05fa9..5664af856 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 @@ -239,12 +239,13 @@ public class ShareActivity } 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.getSharedPreferences("Direct Upload", 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(); } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java index 099790495..4c36d271e 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java @@ -106,6 +106,12 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment { license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA_3); + //TODO: Get this to display title and desc + if (true) { + titleEdit.setText(""); + descEdit.setText(""); + } + // check if this is the first time we have uploaded if (prefs.getString("Title", "").trim().length() == 0 && prefs.getString("Desc", "").trim().length() == 0) {