From 085eace0cfd6137774b68f5b00fa0f1ab616bbf5 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 7 Nov 2025 17:43:21 +0100 Subject: [PATCH 1/3] tweak RegistrationActivity for chatmail profiles --- .../org/thoughtcrime/securesms/RegistrationActivity.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java index 3865f3605..8ad8fd36b 100644 --- a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java @@ -122,9 +122,15 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve startActivity(new Intent(this, ProxySettingsActivity.class)); }); + boolean isChatmail = DcHelper.getContext(getApplicationContext()).isChatmail(); + + findViewById(R.id.no_servers_hint).setVisibility(isChatmail? View.GONE : View.VISIBLE); + ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { - actionBar.setTitle(R.string.manual_account_setup_option); + actionBar.setTitle( + isChatmail? R.string.pref_password_and_account_settings : R.string.manual_account_setup_option + ); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp); actionBar.setElevation(0); // TODO: use custom toolbar instead From 65b1d93c70a5f615d726b453303eab305999f548 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 7 Nov 2025 21:36:31 +0100 Subject: [PATCH 2/3] tweak RegistrationActivity --- .../org/thoughtcrime/securesms/RegistrationActivity.java | 8 +++----- src/main/res/layout/registration_activity.xml | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java index 8ad8fd36b..adc744835 100644 --- a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java @@ -122,20 +122,19 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve startActivity(new Intent(this, ProxySettingsActivity.class)); }); - boolean isChatmail = DcHelper.getContext(getApplicationContext()).isChatmail(); - - findViewById(R.id.no_servers_hint).setVisibility(isChatmail? View.GONE : View.VISIBLE); + boolean isConfigured = DcHelper.isConfigured(getApplicationContext()); ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { actionBar.setTitle( - isChatmail? R.string.pref_password_and_account_settings : R.string.manual_account_setup_option + isConfigured? R.string.pref_password_and_account_settings : R.string.manual_account_setup_option ); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp); actionBar.setElevation(0); // TODO: use custom toolbar instead } + if (isConfigured) emailInput.setEnabled(false); emailInput.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { } @@ -154,7 +153,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve advancedIcon.setRotation(45); viewLogText.setOnClickListener((view) -> showLog()); - boolean isConfigured = DcHelper.isConfigured(getApplicationContext()); boolean expandAdvanced = false; String strVal; int intVal; diff --git a/src/main/res/layout/registration_activity.xml b/src/main/res/layout/registration_activity.xml index 6650cc2ec..a24fba97c 100644 --- a/src/main/res/layout/registration_activity.xml +++ b/src/main/res/layout/registration_activity.xml @@ -71,7 +71,7 @@ app:layout_constraintEnd_toEndOf="@id/guideline_root_end" app:layout_constraintStart_toStartOf="@id/guideline_root_start" app:layout_constraintTop_toBottomOf="@id/email" - app:passwordToggleEnabled="true"> + > + > Date: Fri, 7 Nov 2025 22:18:33 +0100 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f8f35ba4..b177324cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Delta Chat Android Changelog +## Unreleased + +* Tweak advanced section and wording of some advanced options + ## v2.25.0 2025-11