Compare commits

...

4 commits

Author SHA1 Message Date
adb
ec576d7159
Merge branch 'main' into adb/integrated-videocalls 2025-09-24 16:29:51 +02:00
adb
70a05221ab
Merge pull request #3924 from deltachat/adb/update-workflows
update workflows and fix adding artifact link as comment to PRs
2025-09-24 16:29:27 +02:00
adbenitez
6335cfa178 update workflows and fix adding artifact link as comment to PRs 2025-09-24 15:35:55 +02:00
adbenitez
ebda8c4577 hide calls button in "Saved Messages" and "Device Messages" 2025-09-24 14:23:52 +02:00
3 changed files with 15 additions and 9 deletions

View file

@ -7,7 +7,7 @@ on:
jobs: jobs:
artifacts-url-comments: artifacts-url-comments:
name: add artifact links to pull request name: add artifact links to pull request
runs-on: windows-2019 runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }} if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps: steps:
- name: add artifact links to pull request - name: add artifact links to pull request

View file

@ -2,27 +2,27 @@ name: Upload Preview APK
on: pull_request on: pull_request
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
jobs: jobs:
build: build:
name: Upload Preview APK name: Upload Preview APK
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Cancel Previous Runs - uses: actions/checkout@v5
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
with: with:
working-directory: jni/deltachat-core-rust working-directory: jni/deltachat-core-rust
- uses: actions/setup-java@v3 - uses: actions/setup-java@v5
with: with:
java-version: 17 java-version: 17
distribution: 'temurin' distribution: 'temurin'
- uses: android-actions/setup-android@v3 - uses: android-actions/setup-android@v3
- uses: actions/cache@v3 - uses: actions/cache@v4
with: with:
path: | path: |
~/.gradle/caches ~/.gradle/caches

View file

@ -442,7 +442,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
menu.findItem(R.id.menu_show_map).setVisible(false); menu.findItem(R.id.menu_show_map).setVisible(false);
} }
menu.findItem(R.id.menu_start_call).setVisible(Prefs.isCallsEnabled(this) && dcChat.isEncrypted() && !isMultiUser()); menu.findItem(R.id.menu_start_call).setVisible(
Prefs.isCallsEnabled(this)
&& dcChat.canSend()
&& dcChat.isEncrypted()
&& !dcChat.isSelfTalk()
&& !dcChat.isMultiUser()
);
if (!dcChat.isEncrypted() || !dcChat.canSend() || dcChat.isMailingList() ) { if (!dcChat.isEncrypted() || !dcChat.canSend() || dcChat.isMailingList() ) {
menu.findItem(R.id.menu_ephemeral_messages).setVisible(false); menu.findItem(R.id.menu_ephemeral_messages).setVisible(false);