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

Release/1.20.0 #1670

Merged
merged 30 commits into from
Sep 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
93af215
SES-2696 - Fix disappearing message
SessionHero01 Sep 11, 2024
4cb9372
SES-2713 - band dialog strings
ThomasSession Sep 11, 2024
0218bf9
Merge branch 'release/1.20.0' of https://github.com/oxen-io/session-a…
ThomasSession Sep 11, 2024
ad944e3
Avatar dialog shows a red "remove" button
ThomasSession Sep 11, 2024
d30ff25
SES-2715 Calls toggle and Mic permission
ThomasSession Sep 11, 2024
304679d
Strings update
ThomasSession Sep 12, 2024
b9f06c3
Deleting tests no longer needed
ThomasSession Sep 12, 2024
41386fc
Merge pull request #1664 from oxen-io/fix/strings-update
ThomasSession Sep 12, 2024
bdbc2c1
SES-348 Adding a char limit to the input field in conversations
ThomasSession Sep 13, 2024
74787f9
Making sure camera perm updates in QR and new string for rationale d…
ThomasSession Sep 13, 2024
cf92c45
Latest strings
ThomasSession Sep 13, 2024
f270572
SES-2722 & SES-2718
ThomasSession Sep 13, 2024
e80f463
Listening to changes in community write access
ThomasSession Sep 15, 2024
cc63fa3
Removing uneeded line in the "Report a bug" help category in settings
ThomasSession Sep 15, 2024
0d158b6
Cleaning up modals for platform consistency
ThomasSession Sep 15, 2024
915c617
More dialog platform consistency
ThomasSession Sep 15, 2024
1f6a1b1
Using groupId as the key instead of the server alone
ThomasSession Sep 15, 2024
7b7c053
Using the right button for recovery banner
ThomasSession Sep 15, 2024
c3cf2b8
Updated tests
ThomasSession Sep 15, 2024
d044f12
Merge pull request #1669 from oxen-io/feature/dynamic-community-rights
ThomasSession Sep 16, 2024
d0d7626
Moving the heavy lifting code in a coroutine to help with ANRs
ThomasSession Sep 16, 2024
f35f30a
Merge pull request #1671 from oxen-io/fix/attachment-anrs
ThomasSession Sep 16, 2024
d0537c1
Cleaning up thumbnail view bgs
ThomasSession Sep 16, 2024
01a702b
Using our updated qaTag instead of testTag
ThomasSession Sep 17, 2024
06095ce
[SES-2733] Preventing files from being selected in media overview
SessionHero01 Sep 17, 2024
c42ef84
Latest Strings
ThomasSession Sep 17, 2024
d60db11
Have to remove translations for now
ThomasSession Sep 18, 2024
922077e
Latest strings
ThomasSession Sep 19, 2024
be5b79d
New strings script removes non-required duplicate regional folders
ThomasSession Sep 19, 2024
ba3e25c
Update APT repo before installing jdk
SessionHero01 Sep 19, 2024
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
Prev Previous commit
Next Next commit
Updated tests
ThomasSession committed Sep 15, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
aramase Anish Ramasekar
commit c3cf2b8d035dc529eb6c7ead74c4407240ef365a
Original file line number Diff line number Diff line change
@@ -295,7 +295,7 @@ class ConversationViewModel(
* - We are dealing with a contact from a community (blinded recipient) that does not allow
* requests form community members
*/
private fun shouldHideInputBar(): Boolean = openGroup?.canWrite == false ||
fun shouldHideInputBar(): Boolean = openGroup?.canWrite == false ||
blindedRecipient?.blocksCommunityMessageRequests == true

fun legacyBannerRecipient(context: Context): Recipient? = recipient?.run {
Original file line number Diff line number Diff line change
@@ -203,7 +203,7 @@ class ConversationViewModelTest: BaseViewModelTest() {
@Test
fun `local recipient should have input and no blinded recipient`() {
whenever(recipient.isLocalNumber).thenReturn(true)
assertThat(viewModel.uiState.value.hideInputBar, equalTo(false))
assertThat(viewModel.shouldHideInputBar(), equalTo(false))
assertThat(viewModel.blindedRecipient, nullValue())
}

@@ -215,7 +215,7 @@ class ConversationViewModelTest: BaseViewModelTest() {
}
whenever(repository.maybeGetBlindedRecipient(recipient)).thenReturn(blinded)
assertThat(viewModel.blindedRecipient, notNullValue())
assertThat(viewModel.uiState.value.hideInputBar, equalTo(true))
assertThat(viewModel.shouldHideInputBar(), equalTo(true))
}

}