Merge remote-tracking branch 'upstream/dev' into improve_background_jobs

This commit is contained in:
jubb 2021-05-26 15:22:38 +10:00
commit 6fd1a82bed

View File

@ -12,11 +12,27 @@ class OpenGroupGuidelinesActivity : BaseActionBarActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_open_group_guidelines)
communityGuidelinesTextView.text = """
Welcome to Oxen.
Oxen believes privacy is an important part of our future. People have been safeguarding the right to privacy since the dawn of humanity, but the digital world has turned privacy into a privilege. Enough is enough. We're taking it back. For you. For us. For everyone.
Oxen is a private technology stack including the Oxen blockchain, Oxen service nodes (Sessions servers), the Oxen cryptocurrency, an onion-router called Lokinet, and Session itself.
Oxen is what makes Session possible Session is running on the Oxen network right now.
Find out more at https://oxen.io, or ask here!
In order for our open group to be a fun environment, full of robust and constructive discussion, please follow these four simple rules:
1. Keep conversations on-topic and add value to the discussion (no referral links, spamming, or off-topic discussion).
1. Keep conversations on-topic and add value to the discussion.
2. You don't have to love everyone, but be civil (no baiting, excessively partisan arguments, threats, and so on; use common sense).
(No referral links, spamming, or off-topic discussion)
2. You don't have to love everyone, but be civil.
(No baiting, excessively partisan arguments, threats, and so on. Use common sense.)
3. Do not be a shill. Comparison and criticism is reasonable, but blatant shilling is not.
@ -30,7 +46,7 @@ class OpenGroupGuidelinesActivity : BaseActionBarActivity() {
SCAMMER WARNING
Trust only those with an admin tag in the chat. No admin will ever DM you first. No admin will ever message you for Oxen coins.
Trust only those with an admin crown in chat. No admin will ever DM you first. No admin will ever message you for Oxen coins.
""".trimIndent()
}
// endregion