Skip to content

Disable bug reports if homeserver is not synod.im #315

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

Merged
dontub merged 1 commit into from
Jun 19, 2025
Merged

Disable bug reports if homeserver is not synod.im #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion library/ui-strings/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,8 @@
<string name="login_splash_submit">Los geht\'s</string>
<string name="login_server_title">Wähle einen Server</string>
<string name="login_server_text">Genau wie bei E-Mails haben Accounts ein Zuhause, auch wenn du mit jedem kommunizieren kannst</string>
<string name="login_server_matrix_org_text">Tausche dich aus - mit dem sicheren Messenger im kirchlichen Bereich</string>
<string name="login_server_matrix_org_text">Folge Millionen Anderen kostenlos auf dem größten öffentlichen Server</string>
<string name="login_server_synod_im_text">Tausche dich aus - mit dem sicheren Messenger im kirchlichen Bereich</string>
<string name="login_server_modular_text">Premium-Hosting für Organisationen</string>
<string name="login_server_modular_learn_more">Mehr erfahren</string>
<string name="login_server_other_title">Andere</string>
Expand Down
3 changes: 2 additions & 1 deletion library/ui-strings/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2126,7 +2126,8 @@

<string name="login_server_title">Select a server</string>
<string name="login_server_text">Just like email, accounts have one home, although you can talk to anyone</string>
<string name="login_server_matrix_org_text">Communicate - using the secure messenger for congregations</string>
<string name="login_server_matrix_org_text">Join millions for free on the largest public server</string>
<string name="login_server_synod_im_text">Communicate - using the secure messenger for congregations</string>
<string name="login_server_modular_text">Premium hosting for organisations</string>
<string name="login_server_modular_learn_more">Learn more</string>
<string name="login_server_other_title">Other</string>
Expand Down
3 changes: 2 additions & 1 deletion vector-config/src/main/res/values/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<!-- "app_name" is now defined in build.gradle -->

<!-- server urls -->
<string name="matrix_org_server_url" translatable="false">https://synod.im</string>
<string name="matrix_org_server_url" translatable="false">https://matrix.org</string>
<string name="synod_im_server_url" translatable="false">https://synod.im</string>

<!-- Rageshake configuration -->
<string name="bug_report_url" translatable="false">https://bugs.synod.im</string>
Expand Down
10 changes: 10 additions & 0 deletions vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,16 @@ class HomeActivity :
override fun handlePrepareMenu(menu: Menu) {
menu.findItem(R.id.menu_home_init_sync_legacy).isVisible = vectorPreferences.developerMode()
menu.findItem(R.id.menu_home_init_sync_optimized).isVisible = vectorPreferences.developerMode()
// Changed for Synod.im: Disable bug reporting when on third party home server.
// Rage shake is still possible to keep the code changes minimal.
if (activeSessionHolder.hasActiveSession()) {
val homeServerUrlBase = activeSessionHolder.getActiveSession().sessionParams.homeServerUrlBase;
val defaultHomeServerUrl = getString(im.vector.app.config.R.string.synod_im_server_url)
if (homeServerUrlBase != defaultHomeServerUrl) {
menu.findItem(R.id.menu_home_report_bug).isVisible = false
menu.findItem(R.id.menu_home_suggestion).isVisible = false
}
}
}

