-
Notifications
You must be signed in to change notification settings - Fork 316
Fix attachments lost on activity recreation #6377
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.
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
aleksandar-apostolov
merged 2 commits into
v6
from
bug/AND-1145_fix_attachments_lost_on_activity_recreation
Apr 22, 2026
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
...getstream/chat/android/ui/common/feature/messages/composer/internal/ComposerStateSaver.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright (c) 2014-2026 Stream.io Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Stream License; | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://github.com/GetStream/stream-chat-android/blob/main/LICENSE | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.getstream.chat.android.ui.common.feature.messages.composer.internal | ||
|
|
||
| import io.getstream.chat.android.core.internal.InternalStreamChatApi | ||
| import io.getstream.chat.android.models.Attachment | ||
|
|
||
| /** | ||
| * Abstraction for persisting and restoring message composer state across process death. | ||
| * | ||
| * The controller interacts with this interface only — no Android framework imports required. | ||
| */ | ||
| @InternalStreamChatApi | ||
| public interface ComposerStateSaver { | ||
|
|
||
| /** | ||
| * Save the attachments from the composer. | ||
| * | ||
| * Implementations should be cheap to call frequently — this is invoked | ||
| * on every change to the attachment list. | ||
| */ | ||
| public fun saveAttachments(attachments: List<Attachment>) | ||
|
|
||
| /** | ||
| * Restores the attachments to the composer. | ||
| */ | ||
| public fun restoreAttachments(): List<Attachment>? | ||
|
|
||
| /** | ||
| * Clears the stored state. | ||
| */ | ||
| public fun clear() | ||
| } |
34 changes: 34 additions & 0 deletions
34
...tream/chat/android/ui/common/feature/messages/composer/internal/NoOpComposerStateSaver.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright (c) 2014-2026 Stream.io Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Stream License; | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://github.com/GetStream/stream-chat-android/blob/main/LICENSE | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.getstream.chat.android.ui.common.feature.messages.composer.internal | ||
|
|
||
| import io.getstream.chat.android.core.internal.InternalStreamChatApi | ||
| import io.getstream.chat.android.models.Attachment | ||
|
|
||
| /** | ||
| * A [ComposerStateSaver] that does nothing. | ||
| * | ||
| * Used as a fallback when the ViewModel is created without [CreationExtras] | ||
| * (e.g. via the legacy [ViewModelProvider.Factory.create] overload). | ||
| * Composer state will not survive process death in this case. | ||
| */ | ||
| @InternalStreamChatApi | ||
| public object NoOpComposerStateSaver : ComposerStateSaver { | ||
| override fun saveAttachments(attachments: List<Attachment>): Unit = Unit | ||
| override fun restoreAttachments(): List<Attachment>? = null | ||
| override fun clear(): Unit = Unit | ||
| } |
83 changes: 83 additions & 0 deletions
83
...tstream/chat/android/ui/common/feature/messages/composer/internal/ParcelableAttachment.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * Copyright (c) 2014-2026 Stream.io Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Stream License; | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://github.com/GetStream/stream-chat-android/blob/main/LICENSE | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.getstream.chat.android.ui.common.feature.messages.composer.internal | ||
|
|
||
| import android.os.Parcelable | ||
| import io.getstream.chat.android.models.Attachment | ||
| import kotlinx.parcelize.Parcelize | ||
| import kotlinx.parcelize.RawValue | ||
| import java.io.File | ||
|
|
||
| /** | ||
| * A Parcelable subset of [Attachment] containing only the fields that are populated | ||
| * at compose time (before upload). Fields like `imageUrl`, `thumbUrl`, `assetUrl`, | ||
| * `uploadState`, etc. are populated after upload and are intentionally excluded. | ||
| */ | ||
| @Parcelize | ||
| internal data class ParcelableAttachment( | ||
| val uploadPath: String?, | ||
| val type: String?, | ||
| val name: String?, | ||
| val fileSize: Int, | ||
| val mimeType: String?, | ||
| val title: String?, | ||
| val extraData: Map<String, @RawValue Any>, | ||
| ) : Parcelable | ||
|
|
||
| /** | ||
| * Converts an [Attachment] to a [ParcelableAttachment] for persistence via [SavedStateHandle]. | ||
| */ | ||
| internal fun Attachment.toParcelable(): ParcelableAttachment = ParcelableAttachment( | ||
| uploadPath = upload?.absolutePath, | ||
| type = type, | ||
| name = name, | ||
| fileSize = fileSize, | ||
| mimeType = mimeType, | ||
| title = title, | ||
| extraData = extraData, | ||
| ) | ||
|
|
||
| /** | ||
| * Converts a [ParcelableAttachment] back to an [Attachment]. | ||
| */ | ||
| internal fun ParcelableAttachment.toAttachment(): Attachment = Attachment( | ||
| upload = uploadPath?.let { File(it) }, | ||
| type = type, | ||
| name = name, | ||
| fileSize = fileSize, | ||
| mimeType = mimeType, | ||
| title = title, | ||
| extraData = extraData, | ||
| ) | ||
|
|
||
| /** | ||
| * Checks whether all extra data values in the given attachments are safe to parcel. | ||
| * Returns `true` if all values can be written to a [android.os.Parcel] without crashing. | ||
| */ | ||
| internal fun List<Attachment>.areExtraDataParcelSafe(): Boolean = | ||
| all { attachment -> attachment.extraData.values.all { it.isParcelSafe() } } | ||
|
|
||
| /** | ||
| * Recursively checks whether a value can be safely written via [android.os.Parcel.writeValue]. | ||
| */ | ||
| private fun Any.isParcelSafe(): Boolean = when (this) { | ||
| is String, is Int, is Long, is Float, is Double, is Boolean, is Byte, is Short -> true | ||
| is BooleanArray, is ByteArray, is FloatArray, is IntArray, is LongArray, is DoubleArray -> true | ||
| is List<*> -> all { it == null || it.isParcelSafe() } | ||
| is Map<*, *> -> all { (k, v) -> k is String && (v == null || v.isParcelSafe()) } | ||
| else -> false | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.