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 2b45485a7..94eb25e6d 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 @@ -112,10 +112,12 @@ public class ShareActivity private String title; private String description; private Snackbar snackbar; + private boolean duplicateCheckPassed = false; + private String nearbyTitle; private String nearbyDesc; - private boolean duplicateCheckPassed = false; private boolean haveCheckedForOtherImages = false; + private boolean isNearbyUpload = false; /** * Called when user taps the submit button. */ @@ -213,6 +215,10 @@ public class ShareActivity finish(); } + protected boolean isNearbyUpload() { + return isNearbyUpload; + } + protected String getNearbyTitle() { return nearbyTitle; } @@ -249,6 +255,7 @@ public class ShareActivity } if (intent.hasExtra("isDirectUpload")) { Timber.d("This was initiated by a direct upload from Nearby"); + isNearbyUpload = true; SharedPreferences sharedPref = this.getSharedPreferences("Direct Upload", Context.MODE_PRIVATE); nearbyTitle = sharedPref.getString("Title", ""); 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 f3ee745e9..f0ce1356e 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,8 +106,10 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment { license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA_3); + boolean isNearbyUpload = ((ShareActivity) getActivity()).isNearbyUpload(); + //TODO: Get this to display title and desc - if (true) { + if (isNearbyUpload) { String imageTitle = ((ShareActivity) getActivity()).getNearbyTitle(); String imageDesc = ((ShareActivity) getActivity()).getNearbyDesc(); titleEdit.setText(imageTitle); @@ -268,7 +270,8 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment { } return false; } - + + @SuppressLint("StringFormatInvalid") private void setLicenseSummary(String license) { licenseSummaryView.setText(getString(R.string.share_license_summary, getString(Utils.licenseNameFor(license)))); }