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

Merged from 2.8-release

Browse source
This commit is contained in:
Nicolas Raoul 2018-08-08 15:07:51 +09:00
commit e00f69a23d
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
View file

@ -148,12 +148,13 @@ public class NearbyListFragment extends DaggerFragment {
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s", Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
requestCode, resultCode, data); requestCode, resultCode, data);
String wikidataEntityId = directPrefs.getString("WikiDataEntityId", null);
if (requestCode == ContributionController.SELECT_FROM_CAMERA) { if (requestCode == ContributionController.SELECT_FROM_CAMERA) {
// If coming from camera, pass null as uri. Because camera photos get saved to a // If coming from camera, pass null as uri. Because camera photos get saved to a
// fixed directory // fixed directory
controller.handleImagePicked(requestCode, null, true, null); controller.handleImagePicked(requestCode, null, true, wikidataEntityId);
} else { } else {
controller.handleImagePicked(requestCode, data.getData(), true, null); controller.handleImagePicked(requestCode, data.getData(), true, wikidataEntityId);
} }
} else { } else {
Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s", Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",

5
app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
View file

@ -806,12 +806,13 @@ public class NearbyMapFragment extends DaggerFragment {
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s", Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
requestCode, resultCode, data); requestCode, resultCode, data);
String wikidataEntityId = directPrefs.getString("WikiDataEntityId", null);
if (requestCode == ContributionController.SELECT_FROM_CAMERA) { if (requestCode == ContributionController.SELECT_FROM_CAMERA) {
// If coming from camera, pass null as uri. Because camera photos get saved to a // If coming from camera, pass null as uri. Because camera photos get saved to a
// fixed directory // fixed directory
controller.handleImagePicked(requestCode, null, true, null); controller.handleImagePicked(requestCode, null, true, wikidataEntityId);
} else { } else {
controller.handleImagePicked(requestCode, data.getData(), true, null); controller.handleImagePicked(requestCode, data.getData(), true, wikidataEntityId);
} }
} else { } else {
Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s", Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",

4
app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
View file

@ -34,6 +34,7 @@ import fr.free.nrw.commons.di.ApplicationlessInjection;
import timber.log.Timber; import timber.log.Timber;
import static fr.free.nrw.commons.theme.NavigationBaseActivity.startActivityWithFlags; import static fr.free.nrw.commons.theme.NavigationBaseActivity.startActivityWithFlags;
import static fr.free.nrw.commons.wikidata.WikidataConstants.WIKIDATA_ENTITY_ID_PREF;
public class PlaceRenderer extends Renderer<Place> { public class PlaceRenderer extends Renderer<Place> {
@ -160,6 +161,7 @@ public class PlaceRenderer extends Renderer<Place> {
editor.putString("Title", place.getName()); editor.putString("Title", place.getName());
editor.putString("Desc", place.getLongDescription()); editor.putString("Desc", place.getLongDescription());
editor.putString("Category", place.getCategory()); editor.putString("Category", place.getCategory());
editor.putString(WIKIDATA_ENTITY_ID_PREF, place.getWikiDataEntityId());
editor.apply(); editor.apply();
} }
@ -241,4 +243,4 @@ public class PlaceRenderer extends Renderer<Place> {
return place.hasCommonsLink() || place.hasWikidataLink(); return place.hasCommonsLink() || place.hasWikidataLink();
} }
} }

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

@ -114,9 +114,6 @@ public class UploadController {
contribution.setTag("mimeType", mimeType); contribution.setTag("mimeType", mimeType);
contribution.setSource(source); contribution.setSource(source);
//Calls the next overloaded method
startUpload(contribution, onComplete);
Timber.d("Wikidata entity ID received from Share activity is %s", wikiDataEntityId); Timber.d("Wikidata entity ID received from Share activity is %s", wikiDataEntityId);
//TODO: Modify this to include coords //TODO: Modify this to include coords
Account currentAccount = sessionManager.getCurrentAccount(); Account currentAccount = sessionManager.getCurrentAccount();
@ -136,7 +133,8 @@ public class UploadController {
contribution.setWikiDataEntityId(wikiDataEntityId); contribution.setWikiDataEntityId(wikiDataEntityId);
contribution.setContentProviderUri(contentProviderUri); contribution.setContentProviderUri(contentProviderUri);
//Calls the next overloaded method
startUpload(contribution, onComplete);
} }
/** /**