Commit graph

4861 commits

Author SHA1 Message Date
Vivek Maskara
d7628959a7
Fix bugs in peer review flow (#3039) (#3042)
* Fix bugs in peer review flow

* Fix tests

* Bug fixes

* Fix remaining issues with peer review
2019-06-26 21:31:06 +05:30
Vivek Maskara
31b5179371
Merge branch 'master' into 2.11-release 2019-06-26 21:14:21 +05:30
Vivek Maskara
5dc45a53d3 Fix bugs in peer review flow (#3039)
* Fix bugs in peer review flow

* Fix tests

* Bug fixes

* Fix remaining issues with peer review
2019-06-26 17:40:49 +03:00
sherlockbeard
4ec92c2e7b fixes the string issue (#3041)
* fix strings

* Update activity_achievements.xml
2019-06-26 17:06:41 +03:00
neslihanturan
98be517c69 Merge remote-tracking branch 'upstream/master' into refactorNearbyClassesMVP 2019-06-25 13:17:28 +03:00
translatewiki.net
17eb6f43ed Localisation updates from https://translatewiki.net. 2019-06-24 16:43:08 +02:00
neslihanturan
dd50e83319 Fixes previous PR - FIX #2918 Add option for default language for file descriptions (#3020)
* FIX #2918 Add option for default language for file descriptions

* navigation menu error fixed and improvement of code quality

* error language description default fixed

* adapter language selected fixed

* local language selected per default in description language

* Use a better string and variable name as required in review 1

* Add comments

* Add previously missing setValue methods so that list item will be chosen along with the summary

* Add missing Javadocs

* Fix capitalization

* Lint and formatting issues

* Rename methods so it's clearer they are to do with languages

* Use default kv store instead of shared preferences variable

* Make sure saved language code from settings activity is handled on init
2019-06-24 21:40:12 +10:00
translatewiki.net
2837748540 Localisation updates from https://translatewiki.net. 2019-06-20 21:28:47 +02:00
translatewiki.net
667372512b Localisation updates from https://translatewiki.net. 2019-06-17 19:14:52 +02:00
Adam Jones
8e35787248 Gradle 5 update (#3023)
* Update to Gradle 5

* Update gradle-play-publisher
2019-06-17 16:52:26 +05:30
neslihanturan
f2a499e8b6
Revert "Update to Gradle 5 (#2860)" (#3019)
This reverts commit 30df3025b6.
2019-06-14 00:18:43 +03:00
neslihanturan
22290af42f Merge remote-tracking branch 'upstream/master' into refactorNearbyClassesMVP 2019-06-13 23:09:57 +03:00
neslihanturan
86679176d6 Add list item clicked and bottom sheet for list of nearby items is expanded 2019-06-13 23:00:05 +03:00
Ashish Kumar
7a5dc77057 Refactor uploads (#2981)
* Feature/refractor uploads [WIP] (#2887)

* Fix duplicate param information (#2515)

* Bug fix issue #2476 (#2526)

* Added wikidataEntityID in all db versions, handled db.execSql via method runQuery

* Versioning and changelog for v2.10.2 (#2531)

* Update changelog.md

* Versioning for v2.10.2

* Update changelog.md

* Bugfix/issue 2580 (#2584)

* Corrected string placedholders in certain string files

* Corrected string placedholders in certain string files[Bug fix #2580]

* Bug Fix #2585 (#2647)

* Bug Fix #2585
* Added null checks on view in SearchImageFragment when updating views from external sources
* Disposed the disposables in SearchActivity and SearchImageFragment when no longer in active lifecycle

* use FragmentUtils to verify fragment active state

* Bug Fix issue #2648 (#2678)

* Bug Fix issue #2648
* Handled external storage permission before file download

* * Removed redudant check for permission in MediaDetailPagerFragment (Dexter already does that)
* Removed duplicate code in PermissionUtil$checkPermissionsAndPerformAction, used the existing function with conditional extra parameters

* string name typo correction

* BugFix issue #2652 (#2706)

* Addded null check on bookmark before operating on it

* BugFix issue #2711 (#2712)

* Added null checks in OkHttpJsonApiClient$searchImages MwQueryResponse

* BugFix #2718 (#2719)

* Handled null auth cookies

* Fix #2791: NPE when nominating for deletion and leaving screen (#2792)

* Bug Fix issue #2789 (#2790)

* Handled Illegal State Exception for non existent appropriate view parents in ViewUtils$showShortSnackbar

* BugFix #2720 (#2831)

BugFix deprecated licenes #2720

* ui fixes, wip, upload

* *Issue #2886, BugFix #2832[wip]
* updated UploadActivity code
* modified ui
* Updated UploadPresenterTest

* * updated interfaces names to follow names suffixed with Contract
* added test cases

* card view elevation

* view pager disabled swipe

* bug fix, duplicate image

* used existing non-swipable view pager

* Avoid image view resize with keyboard, added adjustPan and stateVisible as softinputMode for UploadActivity

* retain UploadBaseFragment instances on orientation changes

* * Added test cases for UploadMediaPresenter
* Injected io and main thread schedulers

* categories presenter test cased wip

* Added CategoriesPresenter test

* * Added the logic to show open map (with to be uploaded image's coordinates while uploading image)

* codacy suggested changes * added java docs

* Added travis_wait fot android-wait-for-emulator

* ranamed interface onResponseCallback to Callback

* * Added api to delete picture in UploadModel
* cleanUp in UploadModel. once upload has been initiated
* Removed unused methods from UploadModel and the corresponding test class

* * Added tests for UploadPresenter
* Travis suggested changes
* Addded copy previous title and description

* * Made the upload add descriptions visible when keyboard visible
* add description request focus only when user manually requests it

* Added JavaDocs, review suggested changes

* Fix dagger injection

* use DialogUtil to show info in descriptions

* use activity context for DialogUtil

* Minor changes

* Bug fix, reduced the add description edit text clickable bound (#2973)

* Bugfix/uploads (#3000)

* merged with master

* BugFix IllegalStateException
* setRetainState(true), not required with FragmentStatePagerAdapter
* Increase the ViewPager's Offscreen Limit, we want all the fragments to be active

* BugFix, clear selected categoris for previous upload session
* Clear Selected Categories
* Addded JavaDocs for CategoriesModel

* Code Formatting in app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

* Added class level JavaDoc UploadRemoteDataSource

* Added class level JavaDoc for UploadRepository

* Added JavaDocs for ThumbnailsAdapter

* Added JavaDocs for MediaLicensePresenter, CategoriesPresenter

* Removed null check on category query
* Show default catgeories based on image title and gps location when category text empty
* Allow search for empty category search

* Attached image scale listener to upload media image

* Bug fix, reduced the add description edit text clickable bound

* Fix memory leak (#3001)

* Bugfix/uploads (#3002)

* merged with master

* BugFix IllegalStateException
* setRetainState(true), not required with FragmentStatePagerAdapter
* Increase the ViewPager's Offscreen Limit, we want all the fragments to be active

* BugFix, clear selected categoris for previous upload session
* Clear Selected Categories
* Addded JavaDocs for CategoriesModel

* Code Formatting in app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

* Added class level JavaDoc UploadRemoteDataSource

* Added class level JavaDoc for UploadRepository

* Added JavaDocs for ThumbnailsAdapter

* Added JavaDocs for MediaLicensePresenter, CategoriesPresenter

* Removed null check on category query
* Show default catgeories based on image title and gps location when category text empty
* Allow search for empty category search

* Attached image scale listener to upload media image

* Bug fix, reduced the add description edit text clickable bound

* Added tooltip in Title in UploadMediaFragment

* BugFix recent categories

* Updated test methods

* Bugfix/uploads (#3011)

* merged with master

* BugFix IllegalStateException
* setRetainState(true), not required with FragmentStatePagerAdapter
* Increase the ViewPager's Offscreen Limit, we want all the fragments to be active

* BugFix, clear selected categoris for previous upload session
* Clear Selected Categories
* Addded JavaDocs for CategoriesModel

* Code Formatting in app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

* Added class level JavaDoc UploadRemoteDataSource

* Added class level JavaDoc for UploadRepository

* Added JavaDocs for ThumbnailsAdapter

* Added JavaDocs for MediaLicensePresenter, CategoriesPresenter

* Removed null check on category query
* Show default catgeories based on image title and gps location when category text empty
* Allow search for empty category search

* Attached image scale listener to upload media image

* Bug fix, reduced the add description edit text clickable bound

* Added tooltip in Title in UploadMediaFragment

* BugFix recent categories

* Updated test methods

* Avoid memory leak, free the adpater in MediaLicenseFragment.onDestroyView

* bugfix/uploads (#3012)

* merged with master

* BugFix IllegalStateException
* setRetainState(true), not required with FragmentStatePagerAdapter
* Increase the ViewPager's Offscreen Limit, we want all the fragments to be active

* BugFix, clear selected categoris for previous upload session
* Clear Selected Categories
* Addded JavaDocs for CategoriesModel

* Code Formatting in app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

* Added class level JavaDoc UploadRemoteDataSource

* Added class level JavaDoc for UploadRepository

* Added JavaDocs for ThumbnailsAdapter

* Added JavaDocs for MediaLicensePresenter, CategoriesPresenter

* Removed null check on category query
* Show default catgeories based on image title and gps location when category text empty
* Allow search for empty category search

* Attached image scale listener to upload media image

* Bug fix, reduced the add description edit text clickable bound

* Added tooltip in Title in UploadMediaFragment

* BugFix recent categories

* Updated test methods

* Avoid memory leak, free the adpater in MediaLicenseFragment.onDestroyView

* BugFix Illegal State Exception in ViewpPagerAdapter

* Remove irrelevant comment

* merge conflict with strings (#3016)
2019-06-14 01:09:41 +05:30
translatewiki.net
04b051b37a Localisation updates from https://translatewiki.net. 2019-06-13 20:02:26 +02:00
Aadil Ahmed
30df3025b6 Update to Gradle 5 (#2860) 2019-06-13 16:43:51 +01:00
neslihanturan
edfa39a2d3 Add logs to uınderstand why on meap ready callback is never called 2019-06-12 17:31:53 +03:00
sherlockbeard
6619ccf8d5 removed the hard coded string (#3015)
* removed the hard coded string

* fix
2019-06-12 16:06:25 +03:00
neslihanturan
c8b1ebb7fe Add a view to nearby map ragment and insert map view as an item inside it 2019-06-12 15:58:54 +03:00
sherlockbeard
09459a3765 user talk and dialog box fix (#3014) 2019-06-12 20:37:22 +09:00
sherlockbeard
6a9018b550 replaced wikidatCreateClaim to wikidataCreateClaim (#3010) 2019-06-11 18:05:12 +09:00
translatewiki.net
69e23b73a8 Localisation updates from https://translatewiki.net. 2019-06-10 20:17:37 +02:00
neslihanturan
c84ecd1b9c Add changes for permission made by Vivek to newly added fragments along with our nearby classes 2019-06-10 19:39:44 +03:00
Vivek Maskara
f855bb5da9 With attribution enabled for OSM (#2997) 2019-06-10 19:28:39 +03:00
neslihanturan
2e1cb07a51 Fix conflixts 2019-06-10 18:37:05 +03:00
neslihanturan
627cdf791a Clear logs 2019-06-08 10:52:29 +03:00
Vivek Maskara
8971743479 Fixes #2888: Use Dexter for requesting location permissions (#2925)
* Use dexter to ask for location permissions

* Addressed code review comments
2019-06-08 08:45:30 +03:00
Vivek Maskara
6f9d69e63c Use data client for peer review calls (#2937)
* Use data client for peer review calls

* With java docs

* Optimise API calls and fix tests
2019-06-07 09:59:08 +03:00
translatewiki.net
51e2febc53 Localisation updates from https://translatewiki.net. 2019-06-06 17:52:19 +02:00
Ashish Kumar
06dbfefbe8 BugFix #2993 (#2994)
* Added null check on countResponse in OkHttpJsonApiClient$getWikidataEdits
2019-06-05 16:59:19 +05:30
Ashish Kumar
aabcd0ee79 BugFix Issue #2991 (#2992)
Path Segmens need not be preceeded by "/"
2019-06-05 16:19:24 +05:30
neslihanturan
c43b4949ed Merge remote-tracking branch 'upstream/master' into refactorNearbyClassesMVP 2019-06-05 09:25:19 +03:00
Adam Jones
67e43ef446 Upgrade to Robolectric 4 (#2982) 2019-06-04 22:02:07 +05:30
Vivek Maskara
230b9527ed Edit travis config to have travis integration (#2990) 2019-06-04 20:52:25 +05:30
Vivek Maskara
4a671dcb3d Fetch achievements data from beta cluster for beta variant of the app (#2986) 2019-06-05 00:34:05 +10:00
Ashish Kumar
c4f159ea04 BugFix invalid upload count string (#2989)
* Added non empty check in response.body() in OkHttpJsonApiClient$getUploadCount
2019-06-04 15:58:03 +03:00
Vitaly V. Pinchuk
cc0b059595 Image EXIF/XMP metadata removal routine (#2863)
* [WIP] Added preferences for EXIF tags

* [WIP] Added arrays, keys, strings to support EXIF preferences

* [WIP] Updated SettingsFragment to setup summary of added preferences(locationAccuracy)

* [WIP] Added methods getStringSet()in BasicKvStore, KeyValueStore to support Set<String> data type used in preferences (EXIF tags)

* [WIP] Added methods for removing EXIF tags and anonimyzing location coordinates in FileProcessor, GPSExtractor

* [WIP] Fixed errors in preferences EXIF tags, added XMP removal routine

* [WIP] Removed erroneous location accuracy handling

* [WIP] Fixed mistyped GPS Tags

* Reverted BasicKvStore. Removed Set<String> support in BasicKvStore as JsonKVStore already has it.

* FileProcessor: Replaced throwing runtime exception with warning if EXIF redaction fails.

* FileMetadataUtils: Javadoc added

* [WIP] FileMetadataUtilsTest added

* [WIP] FileMetadataUtilsTest: added javadoc

* [WIP] FileMetadataUtilsTest: added javadoc

* [WIP] FileProcessor: fixed disposing observables

* [WIP] FileMetadataUtils.getTagsFromPref: changed return type from observable to simple array

* [WIP] FileProcessorTest: added test for redactExifTags

* [WIP] FileProcessorTest: redactExifTags() doesn't work properly
2019-06-04 15:38:01 +03:00
neslihanturan
026a944859 Try to load un search this area is called 2019-06-04 14:43:32 +03:00
translatewiki.net
5690dd9d0b Localisation updates from https://translatewiki.net. 2019-06-03 17:25:14 +02:00
neslihanturan
ab7f352bd2 Make search this area button appear at correct time 2019-06-03 15:19:08 +03:00
neslihanturan
5a8c137c87 include clear map into add markers method and reorder methods 2019-06-03 11:42:23 +03:00
neslihanturan
c2453cb889 Add current location marker with object animator and remove previous marker is exists 2019-06-03 11:38:38 +03:00
neslihanturan
008e1f6324 Remove unused methods 2019-06-01 14:54:19 +03:00
neslihanturan
a7d35ed02d Add current location marker and remove circle around it 2019-06-01 14:39:56 +03:00
neslihanturan
05fba7da03 Fix conflicts 2019-05-31 13:35:52 +03:00
neslihanturan
1b0d614886 Rename methods accordingly and add Javadocs 2019-05-31 13:16:40 +03:00
neslihanturan
3f847fd890 Make sure everything is called in required order and seach this area method basically works 2019-05-31 13:12:24 +03:00
neslihanturan
4ff63a262a Merge branch 'master' into refactorNearbyClassesMVP 2019-05-29 00:38:10 +03:00
neslihanturan
e8ae344215 Mostly implement search this area methods, not tested yet even once 2019-05-29 00:37:15 +03:00
neslihanturan
9a50f54b4a Search this area button action is added 2019-05-28 23:41:15 +03:00