Skip to content

Commit cb3ec43

Browse files
committed
Move all Uploader fields to the primary constructor
1 parent 62c3d85 commit cb3ec43

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

app/src/main/java/re/flande/xshare/Uploader.kt

+14-13
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,25 @@ import java.io.InputStream
99
import javax.xml.xpath.XPathFactory
1010

1111
// ref: https://github.com/ShareX/ShareX/raw/master/ShareX.UploadersLib/Helpers/CustomUploaderItem.cs
12-
class Uploader {
13-
internal var Name: String? = null
14-
internal var DestinationType: String? = null
15-
internal var RequestType: String? = null
16-
internal var RequestURL: String? = null
17-
internal var FileFormName: String = ""
18-
internal var Headers: Map<String, String>? = null
19-
internal var Arguments: Map<String, String>? = null
20-
lateinit var RegexList: Array<String>
21-
internal var ResponseType: String? = null
22-
internal var URL: String = ""
12+
class Uploader(var Name: String,
13+
var DestinationType: String,
14+
var RequestType: String,
15+
var RequestURL: String,
16+
var FileFormName: String,
17+
var Headers: Map<String, String>,
18+
var Arguments: Map<String, String>,
19+
var RegexList: Array<String>,
20+
var ResponseType: String,
21+
var URL: String) {
2322

2423
class EmptyFieldException(val fieldName: String) : Exception("$fieldName must not be empty")
2524

2625
fun validate() {
27-
if(RequestURL.isNullOrEmpty())
26+
if(RequestType.isEmpty())
27+
RequestType = "POST"
28+
if(RequestURL.isEmpty())
2829
throw EmptyFieldException("RequestURL")
29-
if(FileFormName.isNullOrEmpty())
30+
if(FileFormName.isEmpty())
3031
throw EmptyFieldException("FileFormName")
3132
}
3233

0 commit comments

Comments
 (0)