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/issue-4481

Browse Source
This commit is contained in:
adb
2026-06-11 19:05:27 +02:00
committed by GitHub
parent 9c55de17a3 80de08f980
commit d0f7fca8c9
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/cache-core.yml
+1 -1
View File
@@ -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:
.github/workflows/preview-apk.yml
+1 -1
View File
@@ -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:
src/main/java/com/b44t/messenger/DcAccounts.java
+1 -1
View File
@@ -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;
}
}
src/main/java/com/b44t/messenger/DcContext.java
-4
View File
@@ -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;
}
src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java
+2 -2
View File
@@ -46,7 +46,7 @@ public class DcContactsLoader extends AsyncLoader<DcContactsLoader.Ret> {
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<DcContactsLoader.Ret> {
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);
}
src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
+4 -1
View File
@@ -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) {