mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pass nearby Title and Desc to SingleUploadFragment

Browse source
This commit is contained in:
misaochan 2018-01-02 21:33:10 +10:00 • committed by maskara
parent 73327192f9
commit 0a6ed18c83
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file

@ -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();
}

8
app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
View file

@ -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))));
}