From 46be278bf5a6d7c272ce97a239537fe0f23e4228 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Tue, 9 Jun 2026 17:58:01 +0200 Subject: [PATCH 1/2] update ndk version --- .github/workflows/cache-core.yml | 2 +- .github/workflows/preview-apk.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cache-core.yml b/.github/workflows/cache-core.yml index 7c7b20df7..3418fe1d0 100644 --- a/.github/workflows/cache-core.yml +++ b/.github/workflows/cache-core.yml @@ -25,7 +25,7 @@ jobs: - uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779 # v1.6.0 id: setup-ndk with: - ndk-version: r27 + ndk-version: "r29" - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 with: diff --git a/.github/workflows/preview-apk.yml b/.github/workflows/preview-apk.yml index 4cf14f6f4..767f5491d 100644 --- a/.github/workflows/preview-apk.yml +++ b/.github/workflows/preview-apk.yml @@ -42,7 +42,7 @@ jobs: - uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779 # v1.6.0 id: setup-ndk with: - ndk-version: r27 + ndk-version: "r29" - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 with: From 80de08f9809ced9be52910ec6f0b31a367bc4457 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Thu, 11 Jun 2026 15:07:48 +0200 Subject: [PATCH 2/2] remove remainings of is_chatmail usage instead, force_ncryption is checked now, and this only for for option "New Chat -> New Email". this also fixes the bug that, for classic relays, by default "force encryption" is set but we still show "new email". what's left for now is a check for is_chatmail whether fcm is sufficient or not. --- src/main/java/com/b44t/messenger/DcAccounts.java | 2 +- src/main/java/com/b44t/messenger/DcContext.java | 4 ---- .../org/thoughtcrime/securesms/connect/DcContactsLoader.java | 4 ++-- src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java | 5 ++++- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/b44t/messenger/DcAccounts.java b/src/main/java/com/b44t/messenger/DcAccounts.java index d0bc07895..ba90170c6 100644 --- a/src/main/java/com/b44t/messenger/DcAccounts.java +++ b/src/main/java/com/b44t/messenger/DcAccounts.java @@ -74,7 +74,7 @@ public class DcAccounts { public boolean isAllChatmail() { for (int accountId : getAll()) { DcContext dcContext = getAccount(accountId); - if (!dcContext.isChatmail()) { + if (dcContext.getConfigInt("is_chatmail") == 0) { return false; } } diff --git a/src/main/java/com/b44t/messenger/DcContext.java b/src/main/java/com/b44t/messenger/DcContext.java index d972001b9..980f44ce6 100644 --- a/src/main/java/com/b44t/messenger/DcContext.java +++ b/src/main/java/com/b44t/messenger/DcContext.java @@ -344,10 +344,6 @@ public class DcContext { return displayname; } - public boolean isChatmail() { - return getConfigInt("is_chatmail") == 1; - } - public boolean isMuted() { return getConfigInt("is_muted") == 1; } diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java b/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java index 62d6c1392..afffc8a65 100644 --- a/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java +++ b/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java @@ -46,7 +46,7 @@ public class DcContactsLoader extends AsyncLoader { if (query == null && addScanQRLink) { additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_QR_INVITE); } - if (addCreateContactLink && !dcContext.isChatmail()) { + if (addCreateContactLink && dcContext.getConfigInt(DcHelper.CONFIG_FORCE_ENCRYPTION) == 0) { additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_CLASSIC_CONTACT); } @@ -54,7 +54,7 @@ public class DcContactsLoader extends AsyncLoader { additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_GROUP); additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_BROADCAST); - if (!dcContext.isChatmail()) { + if (dcContext.getConfigInt(DcHelper.CONFIG_FORCE_ENCRYPTION) == 0) { additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_UNENCRYPTED_GROUP); } diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java b/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java index 350c3bfe8..1e8c7e42b 100644 --- a/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java @@ -18,6 +18,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; import androidx.viewpager2.widget.ViewPager2; +import com.b44t.messenger.DcContext; import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; import com.google.zxing.BinaryBitmap; @@ -120,10 +121,12 @@ public class QrActivity extends BaseActionBarActivity implements View.OnClickLis @Override public boolean onPrepareOptionsMenu(Menu menu) { + DcContext dcContext = DcHelper.getContext(this); + menu.clear(); getMenuInflater().inflate(R.menu.qr_show, menu); menu.findItem(R.id.new_classic_contact) - .setVisible(!scanRelay && !DcHelper.getContext(this).isChatmail()); + .setVisible(!scanRelay && dcContext.getConfigInt(DcHelper.CONFIG_FORCE_ENCRYPTION) == 0); Util.redMenuItem(menu, R.id.withdraw); if (tabLayout.getSelectedTabPosition() == TAB_SCAN) {