override fun handleMenuItemSelected(item: MenuItem): Boolean {
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,5 @@ class ServerUrlsRepository @Inject constructor(
/**
* Return default homeserver url from resources.
*/
private fun getDefaultHomeServerUrl() = stringProvider.getString(im.vector.app.config.R.string.matrix_org_server_url)
private fun getDefaultHomeServerUrl() = stringProvider.getString(im.vector.app.config.R.string.synod_im_server_url)
}
1 change: 1 addition & 0 deletions vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
private fun onServerSelectionDone(loginViewEvents: LoginViewEvents.OnServerSelectionDone) {
when (loginViewEvents.serverType) {
ServerType.MatrixOrg -> Unit // In this case, we wait for the login flow
ServerType.SynodIm -> Unit // In this case, we wait for the login flow
ServerType.EMS,
ServerType.Other -> addFragmentToBackstack(
views.loginFragmentContainer,
Expand Down
10 changes: 7 additions & 3 deletions vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,16 @@ class LoginFragment :

when (state.serverType) {
ServerType.MatrixOrg -> {
// Changed for Synod.im: Hide matrix.org icon.
views.loginServerIcon.isVisible = false
views.loginServerIcon.isVisible = true
views.loginServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
views.loginTitle.text = getString(resId, state.homeServerUrlFromUser.toReducedUrl())
views.loginNotice.text = getString(CommonStrings.login_server_matrix_org_text)
}
ServerType.SynodIm -> {
views.loginServerIcon.isVisible = false
views.loginTitle.text = getString(resId, state.homeServerUrlFromUser.toReducedUrl())
views.loginNotice.text = getString(CommonStrings.login_server_synod_im_text)
}
ServerType.EMS -> {
views.loginServerIcon.isVisible = true
views.loginServerIcon.setImageResource(R.drawable.ic_logo_element_matrix_services)
Expand Down Expand Up @@ -259,7 +263,7 @@ class LoginFragment :

override fun updateWithState(state: LoginViewState) {
isSignupMode = state.signMode == SignMode.SignUp
isNumericOnlyUserIdForbidden = state.serverType == ServerType.MatrixOrg
isNumericOnlyUserIdForbidden = state.serverType == ServerType.MatrixOrg || state.serverType == ServerType.SynodIm

setupUi(state)
setupAutoFill(state)
Expand Down
8 changes: 6 additions & 2 deletions vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,15 @@ class LoginSignUpSignInSelectionFragment :
when (state.serverType) {
ServerType.MatrixOrg -> {
views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
// Changed for Synod.im: Hide matrix.org icon.
views.loginSignupSigninServerIcon.isVisible = false
views.loginSignupSigninServerIcon.isVisible = true
views.loginSignupSigninTitle.text = getString(CommonStrings.login_connect_to, state.homeServerUrlFromUser.toReducedUrl())
views.loginSignupSigninText.text = getString(CommonStrings.login_server_matrix_org_text)
}
ServerType.SynodIm -> {
views.loginSignupSigninServerIcon.isVisible = false
views.loginSignupSigninTitle.text = getString(CommonStrings.login_connect_to, state.homeServerUrlFromUser.toReducedUrl())
views.loginSignupSigninText.text = getString(CommonStrings.login_server_synod_im_text)
}
ServerType.EMS -> {
views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_element_matrix_services)
views.loginSignupSigninServerIcon.isVisible = true
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class LoginSplashFragment :
loginViewModel.handle(LoginAction.OnGetStarted(resetLoginConfig = false))
} else {
// Synod.im: skip server selection
loginViewModel.handle(LoginAction.UpdateHomeServer(getString(im.vector.app.config.R.string.matrix_org_server_url).ensureTrailingSlash()))
loginViewModel.handle(LoginAction.UpdateHomeServer(getString(im.vector.app.config.R.string.synod_im_server_url).ensureTrailingSlash()))
}
}

Expand Down
10 changes: 8 additions & 2 deletions vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class LoginViewModel @AssistedInject constructor(
private var currentHomeServerConnectionConfig: HomeServerConnectionConfig? = null

private val matrixOrgUrl = stringProvider.getString(im.vector.app.config.R.string.matrix_org_server_url).ensureTrailingSlash()
private val synodImUrl = stringProvider.getString(im.vector.app.config.R.string.synod_im_server_url).ensureTrailingSlash()

val currentThreePid: String?
get() = registrationWizard?.getCurrentThreePid()
Expand Down Expand Up @@ -441,6 +442,9 @@ class LoginViewModel @AssistedInject constructor(
ServerType.MatrixOrg ->
// Request login flow here
handle(LoginAction.UpdateHomeServer(matrixOrgUrl))
ServerType.SynodIm ->
// Request login flow here
handle(LoginAction.UpdateHomeServer(synodImUrl))
ServerType.EMS,
ServerType.Other -> _viewEvents.post(LoginViewEvents.OnServerSelectionDone(action.serverType))
}
Expand Down Expand Up @@ -780,6 +784,8 @@ class LoginViewModel @AssistedInject constructor(
// It is also useful to set the value again in the case of a certificate error on matrix.org
serverType = if (homeServerConnectionConfig.homeServerUri.toString() == matrixOrgUrl) {
ServerType.MatrixOrg
} else if (homeServerConnectionConfig.homeServerUri.toString() == synodImUrl) {
ServerType.SynodIm
} else {
serverTypeOverride ?: serverType
}
Expand All @@ -793,8 +799,8 @@ class LoginViewModel @AssistedInject constructor(
setState {
copy(
asyncHomeServerLoginFlowRequest = Uninitialized,
// If we were trying to retrieve matrix.org login flow, also reset the serverType
serverType = if (serverType == ServerType.MatrixOrg) ServerType.Unknown else serverType
// If we were trying to retrieve matrix.org or synod.im login flow, also reset the serverType
serverType = if (serverType == ServerType.MatrixOrg || serverType == ServerType.SynodIm) ServerType.Unknown else serverType
)
}
null
Expand Down
3 changes: 2 additions & 1 deletion vector/src/main/java/im/vector/app/features/login/ServerType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ enum class ServerType {
Unknown,
MatrixOrg,
EMS,
Other
Other,
SynodIm
}
12 changes: 10 additions & 2 deletions vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
package im.vector.app.features.onboarding

import android.content.Context
import android.content.res.Resources
import androidx.core.os.ConfigurationCompat
import com.airbnb.mvrx.MavericksViewModelFactory
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
Expand Down Expand Up @@ -115,7 +117,8 @@ class OnboardingViewModel @AssistedInject constructor(
}

private val matrixOrgUrl = stringProvider.getString(im.vector.app.config.R.string.matrix_org_server_url).ensureTrailingSlash()
private val defaultHomeserverUrl = mdmService.getData(MdmData.DefaultHomeserverUrl, matrixOrgUrl)
private val synodImUrl = stringProvider.getString(im.vector.app.config.R.string.synod_im_server_url).ensureTrailingSlash()
private val defaultHomeserverUrl = mdmService.getData(MdmData.DefaultHomeserverUrl, synodImUrl)

private val registrationWizard: RegistrationWizard
get() = authenticationService.getRegistrationWizard()
Expand Down Expand Up @@ -233,7 +236,7 @@ class OnboardingViewModel @AssistedInject constructor(
private fun handleSplashAction(action: OnboardingAction.SplashAction) {
setState { copy(onboardingFlow = action.onboardingFlow) }
// Changed for Synod.im: Skip server selection
handle(OnboardingAction.HomeServerChange.SelectHomeServer(matrixOrgUrl))
handle(OnboardingAction.HomeServerChange.SelectHomeServer(synodImUrl))
// Previous code: (would show "Server Selection Screen")
// continueToPageAfterSplash(action.onboardingFlow)
}
Expand Down Expand Up @@ -473,6 +476,9 @@ class OnboardingViewModel @AssistedInject constructor(
ServerType.MatrixOrg ->
// Request login flow here
handle(OnboardingAction.HomeServerChange.SelectHomeServer(matrixOrgUrl))
ServerType.SynodIm ->
// Request login flow here
handle(OnboardingAction.HomeServerChange.SelectHomeServer(synodImUrl))
ServerType.EMS,
ServerType.Other -> _viewEvents.post(OnboardingViewEvents.OnServerSelectionDone(action.serverType))
}
Expand Down Expand Up @@ -822,6 +828,8 @@ class OnboardingViewModel @AssistedInject constructor(
private fun OnboardingViewState.alignServerTypeAfterSubmission(config: HomeServerConnectionConfig, serverTypeOverride: ServerType?): ServerType {
return if (config.homeServerUri.toString() == matrixOrgUrl) {
ServerType.MatrixOrg
} else if (config.homeServerUri.toString() == synodImUrl) {
ServerType.SynodIm
} else {
serverTypeOverride ?: serverType
}
Expand Down
5 changes: 3 additions & 2 deletions vector/src/main/java/im/vector/app/features/onboarding/RegistrationActionHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class RegistrationActionHandler @Inject constructor(
) {

private val matrixOrgUrl = stringProvider.getString(im.vector.app.config.R.string.matrix_org_server_url).ensureTrailingSlash()
private val synodImUrl = stringProvider.getString(im.vector.app.config.R.string.synod_im_server_url).ensureTrailingSlash()

suspend fun processAction(state: SelectedHomeserverState, action: RegisterAction): Result {
val result = registrationWizardActionDelegate.executeAction(action)
Expand Down Expand Up @@ -66,7 +67,7 @@ class RegistrationActionHandler @Inject constructor(

private fun findNextStage(state: SelectedHomeserverState, flowResult: FlowResult): Result {
val orderedResult = when {
state.hasSelectedMatrixOrg() && vectorFeatures.isOnboardingCombinedRegisterEnabled() -> flowResult.copy(
state.hasSelectedMatrixOrgOrSynodIm() && vectorFeatures.isOnboardingCombinedRegisterEnabled() -> flowResult.copy(
missingStages = flowResult.missingStages.sortedWith(MatrixOrgRegistrationStagesComparator())
)
else -> flowResult
Expand All @@ -80,7 +81,7 @@ class RegistrationActionHandler @Inject constructor(

private suspend fun FlowResult.registrationShouldFallback() = vectorOverrides.forceLoginFallback.first() || missingStages.any { !it.isSupported() }

private fun SelectedHomeserverState.hasSelectedMatrixOrg() = userFacingUrl == matrixOrgUrl
private fun SelectedHomeserverState.hasSelectedMatrixOrgOrSynodIm() = userFacingUrl == matrixOrgUrl || userFacingUrl == synodImUrl

sealed interface Result {
data class RegistrationComplete(val session: Session) : Result
Expand Down
1 change: 1 addition & 0 deletions .../main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,4 +280,5 @@ class FtueAuthCombinedRegisterFragment :

private fun OnboardingViewState.isNumericOnlyUserIdForbidden() =
selectedHomeserver.userFacingUrl == getString(im.vector.app.config.R.string.matrix_org_server_url)
|| selectedHomeserver.userFacingUrl == getString(im.vector.app.config.R.string.synod_im_server_url)
}
10 changes: 7 additions & 3 deletions vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,16 @@ class FtueAuthLoginFragment :

when (state.serverType) {
ServerType.MatrixOrg -> {
// Changed for Synod.im: Hide matrix.org icon.
views.loginServerIcon.isVisible = false
views.loginServerIcon.isVisible = true
views.loginServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
views.loginTitle.text = getString(resId, state.selectedHomeserver.userFacingUrl.toReducedUrl())
views.loginNotice.text = getString(CommonStrings.login_server_matrix_org_text)
}
ServerType.SynodIm -> {
views.loginServerIcon.isVisible = false
views.loginTitle.text = getString(resId, state.selectedHomeserver.userFacingUrl.toReducedUrl())
views.loginNotice.text = getString(CommonStrings.login_server_synod_im_text)
}
ServerType.EMS -> {
views.loginServerIcon.isVisible = true
views.loginServerIcon.setImageResource(R.drawable.ic_logo_element_matrix_services)
Expand Down Expand Up @@ -293,7 +297,7 @@ class FtueAuthLoginFragment :

override fun updateWithState(state: OnboardingViewState) {
isSignupMode = state.signMode == SignMode.SignUp
isNumericOnlyUserIdForbidden = state.serverType == ServerType.MatrixOrg
isNumericOnlyUserIdForbidden = state.serverType == ServerType.MatrixOrg || state.serverType == ServerType.SynodIm

setupUi(state)
setupAutoFill(state)
Expand Down
8 changes: 6 additions & 2 deletions .../java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,15 @@ class FtueAuthSignUpSignInSelectionFragment :
private fun render(state: OnboardingViewState) {
when (state.serverType) {
ServerType.MatrixOrg -> renderServerInformation(
// Changed for Synod.im: Hide matrix.org icon.
icon = null, // R.drawable.ic_logo_matrix_org,
icon = R.drawable.ic_logo_matrix_org,
title = getString(CommonStrings.login_connect_to, state.selectedHomeserver.userFacingUrl.toReducedUrl()),
subtitle = getString(CommonStrings.login_server_matrix_org_text)
)
ServerType.SynodIm -> renderServerInformation(
icon = null,
title = getString(CommonStrings.login_connect_to, state.selectedHomeserver.userFacingUrl.toReducedUrl()),
subtitle = getString(CommonStrings.login_server_synod_im_text)
)
ServerType.EMS -> renderServerInformation(
icon = R.drawable.ic_logo_element_matrix_services,
title = getString(CommonStrings.login_connect_to_modular),
Expand Down
1 change: 1 addition & 0 deletions vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ class FtueAuthVariant(
private fun onServerSelectionDone(onboardingViewEvents: OnboardingViewEvents.OnServerSelectionDone) {
when (onboardingViewEvents.serverType) {
ServerType.MatrixOrg -> Unit // In this case, we wait for the login flow
ServerType.SynodIm -> Unit // In this case, we wait for the login flow
ServerType.EMS,
ServerType.Other -> activity.addFragmentToBackstack(
views.loginFragmentContainer,
Expand Down