diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index a350e2351..4267113ba 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -7,7 +7,7 @@ on: jobs: artifacts-url-comments: name: add artifact links to pull request - runs-on: windows-2019 + runs-on: ubuntu-latest if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: add artifact links to pull request diff --git a/.github/workflows/preview-apk.yml b/.github/workflows/preview-apk.yml index bc0762e91..552927112 100644 --- a/.github/workflows/preview-apk.yml +++ b/.github/workflows/preview-apk.yml @@ -2,27 +2,27 @@ name: Upload Preview APK on: pull_request +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} + jobs: build: name: Upload Preview APK runs-on: ubuntu-latest steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.9.1 - with: - access_token: ${{ github.token }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 with: submodules: recursive - uses: Swatinem/rust-cache@v2 with: working-directory: jni/deltachat-core-rust - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v5 with: java-version: 17 distribution: 'temurin' - uses: android-actions/setup-android@v3 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index 485822c71..0c1723312 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -442,7 +442,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity 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() ) { menu.findItem(R.id.menu_ephemeral_messages).setVisible(false);