Commit graph

4103 commits

Author SHA1 Message Date
neslihanturan
b3b45679bc
Merge pull request #1592 from misaochan/fix-failed-uploads
Attempt to fix failed uploads
2018-06-07 22:39:12 +03:00
tanvidadu
a934d24a2d Introducing a brief exp of Image License 2018-06-07 15:22:07 +05:30
misaochan
7e40f434af More explicit failure toast 2018-06-07 16:53:27 +10:00
misaochan
e7d3584b8d Add forceLogin to case where authentication fails during upload 2018-06-07 16:48:32 +10:00
misaochan
baab89c076 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2018-06-07 16:40:30 +10:00
translatewiki.net
3f47d39cdf Localisation updates from https://translatewiki.net. 2018-06-07 08:05:24 +02:00
misaochan
34fd6e52ec Merge remote-tracking branch 'refs/remotes/origin/master' into 2.8-release 2018-06-06 19:00:46 +10:00
misaochan
a458b8ad06 Merge branch 'master' of https://github.com/commons-app/apps-android-commons 2018-06-06 18:59:37 +10:00
misaochan
5c479b5624 Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release' 2018-06-06 18:59:29 +10:00
Vivek Maskara
b5a4b58b26
Merge pull request #1552 from misaochan/upload-overhaul-fork
Refactor ShareActivity
2018-06-05 22:08:17 +05:30
Yusuke Matsubara
862318c578 Bump max line length to 140 characters in Checkstyle rules (#1590)
Fixes #465
2018-06-05 19:33:51 +10:00
misaochan
a9ae072c73 Merge remote-tracking branch 'refs/remotes/commons-app/master' into upload-overhaul-fork
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
2018-06-05 18:28:41 +10:00
Vivek Maskara
32d45b2687
Merge pull request #1584 from commons-app/wikidataEdits
Merge Wikidata edits branch to master
2018-06-05 01:09:55 +05:30
maskara
ed5cc82fa2 Check for null entity ID 2018-06-05 00:28:49 +05:30
maskara
d1b33933cf Fix build failure 2018-06-05 00:03:56 +05:30
Sean Nemann
f9eed2027c Merge branch 'show-block-status' of https://github.com/seannemann21/apps-android-commons into show-block-status 2018-06-04 11:48:44 -04:00
Sean Nemann
4aac81d627 Added javadoc comments to showBlockStatus method 2018-06-04 11:48:09 -04:00
Sean Nemann
fcfae643c3 Updated isUserBlocked method to check the expiration time instead of just if an expiration time exists. Updated tests accordingly 2018-06-04 11:48:07 -04:00
Sean Nemann
01a3a233a9 Added comments to isUserBlocked method and tests for the method 2018-06-04 11:48:05 -04:00
Sean Nemann
39096cf30b Upon creating AuthenticatedActivity, now checking if the user is blocked via api call and notifying the user if they are blocked via snackbar 2018-06-04 11:48:02 -04:00
misaochan
3ccfcac130 Reinstate MultipleShareActivity intent 2018-06-04 19:52:14 +10:00
misaochan
90334edd32 Remove unnecessary class 2018-06-04 19:45:10 +10:00
misaochan
b4f2404045 Remove unnecessary vars 2018-06-04 19:41:44 +10:00
misaochan
c9ae7176c0 Optimize formatting and imports 2018-06-04 19:40:49 +10:00
misaochan
4e1bf80361 Fix comments 2018-06-04 19:30:18 +10:00
misaochan
147367d75f Get decimal coords to pass into startUpload() 2018-06-04 19:25:29 +10:00
misaochan
4db5dfb5d8 Merge remote-tracking branch 'refs/remotes/commons-app/master' into upload-overhaul-fork 2018-06-04 18:57:30 +10:00
Vivek Maskara
f7c57c03ba Log P18 edits with custom tag (#1583)
* Log P18 edits by adding custom tag to the edits

* Add javadocs
2018-06-04 17:50:50 +10:00
translatewiki.net
8cd8baf49c Localisation updates from https://translatewiki.net. 2018-06-04 07:53:59 +02:00
maskara
e46228205e Merge branch 'master' of https://github.com/commons-app/apps-android-commons into wikidataEdits 2018-06-03 12:52:16 +05:30
Vivek Maskara
46dcb8bd53
Merge pull request #1575 from whym/settingsactivitytest
Add dependencies to com.android.support.test.rules and runner
2018-06-01 21:35:15 +05:30
Yusuke Matsubara
c123767ae0 Add dependencies to com.android.support.test.rules and runner
Needed for ActivityTestRule used in SettingsActivityTest
2018-06-01 15:37:59 +09:00
maskara
edaa0dd05a Fix build 2018-06-01 01:15:28 +05:30
Sean Nemann
db30e03cf2 Added javadoc comments to showBlockStatus method 2018-05-31 13:37:55 -04:00
Sean Nemann
47bffa1b21 Updated isUserBlocked method to check the expiration time instead of just if an expiration time exists. Updated tests accordingly 2018-05-31 11:28:56 -04:00
Sean Nemann
39bf214c57 Added comments to isUserBlocked method and tests for the method 2018-05-31 09:44:09 -04:00
translatewiki.net
30e5312a14 Localisation updates from https://translatewiki.net. 2018-05-31 08:21:26 +02:00
Vivek Maskara
0e86741cc4
Merge branch 'master' into wikidataEdits 2018-05-31 10:02:38 +05:30
Vivek Maskara
4815e93fc9 Make P18 edits to corresponding wikidata entity on uploading from Nearby (#1495)
* Localisation updates from https://translatewiki.net.

* Integrate API for displaying featured images (#1456)

* Integrate API for displaying featured images

* Add pagination and refactor code so that it can be reused for category images

* Add license info to the images

* Fix author view

* Remove unused values

* Fix minor issues with featured images

* Fix null license url issue

* Remove some log lines

* Fix back navigation issue

* fix tests

* fix test inits

* Gracefully handling various error situations

* Added java docs

* Update pull_request_template.md (#1476)

* Update pull_request_template.md

* Remove Javadocs mention

* Added required/optional notes

* resolves #1464 : MediaDataExtractor is making inefficient (redundant) server calls (#1496)

* Open map of place where picture was taken (#1360)

* Intent to map added

*  Merge conflicts resolved

*  Added the functionality to hide FAB incase of null coordinate

*  Merge Conflict resolved

*  Improve pr quality

* Improve Quality

*  Added nested FAB animations

* Nested FAB implemented

*  Improve Quality

*  Added up arrow

*  Javadocs Added

* Add nearby tutorial (#1467)

* Add dependency for MaterialShowcase

* Add actionview class to get a reference to material showcase

* Create a NearbyMaterialShowcaseSequence class

* Apply sequence steps

* Add first three steps of nearby showcase

* Add sequence id constants to make sure they will be displayed only once

* Add last step of sequence to explain plus fab

* Create an object to prevent customize all sequences every time

* Fix typo

* Code cleanup

* Add strings to strings.xml

* Code cleanup

* Revert irrelevant change

* Revert irrelevant change

* Remove showcaseview for recenter button

* Use single showcaseView instead of sequence

* Add single showcase view insted of sequence to be able to edit text style

* Make sure it will be displayed only once

* Cleanup

* Update strings

* Change dismiss text style

* CONTRIBUTING: fix formatting of the gist of the guidelines (#1453)

* CONTRIBUTING: fix formatting of the gist of the guidelines

First level headings for a gist seems to be overkill.

So, replace first level headings with an ordered-list which
sounds more meaningful.

* CONTRIBUTING: specify clearly that 'blame' is a feature of "Git"

The contributing file specifies about the ability to know who wrote
something without the need of @author javadoc tags but incorrectly
attributes the feature to GitHub.

Correctly attribute the feature to where it belongs, Git, and specify
the name of the feature to help users easily take advantage of it.

* Feature/switch to butterknife (#1494)

* Implemented butterknife in MediaDetailFragment [issue #1491]

* Implemented butterknife in MediaDetailPagerFragment [[issue #1491]]

* post merge upstream master wip [[issue #1491]]

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

* Bug fix #1504 (#1506)

* Bug fix #1504

* Filtered messages with ConnectException [issue #1504]

* A generalised message for exceptions in Nearby Activity [issue #1504]

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

* Fix security exception crash while accessing network location provider (#1498)

* Fix security exception crash while accessing network location provider

* Added java docs

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

* Log P18 edits to wikidata corresponding wikidata entity on uploading a nearby image

* Added java docs

* Fix test build

* Refresh nearby

* Refresh nearby list on successful edit

* Java docs

* Make authenticated wikidata edits

* Updated toast message to show entity name that was edited
2018-05-31 11:00:17 +10:00
Vivek Maskara
bcbf0db1ff Add option to set image as wallpaper (#1535)
* Add option to set image as wallpaper

* Added java docs

* Toast message on setting the wallpaper successfully
2018-05-30 20:11:36 +10:00
misaochan
f28c5c7a5f Add TODO 2018-05-29 19:26:34 +10:00
misaochan
15b6a5e16e Only use prefs after doing ApplicationlessInjection 2018-05-29 19:20:47 +10:00
misaochan
dac6a15e60 Pass the GPSExtractor created in FileProcessor.java back into ShareActivity 2018-05-29 19:16:52 +10:00
misaochan
a082f509e7 Add Javadocs 2018-05-29 19:15:14 +10:00
misaochan
c3e911f135 Inject prefs into FileProcessor instead of passing it from ShareActivity 2018-05-29 19:12:45 +10:00
misaochan
82659316ff Add Javadocs to Zoom.java 2018-05-29 19:07:53 +10:00
misaochan
fe185e0da8 Rename mapsFragment to mapButton to be consistent with other FABs 2018-05-29 19:02:38 +10:00
misaochan
96ea3f693d Fix lint issues 2018-05-29 18:41:47 +10:00
misaochan
7dcf2376a6 Rearrange member vars and method params in Zoom.java 2018-05-29 18:36:37 +10:00
misaochan
0d282af0e6 Catch exceptions in Zoom.java 2018-05-29 18:30:17 +10:00