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

Archived Conversations 🗃️ #4333

Merged
merged 7 commits into from
Oct 28, 2024
Merged

Archived Conversations 🗃️ #4333

merged 7 commits into from
Oct 28, 2024

Conversation

rapterjet2004
Copy link
Contributor

@rapterjet2004 rapterjet2004 commented Oct 11, 2024 •
edited
Loading

🏁 Checklist

  • ⛑️ Tests (unit and/or integration) are included or not needed
  • 🔖 Capability is checked or not needed
  • 🔙 Backport requests are created or not needed: /backport to stable-xx.x
  • 📅 Milestone is set
  • 🌸 PR title is meaningful (if it should be in the changelog: is it meaningful to users?)

@rapterjet2004
WIP
8eeca17 
Signed-off-by: rapterjet2004 <[email protected]>
@rapterjet2004 rapterjet2004 added the 2. developing Work in progress label Oct 11, 2024
@rapterjet2004 rapterjet2004 self-assigned this Oct 11, 2024
@rapterjet2004 rapterjet2004 changed the title Archived Conversations Archived Conversations 🗃️ Oct 11, 2024
@rapterjet2004 rapterjet2004 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 15, 2024
@rapterjet2004
Ironed out the bugs
39305d7 
Signed-off-by: rapterjet2004 <[email protected]>
@rapterjet2004 rapterjet2004 marked this pull request as ready for review October 16, 2024 11:47
mahibi
mahibi requested changes Oct 22, 2024
View reviewed changes
app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt Outdated Show resolved Hide resolved
app/src/main/res/layout/activity_conversation_info.xml Show resolved Hide resolved
app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt Outdated
@@ -200,6 +202,56 @@ class ConversationInfoViewModel @Inject constructor(
})
}

fun archiveConversation(user: User, token: String) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing to implement for now (can be done in followup PR if you are interested), but just as a sidenote:

It would be nice to have the archive/unarchive button also available in the conversations context menu. This would lead to the question how duplicated code can be avoided to call the repository.
In the long term we should use "UseCases" for it to make this more reusable. See explanations at https://medium.com/@ami0275/mvvm-clean-architecture-pattern-in-android-with-use-cases-eff7edc2ef76

But as said, should be done later on and not in this PR. So for now i suggest to don't implement it in the context menu.

app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/11.json
@@ -2,7 +2,7 @@
"formatVersion": 1,
"database": {
"version": 11,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the databse version must be bumped and a database migration must be added to alter the affected table

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was merged too fast. there should have been a 12.json file instead to modify 11.json
should be fixed with #4417

@rapterjet2004
changes
46efdf4 
Signed-off-by: rapterjet2004 <[email protected]>
@rapterjet2004
uses NcApiCoroutines now
d464d71 
Signed-off-by: rapterjet2004 <[email protected]>
@rapterjet2004
linter
3d9f836 
Signed-off-by: rapterjet2004 <[email protected]>
@rapterjet2004 rapterjet2004 requested a review from mahibi October 23, 2024 13:26
@rapterjet2004
codacy and analysis
7285c0a 
Signed-off-by: rapterjet2004 <[email protected]>
@github-actions GitHub Actions
Copy link
Contributor

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/4333-talk.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud Talk app.

@github-actions GitHub Actions
Copy link
Contributor

Codacy

Lint

TypemasterPR
Warnings9494
Errors132132

SpotBugs

CategoryBaseNew
Bad practice66
Correctness1111
Dodgy code7979
Internationalization33
Malicious code vulnerability33
Performance66
Security11
Total109109

@rapterjet2004 rapterjet2004 merged commit 085711d into master Oct 28, 2024
18 checks passed
@rapterjet2004 rapterjet2004 deleted the issue-4257-archive-conversation branch October 28, 2024 13:30
@AndyScherzinger AndyScherzinger added this to the 20.1.0 milestone Nov 5, 2024
@mahibi
Copy link
Collaborator

mahibi commented Nov 5, 2024

no backport by intention..

This was referenced Nov 5, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mahibi mahibi mahibi approved these changes

@sowjanyakch sowjanyakch Awaiting requested review from sowjanyakch

Assignees

@rapterjet2004 rapterjet2004

Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
20.1.0
Development

Successfully merging this pull request may close these issues.

Support "Archive conversation" feature
3 participants
@rapterjet2004 @mahibi @AndyScherzinger