Skip to content

feat: delete meeting for me [WPB-27932] #5236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saleniuk merged 4 commits into from
Sep 2, 2026
+218 −66
Merged

feat: delete meeting for me [WPB-27932] #5236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0c0e95
feat: delete meeting for me [WPB-27932]
saleniuk Aug 31, 2026
c4f84ac
update tests
saleniuk Aug 31, 2026
a5451c8
update kalium
saleniuk Sep 2, 2026
465ffdf
Merge remote-tracking branch 'origin/develop' into feat/meeting-delet…
saleniuk Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions app/src/main/baseline-prof.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29502,14 +29502,22 @@ Lcom/wire/android/di/accountScoped/MeetingModule$ProvideCreateNewMeetingUseCaseM
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideCreateNewMeetingUseCaseMetroFactory$Companion;-><init>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideCreateNewMeetingUseCaseMetroFactory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideCreateNewMeetingUseCaseMetroFactory$Companion;->create(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)Lcom/wire/android/di/accountScoped/MeetingModule$ProvideCreateNewMeetingUseCaseMetroFactory;
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory;-><clinit>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory$Companion;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory$Companion;-><init>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory$Companion;->create(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory;
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory;-><clinit>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory$Companion;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory$Companion;-><init>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory$Companion;->create(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory;
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory;-><clinit>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory$Companion;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory$Companion;-><init>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory$Companion;->create(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory;
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideGetNextMeetingOccurrenceUseCaseMetroFactory;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideGetNextMeetingOccurrenceUseCaseMetroFactory;-><clinit>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideGetNextMeetingOccurrenceUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)V
Expand Down Expand Up @@ -48900,4 +48908,4 @@ SPLorg/slf4j/helpers/Util;-><clinit>()V
SPLorg/slf4j/helpers/Util;->safeGetBooleanSystemProperty(Ljava/lang/String;)Z
SPLorg/slf4j/helpers/Util;->safeGetSystemProperty(Ljava/lang/String;)Ljava/lang/String;
Lorg/slf4j/spi/MDCAdapter;
Lorg/slf4j/spi/SLF4JServiceProvider;
Lorg/slf4j/spi/SLF4JServiceProvider;
10 changes: 8 additions & 2 deletions app/src/main/kotlin/com/wire/android/di/accountScoped/MeetingModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import com.wire.android.di.KaliumCoreLogic
import com.wire.kalium.logic.CoreLogic
import com.wire.kalium.logic.data.user.UserId
import com.wire.kalium.logic.feature.meeting.CreateNewMeetingUseCase
import com.wire.kalium.logic.feature.meeting.DeleteMeetingForEveryoneUseCase
import com.wire.kalium.logic.feature.meeting.DeleteMeetingForMeUseCase
import com.wire.kalium.logic.feature.meeting.EnsureMeetingIsMLSEstablishedUseCase
import com.wire.kalium.logic.feature.meeting.GetNextUnfinishedMeetingOccurrenceUseCase
import com.wire.kalium.logic.feature.meeting.GetPaginatedMeetingOccurrencesUseCase
Expand All @@ -48,8 +50,12 @@ class MeetingModule {
meetingScope.observeMeetingOccurrence

@Provides
fun provideDeleteMeetingUseCase(meetingScope: MeetingScope): com.wire.kalium.logic.feature.meeting.DeleteMeetingUseCase =
meetingScope.deleteMeeting
fun provideDeleteMeetingForEveryoneUseCase(meetingScope: MeetingScope): DeleteMeetingForEveryoneUseCase =
meetingScope.deleteMeetingForEveryone

@Provides
fun provideDeleteMeetingForMeUseCase(meetingScope: MeetingScope): DeleteMeetingForMeUseCase =
meetingScope.deleteMeetingForMe

@Provides
fun provideCreateNewMeetingUseCase(meetingScope: MeetingScope): CreateNewMeetingUseCase =
Expand Down
26 changes: 17 additions & 9 deletions app/src/main/startup-prof.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29502,14 +29502,22 @@ Lcom/wire/android/di/accountScoped/MeetingModule$ProvideCreateNewMeetingUseCaseM
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideCreateNewMeetingUseCaseMetroFactory$Companion;-><init>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideCreateNewMeetingUseCaseMetroFactory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideCreateNewMeetingUseCaseMetroFactory$Companion;->create(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)Lcom/wire/android/di/accountScoped/MeetingModule$ProvideCreateNewMeetingUseCaseMetroFactory;
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory;-><clinit>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory$Companion;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory$Companion;-><init>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory$Companion;->create(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingUseCaseMetroFactory;
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory;-><clinit>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory$Companion;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory$Companion;-><init>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory$Companion;->create(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForEveryoneUseCaseMetroFactory;
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory;-><clinit>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory$Companion;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory$Companion;-><init>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory$Companion;->create(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)Lcom/wire/android/di/accountScoped/MeetingModule$ProvideDeleteMeetingForMeUseCaseMetroFactory;
Lcom/wire/android/di/accountScoped/MeetingModule$ProvideGetNextMeetingOccurrenceUseCaseMetroFactory;
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideGetNextMeetingOccurrenceUseCaseMetroFactory;-><clinit>()V
SPLcom/wire/android/di/accountScoped/MeetingModule$ProvideGetNextMeetingOccurrenceUseCaseMetroFactory;-><init>(Lcom/wire/android/di/accountScoped/MeetingModule;Ldev/zacsweers/metro/Provider;)V
Expand Down Expand Up @@ -48900,4 +48908,4 @@ SPLorg/slf4j/helpers/Util;-><clinit>()V
SPLorg/slf4j/helpers/Util;->safeGetBooleanSystemProperty(Ljava/lang/String;)Z
SPLorg/slf4j/helpers/Util;->safeGetSystemProperty(Ljava/lang/String;)Ljava/lang/String;
Lorg/slf4j/spi/MDCAdapter;
Lorg/slf4j/spi/SLF4JServiceProvider;
Lorg/slf4j/spi/SLF4JServiceProvider;
24 changes: 20 additions & 4 deletions ...eetings/src/main/java/com/wire/android/feature/meetings/ui/options/DeleteMeetingDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package com.wire.android.feature.meetings.ui.options

import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import com.wire.android.ui.common.R as commonR
import com.wire.android.feature.meetings.R
import com.wire.android.ui.common.VisibilityState
import com.wire.android.ui.common.WireDialog
Expand All @@ -30,17 +29,29 @@ import com.wire.android.ui.common.button.WireButtonState
import com.wire.android.ui.common.visbility.VisibilityState
import com.wire.android.ui.common.wireDialogPropertiesBuilder
import com.wire.kalium.logic.data.id.MeetingId
import com.wire.android.ui.common.R as commonR

@Composable
internal fun DeleteMeetingDialog(
dialogState: VisibilityState<DeleteMeetingDialogState>,
onDelete: (DeleteMeetingDialogState) -> Unit,
) {
VisibilityState(dialogState) { state ->
val (titleResId, textResId) = when (state.deleteType) {
DeleteMeetingType.ForEveryone -> Pair(
R.string.delete_meeting_for_everyone_title,
R.string.delete_meeting_for_everyone_description,
)

DeleteMeetingType.ForMe -> Pair(
R.string.delete_meeting_for_me_title,
R.string.delete_meeting_for_me_description,
)
}
WireDialog(
properties = wireDialogPropertiesBuilder(dismissOnBackPress = !state.loading, dismissOnClickOutside = !state.loading),
title = stringResource(id = R.string.delete_meeting_for_everyone_title, state.meetingTitle),
text = stringResource(id = R.string.delete_meeting_for_everyone_description),
title = stringResource(id = titleResId),
text = stringResource(id = textResId),
buttonsHorizontalAlignment = true,
onDismiss = dialogState::dismiss,
dismissButtonProperties = WireDialogButtonProperties(
Expand All @@ -61,8 +72,13 @@ internal fun DeleteMeetingDialog(
}
}

enum class DeleteMeetingType {
ForMe,
ForEveryone,
}

data class DeleteMeetingDialogState(
val forEveryone: Boolean,
val deleteType: DeleteMeetingType,
val meetingId: MeetingId,
val meetingTitle: String,
val loading: Boolean = false,
Expand Down
Loading
Loading