github
/
ha-android
mirror of https://github.com/home-assistant/android
1
Fork 0
Code Releases Activity

Bump activity-compose from 1.8.2 to 1.9.0 (#4376) 

* Bump activity-compose from 1.8.2 to 1.9.0

Bumps `activity-compose` from 1.8.2 to 1.9.0.

Updates `androidx.activity:activity-compose` from 1.8.2 to 1.9.0

Updates `androidx.activity:activity-ktx` from 1.8.2 to 1.9.0

---
updated-dependencies:
- dependency-name: androidx.activity:activity-compose
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.activity:activity-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update nullability for overrides in app

* Update nullability for overrides in wear

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joris Pelgröm <joris.pelgrom@gmail.com>
This commit is contained in:
dependabot[bot] 2024-05-03 17:57:14 +02:00 committed by GitHub
parent 1039b8a179
commit a8f924d4b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/full/java/io/homeassistant/companion/android/matter/MatterCommissioningActivity.kt
View File

@ -91,7 +91,7 @@ class MatterCommissioningActivity : AppCompatActivity() {
}
}
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
this.intent = intent // Data is handled by check in onResume()
newMatterDevice = true

2
app/src/main/java/io/homeassistant/companion/android/assist/AssistActivity.kt
View File

@ -142,7 +142,7 @@ class AssistActivity : BaseActivity() {
viewModel.onDestroy()
}
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
this.intent = intent

6
app/src/main/java/io/homeassistant/companion/android/assist/AssistViewModel.kt
View File

