Commit graph

212 commits

Author SHA1 Message Date
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
Adam Jones
69b0f40358 Fix #2793: Campaigns work on Beta (#2798)
* Fix #2793: Campaigns work on Beta

* Update campaign endpoint urls
2019-03-30 22:29:15 +10:00
Madhur Gupta
7c77530c2e Refactor LoginActivity #2690 (#2775)
* Refactor LoginActivity #2690

* Fixed Error cannot find symbol
2019-03-28 15:19:49 +03:00
Vivek Maskara
f7e6b20cab Make all UI tests pass and add more tests (#2700) 2019-03-23 21:38:06 +00:00
Dmitry Brant
adf23c257f Improve extremely inefficient darkness-checking logic. (#2639)
* Improve extremely inefficient darkness-checking logic.

* Use ExifInterface from AndroidX instead of android.media.

* Fix false-positive detekt check.

* Fix false-positive detekt check.
2019-03-19 20:23:36 +05:30
Jason Obeid
04d29fe5f2 Fix #2179: Update ACRA version and theme (#2219) 2019-03-18 23:50:44 +00: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
d24bf20c80 Add NavigationBaseActivityTest (#2633) 2019-03-17 18:09:16 +05:30
Adam Jones
cfade144d9 Refactor string sorting utils to remove dependency (#2623)
Also adds Javadocs, and simplifies calculateSimilarity
2019-03-17 11:21:45 +05:30
Adam Jones
701764d974 Fix tests in SettingsActivity (#2625)
* Fix SettingsActivityTest

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

* Add tests to recent upload limit setting

* Simplify activity test rule
2019-03-17 11:21:10 +05:30
Adam Jones
51f58b7118 Add MapBox localization (#2614) 2019-03-16 19:07:21 +05:30
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
Dmitry Brant
c21cc83eb5 Update to API 28, and fix CI issues. (#2595)
* Update gradle version.

Also update jacoco plugin to work with latest gradle.

* Update target sdk to 28.

* Update other dependencies to latest versions.

* Remove totally unused(?) local jar file.

* Remove dependency on nineoldandroids.

The functions it provides are no longer necessary.
This also removes a homemade "evaluate" function, which is readily
available in the Support library.

* Remove dependency on Traceur.

This library has not been updated in two years (may no longer be maintained?), and no longer works with
the latest RxJava.

* Enable test coverage only when performing CI.

Running test coverage on every single build while developing in the IDE is quite a waste of time.

* Suppress gradle Notes and Warnings from reflection-using packages.

The build output was getting extremely long, and was actually causing
the build to fail because of the sheer size of the log.

* Suppress gradle Note messages during tests and CI.

Stop CI messages from exploding to 10k+ lines.

* Temporarily remove instrumented test(s).

The project's instrumented tests consist of a single test which sets a
SharedPreference, then verified that the SharedPreference was set.

I humbly submit that this is not worth the trouble of having the CI
server download the system image, spin up an emulator, load the APK, and
run it just for this purpose.

Once the instrumented tests are ready for prime time, we can reinstate
instrumented tests in CI.
2019-03-15 08:30:08 +05:30
Vanshika Arora
6389b35b49 replaced icafe with metadata extractor (#2546)
* replaced icafe with metadata extractor

* replaced icafe with metadata extractor

* removed icafe from gradle

* removed icafe from gradle

* Revert: travis commented code

* Use original content URI

* merged pr

* commit after merge

* modified unit tests
2019-03-12 00:20:47 +05:30
Vanshika Arora
3a822d3c30 Added IPTC reader (#2383)
* graddle changes

* readfbmd class

* jar files

* added icafe

* gradle changes

* ReadFBMD

* recent commit

* commit changes

* commit changes

* fixed code quality issues

* optimised imports

* changes for  reviews

* not instantiating class

* removed irrelevant code

* added documentation

* modified test cases

* commit changes

* modified variable

* modified variable

* javadoc

* test changes

* removed .log file

* Show warning dialog for FBMD
2019-02-24 23:16:22 +05:30
Josephine Lim
e9b696c553
Versioning and changelog for v2.10.1 (#2501)
* Update changelog.md

* Update build.gradle

* Versioning for v2.10.1

* Update changelog.md
2019-02-22 00:01:45 +13:00
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
Josephine Lim
aee8839eea
Versioning and changelog for v2.10.0 (#2443)
* Update changelog.md

* Update build.gradle
2019-02-13 05:44:19 +13:00
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
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
Adam Jones
67c5d20468 Tidy up gradle.properties (#2175) 2019-01-27 22:29:56 +05:30
Vivek Maskara
de9611821b Fix version number for alpha builds (#2325) 2019-01-24 23:32:16 +05:30
Vivek Maskara
21f82dd346 Use fresco image loader instead of glide (#2282) 2019-01-16 21:17:28 +05:30
Vivek Maskara
164ef9bcac Use image picker to pick images for upload (#2278)
* Use image picker to pick images for upload

* Consolidate storage permissions in Upload activity

* With proper request codes for image upload

* Use constants for upload limits

* Check for request code while handling requests

* Let fragment initiate the camera/gallery instead of activity

* Delete unused external storage utils
2019-01-09 02:26:46 +10:00
Adam Jones
ef517042e3 Update mapbox sdk (#2176) 2018-12-21 16:41:02 +02:00
Adam Jones
525eb9ab50 Remove unused readmoretextview dependency (#2160) 2018-12-18 14:36:17 +02:00
Adam Jones
647c679c18 Add mapzen lost to build.gradle (#2148)
Reduces the number of javac warnings, and pushes us a step closer to it working with Instant Run.
2018-12-17 15:59:05 +02:00
Adam Jones
378a298e32 Update build.gradle (#1992)
Reorder and group libraries
2018-12-17 11:07:46 +05:30
maskara
932c75a0a3 Fix gradle play plugin 2018-12-16 21:35:29 +05:30
Vivek Maskara
8c083f3dd5 Changes to fix build (#2128)
* Changes to fix build

* Apply GPP plugin only on travis
2018-12-17 00:29:33 +10:00
Vivek Maskara
5b745075e2
Minor changes to fix plugin (#2121) 2018-12-15 01:16:00 +05:30
Vivek Maskara
c40c5ed728
Update p12File key (#2120) 2018-12-15 00:08:32 +05:30
Vivek Maskara
867e447a17
Integrate gradle play publisher for automatic alpha releases (#2116) 2018-12-14 23:53:05 +05:30
Josephine Lim
707c52c768 Automate releases (part 1) (#2111)
* Encrypt keystore

* Modify build.gradle to add signing configs for env vars

* Fixed keystore name

* Remove encrypted file that is causing build errors

* Add encrypted keystore again

* Remove failed keystore again...

* Add keystore encrypted by Nicolas

* Modify env var names for key and iv
2018-12-14 21:07:03 +05:30
Vivek Maskara
f3a90c004c Upload tests (#2086)
* Add unit tests for upload flows

* Tests for upload model

* Test fixes

* Remove empty test cases

* Changes based on comments
2018-12-11 02:15:24 +10:00
maskara
4a2cdb70b9 Merge branch '2.9-release' 2018-11-27 22:38:20 +05:30
Josephine Lim
6391307fad
2 9 0 release fork (#2038)
Change versionCode to 94
2018-11-27 23:28:22 +10:00
Josephine Lim
66a77f9d0e
Versioning and changelog for v2.9.0 (#2037)
* Update changelog.md

* Versioning for v2.9.0
2018-11-27 23:13:51 +10:00
Vivek Maskara
f607c1c14d Multiple uploads with over haul (#1968)
* Added new upload activity that receives shared files from the gallery.  Cards show and hide, plus titles are correct.  Displayed thumbnails for the shared images

* Better handling of the view paging plus error handling for required fields.

* Code cleanup to make things more readable.

* Extracted a model from the category search fragment that can possibly be shared with the new upload activity.

* Added category selection to the combined upload screen.

* Cleanup before the home-stretch on the GUI.

* Adding license selection.

* Fixed build warnings + cleanup

* Start to support the dark theme.

* Work in progress to add quality checking.

* Fixing merge.

* GPSExtractor: optimized away the EXifInterface object

* Implemented submit functionality, temporarily fixed jacoco crash by disabling DUMMY UploadView object.

* Implemented uploading of categories along with the picture. The category screen now displays GPS and recent categories when nothing is searched.

* Implemented caching of files. Did some work on picture quality detection.

* Implemented too dark picture detection.

* Added a side card for zoom and map buttons along with pretty animations for stuff.

* Added duplicate image on commons checking and fixed files not getting proper file extensions in several places.

* Added support for map button and switched in-app upload buttons to UploadActivity

* Pretty pretty animations!

* Implemented zoom functionality for th background image. Just pinching on the image works instead of requiring buttons.

* Added multi-language descriptions with categories by region.

* Reimplemented the duplicate title checker and implemented a check against putting the same language twice in the description.

* Javadocs for Description and UploadPresenter, plus some general cleanup.

* Small code changes.

* Implemented login checks for the Upload screen.

* Implement receiving data from Nearby.

* Feature/permissions library (#1855)

* Added permission for Dexter, the runtime permission handling library

* [Preparing fir issue #1773] Added a utility function which would take the user to app settings screen where he could manually give us the required permission

* Added an alert dialog with positive and negative callback [Preparing fir issue #1773]

* Improvements in the way External Storage Permission is handled in MultipleShareActivity[Bug fix #1697]
1. Used dexter to handle the external storage permission
2. Behaviour changes : When user tries to share(uppload) images to commons via MultipleShareActivity, following decision tree is followed
	a. If the app has permission for external storage, normal upload operation is followed
	b. If the app does not has the permission for external storage, dexter is used to ask for the same
	c. If the user gives us the required permission, normal upload flow is proceeded
	d. If the doesnot gives us the required permission a rationale dialog is shown with the appropriate message to let him know why we need the permission
	e. If he presses okay, steps a-c are followed and if he presses cancel, we close the app.
	f. If while asking for permission, the user chooses never ask again, then next time he tries to upload an image via MSA, the rational dialog follows the app setting screen where he could manually give us the required permission and the onActivityResult of same is handled

* Added a Constants class to handle request and result codes from one place and other related constants common to the all app elements

* replaced hardcoded strings ok and cancel in DialogUtil to string resources

* init permission rationale dialog in activities onCreate

* Code formatting, updated access modifiers wherever required, added javadocs for new methods created

* *shifted constants to app class
*Added JavaDocs in PermissionUtils

* removed class REQUEST_CODES from CommonsApplication and instead put the enclosing constants in the App class itself

* Made Codacy happy.

* Abstarcted permission acquisition into new class DexterPermissionObtainer

* Fixed Nearby upload detection

* Migrated bad picture detection from AsyncTask to RxJava.

* Removed ShareActivity and related dead code

* Removed dead or duplicate code from FileProcessor

* Added info button to title EditText

* Fixed the add description button not disappearing.
Added "Starting Upload" toast.
Added link to the license on final screen.
Made it so that the map button is hidden when image lacks gps coords.

* Support in app multiple uploads

* Minor changes to fix build

* Changes to fix pending issues with upload flow

* Fix display of similar image fragment

* When uploading several files at once the date is missing #1854 (#2)

* Bug fix issue #1854
* updated ContributionsDao to save create date, which it was not doing currently [it was instead saving current date]
* UploadItem accepts are dateCreated param
* Added a function in UploadModel, getFileCreatedDate which tries to fetched the file creaction date from all possible content providers.

* Fix pending issues in upload flow

* Make multiple uploads work for Google Photos

* Fix default state for upload activity

* Fix keyboard state for license screen

* Fix descriptions for uploads

* wip

* Fix language spinner
2018-11-19 17:00:32 +05:30
Vivek Maskara
2704c9e8f3 Multiple uploads with over haul (#1968)
* Added new upload activity that receives shared files from the gallery.  Cards show and hide, plus titles are correct.  Displayed thumbnails for the shared images

* Better handling of the view paging plus error handling for required fields.

* Code cleanup to make things more readable.

* Extracted a model from the category search fragment that can possibly be shared with the new upload activity.

* Added category selection to the combined upload screen.

* Cleanup before the home-stretch on the GUI.

* Adding license selection.

* Fixed build warnings + cleanup

* Start to support the dark theme.

* Work in progress to add quality checking.

* Fixing merge.

* GPSExtractor: optimized away the EXifInterface object

* Implemented submit functionality, temporarily fixed jacoco crash by disabling DUMMY UploadView object.

* Implemented uploading of categories along with the picture. The category screen now displays GPS and recent categories when nothing is searched.

* Implemented caching of files. Did some work on picture quality detection.

* Implemented too dark picture detection.

* Added a side card for zoom and map buttons along with pretty animations for stuff.

* Added duplicate image on commons checking and fixed files not getting proper file extensions in several places.

* Added support for map button and switched in-app upload buttons to UploadActivity

* Pretty pretty animations!

* Implemented zoom functionality for th background image. Just pinching on the image works instead of requiring buttons.

* Added multi-language descriptions with categories by region.

* Reimplemented the duplicate title checker and implemented a check against putting the same language twice in the description.

* Javadocs for Description and UploadPresenter, plus some general cleanup.

* Small code changes.

* Implemented login checks for the Upload screen.

* Implement receiving data from Nearby.

* Feature/permissions library (#1855)

* Added permission for Dexter, the runtime permission handling library

* [Preparing fir issue #1773] Added a utility function which would take the user to app settings screen where he could manually give us the required permission

* Added an alert dialog with positive and negative callback [Preparing fir issue #1773]

* Improvements in the way External Storage Permission is handled in MultipleShareActivity[Bug fix #1697]
1. Used dexter to handle the external storage permission
2. Behaviour changes : When user tries to share(uppload) images to commons via MultipleShareActivity, following decision tree is followed
	a. If the app has permission for external storage, normal upload operation is followed
	b. If the app does not has the permission for external storage, dexter is used to ask for the same
	c. If the user gives us the required permission, normal upload flow is proceeded
	d. If the doesnot gives us the required permission a rationale dialog is shown with the appropriate message to let him know why we need the permission
	e. If he presses okay, steps a-c are followed and if he presses cancel, we close the app.
	f. If while asking for permission, the user chooses never ask again, then next time he tries to upload an image via MSA, the rational dialog follows the app setting screen where he could manually give us the required permission and the onActivityResult of same is handled

* Added a Constants class to handle request and result codes from one place and other related constants common to the all app elements

* replaced hardcoded strings ok and cancel in DialogUtil to string resources

* init permission rationale dialog in activities onCreate

* Code formatting, updated access modifiers wherever required, added javadocs for new methods created

* *shifted constants to app class
*Added JavaDocs in PermissionUtils

* removed class REQUEST_CODES from CommonsApplication and instead put the enclosing constants in the App class itself

* Made Codacy happy.

* Abstarcted permission acquisition into new class DexterPermissionObtainer

* Fixed Nearby upload detection

* Migrated bad picture detection from AsyncTask to RxJava.

* Removed ShareActivity and related dead code

* Removed dead or duplicate code from FileProcessor

* Added info button to title EditText

* Fixed the add description button not disappearing.
Added "Starting Upload" toast.
Added link to the license on final screen.
Made it so that the map button is hidden when image lacks gps coords.

* Support in app multiple uploads

* Minor changes to fix build

* Changes to fix pending issues with upload flow

* Fix display of similar image fragment

* When uploading several files at once the date is missing #1854 (#2)

* Bug fix issue #1854
* updated ContributionsDao to save create date, which it was not doing currently [it was instead saving current date]
* UploadItem accepts are dateCreated param
* Added a function in UploadModel, getFileCreatedDate which tries to fetched the file creaction date from all possible content providers.

* Fix pending issues in upload flow

* Make multiple uploads work for Google Photos

* Fix default state for upload activity

* Fix keyboard state for license screen

* Fix descriptions for uploads

* wip

* Fix language spinner
2018-11-19 20:01:35 +11:00
Adam Jones
2b728718ae Remove unused mediawiki api dependency (#1991) 2018-11-10 11:03:03 +05:30
Vivek Maskara
27123f5317 Crash fix due to bookmarks authority on prod variant (#1977) 2018-11-03 13:12:07 +00:00
Victor-Bonin
80a9c94653 Feature #1756 : Bookmark System (#1935)
* Add bookmark star images

* Add bookmark item in navigation menu

* Add Activity for bookmarks

* Implement bookmarks viewpager

* Bookmark object and bookmarkDao

* Implement Bookmark Picture Fragment and Controller

* Implement image detail bookmark menu action UI

* contentProvider + config + dao rework

* Fix Dao and Content Provider crashes

* Link bookmark controllers and dao

* Implement bookmark location fragment, controller

* Add bookmark icon to location items

* Add empty bookmark list behavior and refactoring

* bookmarkLocation dao and contentProvider

* Fix bookmarks location crashes

* Rename and refactor classes

* Implement location list refresh

* Fix picture list update
When user come back from detail picture fragment, it solve the refresh bug.

* full test coverage

* Refactor bookmarks classes

* Fix bookmarks pictures loading

* Fix bookmark locations list display

* Java Documetation

* Fix Code review quality

* Fix DB version update

* Remove forgotten todo

* Update bookmark activity base class
Change from AuthenticatedActivity to BaseNavigationActivity
2018-10-26 02:54:22 +11:00
Vivek Maskara
b0b4b08100 Fix log reporting for release builds (#1916)
* Fix log reporting for release builds

* Fix logs for release builds

* wip

* Clean up the branch to exclude unrelated changes

* With java docs

* Uncomment quiz checker

* Check for external storage permissions before sending logs

* With more java docs

* Fix crash while zipping log files

* Do not log token and cookies

* Add instruction to restart app
2018-10-14 22:19:43 +11:00
Vivek Maskara
02fe0044a6 Merge release branch to master (#1932)
* Bugfix/upload via share (#1920)

* Bug Fix #1878
* Added a java library to fetch the MIME type from input stream
* Fetch MIME type using this and use the contribution tag only when this fails:

* formatting changes, removed unused commented out line

* Versioning and changelog for v2.8.5 (#1923)

* Versioning for v2.8.5

* Update changelog.md
2018-10-13 19:45:00 +11:00
Vivek Maskara
86e849683a
Refactor code to remove usage of Jsoup and Rssparser (#1888)
* Refactor code to remove usage of Jsoup and Rssparser

* Use current date for picture of the day
2018-09-11 21:14:41 +05:30
Dmitry Brant
fc30f1b5ec Sweeping update of gradle and dependency versions. (#1858)
* Sweeping update of gradle and library versions.

This updates all of the dependencies of the project to their latest
versions. Everyone should please upgrade to the latest version of Android
Studio, update your build tools, and keep your version of Gradle and the
Kotlin plugin up to date.

* Update build tools in travis.

* Remove cruft and fix tests.

* Remove even more stuff.

* Reinstate instrumented tests.

* Update emulator image in travis.

* Localisation updates from https://translatewiki.net.

* Work towards eliminating string literals from code. (#1861)

String literals are being used in many places in the code, instead of
proper string resources which are automatically localized. This PR
replaces many of the string literals with pre-packaged resources, or will
add the appropriate string if necessary.

* Add button on image details to copy wikicode to clipboard (#1849)

* Add button on image details to copy wikicode to clipboard

* Make copy wikicode button width the same as the nominate deletion button width by filling in background

* Build fix

* Enable ProGuard for Debug and Release builds.

This enables ProGuard minification, which significantly shrinks the APK
(for both debug and release configurations) and vastly decreases the
method count.

* Add ProGuard rules for test builds.
2018-09-11 11:51:28 +03:00
Vivek Maskara
a63b9f88bb
Merge 2.8 release with master (#1887)
* Add Traceur for getting meaningful RxJava stack traces (#1832)

* Hotfix for overwrite issue in 2.8.0  (#1838)

* This solution is an hotfix for overrite issue came back on 2.8.0 version. What I did is checking the extension, and if it is null, adding .jpg suffix. Because commons files always have suffixes, and we should compare file names after adding suffixes. Othervise overrides are possible.

* Check if file title includes an extension already, by checking if is there any dot in it.

* Fix logic error

* Add uncovered tests

* Remove unecessary line breaks

* Make Javadocs more explicit

* Versioning and changelog for v2.8.2 (#1842)

* Versioning for v2.8.2

* Changelog for v2.8.2

* Add logs in wiki data edit and session refresh flow (#1874)

* Fix logout (#1875)

* [WIP] Refactor feedback and quiz to reduce possibility of NPE (#1881)

* Refactor feedback and quiz to reduce possibility of NPE

* Handle throwables in quiz checker

* Minor refactoring

* Set Traceur to only work in DEBUG mode (#1884)

* Bug fix for uploaded images count in achievements activity (#1885)

* Versioning and changelog for v2.8.3 (#1886)

* Update changelog.md

* Versioning for v2.8.3
2018-09-07 05:50:41 +05:30