awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge branch 'main' into adb/improve-conversationListFragment

Browse Source
This commit is contained in:
adb
2026-05-25 16:52:10 +02:00
committed by GitHub
parent 47512f786e ed6eca8920
commit 644bd1f594
5 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
+1
View File
@@ -55,6 +55,7 @@ public class DcHelper {
public static final String CONFIG_PRIVATE_TAG = "private_tag";
public static final String CONFIG_STATS_SENDING = "stats_sending";
public static final String CONFIG_STATS_ID = "stats_id";
public static final String CONFIG_FORCE_ENCRYPTION = "force_encryption";
public static DcContext getContext(@NonNull Context context) {
return ApplicationContext.getInstance(context).getDcContext();
src/main/java/org/thoughtcrime/securesms/relay/EditRelayActivity.java
+10
View File
@@ -23,6 +23,7 @@ import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.SwitchCompat;
import androidx.constraintlayout.widget.Group;
import chat.delta.rpc.Rpc;
import chat.delta.rpc.RpcException;
@@ -75,6 +76,7 @@ public class EditRelayActivity extends BaseActionBarActivity
Spinner imapSecurity;
Spinner smtpSecurity;
Spinner certCheck;
private SwitchCompat enforceE2eeSwitch;
Rpc rpc;
int accId;
@@ -110,6 +112,7 @@ public class EditRelayActivity extends BaseActionBarActivity
imapSecurity = findViewById(R.id.imap_security);
smtpSecurity = findViewById(R.id.smtp_security);
certCheck = findViewById(R.id.cert_check);
enforceE2eeSwitch = findViewById(R.id.enforce_e2ee_switch);
String addr = getIntent().getStringExtra(EXTRA_ADDR);
EnteredLoginParam config = null;
@@ -173,6 +176,10 @@ public class EditRelayActivity extends BaseActionBarActivity
boolean expandAdvanced = false;
int intVal;
intVal = getContext(this).getConfigInt(DcHelper.CONFIG_FORCE_ENCRYPTION);
enforceE2eeSwitch.setChecked(intVal == 1);
expandAdvanced = expandAdvanced || intVal == 0;
if (config != null) { // configured
emailInput.setText(config.addr);
if (!TextUtils.isEmpty(config.addr)) {
@@ -500,9 +507,12 @@ public class EditRelayActivity extends BaseActionBarActivity
param.smtpPassword = getParam(R.id.smtp_password_text, false);
param.certificateChecks = certificateChecksFromInt(certCheck.getSelectedItemPosition());
final String forceEncryption = enforceE2eeSwitch.isChecked() ? "1" : "0";
new Thread(
() -> {
try {
rpc.setConfig(accId, DcHelper.CONFIG_FORCE_ENCRYPTION, forceEncryption);
rpc.addOrUpdateTransport(accId, param);
DcHelper.getEventCenter(this).endCaptureNextError();
progressDialog.dismiss();