@@ -23,15 +23,11 @@ data class OCUploadLocalPathData(
2323 val creationType : Int ,
2424 val requiresWifi : Boolean ,
2525 val requiresCharging : Boolean ,
26- val collisionPolicy : NameCollisionPolicy ,
26+ val collisionPolicy : NameCollisionPolicy
2727) {
2828 companion object {
29- fun forDocument (
30- user : User ,
31- localPaths : Array <String >,
32- remotePaths : Array <String >
33- ): OCUploadLocalPathData {
34- return OCUploadLocalPathData (
29+ fun forDocument (user : User , localPaths : Array <String >, remotePaths : Array <String >): OCUploadLocalPathData =
30+ OCUploadLocalPathData (
3531 user,
3632 localPaths,
3733 remotePaths,
@@ -42,26 +38,23 @@ data class OCUploadLocalPathData(
4238 requiresCharging = false ,
4339 NameCollisionPolicy .ASK_USER
4440 )
45- }
4641
4742 fun forAlbum (
4843 user : User ,
4944 localPaths : Array <String >,
5045 remotePaths : Array <String >,
5146 localBehavior : Int
52- ): OCUploadLocalPathData {
53- return OCUploadLocalPathData (
54- user,
55- localPaths,
56- remotePaths,
57- localBehavior,
58- createRemoteFolder = true ,
59- UploadFileOperation .CREATED_BY_USER ,
60- requiresWifi = false ,
61- requiresCharging = false ,
62- NameCollisionPolicy .RENAME
63- )
64- }
47+ ): OCUploadLocalPathData = OCUploadLocalPathData (
48+ user,
49+ localPaths,
50+ remotePaths,
51+ localBehavior,
52+ createRemoteFolder = true ,
53+ UploadFileOperation .CREATED_BY_USER ,
54+ requiresWifi = false ,
55+ requiresCharging = false ,
56+ NameCollisionPolicy .RENAME
57+ )
6558
6659 @JvmOverloads
6760 fun forFile (
@@ -70,23 +63,21 @@ data class OCUploadLocalPathData(
7063 remotePaths : Array <String >,
7164 localBehavior : Int ,
7265 createRemoteFolder : Boolean = false
73- ): OCUploadLocalPathData {
74- return OCUploadLocalPathData (
75- user,
76- localPaths,
77- remotePaths,
78- localBehavior,
79- createRemoteFolder = createRemoteFolder,
80- UploadFileOperation .CREATED_BY_USER ,
81- requiresWifi = false ,
82- requiresCharging = false ,
83- NameCollisionPolicy .ASK_USER
84- )
85- }
66+ ): OCUploadLocalPathData = OCUploadLocalPathData (
67+ user,
68+ localPaths,
69+ remotePaths,
70+ localBehavior,
71+ createRemoteFolder = createRemoteFolder,
72+ UploadFileOperation .CREATED_BY_USER ,
73+ requiresWifi = false ,
74+ requiresCharging = false ,
75+ NameCollisionPolicy .ASK_USER
76+ )
8677 }
8778
88- fun toOCUpload (localPath : String , index : Int ): OCUpload {
89- return OCUpload (localPath, remotePaths[index], user.accountName).apply {
79+ fun toOCUpload (localPath : String , index : Int ): OCUpload =
80+ OCUpload (localPath, remotePaths[index], user.accountName).apply {
9081 nameCollisionPolicy = collisionPolicy
9182 isUseWifiOnly = requiresWifi
9283 isWhileChargingOnly = requiresCharging
@@ -95,7 +86,6 @@ data class OCUploadLocalPathData(
9586 isCreateRemoteFolder = createRemoteFolder
9687 localAction = localBehavior
9788 }
98- }
9989
10090 override fun equals (other : Any? ): Boolean {
10191 if (this == = other) return true
0 commit comments