TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't show Session Public Chat suggestion sheet

Browse Source
This commit is contained in:
Niels Andriesse 2020-02-06 16:12:50 +11:00
parent 0b3ca0140f
commit d84b0611c5
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
View File

@ -22,16 +22,13 @@ import android.text.style.ForegroundColorSpan
import android.view.View import android.view.View
import kotlinx.android.synthetic.main.activity_home.* import kotlinx.android.synthetic.main.activity_home.*
import network.loki.messenger.R import network.loki.messenger.R
import nl.komponents.kovenant.ui.successUi
import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.ApplicationContext
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
import org.thoughtcrime.securesms.conversation.ConversationActivity import org.thoughtcrime.securesms.conversation.ConversationActivity
import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.DatabaseFactory
import org.thoughtcrime.securesms.database.ThreadDatabase import org.thoughtcrime.securesms.database.ThreadDatabase
import org.thoughtcrime.securesms.database.model.ThreadRecord import org.thoughtcrime.securesms.database.model.ThreadRecord
import org.thoughtcrime.securesms.loki.getColorWithID import org.thoughtcrime.securesms.loki.getColorWithID
import org.thoughtcrime.securesms.loki.redesign.dialogs.OpenGroupSuggestionBottomSheet
import org.thoughtcrime.securesms.loki.redesign.utilities.push import org.thoughtcrime.securesms.loki.redesign.utilities.push
import org.thoughtcrime.securesms.loki.redesign.utilities.show import org.thoughtcrime.securesms.loki.redesign.utilities.show
import org.thoughtcrime.securesms.loki.redesign.views.ConversationView import org.thoughtcrime.securesms.loki.redesign.views.ConversationView
@ -150,32 +147,32 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
if (hasViewedSeed || !isMasterDevice) { if (hasViewedSeed || !isMasterDevice) {
seedReminderView.visibility = View.GONE seedReminderView.visibility = View.GONE
} }
if (!TextSecurePreferences.getHasSeenOpenGroupSuggestionSheet(this)) { // if (!TextSecurePreferences.getHasSeenOpenGroupSuggestionSheet(this)) {
val bottomSheet = OpenGroupSuggestionBottomSheet() // val bottomSheet = OpenGroupSuggestionBottomSheet()
bottomSheet.onJoinTapped = { // bottomSheet.onJoinTapped = {
TextSecurePreferences.setHasSeenOpenGroupSuggestionSheet(this) // TextSecurePreferences.setHasSeenOpenGroupSuggestionSheet(this)
bottomSheet.dismiss() // bottomSheet.dismiss()
// TODO: Duplication of the code in JoinPublicChatActivity // // TODO: Duplication of the code in JoinPublicChatActivity
val application = ApplicationContext.getInstance(this) // val application = ApplicationContext.getInstance(this)
val channel: Long = 1 // val channel: Long = 1
val displayName = TextSecurePreferences.getProfileName(this) // val displayName = TextSecurePreferences.getProfileName(this)
val lokiPublicChatAPI = application.lokiPublicChatAPI!! // val lokiPublicChatAPI = application.lokiPublicChatAPI!!
val url = "https://chat.getsession.org" // val url = "https://chat.getsession.org"
application.lokiPublicChatManager.addChat(url, channel).successUi { // application.lokiPublicChatManager.addChat(url, channel).successUi {
lokiPublicChatAPI.getMessages(channel, url) // lokiPublicChatAPI.getMessages(channel, url)
lokiPublicChatAPI.setDisplayName(displayName, url) // lokiPublicChatAPI.setDisplayName(displayName, url)
lokiPublicChatAPI.join(channel, url) // lokiPublicChatAPI.join(channel, url)
val profileKey: ByteArray = ProfileKeyUtil.getProfileKey(this) // val profileKey: ByteArray = ProfileKeyUtil.getProfileKey(this)
val profileUrl: String? = TextSecurePreferences.getProfileAvatarUrl(this) // val profileUrl: String? = TextSecurePreferences.getProfileAvatarUrl(this)
lokiPublicChatAPI.setProfilePicture(url, profileKey, profileUrl) // lokiPublicChatAPI.setProfilePicture(url, profileKey, profileUrl)
} // }
} // }
bottomSheet.onDismissTapped = { // bottomSheet.onDismissTapped = {
TextSecurePreferences.setHasSeenOpenGroupSuggestionSheet(this) // TextSecurePreferences.setHasSeenOpenGroupSuggestionSheet(this)
bottomSheet.dismiss() // bottomSheet.dismiss()
} // }
bottomSheet.show(supportFragmentManager, bottomSheet.tag) // bottomSheet.show(supportFragmentManager, bottomSheet.tag)
} // }
} }
// endregion // endregion