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

Fixed NPE caused by not initializing the resultStatus field of UploadResult when on the happy-path.

Browse source
This commit is contained in:
Paul Hawke 2017-07-10 15:23:13 -05:00
parent 883419844d
commit 6f86b1871f
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import android.os.Build;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ClientConnectionManager;
@ -356,6 +357,9 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
progressListener.onProgress(transferred, total); progressListener.onProgress(transferred, total);
} }
}); });
Log.e("WTF", "Result: "+result.toString());
String resultStatus = result.getString("/api/upload/@result"); String resultStatus = result.getString("/api/upload/@result");
if (!resultStatus.equals("Success")) { if (!resultStatus.equals("Success")) {
String errorCode = result.getString("/api/error/@code"); String errorCode = result.getString("/api/error/@code");
@ -364,7 +368,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
Date dateUploaded = Utils.parseMWDate(result.getString("/api/upload/imageinfo/@timestamp")); Date dateUploaded = Utils.parseMWDate(result.getString("/api/upload/imageinfo/@timestamp"));
String canonicalFilename = "File:" + result.getString("/api/upload/@filename").replace("_", " "); // Title vs Filename String canonicalFilename = "File:" + result.getString("/api/upload/@filename").replace("_", " "); // Title vs Filename
String imageUrl = result.getString("/api/upload/imageinfo/@url"); String imageUrl = result.getString("/api/upload/imageinfo/@url");
return new UploadResult(dateUploaded, canonicalFilename, imageUrl); return new UploadResult(resultStatus, dateUploaded, canonicalFilename, imageUrl);
} }
} }
} }

3
app/src/main/java/fr/free/nrw/commons/mwapi/UploadResult.java
View file

@ -14,7 +14,8 @@ public class UploadResult {
this.errorCode = errorCode; this.errorCode = errorCode;
} }
UploadResult(Date dateUploaded, String canonicalFilename, String imageUrl) { UploadResult(String resultStatus, Date dateUploaded, String canonicalFilename, String imageUrl) {
this.resultStatus = resultStatus;
this.dateUploaded = dateUploaded; this.dateUploaded = dateUploaded;
this.canonicalFilename = canonicalFilename; this.canonicalFilename = canonicalFilename;
this.imageUrl = imageUrl; this.imageUrl = imageUrl;