From 75aaec6688539443b354929ac0be1e9103ccd37d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 21:06:01 +0000 Subject: [PATCH 1/3] Update activity to v1.9.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 43f369288d..f213127076 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ datastore = "1.0.0" constraintlayout = "2.1.4" constraintlayout_compose = "1.0.1" lifecycle = "2.7.0" -activity = "1.8.2" +activity = "1.9.0" media3 = "1.3.1" camera = "1.3.3" From e052bc99f643f33ba9615e69dac926c0fa13f5e2 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 18 Apr 2024 01:17:36 +0200 Subject: [PATCH 2/3] Fix compilation issue. --- .../element/android/features/call/ui/ElementCallActivity.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt b/features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt index 8eea4c814f..ded5b11c8f 100644 --- a/features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt +++ b/features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt @@ -121,13 +121,11 @@ class ElementCallActivity : NodeComponentActivity(), CallScreenNavigator { override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - updateUiMode(newConfig) } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) - setCallType(intent) } From 2f926d81a4326d53b211adc37db5e45773efb20a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 4 Jun 2024 10:22:48 +0200 Subject: [PATCH 3/3] Let ElementCallActivity extend AppCompatActivity instead of NodeComponentActivity. --- .../element/android/features/call/ui/ElementCallActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt b/features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt index ded5b11c8f..f810dbb496 100644 --- a/features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt +++ b/features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt @@ -31,12 +31,12 @@ import android.webkit.PermissionRequest import androidx.activity.compose.setContent import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts +import androidx.appcompat.app.AppCompatActivity import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.core.content.IntentCompat -import com.bumble.appyx.core.integrationpoint.NodeComponentActivity import io.element.android.compound.theme.ElementTheme import io.element.android.compound.theme.Theme import io.element.android.compound.theme.isDark @@ -49,7 +49,7 @@ import io.element.android.features.preferences.api.store.AppPreferencesStore import io.element.android.libraries.architecture.bindings import javax.inject.Inject -class ElementCallActivity : NodeComponentActivity(), CallScreenNavigator { +class ElementCallActivity : AppCompatActivity(), CallScreenNavigator { companion object { private const val EXTRA_CALL_WIDGET_SETTINGS = "EXTRA_CALL_WIDGET_SETTINGS"