mirror of
https://github.com/deltachat/deltachat-android.git
synced 2025-10-03 01:39:18 +02:00
Compare commits
4 commits
de9a2df1b4
...
ec576d7159
Author | SHA1 | Date | |
---|---|---|---|
![]() |
ec576d7159 | ||
![]() |
70a05221ab | ||
![]() |
6335cfa178 | ||
![]() |
ebda8c4577 |
3 changed files with 15 additions and 9 deletions
2
.github/workflows/artifacts.yml
vendored
2
.github/workflows/artifacts.yml
vendored
|
@ -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
|
||||||
|
|
14
.github/workflows/preview-apk.yml
vendored
14
.github/workflows/preview-apk.yml
vendored
|
@ -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
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue