Commit graph

4976 commits

Author SHA1 Message Date
Seán Mac Gillicuddy
23b8c2e659
#3529 Captions/depictions are not saved to Commons (#3574)
* #3529 Captions/depictions are not saved to Commons - make copy of list of depictionEntityIds - uncomment editBaseDepictsProperty - refactor upload related classes

* #3529 Captions/depictions are not saved to Commons - fix wrong ArrayList usage

* #3529 Captions/depictions are not saved to Commons - fix test
2020-03-25 20:42:29 +10:00
Sean Mac Gillicuddy
587d97716a Merge branch 'master' into structured-data 2020-03-25 10:13:06 +00:00
Seán Mac Gillicuddy
7ed911808d
#3579 p18Value causes NPE in WikidataEditService createClaimWithLogging - add null check (#3580) 2020-03-25 00:59:44 +10:00
Sean Mac Gillicuddy
2854f6af02 Fix method invocations 2020-03-24 13:48:15 +00:00
Sean Mac Gillicuddy
d5b62befc9 Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
#	app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java
2020-03-24 13:35:49 +00:00
318anushka
8cb4e28a97
Wiki itemname displaying in toast (#3569)
* Wiki itemname displaying in toast

* Wikidata label displaying in toast

* Wikidata label displaying in toast

* wikiItemName added to parcelable methods

* Wikidata label displayed in toast

* Wikidata label displayed in toast
2020-03-24 12:54:37 +00:00
Sean Mac Gillicuddy
2e43995276 Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
2020-03-24 08:21:02 +00:00
Vivek Maskara
f7efa0e20a
Fix title/desc not getting filled for nearby picture (#3577) 2020-03-24 07:56:44 +00:00
Kaartic Sivaraam
1899d92cdf
PULL_REQUEST_TEMPLATE: request only issue number (#3545)
For some time now, GitHub is showing cards when we hover over an issue
number which gives us a quick summary of the issue. The issue title is
shown in the card among other things.

Given that and the fact that we already require the issue number to be
specified in the pull request description, it's now moot to
ask the contributors to include the issue title in the pull request
description. So, let's remove this unnecessary burden from them.
2020-03-23 12:33:52 -07:00
translatewiki.net
a31499b11f Localisation updates from https://translatewiki.net. 2020-03-23 14:57:26 +01:00
Anmol Gupta
839a61bba4
Change BiMap to HashMap (#3572)
* Change BiMap to HashMap

* Change containsKey to containsValue and delete BiMap.java
2020-03-23 13:21:28 +00:00
Sean Mac Gillicuddy
895b343f81 #3222 Merge master into Structured Data branch, fix conflicts - review fixes 2020-03-23 11:30:02 +00:00
Kaartic Sivaraam
630f0a1dff
Fix hardcoded string in similar image dialog (#3563)
Fixes #3557
2020-03-22 11:23:00 -07:00
Sean Mac Gillicuddy
1404bb0da6 Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
#	app/src/main/java/fr/free/nrw/commons/repository/UploadRemoteDataSource.java
#	app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.java
#	app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java
#	app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
#	app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.java
#	app/src/test/kotlin/fr/free/nrw/commons/upload/FileProcessorTest.kt
#	app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt
2020-03-20 14:40:13 +00:00
Anmol Gupta
a63a3580de
Change "Archived" notifications to "Read" notifications (#3554)
* Change archived to read

* Change string names
2020-03-20 14:20:20 +00:00
Seán Mac Gillicuddy
fb51fc618a
#3408 Refactoring the FileProcessor and GPSExtractor classes (#3543)
* #3408 Refactoring the FileProcessor and GPSExtractor classes - refactor FileProcessor

* #3408 Refactoring the FileProcessor and GPSExtractor classes - refactor and rename GpsExtractor

* #3408 Refactoring the FileProcessor and GPSExtractor classes - convert ImageCoordinates to kotlin

* #3408 Refactoring the FileProcessor and GPSExtractor classes - convert FileProcessor to kotlin

* #3408 Refactoring the FileProcessor and GPSExtractor classes - minor reformatting

* #3408 Refactoring the FileProcessor and GPSExtractor classes - fix compilation and naming issues

* #3408 Refactoring the FileProcessor and GPSExtractor classes - remove empty test

* #3408 Refactoring the FileProcessor and GPSExtractor classes - set coordinates for upload item if user chooses it
2020-03-20 17:18:14 +03:00
Madhur Gupta
efc6fa6211
Fixes #3473 Changed Names and Order or Theme Options (#3556) 2020-03-20 13:30:28 +00:00
Sean Mac Gillicuddy
f1f0f4a359 Fix Crash 2020-03-20 12:45:37 +00:00
Sean Mac Gillicuddy
bc8b29b71f #3222 remove lingering reference to depiction content provider 2020-03-20 11:29:36 +00:00
Sean Mac Gillicuddy
02a0042d3c Merge remote-tracking branch 'origin/master' into structured-data 2020-03-20 11:25:49 +00:00
Seán Mac Gillicuddy
c972f74fad
#3532 Issue with gitignore - synchronise section with default plugin state (#3535) 2020-03-20 20:34:41 +10:00
Sean Mac Gillicuddy
e992ed4317 fix unit test compilation 2020-03-20 09:08:41 +00:00
Sean Mac Gillicuddy
719f32c27e Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/build.gradle
#	app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
#	app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
#	app/src/main/java/fr/free/nrw/commons/contributions/model/DisplayableContribution.java
#	app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.java
#	app/src/main/java/fr/free/nrw/commons/upload/SpinnerLanguagesAdapter.java
#	app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
#	app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
#	app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java
2020-03-20 08:46:39 +00:00
Fawziyah Alebiosu
d3bc0721c6
Issue #3428: Swapped text in dialog buttons (#3496)
* Issue #3428: Swapped text in dialog buttons because, according to Android Convention, they were opposite each other

* Fixed Issue #3428 so it actually works correctly now: Swapped text in dialog buttons because, according to Android Convention, they were opposite each other

* Made sure that all of the places where the two types of showAlertDialog accurately match up with the new position of positive and negative text on the dialog box
Also removed occurences of empty lambda expressions and used null instead

* modified deletThisPicture to be accurate lambda call

* reverted mistake where ellipses replaced the three dots
2020-03-20 07:26:34 +00:00
Seán Mac Gillicuddy
fb751c6fd0
#3490 Depiction Search in upload shows No Results before it gets results (#3491)
* #3482 Use Room in Structured Data branch - remove unused code

* #3482 Use Room in Structured Data branch - fix unit test compilation

* #3490 Depiction Search in upload shows No Results before it gets results - stop showing error on subscription

* #3490 Depiction Search in upload shows No Results before it gets results - update test cases

* make labels nullable too
2020-03-20 00:51:39 +10:00
translatewiki.net
d028cf189c Localisation updates from https://translatewiki.net. 2020-03-19 15:02:56 +01:00
Anmol Gupta
a0309d955a
Modify PR template (#3548) 2020-03-19 11:52:22 +00:00
Aryan Tyagi
4e51492de6
Removed the focus change listener of the username edittext (#3538) 2020-03-19 08:54:23 +00:00
Madhur Gupta
0ad269d3d6
Fixes 3536 (#3537) 2020-03-19 08:39:59 +00:00
Seán Mac Gillicuddy
66e195d88b
#3482 Use Room in Structured Data branch - remove unused code (#3483)
* #3482 Use Room in Structured Data branch - remove unused code

* #3482 Use Room in Structured Data branch - fix unit test compilation

* #3482 Use Room in Structured Data branch - add kdoc
2020-03-19 01:12:37 +10:00
Ashish Kumar
efdb00b5ee
Fixes #3359 Duplicate Photos in Contributions Page (#3515)
* Fixes #3359
* Cache thumb url & imageUrl in local db
* Use Fresco's ImageRequest to show images in ContributionViewHolder[this was the issue, we should have always used this to show the image]
* Deleted DisplayableContribution (not needed anymore)
* Exposed abstract function in ContributionDao to updateContribution

* * Make position private in ContributionViewHolder
* Remove MediaDataExtractor from ContributionsFragment

* * Show placeholder image for Contributions while the image loads
* setHasStableId's ContributionsAdapter

* make Random variable private in ContributionViewHolder

* replace local variable-if-with ternary operator in ContributionViewHolder

* Fix indentation/formatting of ternary operator in ContributionViewHolder

* I might revert this commit[I have reasons]

* Create in-memory drawables in CVH's onBind, caches are bad, add mental overhead

* Revert "I might revert this commit[I have reasons]"

This reverts commit 627ac91517.

* minor formatting changes, reverted 627ac91517

* uh-oh missed semicolon, java

* minor formatting changes
2020-03-18 13:47:51 +03:00
Aryan Tyagi
021105ac4d
Add a dialog to prompt user if location is off in Nearby when L… (#3438) 2020-03-18 15:50:00 +05:30
Madhur Gupta
15bccdf650
Fixes #3465 Use AndroidX Pref (#3521)
* [WIP] Fixes #3465 Use AndroidX Pref

* Deleted Unused Files

* Added singleLineTitle

* Updated Gradle Properties

* Migrated to Androidx

* Inline Variable change

* optimise imports

* Fixed Crash on empty input
2020-03-17 13:10:26 +00:00
Vitaly V. Pinchuk
e55b5495a1
Fixes #3464, App posts deletion request notifications ({{subst:idw}}) on the wrong user's talk page (#3495)
* Fixed #3464: App posts deletion request notifications ({{subst:idw}}) on the wrong user's talk page

* Fixed DeleteHelperTest.kt

* Fixed DeleteHelper tests and null-pointer exception

* Modified DeleteHelper makeDeletion() test

* Reverted unintentionally modified Project.xml

* Raising exception when nominating for deletion with empty creator name

* Fixed code style

* Fixed code style
2020-03-17 14:39:28 +03:00
Seán Mac Gillicuddy
cd2d530175
#3524 Convert SpinnerLanguagesAdapter to kotlin - converted to kotlin (#3528)
* #3524 Convert SpinnerLanguagesAdapter to kotlin - converted to kotlin

* #3524 Convert SpinnerLanguagesAdapter to kotlin - add KDoc - rework logic - format
2020-03-17 21:06:56 +10:00
neslihanturan
e5d5a7af92
Fix p18 issue For an item with P18 item, do not add another one (#3527)
* Add p18value variable to contrib

* set place.pic to candidate contribution

* Add p18 value to contrib

* Passes p18 value to wikidata upload service

* Checks if pic parameter of the wikidata item is empty or not. If not, it does not overrides the existing image, it is just a regular commons upload.

* Make public var private

* Make current tests pass

* Add test case for p18 value is not empty

* Fix wrong log message

* Add nonnul annotation and fix method javadoc
2020-03-17 10:35:21 +00:00
318anushka
bdb61dfda6
Fixes #2238 scalebar added in map (#3511)
* scalebar added in map

* changes reverted in .idea/Project.xml

* magic numbers replaced with constants for scalebar

* Default setting for scaling unit

* Default setting for scalebar refresh interval

* Reformatted code for adding scalebar

* dimen values for scalebar params
2020-03-17 08:41:31 +00:00
translatewiki.net
af131a9792 Localisation updates from https://translatewiki.net. 2020-03-16 15:40:49 +01:00
taakanksha
9cb81fce8c
author not shown bug (#3525) 2020-03-16 13:46:36 +00:00
gouri-panda
1fd748f8e7
solved crashing problem in nomination button (#3522)
solved crashing problem in nomination button

solved crashing problem in nomination button
2020-03-16 11:14:06 +00:00
Anmol Gupta
34a016d49d
Change item background according to the theme (#3480)
* Change item  background according to the theme

* Change background colour of item on being selected

* Change background colors using XML selectors
2020-03-16 10:13:20 +00:00
Seán Mac Gillicuddy
81c7281d3a
#3471 Remove android.enableUnitTestBinaryResources - remove line (#3478) 2020-03-16 19:38:58 +10:00
Kshitij Bhardwaj
668b5896a2
Chek if getContext() is instanceOf CategoryImagesCallback and only then request more images 2020-03-14 15:00:33 +05:30
Kaartic Sivaraam
a78e167676
Revert stopgaps related to beta server cert issue (#3396)
* Revert stopgaps related to beta server cert issue

The upstream issue with Commons beta server has been
fixed now[1]. So, there's no point in stopgapping
the issue anymore. So, revert the related changes.

This reverts fa87eb5661
and df426f7c42 which
correspond to PRs #3350 and #3349 respectively.

[1]: https://phabricator.wikimedia.org/T243881#5861983

* Test-fix: fix the failing CI test
2020-03-13 14:58:43 +00:00
Seán Mac Gillicuddy
4bd7a5b1e2
#3493 App freezes for 15 seconds when you press Next in UploadMediaDetailsFragment (#3499)
* #3493 App freezes for 15 seconds when you press Next in UploadMediaDetailsFragment - add apropriate schedulers and convert justs to fromCallable

* #3493 App freezes for 15 seconds when you press Next in UploadMediaDetailsFragment - remove test for removed functionality

* #3493 App freezes for 15 seconds when you press Next in UploadMediaDetailsFragment - replace kotlin with java
2020-03-13 23:47:20 +10:00
translatewiki.net
ed5f8efa6b Localisation updates from https://translatewiki.net. 2020-03-12 19:19:15 +01:00
Madhur Gupta
d925e32d2f
Added AboutActivityTest (#3475)
* Added AboutActivityTest

* Changes made as per suggestions

* Removed File to resolve conflict

* Removed hardcoded packagename

* Changes as per suggestion

* Removed Unrelated changes

* Fixed Build Issues
2020-03-11 15:02:30 -07:00
Seán Mac Gillicuddy
57ddc6af10
#3488 Delete app/prod folder - deleted (#3489) 2020-03-11 22:58:59 +05:30
Seán Mac Gillicuddy
80ea11f7d8
#3445 Add codestyle to git - import google java code style, use predefined styles for kotlin/xml (#3486) 2020-03-11 22:41:29 +10:00
taakanksha
61a3f45512
openStreetMap attribution enabled (#3485) 2020-03-11 09:51:38 +00:00