From a2eb41900f4fa6d663d3619f65341167dec87e10 Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Sat, 22 Sep 2018 21:11:18 +0200 Subject: [PATCH] fix RecentlyNonNull/Nullable warnings --- app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt | 4 ++-- .../tusky/receiver/SendStatusBroadcastReceiver.kt | 2 +- .../com/keylesspalace/tusky/util/ClickableSpanNoUnderline.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt index 5480b580d..0d0fdbd19 100644 --- a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt @@ -78,7 +78,7 @@ class LoginActivity : AppCompatActivity(), Injectable { setContentView(R.layout.activity_login) if (savedInstanceState != null) { - domain = savedInstanceState.getString(DOMAIN) + domain = savedInstanceState.getString(DOMAIN)!! clientId = savedInstanceState.getString(CLIENT_ID) clientSecret = savedInstanceState.getString(CLIENT_SECRET) } @@ -225,7 +225,7 @@ class LoginActivity : AppCompatActivity(), Injectable { val code = uri.getQueryParameter("code") val error = uri.getQueryParameter("error") - domain = preferences.getString(DOMAIN, "") + domain = preferences.getString(DOMAIN, "")!! if (code != null && domain.isNotEmpty()) { /* During the redirect roundtrip this Activity usually dies, which wipes out the diff --git a/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt b/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt index 8b2e535f9..78088c6b6 100644 --- a/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt +++ b/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt @@ -139,7 +139,7 @@ class SendStatusBroadcastReceiver : BroadcastReceiver() { private fun getReplyMessage(intent: Intent): CharSequence { val remoteInput = RemoteInput.getResultsFromIntent(intent) - return remoteInput.getCharSequence(NotificationHelper.KEY_REPLY) + return remoteInput.getCharSequence(NotificationHelper.KEY_REPLY, "") } } \ No newline at end of file diff --git a/app/src/main/java/com/keylesspalace/tusky/util/ClickableSpanNoUnderline.kt b/app/src/main/java/com/keylesspalace/tusky/util/ClickableSpanNoUnderline.kt index dfe6ce787..a9e7ba89a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/ClickableSpanNoUnderline.kt +++ b/app/src/main/java/com/keylesspalace/tusky/util/ClickableSpanNoUnderline.kt @@ -4,8 +4,8 @@ import android.text.TextPaint import android.text.style.ClickableSpan abstract class ClickableSpanNoUnderline : ClickableSpan() { - override fun updateDrawState(ds: TextPaint?) { + override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds?.isUnderlineText = false + ds.isUnderlineText = false } } \ No newline at end of file