Skip to content

Commit d31c741

Browse files
committed
Hide deactivate account section in case of account managed externally.
1 parent ec9a066 commit d31c741

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

changelog.d/8619.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Hide account deactivation UI for account managed externally.

vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import im.vector.app.core.intent.getFilenameFromUri
4545
import im.vector.app.core.platform.SimpleTextWatcher
4646
import im.vector.app.core.preference.UserAvatarPreference
4747
import im.vector.app.core.preference.VectorPreference
48+
import im.vector.app.core.preference.VectorPreferenceCategory
4849
import im.vector.app.core.preference.VectorSwitchPreference
4950
import im.vector.app.core.utils.TextUtils
5051
import im.vector.app.core.utils.getSizeOfFiles
@@ -110,6 +111,9 @@ class VectorSettingsGeneralFragment :
110111
private val mExternalAccountManagementPreference by lazy {
111112
findPreference<VectorPreference>(VectorPreferences.SETTINGS_EXTERNAL_ACCOUNT_MANAGEMENT_KEY)!!
112113
}
114+
private val mDeactivateAccountCategory by lazy {
115+
findPreference<VectorPreferenceCategory>("SETTINGS_DEACTIVATE_ACCOUNT_CATEGORY_KEY")!!
116+
}
113117

114118
// Local contacts
115119
private val mContactSettingsCategory by lazy {
@@ -322,6 +326,8 @@ class VectorSettingsGeneralFragment :
322326

323327
false
324328
}
329+
// Account deactivation is visible only if account is not managed by an external URL.
330+
mDeactivateAccountCategory.isVisible = homeServerCapabilities.delegatedOidcAuthEnabled.not()
325331
}
326332

327333
private suspend fun getCacheSize(): Long = withContext(Dispatchers.IO) {

vector/src/main/res/xml/vector_settings_general.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@
113113

114114
</im.vector.app.core.preference.VectorPreferenceCategory>
115115

116-
<im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_deactivate_account_section">
116+
<im.vector.app.core.preference.VectorPreferenceCategory
117+
android:key="SETTINGS_DEACTIVATE_ACCOUNT_CATEGORY_KEY"
118+
android:title="@string/settings_deactivate_account_section">
117119

118120
<im.vector.app.core.preference.VectorPreference
119121
android:key="SETTINGS_DEACTIVATE_ACCOUNT_KEY"

0 commit comments

Comments
 (0)