Skip to content
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

Jump to bottom

fix: when changing the timer from a value to off in the file sharing screen the button state is not updated correctly [WPB-405] #2156

Merged
merged 6 commits into from
Sep 1, 2023
Merged

fix: when changing the timer from a value to off in the file sharing screen the button state is not updated correctly [WPB-405] #2156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b265d2
fix: sharing extension self delete icon is enabled after changing to OFF
MohamadJaara Aug 30, 2023
0bb98b8
fix the issue from the source
MohamadJaara Aug 30, 2023
343767e
detekt
MohamadJaara Aug 30, 2023
4ff4497
Merge branch 'release/candidate' into fix/WPB-405
MohamadJaara Aug 30, 2023
64f660a
Merge branch 'release/candidate' into fix/WPB-405
MohamadJaara Aug 30, 2023
f8a5c68
Merge branch 'release/candidate' into fix/WPB-405
ohassine Sep 1, 2023
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
5 changes: 2 additions & 3 deletions app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/SelfDeletionDuration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ import com.wire.android.BuildConfig
import com.wire.android.R
import com.wire.android.util.ui.UIText
import kotlin.time.Duration
import kotlin.time.Duration.Companion.ZERO
import kotlin.time.Duration.Companion.days
import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.minutes
import kotlin.time.Duration.Companion.seconds

@Suppress("MagicNumber")
enum class SelfDeletionDuration(val value: Duration, val longLabel: UIText, val shortLabel: UIText) {
None(ZERO, UIText.StringResource(R.string.label_off), UIText.StringResource(R.string.label_off)),
enum class SelfDeletionDuration(val value: Duration?, val longLabel: UIText, val shortLabel: UIText) {
None(null, UIText.StringResource(R.string.label_off), UIText.StringResource(R.string.label_off)),
TenSeconds(
10.seconds,
UIText.PluralResource(R.plurals.seconds_long_label, 10, 10),
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaAuthenticatedViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.util.UUID
import javax.inject.Inject
import kotlin.time.Duration.Companion.ZERO

@HiltViewModel
@OptIn(FlowPreview::class)
Expand Down Expand Up @@ -458,5 +457,5 @@ data class ImportMediaAuthenticatedState(
val isImporting: Boolean = false,
val shareableConversationListState: ShareableConversationListState = ShareableConversationListState(),
val selectedConversationItem: List<ConversationItem> = emptyList(),
val selfDeletingTimer: SelfDeletionTimer = SelfDeletionTimer.Enabled(ZERO)
val selfDeletingTimer: SelfDeletionTimer = SelfDeletionTimer.Enabled(null)
)
Loading