Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit 34bf83d

Browse files
theScrabiabelgardep
authored andcommitted
make sharee parts non null that can't be null
1 parent 90b6ff5 commit 34bf83d

File tree

1 file changed

+19
-33
lines changed
  • owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/responses

1 file changed

+19
-33
lines changed

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponse.kt

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,63 +35,49 @@ data class ShareeOcsResponse(
3535
@Json(name = "exact")
3636
val exact: ExactSharees?,
3737
@Json(name = "groups")
38-
val groups: List<ShareeItem>?,
38+
val groups: List<ShareeItem>,
3939
@Json(name = "remotes")
40-
val remotes: List<ShareeItem>?,
40+
val remotes: List<ShareeItem>,
4141
@Json(name = "users")
42-
val users: List<ShareeItem>?
42+
val users: List<ShareeItem>
4343
) {
44-
fun getFlatRepresentationWithoutExact()
45-
= ArrayList<ShareeItem>().apply {
46-
if(users != null) {
47-
addAll(users)
48-
}
49-
if(remotes != null) {
50-
addAll(remotes)
51-
}
52-
if(groups != null) {
53-
addAll(groups)
54-
}
44+
fun getFlatRepresentationWithoutExact() = ArrayList<ShareeItem>().apply {
45+
addAll(users)
46+
addAll(remotes)
47+
addAll(groups)
5548
}
5649
}
5750

5851
@JsonClass(generateAdapter = true)
5952
data class ExactSharees(
6053
@Json(name = "groups")
61-
val groups: List<ShareeItem>?,
54+
val groups: List<ShareeItem>,
6255
@Json(name = "remotes")
63-
val remotes: List<ShareeItem>?,
56+
val remotes: List<ShareeItem>,
6457
@Json(name = "users")
65-
val users: List<ShareeItem>?
58+
val users: List<ShareeItem>
6659
) {
67-
fun getFlatRepresentation()
68-
= ArrayList<ShareeItem>().apply {
69-
if(users != null) {
70-
addAll(users)
71-
}
72-
if(remotes != null) {
73-
addAll(remotes)
74-
}
75-
if(groups != null) {
76-
addAll(groups)
77-
}
60+
fun getFlatRepresentation() = ArrayList<ShareeItem>().apply {
61+
addAll(users)
62+
addAll(remotes)
63+
addAll(groups)
7864
}
7965
}
8066

8167
@JsonClass(generateAdapter = true)
8268
data class ShareeItem(
8369
@Json(name = "label")
84-
val label: String?,
70+
val label: String,
8571
@Json(name = "value")
86-
val value: ShareeValue?
72+
val value: ShareeValue
8773
)
8874

8975
@JsonClass(generateAdapter = true)
9076
data class ShareeValue(
9177
@Json(name = "shareType")
92-
val shareType: Int?,
78+
val shareType: Int,
9379
@Json(name = "shareWith")
94-
val shareWith: String?,
95-
@Json(name ="shareWithAdditionalInfo")
80+
val shareWith: String,
81+
@Json(name = "shareWithAdditionalInfo")
9682
val additionalInfo: String?
9783
)

0 commit comments

Comments
 (0)