From 00663adfc197d8ed7283243547f8341a0b18db11 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 30 Aug 2021 02:00:06 -0700 Subject: Fix iconics and android changes --- app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt | 2 +- app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main/kotlin/com') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt index 1e2b438e..f5ef0b74 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt @@ -76,7 +76,7 @@ class FrostApp : Application() { L.d { "Activity ${activity.localClassName} destroyed" } } - override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) {} + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} override fun onActivityStopped(activity: Activity) {} diff --git a/app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt b/app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt index 9efe83f6..9c5fbb7d 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt @@ -176,7 +176,7 @@ class NotificationWidgetDataProvider( @Volatile private var content: List = emptyList() - private val type = NotificationType.valueOf(intent.getStringExtra(NOTIF_WIDGET_TYPE)) + private val type = NotificationType.valueOf(intent.getStringExtra(NOTIF_WIDGET_TYPE)!!) private val userId = intent.getLongExtra(NOTIF_WIDGET_USER_ID, -1) -- cgit v1.2.3 From 2f2cfd68e8c3d74ca776a6bfc8013828c4308cc3 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 11 Sep 2021 14:31:05 -0700 Subject: Fix build failure --- .../kotlin/com/pitchedapps/frost/facebook/parsers/MessageParser.kt | 4 ++-- spotless.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/src/main/kotlin/com') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/MessageParser.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/MessageParser.kt index e1a6c814..ef56aa7b 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/MessageParser.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/MessageParser.kt @@ -128,8 +128,8 @@ private class MessageParserImpl : FrostParserBase(true) { ) .mapNotNull(this::parseMessage) val seeMore = parseLink(doc.getElementById("see_older_threads")) - val extraLinks = threadList.nextElementSibling().select("a") - .mapNotNull(this::parseLink) + val extraLinks = threadList.nextElementSibling()?.select("a") + ?.mapNotNull(this::parseLink) ?: emptyList() return FrostMessages(threads, seeMore, extraLinks) } diff --git a/spotless.gradle b/spotless.gradle index 16e1ff1a..ea95c38f 100644 --- a/spotless.gradle +++ b/spotless.gradle @@ -3,7 +3,7 @@ apply plugin: "com.diffplug.spotless" spotless { kotlin { target "**/*.kt" - ktlint("0.41.0").userData(["disabled_rules": "no-wildcard-imports"]) + ktlint().userData(["disabled_rules": "no-wildcard-imports"]) licenseHeaderFile '../spotless.license.kt' trimTrailingWhitespace() endWithNewline() -- cgit v1.2.3