From 645bc8ff50bb0ac621ae762c23ce89597b7229d6 Mon Sep 17 00:00:00 2001
From: Yusuke Matsubara <whym@whym.org>
Date: Sun, 24 Feb 2019 22:54:09 +0900
Subject: [PATCH] Convert Kotlin code to Java, fix temporary file name

---
 .../mwapi/ApacheHttpClientMediaWikiApi.java   |  4 +-
 .../free/nrw/commons/mwapi/UploadStash.java   | 70 +++++++++++++++++++
 .../fr/free/nrw/commons/mwapi/UploadStash.kt  |  8 ---
 .../nrw/commons/upload/UploadService.java     |  2 +-
 4 files changed, 73 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/fr/free/nrw/commons/mwapi/UploadStash.java
 delete mode 100644 app/src/main/java/fr/free/nrw/commons/mwapi/UploadStash.kt

diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
index c9ee9dcb902..d74ed182ad3 100644
--- a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
@@ -860,10 +860,10 @@ public Single<UploadStash> uploadFile(
                 if (errorCode.equals(ERROR_CODE_BAD_TOKEN)) {
                     ViewUtil.showLongToast(context, R.string.bad_token_error_proposed_solution);
                 }
-                return new UploadStash(resultStatus, errorCode, filename, "");
+                return new UploadStash(errorCode, resultStatus, filename, "");
             } else {
                 String filekey = result.getString("/api/upload/@filekey");
-                return new UploadStash(resultStatus, "Success", filename, filekey);
+                return new UploadStash("", resultStatus, filename, filekey);
             }
         });
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/UploadStash.java b/app/src/main/java/fr/free/nrw/commons/mwapi/UploadStash.java
new file mode 100644
index 00000000000..fed98892ca3
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/UploadStash.java
@@ -0,0 +1,70 @@
+package fr.free.nrw.commons.mwapi;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+public class UploadStash {
+    @NonNull
+    private String errorCode;
+    @NonNull
+    private String resultStatus;
+    @NonNull
+    private String filename;
+    @NonNull
+    private String filekey;
+
+    @NonNull
+    public final String getErrorCode() {
+        return this.errorCode;
+    }
+
+    @NonNull
+    public final String getResultStatus() {
+        return this.resultStatus;
+    }
+
+    @NonNull
+    public final String getFilename() {
+        return this.filename;
+    }
+
+    @NonNull
+    public final String getFilekey() {
+        return this.filekey;
+    }
+
+    public UploadStash(@NonNull String errorCode, @NonNull String resultStatus, @NonNull String filename, @NonNull String filekey) {
+        this.errorCode = errorCode;
+        this.resultStatus = resultStatus;
+        this.filename = filename;
+        this.filekey = filekey;
+    }
+
+    public String toString() {
+        return "UploadStash(errorCode=" + this.errorCode + ", resultStatus=" + this.resultStatus + ", filename=" + this.filename + ", filekey=" + this.filekey + ")";
+    }
+
+    public int hashCode() {
+        return ((this.errorCode.hashCode() * 31 + this.resultStatus.hashCode()
+        ) * 31 + this.filename.hashCode()
+        ) * 31 + this.filekey.hashCode();
+    }
+
+    public boolean equals(@Nullable Object obj) {
+        if (this != obj) {
+            if (obj instanceof UploadStash) {
+                UploadStash that = (UploadStash)obj;
+                if (this.errorCode.equals(that.errorCode)
+                    && this.resultStatus.equals(that.resultStatus)
+                    && this.filename.equals(that.filename)
+                        && this.filekey.equals(that.filekey)) {
+                    return true;
+                }
+            }
+
+            return false;
+        } else {
+            return true;
+        }
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/UploadStash.kt b/app/src/main/java/fr/free/nrw/commons/mwapi/UploadStash.kt
deleted file mode 100644
index 3b08afb3898..00000000000
--- a/app/src/main/java/fr/free/nrw/commons/mwapi/UploadStash.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package fr.free.nrw.commons.mwapi
-
-data class UploadStash(
-        var errorCode: String? = null,
-        var resultStatus: String? = null,
-        var filename: String? = null,
-        var filekey: String? = null) {
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
index 7e51d28a4cd..c690f2d77a1 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
@@ -254,7 +254,7 @@ private void uploadContribution(Contribution contribution) {
                     getString(R.string.upload_progress_notification_title_finishing, contribution.getDisplayTitle()),
                     contribution
             );
-            String stashFilename = filename + contribution.hashCode();
+            String stashFilename = "Temp_" + contribution.hashCode() + filename;
             mwApi.uploadFile(
                     stashFilename, fileInputStream, contribution.getDataLength(),
                     localUri, contribution.getContentProviderUri(), notificationUpdater)