mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'refs/remotes/origin/2.8-release'

Browse source
This commit is contained in:
misaochan 2018-08-14 17:59:48 +10:00
commit 61888f7456
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,5 +1,8 @@
# Wikimedia Commons for Android # Wikimedia Commons for Android
## v2.8.1
- Fixed bug with category edits not being sent to server
## v2.8.0 ## v2.8.0
- Fixed failed uploads by modifying auth token - Fixed failed uploads by modifying auth token
- Fixed crashes during upload by storing file temporarily - Fixed crashes during upload by storing file temporarily

4
app/build.gradle
View file

@ -87,8 +87,8 @@ android {
defaultConfig { defaultConfig {
applicationId 'fr.free.nrw.commons' applicationId 'fr.free.nrw.commons'
versionCode 87 versionCode 88
versionName '2.8.0' versionName '2.8.1'
setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName()) setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
minSdkVersion project.minSdkVersion minSdkVersion project.minSdkVersion

9
app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
View file

@ -270,7 +270,8 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
public String edit(String editToken, String processedPageContent, String filename, String summary) throws IOException { public String edit(String editToken, String processedPageContent, String filename, String summary) throws IOException {
return api.action("edit") return api.action("edit")
.param("title", filename) .param("title", filename)
.param("token", editToken) .param("token", getEditToken())
.param("centralauthtoken", getCentralAuthToken())
.param("text", processedPageContent) .param("text", processedPageContent)
.param("summary", summary) .param("summary", summary)
.post() .post()
@ -283,7 +284,8 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
public String appendEdit(String editToken, String processedPageContent, String filename, String summary) throws IOException { public String appendEdit(String editToken, String processedPageContent, String filename, String summary) throws IOException {
return api.action("edit") return api.action("edit")
.param("title", filename) .param("title", filename)
.param("token", editToken) .param("token", getEditToken())
.param("centralauthtoken", getCentralAuthToken())
.param("appendtext", processedPageContent) .param("appendtext", processedPageContent)
.param("summary", summary) .param("summary", summary)
.post() .post()
@ -295,7 +297,8 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
public String prependEdit(String editToken, String processedPageContent, String filename, String summary) throws IOException { public String prependEdit(String editToken, String processedPageContent, String filename, String summary) throws IOException {
return api.action("edit") return api.action("edit")
.param("title", filename) .param("title", filename)
.param("token", editToken) .param("token", getEditToken())
.param("centralauthtoken", getCentralAuthToken())
.param("prependtext", processedPageContent) .param("prependtext", processedPageContent)
.param("summary", summary) .param("summary", summary)
.post() .post()