Commit graph

317 commits

Author SHA1 Message Date
Ashish Kumar
5865d59d22 Revert "Merge branch 'backend-overhaul' into master" (#3125)
* Revert "Merge branch 'backend-overhaul' into master"

This reverts commit 0090f24257, reversing
changes made to 9bccbfe443.

* fixed test handleSubmitTest
2019-08-12 14:32:25 +05:30
Ashish Kumar
0628b1b8f5 bug fix sync service (#3069) 2019-07-14 13:20:13 +05:30
Vivek Maskara
cd57552d76
Fix auth issues in the app (#3064) 2019-07-12 01:49:28 +05:30
Vivek Maskara
d427a77c2a Consume login client from data client library (#2894)
Fix actions for review client

Use data client library for notifications

With delete helper migrated to data client

With wikidata edits

With notifications and modifications migrated to data client

With upload migrated to retrofit

Delete unused code

Reuse thank interface from the library
2019-07-10 23:11:18 +05:30
Ashish Kumar
828b5a3cd1 Closes #3061 (#3062)
* Added null check for contribution with position in ContributionsListFragment
2019-07-10 19:10:34 +10:00
Ashish Kumar
60b1eb1957 Feature/refactor contributions (#3046)
* * Refactored ContributionsListFragment to use RecyclerView
* Added ContributionsPresenter
* Extracted out the cursor to presenter
* Probable fix for #3028

* Improved the logic for cache in ContributionViewHolder

* Some more refactoring

* While displaying images in ContributionsList, check if status is not completed && local uri exists, use that uri to show image

* typo correction in LocalDataSource

* Fixed formatting in ContributionsPresenter

* retain adapter position when orientation changes

* retain child position with its id

* Made ContributionViewHolder not implement ViewHolder

* Code formatting, review suggested changes

* initialise the rv layout managers only when needed

* added test cases for ContributionPresenter

* removed not needed semi colon

* added more java docs and code formatting
2019-07-07 10:24:28 +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
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
Dan Garry
5f3510226a Refactor onRequestPermissionsResult to be simpler (#2965)
onRequestPermissionsResult has a switch statement with a single case, and a functionally empty default; this patch refactors it into an if statement to simplify the code. This patch also changes a C-style array declaration (String permissions[]) to the more standard Java style (String[] permissions).
2019-05-24 12:56:55 +03:00
Dan Garry
877c669297 Remove redundant empty if/else statement in NotificationActivity (#2953)
* Remove redundant empty if/else statement

This patch removes an empty if/else statement that has no effect on the execution flow of the program.

* Remove redundant empty if/else statement in MainActivity

This patch removes an empty if/else statement that has no effect on the execution flow of the program, which makes the code simpler.
2019-05-17 17:35:14 +03:00
Vivek Maskara
c004e47c0b Fix loading of images in contributions list (#2932) 2019-04-28 13:34:07 +05:30
Vivek Maskara
98d28c60a2 Bump data client library version (#2926)
* Bump data client library version

* Fix tests

* Add javadocs
2019-04-25 10:54:51 +05:30
Vivek Maskara
37e9eae314 Fetch and use thumbnail across the app (#2906) 2019-04-24 03:03:09 +10:00
Vivek Maskara
a003e9706f Do not use erroneous thumb url util function (#2901)
* Do not use erroneous thumb url util function

* Remove unused code

* Fix image loading for peer review

* Clear disposable
2019-04-20 15:03:52 +05:30
Ashish Kumar
08a555c095 Merge 2.10 with master & Fixed merge conflicts (#2844) 2019-04-04 03:09:54 +10:00
Vivek Maskara
dcbf076965
Update master with backend overhaul branch (#2829)
* Beginnings of integration with Wikipedia client library. (#2642)

* Remove remaining unnecessary API version check.

* Roll up sleeves.

* Add and integrate the beginnings of app adapter.

* Remove vestigial event logging logic.

Event logging is no longer used in this app.

* Beginnings: remove StringUtils and associated redundancies.

* Remove redundant capitalize() method.

* Remove redundant urlEncode() method.

* Remove redundant (and incomplete) language lists.

* Remove redundant usages of SimpleDateFormat.

* Remove redundant json type adapter.

* Remove redundant MW error model classes.

* Rip out redundant MW model classes.

* Pass SessionManager into AppAdapter instead of injecting.

* Wire up more of the AppAdapter.

* Remove redundant Gson initialization and type adapters.

* Rip out PageTitle.

This was being used in some slightly incorrect/unexpected ways.

* Don't need static WikiSite.

* Bump data client library version

* Bump library version and fix build

* Fix tests

* Fix build

* Fix media of the day

* With fixes in recently modified APIs
2019-04-02 08:35:22 +05:30
Vanshika Arora
22629a7d8a Fix #2679: Main activity crashing on navigating back from gallery selector (#2680) 2019-03-23 14:42:18 +00:00
Dmitry Brant
8474c04c64 Fix crash(es) caused by failing to dispose Rx observables (#2669) 2019-03-19 21:08:04 +00:00
Vanshika Arora
38d39e08ac Work on resolving #2311 for viewing failed uploads (#2617) 2019-03-19 21:02:01 +00:00
Dmitry Brant
351109440f Fix memory leak(s). (#2674) 2019-03-19 19:59:33 +00:00
Dmitry Brant
8cd87ad148 Prevent memory leak(s) from QuizChecker. (#2656) 2019-03-19 20:36:14 +10:00
Adam Jones
db5290efcf Upload UI tests (#2626)
* Fix SettingsActivityTest

* Add test in SettingsActivity to set recent upload limit to 0

* Add tests to recent upload limit setting

* Simplify activity test rule

* Add UploadTest

* Log the URL where the file should be uploaded

* Generate an image file before testing uploads

* With runtime permissions

* With automatic login

* With automatic login

* Get test credentials from travis
2019-03-19 01:51:44 +05:30
Adam Jones
3b7b6f91a2
Fix #2203: Require number of uploads not to have decimal (#2615) 2019-03-17 16:54:55 +00:00
Vanshika Arora
9d55c1e8d7 Fix #2245: Correct back button behaviour from nearby fragment (#2301) 2019-03-16 16:27:25 +00:00
Vivek Maskara
7cb87f3cab Consolidate shared prefs to a single store (#2613)
* Consolidate shared prefs to a single store
* Fix achievements activity
* Fix store usage
2019-03-16 13:56:56 +00:00
Vivek Maskara
6cbce9d283 Fix #1131: Update min sdk version and remove redundant checks (#2608) 2019-03-16 12:21:51 +00:00
Vivek Maskara
57e685cf6c Fix #2593: Migrate to androidX (#2594)
* Update dependencies and migrate to androidX
* Make gradle properties tidy
2019-03-16 11:22:37 +00:00
Madhur Gupta
5c4278bbff Fix #2324: Number of contributions updates on upload (#2587)
* Fixed bug - Number of Contributions not updating unless app is restarted, #2324
* Inverted if statement for better readability
2019-03-15 23:15:11 +00:00
Brenda Jerop
2dc2e32d87 Fix #2552: Close FAB in contributions when an mini-fab is clicked (#2556) 2019-03-15 17:27:39 +00:00
Yusuke Matsubara
b5051f9a4f Use Timber.e(Throwable t, String message, Object... args) (#2582) 2019-03-15 08:34:25 +05:30
Ronan Brigdale
480c05b2f3 Fix Lint Issues #171: Fix numerous errors/warnings (#2537) 2019-03-10 23:55:35 +05:30
Silky Priya
32752c2d1e Fab in landscape (#2559)
* fix fab in landscape orientation

* fixes fax in landscape orientation
2019-03-09 10:42:26 +05:30
srinivas1729
0c2ae1df18 Fix #2139: Now showing "Upload your media" text properly (#2539)
* "Upload your media..." text was being shown while contributions were
  still being loaded. Fixed things to show after load is finished and no
  contributions are present. Also updated text string since UI now uses
  FAB button for uploads (no camera/gallery) icons any more.
* Removed waitingMessage in ContributionsListFragment and from layout
  since its never VISIBLE, only GONE.
2019-03-06 00:36:08 +05:30
Ronan Brigdale
de9a72d465 Fix Lint Issues #171: Remove unused imports (#2533)
* Fix Lint Issues #171: Remove unused imports

Removed unused Java imports

* Fix Lint Issues #171: Perfromance issue, close cursor

Cursor was not closed when no longer needed
2019-03-02 19:30:50 +05:30
Ashish Kumar
64eae8be82 Bug fix issue #2476 (#2526)
* Added wikidataEntityID in all db versions, handled db.execSql via method runQuery
2019-02-28 05:55:16 +13:00
Vivek Maskara
5bcb2a41fd Fix duplicate param information (#2515) 2019-02-26 05:24:37 +13:00
Ashish Kumar
cd145efe91 Bug fix issue #2476 (#2495)
* Bug fix issue #2476
* Support db migrations from version 5

* support migration(alter table) for versions >5
2019-02-20 22:28:53 +05:30
Vivek Maskara
546322ac35
Fix update date template based on date source (#2483) (#2492)
* Fix update date template based on date source

* Add javadocs
2019-02-20 20:14:19 +05:30
Vivek Maskara
2bc0d41748 Fix date time issue for google photos (#2438) 2019-02-13 00:17:06 +13:00
Shubham Pinjwani
0e2bd3ec0c update Notification count after notification is marked as read (#2423) 2019-02-11 09:16:10 +05:30
Shubham Pinjwani
a9629c6f99 Added option in the action bar menu to view archived notifications (#2422)
* changed layout and implemented archived notificaitons feature

* set different texts for toolbar,menu option and no notification text in archived

* modified the startup intent for NotificationsActivity

* disabled swipe on archived

* commit

* fixed navigation drawer on notification activity

* handled on back pressed

* updated strings.xml

* removed TODO

* some minor changes

* set progress bar visibility

* some code quality changes

* commit

* some code quality changes

* removing unused import statements
2019-02-10 16:10:08 +05:30
Vivek Maskara
f12837650a Use JSON SPARQL query for fetching nearby places (#2398)
* Use JSON response for nearby places

* Move okhttp calls to a different class

* wip

* Fetch picture of the day using JSON API

* Search images using JSON APIs

* tests

* Fix injection based on code review comments
2019-02-06 10:40:30 +05:30
Shubham Pinjwani
323527b3be Fixed notification card visiblity issue on media Detail Page (#2401) 2019-02-06 10:13:47 +05:30
Shubham Pinjwani
112f4ba15f Close Navigation Drawer on pressing back button(#2294) (#2295)
* Close Navigation Drawer on back pressed(#2294)

* some minor changes
2019-02-06 02:15:29 +05:30
Shubham Pinjwani
29bea33035 hide the notification card if there's no nearby location (#2396)
* hide the notification card if there's no nearby location

* some minor changes
2019-02-06 01:59:44 +05:30
Vivek Maskara
52ab39381e Add module for file picker for camera and gallery uploads (#2375)
* Use easy image for image picker

* Do not use harcoded mime type

* Use uploadable file for image uploads

* Add picker files in filepicker module

* Remove redundant checks for file

* Make usage of file extensions consistent

* Add javadocs

* Fix tests

* Enable image upload using bookmark activity

* Fix multiple uploads

* Fix external image uploads

* Fix chooser intents

* Fix image quality checks

* Segregate internal and external upload intents

* Invoke all error messages from one place

* Minor changes

* Fix tests

* Add image processing service tests
2019-02-03 22:40:31 +02:00
Vivek Maskara
fb5a40bba5
Fix click of nearby list menu item (#2399) 2019-02-03 02:13:35 +05:30
Vanshika Arora
1b62ac4d2d Code to retrive unknown notification and UI (#2340)
* request change, changed notification icon

* Completed task 1 of the work

* commit changes

* commit changes

* updated notification class

* before notification id

* gradle reverted

* Minor changes to mark notifications as read

* commit changes

* delete on swipe

* notification count

* sipe to delete

* changes

* worked on changes requested

* commit changes

* Fix notification count

* reviewed changes

* round icon, swipe with icon

* Fix pending NPE issues with notifications

* final commit

* graddle changes

* removed changes for testing
2019-02-02 19:21:58 +05:30
Vivek Maskara
35f1e84ff1 Use viewholder for populating contributions list (#2306)
* Use viewholder for populatiing contributions list

* Fix codacy issues

* Remove unused code
2019-01-30 12:06:15 +02:00
Vivek Maskara
4bbbfc839b Save Wikidata entity ID in contributions DB (#2317) 2019-01-30 11:49:30 +02:00