@ -122,10 +122,10 @@ class AssistViewModel @Inject constructor(
* @param intent the updated intent
* @param lockedMatches whether the locked state changed and contents should be cleared
*/
fun onNewIntent(intent: Intent?, lockedMatches: Boolean) {
fun onNewIntent(intent: Intent, lockedMatches: Boolean) {
if (
(intent?.flags != null && intent.flags and Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT != 0) ||
intent?.action in listOf(Intent.ACTION_ASSIST, "android.intent.action.VOICE_ASSIST", Intent.ACTION_VOICE_COMMAND)
(intent.flags and Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT != 0) ||
intent.action in listOf(Intent.ACTION_ASSIST, "android.intent.action.VOICE_ASSIST", Intent.ACTION_VOICE_COMMAND)
) {
if (!lockedMatches && inputMode != AssistInputMode.BLOCKED) {
_conversation.clear()

6
app/src/main/java/io/homeassistant/companion/android/onboarding/OnboardingActivity.kt
View File

@ -86,10 +86,10 @@ class OnboardingActivity : BaseActivity() {
}
}
override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
// Temporary workaround to sideload on Android TV and use a remote for basic navigation in WebView
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
// Workaround to sideload on Android TV and use a remote for basic navigation in WebView
val fragmentManager = supportFragmentManager.findFragmentByTag(AUTHENTICATION_FRAGMENT)
if (event?.keyCode == KeyEvent.KEYCODE_DPAD_DOWN && event.action == KeyEvent.ACTION_DOWN &&
if (event.keyCode == KeyEvent.KEYCODE_DPAD_DOWN && event.action == KeyEvent.ACTION_DOWN &&
fragmentManager != null && fragmentManager.isVisible
) {
dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_TAB))

10
app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
View File

@ -1589,9 +1589,9 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
}
}
override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
// Temporary workaround to sideload on Android TV and use a remote for basic navigation in WebView
if (event?.keyCode == KeyEvent.KEYCODE_DPAD_DOWN && event.action == KeyEvent.ACTION_DOWN) {
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
// Workaround to sideload on Android TV and use a remote for basic navigation in WebView
if (event.keyCode == KeyEvent.KEYCODE_DPAD_DOWN && event.action == KeyEvent.ACTION_DOWN) {
dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_TAB))
return true
}
@ -1656,10 +1656,10 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
}
}
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
this.intent = intent
if (intent?.extras?.containsKey(EXTRA_SERVER) == true) {
if (intent.extras?.containsKey(EXTRA_SERVER) == true) {
intent.extras?.getInt(EXTRA_SERVER)?.let {
presenter.setActiveServer(it)
intent.removeExtra(EXTRA_SERVER)

4
app/src/main/java/io/homeassistant/companion/android/widgets/button/ButtonWidgetConfigureActivity.kt
View File

@ -366,9 +366,9 @@ class ButtonWidgetConfigureActivity : BaseWidgetConfigureActivity() {
}
}
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
if (intent != null && intent.extras != null && intent.hasExtra(PIN_WIDGET_CALLBACK)) {
if (intent.extras != null && intent.hasExtra(PIN_WIDGET_CALLBACK)) {
appWidgetId = intent.extras!!.getInt(
AppWidgetManager.EXTRA_APPWIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID

4
app/src/main/java/io/homeassistant/companion/android/widgets/camera/CameraWidgetConfigureActivity.kt
View File

@ -214,9 +214,9 @@ class CameraWidgetConfigureActivity : BaseWidgetConfigureActivity() {
}
}
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
if (intent != null && intent.extras != null && intent.hasExtra(PIN_WIDGET_CALLBACK)) {
if (intent.extras != null && intent.hasExtra(PIN_WIDGET_CALLBACK)) {
appWidgetId = intent.extras!!.getInt(
AppWidgetManager.EXTRA_APPWIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID

4
app/src/main/java/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureActivity.kt
View File

@ -423,9 +423,9 @@ class EntityWidgetConfigureActivity : BaseWidgetConfigureActivity() {
}
}
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
if (intent != null && intent.extras != null && intent.hasExtra(PIN_WIDGET_CALLBACK)) {
if (intent?.extras != null && intent.hasExtra(PIN_WIDGET_CALLBACK)) {
appWidgetId = intent.extras!!.getInt(
AppWidgetManager.EXTRA_APPWIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID

4
app/src/main/java/io/homeassistant/companion/android/widgets/mediaplayer/MediaPlayerControlsWidgetConfigureActivity.kt
View File

@ -280,9 +280,9 @@ class MediaPlayerControlsWidgetConfigureActivity : BaseWidgetConfigureActivity()
}
}
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
if (intent != null && intent.extras != null && intent.hasExtra(PIN_WIDGET_CALLBACK)) {
if (intent.extras != null && intent.hasExtra(PIN_WIDGET_CALLBACK)) {
appWidgetId = intent.extras!!.getInt(
AppWidgetManager.EXTRA_APPWIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID

4
app/src/main/java/io/homeassistant/companion/android/widgets/template/TemplateWidgetConfigureActivity.kt
View File

@ -213,9 +213,9 @@ class TemplateWidgetConfigureActivity : BaseWidgetConfigureActivity() {
finish()
}
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
if (intent != null && intent.extras != null && intent.hasExtra(PIN_WIDGET_CALLBACK)) {
if (intent.extras != null && intent.hasExtra(PIN_WIDGET_CALLBACK)) {
appWidgetId = intent.extras!!.getInt(
AppWidgetManager.EXTRA_APPWIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID

2
gradle/libs.versions.toml
View File

@ -1,6 +1,6 @@
[versions]
accompanist = "0.34.0"
activity-compose = "1.8.2"
activity-compose = "1.9.0"
androidBeaconLibrary = "2.20.4"
androidJunit5 = "1.9.3.0"
androidPlugin = "8.4.0"

2
wear/src/main/java/io/homeassistant/companion/android/conversation/ConversationActivity.kt
View File

@ -82,7 +82,7 @@ class ConversationActivity : ComponentActivity() {
}
}
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
this.intent = intent

6
wear/src/main/java/io/homeassistant/companion/android/conversation/ConversationViewModel.kt
View File

@ -112,11 +112,11 @@ class ConversationViewModel @Inject constructor(
}
/** @return `true` if the voice input intent should be fired */
fun onNewIntent(intent: Intent?): Boolean {
fun onNewIntent(intent: Intent): Boolean {
if (
(
(intent?.flags != null && intent.flags and Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT != 0) ||
intent?.action in listOf(Intent.ACTION_ASSIST, "android.intent.action.VOICE_ASSIST")
(intent.flags and Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT != 0) ||
intent.action in listOf(Intent.ACTION_ASSIST, "android.intent.action.VOICE_ASSIST")
) &&
inputMode != AssistInputMode.BLOCKED
) {