Skip to content

Commit dc422a3

Browse files
committed
AndroidExtensions: Intent setter allow set nullable value
Signed-off-by: Fung <fython@163.com>
1 parent 98580ef commit dc422a3

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BUILD_TOOLS_VERSION=25.0.3
22
org.gradle.jvmargs=-Xmx1536m
3-
VERSION_NAME=0.1.5.1
3+
VERSION_NAME=0.1.5.2
44
TARGET_SDK_VERSION=25
5-
VERSION_CODE=4
5+
VERSION_CODE=5
66
MIN_SDK_VERSION=19

kotlinyan-common/src/main/kotlin/moe/feng/kotlinyan/common/AndroidExtensions.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import java.io.Serializable
1212

1313
interface AndroidExtensions : ActivityExtensions, ViewExtensions, ResourcesExtensions, FragmentExtensions {
1414

15-
operator fun Intent.set(key: String, value: Any) {
15+
operator fun Intent.set(key: String, value: Any?) {
1616
when (value) {
1717
is Int -> putExtra(key, value)
1818
is String -> putExtra(key, value)
@@ -42,6 +42,7 @@ interface AndroidExtensions : ActivityExtensions, ViewExtensions, ResourcesExten
4242
is String -> putStringArrayListExtra(key, value as java.util.ArrayList<String>)
4343
is Parcelable -> putParcelableArrayListExtra(key, value as java.util.ArrayList<Parcelable>)
4444
}
45+
null -> {} // Ignore null pointer
4546
else -> throw UnsupportedOperationException("Unsupported type ${value.javaClass.name} in params")
4647
}
4748
}

0 commit comments

Comments
 (0)