Skip to content
This repository was archived by the owner on Feb 17, 2020. It is now read-only.

Commit 27544e7

Browse files
authored
Merge pull request #541 from squanchy-dev/fix_voice_crash_on_samsung
Fix voice search crash on Samsung
2 parents b96dafa + 0a7c38a commit 27544e7

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

app/src/main/java/net/squanchy/search/SearchActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,10 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
211211
searchField.setText("")
212212
}
213213

214-
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
214+
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
215215
if (requestCode == SPEECH_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
216-
val results = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
217-
searchField.setText(results[0])
216+
val results = data?.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
217+
if (results != null) searchField.setText(results[0])
218218
return
219219
}
220220
super.onActivityResult(requestCode, resultCode, data)

app/src/main/java/net/squanchy/signin/SignInActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class SignInActivity : AppCompatActivity() {
9292
window.setGravity(Gravity.FILL_HORIZONTAL or Gravity.BOTTOM)
9393
}
9494

95-
public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
95+
public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
9696
super.onActivityResult(requestCode, resultCode, data)
9797

9898
if (requestCode == RC_SIGN_IN) {

0 commit comments

Comments
 (0)