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.

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

Master back merge with 2.2.0 final changes #798

Merged
merged 27 commits into from
Oct 12, 2023
Merged

Master back merge with 2.2.0 final changes #798

merged 27 commits into from
Oct 12, 2023

Conversation

Pelkar
Copy link
Collaborator

@Pelkar Pelkar commented Oct 12, 2023

release/2.2.0 back merge with minor fixes

gersonnoboa and others added 27 commits June 5, 2023 11:51
Bitrise does commits sometimes for us, like for example updating
dependencies. Bitrise's documentation recommends to introduce an
envvar with the values. These are the same values used in other
projects.

MOB-1696
…rator's Activity

This prevents the `java.lang.IllegalArgumentException: The style on this component requires your app theme to be Theme.MaterialComponents (or a descendant)` crash even if integrator's activity style is not Material

MOB-2515
…ctivity instead of integrator's Activity

MOB-2515
Some listeners subscribe only once, so we shouldn't unsubscribe

MOB-2556
# Conflicts:
#	version.properties
#	widgetssdk/src/main/java/com/glia/widgets/GliaWidgets.java
#	widgetssdk/src/main/java/com/glia/widgets/chat/adapter/holder/OperatorStatusViewHolder.kt
#	widgetssdk/src/main/java/com/glia/widgets/chat/model/ChatState.java
#	widgetssdk/src/main/java/com/glia/widgets/view/MessagesNotSeenHandler.java
@Pelkar Pelkar requested a review from andrews-moc October 12, 2023 07:23
@Pelkar Pelkar merged commit 60f9d5c into development Oct 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

6 participants