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

Retrieve title/desc via Dagger injection in SingleUploadFragment

Browse source
This commit is contained in:
misaochan 2018-01-24 21:58:50 +10:00 • committed by maskara
parent 31fcb212c2
commit 59cc07922d
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -257,10 +257,12 @@ public class ShareActivity
Timber.d("This was initiated by a direct upload from Nearby"); Timber.d("This was initiated by a direct upload from Nearby");
isNearbyUpload = true; isNearbyUpload = true;
/**
SharedPreferences sharedPref = this.getSharedPreferences("Direct Upload", Context.MODE_PRIVATE); SharedPreferences sharedPref = this.getSharedPreferences("Direct Upload", Context.MODE_PRIVATE);
nearbyTitle = sharedPref.getString("Title", ""); nearbyTitle = sharedPref.getString("Title", "");
nearbyDesc = sharedPref.getString("Desc", ""); nearbyDesc = sharedPref.getString("Desc", "");
Timber.d("In ShareActivity, image title: " + nearbyTitle + " and image desc: " + nearbyDesc); Timber.d("In ShareActivity, image title: " + nearbyTitle + " and image desc: " + nearbyDesc);
*/
} }
mimeType = intent.getType(); mimeType = intent.getType();
} }

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

@ -56,6 +56,8 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment {
@BindView(R.id.licenseSpinner) Spinner licenseSpinner; @BindView(R.id.licenseSpinner) Spinner licenseSpinner;
@Inject @Named("default_preferences") SharedPreferences prefs; @Inject @Named("default_preferences") SharedPreferences prefs;
@Inject @Named("direct_nearby_upload_prefs") SharedPreferences directPrefs;
private String license; private String license;
private OnUploadActionInitiated uploadActionInitiatedHandler; private OnUploadActionInitiated uploadActionInitiatedHandler;
@ -110,8 +112,8 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment {
boolean isNearbyUpload = ((ShareActivity) getActivity()).isNearbyUpload(); boolean isNearbyUpload = ((ShareActivity) getActivity()).isNearbyUpload();
if (isNearbyUpload) { if (isNearbyUpload) {
String imageTitle = ((ShareActivity) getActivity()).getNearbyTitle(); String imageTitle = directPrefs.getString("Title", "");
String imageDesc = ((ShareActivity) getActivity()).getNearbyDesc(); String imageDesc = directPrefs.getString("Desc", "");
titleEdit.setText(imageTitle); titleEdit.setText(imageTitle);
descEdit.setText(imageDesc); descEdit.setText(imageDesc);
} }