From 0a6ed18c8333375953e9d81a2c70539caf0f2fe1 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Tue, 2 Jan 2018 21:33:10 +1000
Subject: [PATCH] Pass nearby Title and Desc to SingleUploadFragment

---
 .../free/nrw/commons/upload/ShareActivity.java | 18 +++++++++++++-----
 .../commons/upload/SingleUploadFragment.java   |  8 +++++---
 2 files changed, 18 insertions(+), 8 deletions(-)

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 5664af856..2b45485a7 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,6 +112,8 @@ public class ShareActivity
     private String title;
     private String description;
     private Snackbar snackbar;
+    private String nearbyTitle;
+    private String nearbyDesc;
     private boolean duplicateCheckPassed = false;
     private boolean haveCheckedForOtherImages = false;
     /**
@@ -211,6 +213,14 @@ public class ShareActivity
         finish();
     }
 
+    protected String getNearbyTitle() {
+        return nearbyTitle;
+    }
+
+    protected String getNearbyDesc() {
+        return nearbyDesc;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -241,11 +251,9 @@ public class ShareActivity
                 Timber.d("This was initiated by a direct upload from Nearby");
 
                 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);
-
-
+                nearbyTitle = sharedPref.getString("Title", "");
+                nearbyDesc = sharedPref.getString("Desc", "");
+                Timber.d("In ShareActivity, image title: " + nearbyTitle + " and image desc: " + nearbyDesc);
             }
             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 4c36d271e..f3ee745e9 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
@@ -108,8 +108,10 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment {
 
         //TODO: Get this to display title and desc
         if (true) {
-            titleEdit.setText("");
-            descEdit.setText("");
+            String imageTitle = ((ShareActivity) getActivity()).getNearbyTitle();
+            String imageDesc = ((ShareActivity) getActivity()).getNearbyDesc();
+            titleEdit.setText(imageTitle);
+            descEdit.setText(imageDesc);
         }
 
         // check if this is the first time we have uploaded
@@ -266,7 +268,7 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment {
         }
         return false;
     }
-
+    
     private void setLicenseSummary(String license) {
         licenseSummaryView.setText(getString(R.string.share_license_summary, getString(Utils.licenseNameFor(license))));
     }