Skip to content

Commit 1d7e528

Browse files
authored
Merge branch 'develop' into feature/fga/update_rust_sdk_0.2.23
2 parents c135a91 + 11a8bbe commit 1d7e528

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

features/call/src/main/kotlin/io/element/android/features/call/ui/ElementCallActivity.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ import android.webkit.PermissionRequest
3131
import androidx.activity.compose.setContent
3232
import androidx.activity.result.ActivityResultLauncher
3333
import androidx.activity.result.contract.ActivityResultContracts
34+
import androidx.appcompat.app.AppCompatActivity
3435
import androidx.compose.runtime.collectAsState
3536
import androidx.compose.runtime.getValue
3637
import androidx.compose.runtime.mutableStateOf
3738
import androidx.compose.runtime.remember
3839
import androidx.core.content.IntentCompat
39-
import com.bumble.appyx.core.integrationpoint.NodeComponentActivity
4040
import io.element.android.compound.theme.ElementTheme
4141
import io.element.android.compound.theme.Theme
4242
import io.element.android.compound.theme.isDark
@@ -49,7 +49,7 @@ import io.element.android.features.preferences.api.store.AppPreferencesStore
4949
import io.element.android.libraries.architecture.bindings
5050
import javax.inject.Inject
5151

52-
class ElementCallActivity : NodeComponentActivity(), CallScreenNavigator {
52+
class ElementCallActivity : AppCompatActivity(), CallScreenNavigator {
5353
companion object {
5454
private const val EXTRA_CALL_WIDGET_SETTINGS = "EXTRA_CALL_WIDGET_SETTINGS"
5555

@@ -121,13 +121,11 @@ class ElementCallActivity : NodeComponentActivity(), CallScreenNavigator {
121121

122122
override fun onConfigurationChanged(newConfig: Configuration) {
123123
super.onConfigurationChanged(newConfig)
124-
125124
updateUiMode(newConfig)
126125
}
127126

128-
override fun onNewIntent(intent: Intent?) {
127+
override fun onNewIntent(intent: Intent) {
129128
super.onNewIntent(intent)
130-
131129
setCallType(intent)
132130
}
133131

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ datastore = "1.0.0"
1919
constraintlayout = "2.1.4"
2020
constraintlayout_compose = "1.0.1"
2121
lifecycle = "2.7.0"
22-
activity = "1.8.2"
22+
activity = "1.9.0"
2323
media3 = "1.3.1"
2424
camera = "1.3.3"
2525

0 commit comments

Comments
 (0)