Handle nullable key events

bubelov · bubelov · commit f4b3a2f985f5 · 2023-01-04T16:16:32.000+07:00
diff --git a/app/src/main/kotlin/auth/MinifluxAuthFragment.kt b/app/src/main/kotlin/auth/MinifluxAuthFragment.kt
@@ -40,7 +40,7 @@ class MinifluxAuthFragment : Fragment() {
             toolbar.setNavigationOnClickListener { findNavController().popBackStack() }
 
             password.setOnEditorActionListener { _, actionId, keyEvent ->
-                if (actionId == EditorInfo.IME_ACTION_DONE || keyEvent.keyCode == KeyEvent.KEYCODE_ENTER) {
+                if (actionId == EditorInfo.IME_ACTION_DONE || keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER) {
                     connect()
                     return@setOnEditorActionListener true
                 }
diff --git a/app/src/main/kotlin/auth/NextcloudAuthFragment.kt b/app/src/main/kotlin/auth/NextcloudAuthFragment.kt
@@ -40,7 +40,7 @@ class NextcloudAuthFragment : Fragment() {
             toolbar.setNavigationOnClickListener { findNavController().popBackStack() }
 
             password.setOnEditorActionListener { _, actionId, keyEvent ->
-                if (actionId == EditorInfo.IME_ACTION_DONE || keyEvent.keyCode == KeyEvent.KEYCODE_ENTER) {
+                if (actionId == EditorInfo.IME_ACTION_DONE || keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER) {
                     connect()
                     return@setOnEditorActionListener true
                 }
diff --git a/app/src/main/kotlin/feeds/FeedsFragment.kt b/app/src/main/kotlin/feeds/FeedsFragment.kt
@@ -121,7 +121,7 @@ class FeedsFragment : Fragment() {
             val urlView = dialog.findViewById<EditText>(R.id.url)!!
 
             urlView.setOnEditorActionListener { _, actionId, keyEvent ->
-                if (actionId == EditorInfo.IME_ACTION_DONE || keyEvent.keyCode == KeyEvent.KEYCODE_ENTER) {
+                if (actionId == EditorInfo.IME_ACTION_DONE || keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER) {
                     dialog.dismiss()
                     model.addFeed(urlView.text.toString())
                     return@setOnEditorActionListener true

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class MinifluxAuthFragment : Fragment() {`
`40`	`40`	`toolbar.setNavigationOnClickListener { findNavController().popBackStack() }`
`41`	`41`
`42`	`42`	`password.setOnEditorActionListener { _, actionId, keyEvent ->`
`43`		`- if (actionId == EditorInfo.IME_ACTION_DONE \|\| keyEvent.keyCode == KeyEvent.KEYCODE_ENTER) {`
	`43`	`+ if (actionId == EditorInfo.IME_ACTION_DONE \|\| keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER) {`
`44`	`44`	`connect()`
`45`	`45`	`return@setOnEditorActionListener true`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class NextcloudAuthFragment : Fragment() {`
`40`	`40`	`toolbar.setNavigationOnClickListener { findNavController().popBackStack() }`
`41`	`41`
`42`	`42`	`password.setOnEditorActionListener { _, actionId, keyEvent ->`
`43`		`- if (actionId == EditorInfo.IME_ACTION_DONE \|\| keyEvent.keyCode == KeyEvent.KEYCODE_ENTER) {`
	`43`	`+ if (actionId == EditorInfo.IME_ACTION_DONE \|\| keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER) {`
`44`	`44`	`connect()`
`45`	`45`	`return@setOnEditorActionListener true`
`46`	`46`	`}`