TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-03 21:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up modals for platform consistency

Browse Source
This commit is contained in:
ThomasSession 2024-09-16 09:29:19 +10:00
parent cc63fa3eca
commit 0d158b62e4
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
View File

@ -949,11 +949,20 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
block(deleteThread = true) block(deleteThread = true)
} }
binding.declineMessageRequestButton.setOnClickListener { binding.declineMessageRequestButton.setOnClickListener {
viewModel.declineMessageRequest() fun doDecline() {
lifecycleScope.launch(Dispatchers.IO) { viewModel.declineMessageRequest()
ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(this@ConversationActivityV2) lifecycleScope.launch(Dispatchers.IO) {
ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(this@ConversationActivityV2)
}
finish()
}
showSessionDialog {
title(R.string.delete)
text(resources.getString(R.string.messageRequestsDelete))
dangerButton(R.string.delete) { doDecline() }
button(R.string.cancel)
} }
finish()
} }
} }

7
app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt
View File

@ -108,7 +108,7 @@ class MessageRequestsActivity : PassphraseRequiredActionBarActivity(), Conversat
showSessionDialog { showSessionDialog {
title(R.string.delete) title(R.string.delete)
text(resources.getString(R.string.messageRequestsDelete)) text(resources.getString(R.string.messageRequestsDelete))
button(R.string.delete) { doDecline() } dangerButton(R.string.delete) { doDecline() }
button(R.string.cancel) button(R.string.cancel)
} }
} }
@ -129,9 +129,10 @@ class MessageRequestsActivity : PassphraseRequiredActionBarActivity(), Conversat
} }
showSessionDialog { showSessionDialog {
title(resources.getString(R.string.clearAll))
text(resources.getString(R.string.messageRequestsClearAllExplanation)) text(resources.getString(R.string.messageRequestsClearAllExplanation))
button(R.string.yes) { doDeleteAllAndBlock() } dangerButton(R.string.clear) { doDeleteAllAndBlock() }
button(R.string.no) button(R.string.cancel)
} }
} }
} }