diff --git a/CHANGELOG.md b/CHANGELOG.md
index f65430184..02fa2b571 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
# Delta Chat Android Changelog
+## v1.46.14
+2024-09
+
+* add monochrome/themed launcher icon support
+* allow to remove the selected profile in "Switch Profile" dialog
+* improve display of selected profile in "Switch Profile" dialog
+* improve the hit/tap area to open "Switch Profile" dialog in the main screen's toolbar
+* add support for system per-app language and remove in-app language selector
+* remove the experimental "encrypt database" checkbox in classic registration screen
+* fix various bugs
+* update to core 1.142.12
+
+
## v1.46.13
2024-08
diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust
index 17bddd60a..2aa5637bf 160000
--- a/jni/deltachat-core-rust
+++ b/jni/deltachat-core-rust
@@ -1 +1 @@
-Subproject commit 17bddd60a80fe19cc4759214b1ebd7497017f9b8
+Subproject commit 2aa5637bf41a7af198b76f3f81d671dc9552bcac
diff --git a/metadata/it/changelogs/6864.txt b/metadata/it/changelogs/6864.txt
new file mode 100644
index 000000000..ab3bcb224
--- /dev/null
+++ b/metadata/it/changelogs/6864.txt
@@ -0,0 +1,7 @@
+- nuovo inserimento: puoi creare un nuovo profilo con un tocco su "Crea Nuovo Profilo" - oppure utilizzare un accesso esistente o la configurazione del secondo dispositivo come al solito
+i contatti possono essere allegati come "Schede" in "Allega/Contatto"; quando il destinatario tocca le carte, è possibile stabilire la crittografia end-to-end garantita
+- aggiungi contatti manualmente in "Nuova Chat / Nuovo Contatto / Aggiungi Contatto Manualmente"
+ - invia qualsiasi emoji come reazione
+ - mostrare le reazioni nei riepiloghi
+ - blocca/archivia/ecc. le chat direttamente dai risultati di ricerca
+ - Risolti bug e altro ancora
diff --git a/metadata/it/changelogs/6904.txt b/metadata/it/changelogs/6904.txt
new file mode 100644
index 000000000..a6cffadc4
--- /dev/null
+++ b/metadata/it/changelogs/6904.txt
@@ -0,0 +1,4 @@
+- aggiungi un'opzione per contrassegnare tutte le chat selezionate come "Lette" (tocca a lungo una chat per avviare la modalità di selezione)
+ - i nuovi profili chatmail per dispositivo singolo hanno come impostazione predefinita "Elimina Messaggi Dopo il Download"
+ - quando si utilizza un profilo chatmail su più dispositivi, la cancellazione viene modificata in "Automatica" (la strategia di cancellazione dipende quindi dal server)
+ - Risolti bug e altro ancora
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index cd5d48f9a..b596667e3 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -262,6 +262,11 @@
+
+
= 34) {
- ActionBar supportActionBar = getSupportActionBar();
- if (supportActionBar != null && container.isKeyboardOpen()) {
- PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
- if (!pm.isInteractive()) {
- supportActionBar.hide();
- }
- }
- }
- }
-
@Override
public void onConfigurationChanged(Configuration newConfig) {
Log.i(TAG, "onConfigurationChanged(" + newConfig.orientation + ")");
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
index 419b519a1..801fc0c66 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -20,6 +20,7 @@ import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA;
import static org.thoughtcrime.securesms.ConversationActivity.STARTING_POSITION_EXTRA;
import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_ADDRESS;
import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SERVER_FLAGS;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SOCKS5_ENABLED;
import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent;
import static org.thoughtcrime.securesms.util.RelayUtil.getDirectSharingChatId;
import static org.thoughtcrime.securesms.util.RelayUtil.getSharedTitle;
@@ -265,7 +266,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
DcContext dcContext = DcHelper.getContext(this);
int accountId = getIntent().getIntExtra(ACCOUNT_ID_EXTRA, dcContext.getAccountId());
if (getIntent().getBooleanExtra(CLEAR_NOTIFICATIONS, false)) {
- DcHelper.getNotificationCenter(this).removeAllNotifiations(accountId);
+ DcHelper.getNotificationCenter(this).removeAllNotifications(accountId);
}
if (accountId != dcContext.getAccountId()) {
AccountManager.getInstance().switchAccountAndStartActivity(this, accountId);
@@ -312,6 +313,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
}
public void refreshAvatar() {
+ if (selfAvatarContainer == null) return;
+
if (isRelayingMessageContent(this)) {
selfAvatarContainer.setVisibility(View.GONE);
} else {
@@ -377,19 +380,13 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
if (!isRelayingMessageContent(this)) {
inflater.inflate(R.menu.text_secure_normal, menu);
- MenuItem item = menu.findItem(R.id.menu_global_map);
- if (Prefs.isLocationStreamingEnabled(this)) {
- item.setVisible(true);
- }
-
- if (!Prefs.isLocationStreamingEnabled(this)) {
- menu.findItem(R.id.menu_global_map).setVisible(false);
- }
+ menu.findItem(R.id.menu_global_map).setVisible(Prefs.isLocationStreamingEnabled(this));
+ menu.findItem(R.id.menu_proxy_settings).setVisible(DcHelper.getInt(this, CONFIG_SOCKS5_ENABLED) == 1);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- MenuCompat.setGroupDividerEnabled(menu, true);
- } else{
- menu.setGroupVisible(R.id.extra_services, false);
+ MenuCompat.setGroupDividerEnabled(menu, true);
+ } else {
+ menu.setGroupVisible(R.id.extra_services, false);
}
}
@@ -453,6 +450,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
case R.id.menu_global_map:
WebxdcActivity.openMaps(this, 0);
return true;
+ case R.id.menu_proxy_settings:
+ startActivity(new Intent(this, ProxySettingsActivity.class));
+ return true;
case android.R.id.home:
onBackPressed();
return true;
diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
index 165212570..d3ec68551 100644
--- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
@@ -13,6 +13,7 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.text.util.Linkify;
import android.util.Log;
+import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
@@ -132,13 +133,29 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
handleIntent();
}
+ @Override
+ public boolean onPrepareOptionsMenu(Menu menu) {
+ menu.clear();
+ getMenuInflater().inflate(R.menu.instant_onboarding_menu, menu);
+ return super.onPrepareOptionsMenu(menu);
+ }
+
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
super.onOptionsItemSelected(item);
- if (item.getItemId() == android.R.id.home) {
+
+ switch (item.getItemId()) {
+ case android.R.id.home:
getOnBackPressedDispatcher().onBackPressed();
return true;
+ case R.id.menu_proxy_settings:
+ startActivity(new Intent(this, ProxySettingsActivity.class));
+ return true;
+ case R.id.menu_view_log:
+ startActivity(new Intent(this, LogViewActivity.class));
+ return true;
}
+
return false;
}
@@ -369,7 +386,7 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
private void progressError(String data2) {
progressDialog.dismiss();
- maybeShowConfigurationError(this, data2);
+ WelcomeActivity.maybeShowConfigurationError(this, data2);
}
private void progressSuccess() {
@@ -382,22 +399,6 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
finishAffinity();
}
- public static void maybeShowConfigurationError(Activity activity, String data2) {
- if (data2 != null && !data2.isEmpty()) {
- AlertDialog d = new AlertDialog.Builder(activity)
- .setMessage(data2)
- .setPositiveButton(android.R.string.ok, null)
- .create();
- d.show();
- try {
- //noinspection ConstantConditions
- Linkify.addLinks((TextView) d.findViewById(android.R.id.message), Linkify.WEB_URLS | Linkify.EMAIL_ADDRESSES);
- } catch(NullPointerException e) {
- Log.e(TAG, "Linkify failed", e);
- }
- }
- }
-
@SuppressLint("StaticFieldLeak")
private void createProfile() {
if (TextUtils.isEmpty(this.name.getText())) {
diff --git a/src/main/java/org/thoughtcrime/securesms/LogViewFragment.java b/src/main/java/org/thoughtcrime/securesms/LogViewFragment.java
index 89b3b6117..17ce31e42 100644
--- a/src/main/java/org/thoughtcrime/securesms/LogViewFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/LogViewFragment.java
@@ -17,6 +17,7 @@
package org.thoughtcrime.securesms;
+import android.Manifest;
import android.annotation.TargetApi;
import android.app.ActivityManager;
import android.content.Context;
@@ -35,6 +36,7 @@ import android.view.ViewGroup;
import android.widget.EditText;
import androidx.annotation.NonNull;
+import androidx.core.content.PermissionChecker;
import androidx.fragment.app.Fragment;
import com.b44t.messenger.DcContext;
@@ -256,6 +258,8 @@ public class LogViewFragment extends Fragment {
}
final String token = FcmReceiveService.getToken();
+ boolean notifPermGranted = PermissionChecker.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) == PermissionChecker.PERMISSION_GRANTED;
+ builder.append("post-notifications-granted=").append(notifPermGranted).append("\n");
builder.append("push-enabled=").append(Prefs.isPushEnabled(context)).append("\n");
builder.append("push-token=").append(token == null ? "" : token).append("\n");
} catch (Exception e) {
diff --git a/src/main/java/org/thoughtcrime/securesms/ProxySettingsActivity.java b/src/main/java/org/thoughtcrime/securesms/ProxySettingsActivity.java
new file mode 100644
index 000000000..d88f66073
--- /dev/null
+++ b/src/main/java/org/thoughtcrime/securesms/ProxySettingsActivity.java
@@ -0,0 +1,160 @@
+package org.thoughtcrime.securesms;
+
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SOCKS5_ENABLED;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SOCKS5_HOST;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SOCKS5_PASSWORD;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SOCKS5_PORT;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_SOCKS5_USER;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Patterns;
+import android.view.MenuItem;
+import android.view.View;
+
+import androidx.annotation.IdRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.constraintlayout.widget.Group;
+
+import com.b44t.messenger.DcContext;
+import com.google.android.material.textfield.TextInputEditText;
+
+import org.thoughtcrime.securesms.connect.DcHelper;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+
+public class ProxySettingsActivity extends BaseActionBarActivity {
+
+ private enum VerificationType {
+ SERVER,
+ PORT,
+ }
+
+ private final DynamicTheme dynamicTheme = new DynamicTheme();
+
+ private SwitchCompat proxySwitch;
+ private Group proxyGroup;
+
+ @Override
+ public void onCreate(Bundle bundle) {
+ super.onCreate(bundle);
+ dynamicTheme.onCreate(this);
+ setContentView(R.layout.proxy_settings_activity);
+
+ ActionBar actionBar = getSupportActionBar();
+ if (actionBar != null) {
+ actionBar.setTitle(R.string.proxy_settings);
+ actionBar.setDisplayHomeAsUpEnabled(true);
+ }
+
+ proxyGroup = findViewById(R.id.proxy_group);
+
+ proxySwitch = findViewById(R.id.proxy_switch);
+ proxySwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+ proxyGroup.setVisibility(isChecked? View.VISIBLE : View.GONE);
+ });
+ proxySwitch.setChecked(DcHelper.getInt(this, CONFIG_SOCKS5_ENABLED) == 1);
+
+ TextInputEditText proxyHostInput = findViewById(R.id.proxy_host_text);
+ proxyHostInput.setOnFocusChangeListener((view, focused) -> focusListener(view, focused, VerificationType.SERVER));
+ proxyHostInput.setText(DcHelper.get(this, CONFIG_SOCKS5_HOST));
+
+ TextInputEditText proxyPortInput = findViewById(R.id.proxy_port_text);
+ proxyPortInput.setOnFocusChangeListener((view, focused) -> focusListener(view, focused, VerificationType.PORT));
+ proxyPortInput.setText(DcHelper.get(this, CONFIG_SOCKS5_PORT));
+
+ TextInputEditText proxyUserInput = findViewById(R.id.proxy_user_text);
+ proxyUserInput.setText(DcHelper.get(this, CONFIG_SOCKS5_USER));
+
+ TextInputEditText proxyPasswordInput = findViewById(R.id.proxy_password_text);
+ proxyPasswordInput.setText(DcHelper.get(this, CONFIG_SOCKS5_PASSWORD));
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ dynamicTheme.onResume(this);
+ }
+
+ public boolean onOptionsItemSelected(MenuItem item) {
+ int id = item.getItemId();
+ if (id == android.R.id.home) {
+ finish();
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ saveConfig();
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ saveConfig();
+ }
+
+ private void focusListener(View view, boolean focused, VerificationType type) {
+
+ if (!focused) {
+ TextInputEditText inputEditText = (TextInputEditText) view;
+ switch (type) {
+ case SERVER:
+ verifyServer(inputEditText);
+ break;
+ case PORT:
+ verifyPort(inputEditText);
+ break;
+ }
+ }
+ }
+
+ private void verifyServer(TextInputEditText view) {
+ String server = view.getText().toString();
+ if (!TextUtils.isEmpty(server) && !Patterns.DOMAIN_NAME.matcher(server).matches()
+ && !Patterns.IP_ADDRESS.matcher(server).matches()
+ && !Patterns.WEB_URL.matcher(server).matches()
+ && !"localhost".equals(server)) {
+ view.setError(getString(R.string.login_error_server));
+ }
+ }
+
+ private void verifyPort(TextInputEditText view) {
+ String portString = view.getText().toString();
+ if (!portString.isEmpty()) {
+ String error = getString(R.string.login_error_port);
+ try {
+ int port = Integer.valueOf(portString);
+ if (port < 1 || port > 65535) {
+ view.setError(error);
+ }
+ } catch (NumberFormatException exception) {
+ view.setError(error);
+ }
+ }
+ }
+
+ private void saveConfig() {
+ DcContext dcContext = DcHelper.getContext(this);
+ dcContext.setConfigInt(CONFIG_SOCKS5_ENABLED, proxySwitch.isChecked()? 1 : 0);
+ setConfig(R.id.proxy_host_text, CONFIG_SOCKS5_HOST, true);
+ setConfig(R.id.proxy_port_text, CONFIG_SOCKS5_PORT, true);
+ setConfig(R.id.proxy_user_text, CONFIG_SOCKS5_USER, true);
+ setConfig(R.id.proxy_password_text, CONFIG_SOCKS5_PASSWORD, false);
+ dcContext.stopIo();
+ dcContext.startIo();
+ }
+
+ private void setConfig(@IdRes int viewId, String configTarget, boolean doTrim) {
+ TextInputEditText view = findViewById(viewId);
+ String value = view.getText().toString();
+ if(doTrim) {
+ value = value.trim();
+ }
+ DcHelper.getContext(this).setConfig(configTarget, value.isEmpty()? null : value);
+ }
+
+}
diff --git a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
index f41c22896..8a5eb6f9e 100644
--- a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -96,7 +96,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
Spinner certCheck;
private SwitchCompat proxySwitch;
- private Group proxyGroup;
@Override
public void onCreate(Bundle bundle) {
@@ -127,15 +126,11 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
authMethod = findViewById(R.id.auth_method);
certCheck = findViewById(R.id.cert_check);
- proxyGroup = findViewById(R.id.socks5_group);
- proxySwitch = findViewById(R.id.socks5_switch);
- proxySwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
- proxyGroup.setVisibility(isChecked? advancedGroup.getVisibility() : View.GONE);
+ proxySwitch = findViewById(R.id.proxy_settings);
+ proxySwitch.setOnClickListener(l -> {
+ proxySwitch.setChecked(!proxySwitch.isChecked()); // revert toggle
+ startActivity(new Intent(this, ProxySettingsActivity.class));
});
- TextInputEditText proxyHostInput = findViewById(R.id.socks5_host_text);
- TextInputEditText proxyPortInput = findViewById(R.id.socks5_port_text);
- proxyHostInput.setOnFocusChangeListener((view, focused) -> focusListener(view, focused, VerificationType.SERVER));
- proxyPortInput.setOnFocusChangeListener((view, focused) -> focusListener(view, focused, VerificationType.PORT));
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
@@ -161,7 +156,16 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
advancedIcon.setOnClickListener(l -> onAdvancedSettings());
advancedIcon.setRotation(45);
viewLogText.setOnClickListener((view) -> showLog());
+
boolean isConfigured = DcHelper.isConfigured(getApplicationContext());
+ boolean expandAdvanced = false;
+ String strVal;
+ int intVal;
+
+ intVal = DcHelper.getInt(this, CONFIG_SOCKS5_ENABLED);
+ proxySwitch.setChecked(intVal == 1);
+ expandAdvanced = expandAdvanced || intVal == 1;
+
if (isConfigured) {
String email = DcHelper.get(this, CONFIG_ADDRESS);
emailInput.setText(email);
@@ -170,10 +174,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
}
passwordInput.setText(DcHelper.get(this, CONFIG_MAIL_PASSWORD));
- boolean expandAdvanced = false;
- String strVal;
- int intVal;
-
TextInputEditText imapLoginInput = findViewById(R.id.imap_login_text);
strVal = DcHelper.get(this, CONFIG_MAIL_USER);
imapLoginInput.setText(strVal);
@@ -213,17 +213,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
smtpSecurity.setSelection(intVal);
expandAdvanced = expandAdvanced || intVal != 0;
- intVal = DcHelper.getInt(this, CONFIG_SOCKS5_ENABLED);
- proxySwitch.setChecked(intVal == 1);
- expandAdvanced = expandAdvanced || intVal == 1;
-
- proxyHostInput.setText(DcHelper.get(this, CONFIG_SOCKS5_HOST));
- proxyPortInput.setText(DcHelper.get(this, CONFIG_SOCKS5_PORT));
- TextInputEditText proxyUserInput = findViewById(R.id.socks5_user_text);
- TextInputEditText proxyPasswordInput = findViewById(R.id.socks5_password_text);
- proxyUserInput.setText(DcHelper.get(this, CONFIG_SOCKS5_USER));
- proxyPasswordInput.setText(DcHelper.get(this, CONFIG_SOCKS5_PASSWORD));
-
int serverFlags = DcHelper.getInt(this, CONFIG_SERVER_FLAGS);
int sel = 0;
if((serverFlags&DcContext.DC_LP_AUTH_OAUTH2)!=0) {
@@ -242,8 +231,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
int certCheckFlags = DcHelper.getInt(this, "imap_certificate_checks");
certCheck.setSelection(certCheckFlags);
expandAdvanced = expandAdvanced || certCheckFlags != 0;
-
- if (expandAdvanced) { onAdvancedSettings(); }
} else if (getIntent() != null && getIntent().getBundleExtra(ACCOUNT_DATA) != null) {
// Companion app might have sent account data
Bundle b = getIntent().getBundleExtra(ACCOUNT_DATA);
@@ -261,6 +248,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
}
}
+ if (expandAdvanced) { onAdvancedSettings(); }
registerForEvents();
}
@@ -272,6 +260,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
public void onResume() {
super.onResume();
dynamicTheme.onResume(this);
+ proxySwitch.setChecked(DcHelper.getInt(this, CONFIG_SOCKS5_ENABLED) == 1);
}
private void showLog() {
@@ -574,12 +563,10 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
private void onAdvancedSettings() {
boolean advancedViewVisible = advancedGroup.getVisibility() == View.VISIBLE;
if (advancedViewVisible) {
- proxyGroup.setVisibility(View.GONE);
advancedGroup.setVisibility(View.GONE);
advancedIcon.setRotation(45);
} else {
advancedGroup.setVisibility(View.VISIBLE);
- if (proxySwitch.isChecked()) proxyGroup.setVisibility(View.VISIBLE);
advancedIcon.setRotation(0);
}
}
@@ -621,15 +608,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
setConfig(R.id.smtp_port_text, CONFIG_SEND_PORT, true);
setConfig(R.id.smtp_login_text, CONFIG_SEND_USER, false);
setConfig(R.id.smtp_password_text, CONFIG_SEND_PASSWORD, false);
- if (proxySwitch.isChecked()) {
- DcHelper.getContext(this).setConfigInt(CONFIG_SOCKS5_ENABLED, 1);
- setConfig(R.id.socks5_host_text, CONFIG_SOCKS5_HOST, true);
- setConfig(R.id.socks5_port_text, CONFIG_SOCKS5_PORT, true);
- setConfig(R.id.socks5_user_text, CONFIG_SOCKS5_USER, true);
- setConfig(R.id.socks5_password_text, CONFIG_SOCKS5_PASSWORD, false);
- } else {
- DcHelper.getContext(this).setConfigInt(CONFIG_SOCKS5_ENABLED, 0);
- }
DcHelper.getContext(this).setConfigInt(CONFIG_MAIL_SECURITY, imapSecurity.getSelectedItemPosition());
DcHelper.getContext(this).setConfigInt(CONFIG_SEND_SECURITY, smtpSecurity.getSelectedItemPosition());
diff --git a/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java b/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
index df26e9459..82e8ec163 100644
--- a/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
@@ -279,6 +279,8 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen
}
public static void maybeShowConfigurationError(Activity activity, String data2) {
+ if (activity.isFinishing()) return; // avoid android.view.WindowManager$BadTokenException
+
if (data2 != null && !data2.isEmpty()) {
AlertDialog d = new AlertDialog.Builder(activity)
.setMessage(data2)
diff --git a/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java b/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java
index 7f8958250..d81ca5126 100644
--- a/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java
@@ -4,10 +4,12 @@ import android.app.Activity;
import android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
+import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
@@ -16,15 +18,20 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.b44t.messenger.DcAccounts;
+import com.b44t.messenger.DcContact;
import com.b44t.messenger.DcContext;
import com.b44t.messenger.DcEvent;
+import com.b44t.messenger.rpc.Rpc;
+import com.b44t.messenger.rpc.RpcException;
import org.thoughtcrime.securesms.ConnectivityActivity;
import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.components.AvatarView;
import org.thoughtcrime.securesms.connect.AccountManager;
import org.thoughtcrime.securesms.connect.DcEventCenter;
import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil;
@@ -134,13 +141,38 @@ public class AccountSelectionListFragment extends DialogFragment implements DcEv
AccountSelectionListFragment.this.dismiss();
if (activity == null) return;
DcAccounts accounts = DcHelper.getAccounts(activity);
+ Rpc rpc = DcHelper.getRpc(activity);
+
+ View dialogView = View.inflate(activity, R.layout.dialog_delete_profile, null);
+ AvatarView avatar = dialogView.findViewById(R.id.avatar);
+ TextView nameView = dialogView.findViewById(R.id.name);
+ TextView addrView = dialogView.findViewById(R.id.address);
+ TextView sizeView = dialogView.findViewById(R.id.size_label);
+ TextView description = dialogView.findViewById(R.id.description);
+ DcContext dcContext = accounts.getAccount(accountId);
+ String name = dcContext.getConfig("displayname");
+ DcContact contact = dcContext.getContact(DcContact.DC_CONTACT_ID_SELF);
+ if (TextUtils.isEmpty(name)) {
+ name = contact.getAddr();
+ }
+ Recipient recipient = new Recipient(getContext(), contact, name);
+ avatar.setAvatar(GlideApp.with(activity), recipient, false);
+ nameView.setText(name);
+ addrView.setText(contact.getAddr());
+ try {
+ sizeView.setText(Util.getPrettyFileSize(rpc.getAccountFileSize(accountId)));
+ } catch (RpcException e) {
+ e.printStackTrace();
+ }
+ description.setText(activity.getString(R.string.delete_account_explain_with_name, name));
+
AlertDialog dialog = new AlertDialog.Builder(activity)
- .setTitle(accounts.getAccount(accountId).getNameNAddr())
- .setMessage(R.string.forget_login_confirmation_desktop)
+ .setTitle(R.string.delete_account)
+ .setView(dialogView)
.setNegativeButton(R.string.cancel, (d, which) -> AccountManager.getInstance().showSwitchAccountMenu(activity))
.setPositiveButton(R.string.delete, (d2, which2) -> {
boolean selected = accountId == accounts.getSelectedAccount().getAccountId();
- DcHelper.getNotificationCenter(activity).removeAllNotifiations(accountId);
+ DcHelper.getNotificationCenter(activity).removeAllNotifications(accountId);
accounts.removeAccount(accountId);
if (selected) {
DcContext selAcc = accounts.getSelectedAccount();
diff --git a/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
index 788dd95ff..7c489a484 100644
--- a/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -638,14 +638,12 @@ public class AttachmentManager {
private class EditButtonListener implements View.OnClickListener {
@Override
public void onClick(View v) {
- if (Build.VERSION.SDK_INT >= 19) {
+ Uri imgUri = getSlideUri();
+ if (imgUri != null) {
Intent intent = new Intent(context, ScribbleActivity.class);
- intent.setData(getSlideUri());
+ intent.setData(imgUri);
((Activity) context).startActivityForResult(intent, ScribbleActivity.SCRIBBLE_REQUEST_CODE);
}
- else {
- Toast.makeText(context, "Image editing requires Android 4.4 KitKat or newer.", Toast.LENGTH_LONG).show();
- }
}
}
diff --git a/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
index 2001d3d00..3e569c744 100644
--- a/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
+++ b/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
@@ -8,6 +8,8 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
+import com.b44t.messenger.DcContext;
+
import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.util.Util;
@@ -16,6 +18,7 @@ public class MarkReadReceiver extends BroadcastReceiver {
public static final String CANCEL_ACTION = "org.thoughtcrime.securesms.notifications.CANCEL";
public static final String ACCOUNT_ID_EXTRA = "account_id";
public static final String CHAT_ID_EXTRA = "chat_id";
+ public static final String MSG_ID_EXTRA = "msg_id";
@Override
public void onReceive(final Context context, Intent intent) {
@@ -26,6 +29,7 @@ public class MarkReadReceiver extends BroadcastReceiver {
final int accountId = intent.getIntExtra(ACCOUNT_ID_EXTRA, 0);
final int chatId = intent.getIntExtra(CHAT_ID_EXTRA, DC_CHAT_NO_CHAT);
+ final int msgId = intent.getIntExtra(MSG_ID_EXTRA, 0);
if (accountId == 0 || chatId == DC_CHAT_NO_CHAT) {
return;
}
@@ -33,7 +37,9 @@ public class MarkReadReceiver extends BroadcastReceiver {
Util.runOnAnyBackgroundThread(() -> {
DcHelper.getNotificationCenter(context).removeNotifications(accountId, chatId);
if (markNoticed) {
- DcHelper.getAccounts(context).getAccount(accountId).marknoticedChat(chatId);
+ DcContext dcContext = DcHelper.getAccounts(context).getAccount(accountId);
+ dcContext.marknoticedChat(chatId);
+ dcContext.markseenMsgs(new int[]{msgId});
}
});
}
diff --git a/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
index c926031f9..683ada664 100644
--- a/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
+++ b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
@@ -128,22 +128,24 @@ public class NotificationCenter {
.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT | IntentUtils.FLAG_MUTABLE());
}
- private PendingIntent getRemoteReplyIntent(ChatData chatData) {
+ private PendingIntent getRemoteReplyIntent(ChatData chatData, int msgId) {
Intent intent = new Intent(RemoteReplyReceiver.REPLY_ACTION);
intent.setClass(context, RemoteReplyReceiver.class);
intent.setData(Uri.parse("custom://"+chatData.accountId+"."+chatData.chatId));
intent.putExtra(RemoteReplyReceiver.ACCOUNT_ID_EXTRA, chatData.accountId);
intent.putExtra(RemoteReplyReceiver.CHAT_ID_EXTRA, chatData.chatId);
+ intent.putExtra(RemoteReplyReceiver.MSG_ID_EXTRA, msgId);
intent.setPackage(context.getPackageName());
return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | IntentUtils.FLAG_MUTABLE());
}
- private PendingIntent getMarkAsReadIntent(ChatData chatData, boolean markNoticed) {
+ private PendingIntent getMarkAsReadIntent(ChatData chatData, int msgId, boolean markNoticed) {
Intent intent = new Intent(markNoticed? MarkReadReceiver.MARK_NOTICED_ACTION : MarkReadReceiver.CANCEL_ACTION);
intent.setClass(context, MarkReadReceiver.class);
intent.setData(Uri.parse("custom://"+chatData.accountId+"."+chatData.chatId));
intent.putExtra(MarkReadReceiver.ACCOUNT_ID_EXTRA, chatData.accountId);
intent.putExtra(MarkReadReceiver.CHAT_ID_EXTRA, chatData.chatId);
+ intent.putExtra(MarkReadReceiver.MSG_ID_EXTRA, msgId);
intent.setPackage(context.getPackageName());
return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | IntentUtils.FLAG_MUTABLE());
}
@@ -379,7 +381,7 @@ public class NotificationCenter {
.setCategory(NotificationCompat.CATEGORY_MESSAGE)
.setOnlyAlertOnce(!signal)
.setContentText(line)
- .setDeleteIntent(getMarkAsReadIntent(chatData, false))
+ .setDeleteIntent(getMarkAsReadIntent(chatData, msgId, false))
.setContentIntent(getOpenChatIntent(chatData));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -450,11 +452,11 @@ public class NotificationCenter {
// if privacy options are enabled, the buttons are not added.
if (privacy.isDisplayContact() && privacy.isDisplayMessage()) {
try {
- PendingIntent inNotificationReplyIntent = getRemoteReplyIntent(chatData);
- PendingIntent markReadIntent = getMarkAsReadIntent(chatData, true);
+ PendingIntent inNotificationReplyIntent = getRemoteReplyIntent(chatData, msgId);
+ PendingIntent markReadIntent = getMarkAsReadIntent(chatData, msgId, true);
NotificationCompat.Action markAsReadAction = new NotificationCompat.Action(R.drawable.check,
- context.getString(R.string.notify_dismiss),
+ context.getString(R.string.mark_as_read_short),
markReadIntent);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -567,7 +569,7 @@ public class NotificationCenter {
} catch (Exception e) { Log.w(TAG, e); }
}
- public void removeAllNotifiations(int accountId) {
+ public void removeAllNotifications(int accountId) {
NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
String tag = String.valueOf(accountId);
synchronized (inboxes) {
diff --git a/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
index 3233bd6d3..c010cc917 100644
--- a/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
+++ b/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
@@ -27,6 +27,7 @@ import android.os.Bundle;
import androidx.core.app.RemoteInput;
import com.b44t.messenger.DcContext;
+import com.b44t.messenger.DcMsg;
import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.util.Util;
@@ -41,6 +42,7 @@ public class RemoteReplyReceiver extends BroadcastReceiver {
public static final String REPLY_ACTION = "org.thoughtcrime.securesms.notifications.WEAR_REPLY";
public static final String ACCOUNT_ID_EXTRA = "account_id";
public static final String CHAT_ID_EXTRA = "chat_id";
+ public static final String MSG_ID_EXTRA = "msg_id";
public static final String EXTRA_REMOTE_REPLY = "extra_remote_reply";
@SuppressLint("StaticFieldLeak")
@@ -50,6 +52,7 @@ public class RemoteReplyReceiver extends BroadcastReceiver {
Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
final int accountId = intent.getIntExtra(ACCOUNT_ID_EXTRA, 0);
final int chatId = intent.getIntExtra(CHAT_ID_EXTRA, DC_CHAT_NO_CHAT);
+ final int msgId = intent.getIntExtra(MSG_ID_EXTRA, 0);
if (remoteInput == null || chatId == DC_CHAT_NO_CHAT || accountId == 0) return;
@@ -58,10 +61,17 @@ public class RemoteReplyReceiver extends BroadcastReceiver {
if (responseText != null) {
Util.runOnAnyBackgroundThread(() -> {
DcContext dcContext = DcHelper.getAccounts(context).getAccount(accountId);
+ dcContext.marknoticedChat(chatId);
+ dcContext.markseenMsgs(new int[]{msgId});
if (dcContext.getChat(chatId).isContactRequest()) {
dcContext.acceptChat(chatId);
}
- dcContext.sendTextMsg(chatId, responseText.toString());
+
+ DcMsg msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
+ msg.setText(responseText.toString());
+ msg.setQuote(dcContext.getMsg(msgId));
+ dcContext.sendMsg(chatId, msg);
+
DcHelper.getNotificationCenter(context).removeNotifications(accountId, chatId);
});
}
diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
index a787510bc..8fc8cf406 100644
--- a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
@@ -35,6 +35,7 @@ import com.b44t.messenger.rpc.RpcException;
import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
import org.thoughtcrime.securesms.ConversationActivity;
import org.thoughtcrime.securesms.LogViewActivity;
+import org.thoughtcrime.securesms.ProxySettingsActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.RegistrationActivity;
import org.thoughtcrime.securesms.connect.DcEventCenter;
@@ -157,6 +158,11 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
return true;
}));
+ this.findPreference("proxy_settings_button").setOnPreferenceClickListener((preference) -> {
+ startActivity(new Intent(getActivity(), ProxySettingsActivity.class));
+ return true;
+ });
+
Preference passwordAndAccount = this.findPreference("password_account_settings_button");
passwordAndAccount.setOnPreferenceClickListener(((preference) -> {
boolean result = ScreenLockUtil.applyScreenLock(getActivity(), getString(R.string.pref_password_and_account_settings), getString(R.string.enter_system_secret_to_continue), REQUEST_CODE_CONFIRM_CREDENTIALS_ACCOUNT);
diff --git a/src/main/res/drawable/delete_account_item_background.xml b/src/main/res/drawable/delete_account_item_background.xml
new file mode 100644
index 000000000..583b62b94
--- /dev/null
+++ b/src/main/res/drawable/delete_account_item_background.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
diff --git a/src/main/res/layout/dialog_delete_profile.xml b/src/main/res/layout/dialog_delete_profile.xml
new file mode 100644
index 000000000..2d009ea8b
--- /dev/null
+++ b/src/main/res/layout/dialog_delete_profile.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/res/layout/proxy_settings_activity.xml b/src/main/res/layout/proxy_settings_activity.xml
new file mode 100644
index 000000000..d3660855e
--- /dev/null
+++ b/src/main/res/layout/proxy_settings_activity.xml
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/res/layout/registration_activity.xml b/src/main/res/layout/registration_activity.xml
index 239385314..a8dc34db5 100644
--- a/src/main/res/layout/registration_activity.xml
+++ b/src/main/res/layout/registration_activity.xml
@@ -123,7 +123,7 @@
android:visibility="gone"
tools:visibility="visible"
app:constraint_referenced_ids="inbox, imap_login, imap_server, imap_port, imap_security_label, imap_security, outbox_view_spacer_top,
- outbox, smtp_login, smtp_password, smtp_server, smtp_port, smtp_security_label, smtp_security, auth_method_label, auth_method, cert_check_label, cert_check, view_log_button, socks5_switch" />
+ outbox, smtp_login, smtp_password, smtp_server, smtp_port, smtp_security_label, smtp_security, auth_method_label, auth_method, cert_check_label, cert_check, view_log_button, proxy_settings" />
+
+
+ app:layout_constraintTop_toBottomOf="@id/proxy_settings" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ app:layout_constraintTop_toBottomOf="@id/cert_check" />
+
+
diff --git a/src/main/res/menu/text_secure_normal.xml b/src/main/res/menu/text_secure_normal.xml
index 13be761bf..df21b4713 100644
--- a/src/main/res/menu/text_secure_normal.xml
+++ b/src/main/res/menu/text_secure_normal.xml
@@ -7,6 +7,11 @@
android:icon="@drawable/baseline_qr_code_24"
app:showAsAction="always"/>
+ - Видалити %d чатів? Вони більше не будуть відображатися у списку чатів, їх повідомлення залишаться на сервері.
- Видалити %d чатів? Вони більше не будуть відображатися у списку чатів, їх повідомлення залишаться на сервері.
- Ви впевнені, що хочете видалити \"%1$s\"?
+ Видалити чат \"%1$s\"? Він більше не буде відображатися у списку чату, але його повідомлення залишаться на сервері.
Ви впевнені, що хочете видалити це повідомлення?
- Видалити %d повідомлення тут і на сервері?
@@ -936,6 +946,7 @@
Наскрізне шифрування більше не гарантується, імовірно, через те, що %1$s перевстановив (-ла) ArcaneChat або надіслав (-ла) повідомлення з іншого пристрою.\n\nВи можете зустрітися з ним (нею) особисто та знову відсканувати його (її) QR-код, щоб відновити гарантоване наскрізне шифрування.
⚠️ %1$s вимагає наскрізного шифрування, яке ще не налаштоване для цього чату. Натисніть, щоб дізнатися більше.
Щоб установити наскрізне шифрування, Ви можете зустрітися з контактами особисто та відсканувати їхній QR-код, щоб додати їх.
+ Потрібне наскрізне шифрування, але воно ще не налаштоване на %1$s.\n\nВи можете поділитися з ними посиланням на запрошення або зустрітися особисто і відсканувати їхній QR-код.
Дізнатися більше
Ви видалили чат \"Збережені повідомлення\".\n\nℹ️ Аби використовувати функцію \"Збережені повідомлення\" знову, створіть новий чат самі із собою.
@@ -1169,4 +1180,5 @@
Новий онбордінг 🐣 та багато іншого:\n\n⚡️ Підпишіться на безпечні сервери швидкої пошти (https://delta.chat/chatmail) або використовуйте класичні сервери електронної пошти\n\n👉 PUSH-сповіщення для будь-якого сервера чату\n\n👤 Безпечно підключайте друзів через \"Прикріпити контакти\"\n\n🥰 Реагуйте будь-якими емодзі\n\n📌 Прикріплюйте чати прямо з пошуку ... та багато іншого на %1$s
Новий онбордінг 🐣 та багато іншого:\n\n⚡️ Підпишіться на безпечні швидкі chatmail-сервери (https://delta.chat/chatmail) або використовуйте класичні сервери електронної пошти\n\n👉 PUSH-повідомлення для будь-якого сервера чату\n\n👤 Отримуйте \"Прикріплені контакти\" та з\'єднуйтеся з друзями\n\n🥰 Швидший вибір реакції ... та багато іншого на %1$s
-
+ ℹ️ Опцію \"Переключити профіль\" переміщено: Торкніться зображення свого профілю у верхньому кутку головного екрану, щоб додати або переключити профіль 💡.
+
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index fe2edcfeb..f73393c2f 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -309,6 +309,7 @@
Nhấn để mở
Phiên bản trò chuyện video
Phiên bản trò chuyện video của bạn
+
Ví dụ: https://your-server.org/$ROOM
Nếu được bật, bạn có thể bắt đầu trò chuyện video từ mỗi cuộc trò chuyện. Yêu cầu ứng dụng tương thích hoặc trình duyệt ở cả hai đầu.
Sử dụng \"%1$s\" để mời người khác trò chuyện video?\n\nSau khi thiết lập, bạn có thể bắt đầu trò chuyện video từ mỗi cuộc trò chuyện. Điều này sẽ thay thế mọi cài đặt trước đó cho trò chuyện video.
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 45517a011..88ecceb99 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -322,6 +322,7 @@
点击来打开
视频聊天实例
您的视频聊天实例
+
示例： https://meet.jit.si/$ROOM 或 basicwebrtc:https://your-server
启用视频聊天后，您便可以在所有聊天中发起视频聊天。需要双方均装有兼容的应用或浏览器。
使用“%1$s”邀请其他人参加视频聊天吗？\n\n设置好后，您就可以在聊天里发起视频聊天了。 这会取代之前的视频聊天设置。
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index af15b2fc3..d5d260503 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -308,6 +308,7 @@
點擊以開啟
視訊通話服務商
你的視訊通話服務商
+
範例：https://your-server.org/$ROOM
如果啟用，你可以在每個對話中開始視訊聊天。兩端都需要相容的應用程式或瀏覽器。
要使用\"%1$s\"來邀請其他人加入視訊通話嗎？\n\n一旦設定完成，你可以在每個聊天室內開啟視訊通話。這將會取代先前的視訊通話設定。
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index d736dabcc..d34348526 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -133,4 +133,6 @@
@color/reaction_pill_background
?attr/colorPrimary
@color/reaction_pill_text_color
+
+ #eeeeee
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6bfed055a..a0540530f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -61,7 +61,7 @@
Mark All as Read
Mark as Read
- Read
+ Mark Read
Loading…
Hide
@@ -341,6 +341,7 @@
Tap to Open
Video Chat Instance
Your Video Chat Instance
+
Example: https://your-server.org/$ROOM
If enabled, you can start a video chat from each chat. Requires a compatible app or a browser on both ends.
Use \"%1$s\" to invite others to video chats?\n\nOnce set, you can start a video chat from each chat. This replaces any previous setting for video chats.
@@ -622,6 +623,9 @@
SMTP Port
SMTP Security
Authorization Method
+
+ Proxy
+ Use Proxy
SOCKS5
Use SOCKS5
@@ -1011,6 +1015,7 @@
mailto link could not be decoded: %1$s
+
Dismiss
Reply
New message
diff --git a/src/main/res/xml/preferences_advanced.xml b/src/main/res/xml/preferences_advanced.xml
index 9a21754e0..3a38e3ca4 100644
--- a/src/main/res/xml/preferences_advanced.xml
+++ b/src/main/res/xml/preferences_advanced.xml
@@ -52,6 +52,9 @@
+
+