-
Notifications
You must be signed in to change notification settings - Fork 136
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/0.5.0' into main
- Loading branch information
Showing
558 changed files
with
8,869 additions
and
3,372 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,14 +6,16 @@ jobs: | |
| build: | ||
| runs-on: ubuntu-latest | ||
| name: Danger main check | ||
| # Skip in forks, it doesn't work even with the fallback token | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Add SSH private keys for submodule repositories | ||
| uses: webfactory/[email protected] | ||
| with: | ||
| ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }} | ||
| - name: Clone submodules | ||
| if: github.repository == 'element-hq/element-x-android' | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| run: git submodule update --init --recursive | ||
| - run: | | ||
| npm install --save-dev @babel/plugin-transform-flow-strip-types | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ jobs: | |
| generate-github-pages: | ||
| runs-on: ubuntu-latest | ||
| # Skip in forks | ||
| if: github.repository == 'element-hq/element-x-android' | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| steps: | ||
| - name: ⏬ Checkout with LFS | ||
| uses: nschloe/[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,10 +20,11 @@ jobs: | |
| - uses: actions/checkout@v4 | ||
| - name: Add SSH private keys for submodule repositories | ||
| uses: webfactory/[email protected] | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| with: | ||
| ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }} | ||
| - name: Clone submodules | ||
| if: github.repository == 'element-hq/element-x-android' | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| run: git submodule update --init --recursive | ||
| - name: Run code quality check suite | ||
| run: ./tools/check/check_code_quality.sh | ||
|
|
@@ -77,10 +78,11 @@ jobs: | |
| ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }} | ||
| - name: Add SSH private keys for submodule repositories | ||
| uses: webfactory/[email protected] | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| with: | ||
| ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }} | ||
| - name: Clone submodules | ||
| if: github.repository == 'element-hq/element-x-android' | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| run: git submodule update --init --recursive | ||
| - name: Use JDK 17 | ||
| uses: actions/setup-java@v4 | ||
|
|
@@ -116,10 +118,11 @@ jobs: | |
| ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }} | ||
| - name: Add SSH private keys for submodule repositories | ||
| uses: webfactory/[email protected] | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| with: | ||
| ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }} | ||
| - name: Clone submodules | ||
| if: github.repository == 'element-hq/element-x-android' | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| run: git submodule update --init --recursive | ||
| - name: Use JDK 17 | ||
| uses: actions/setup-java@v4 | ||
|
|
@@ -159,10 +162,11 @@ jobs: | |
| ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }} | ||
| - name: Add SSH private keys for submodule repositories | ||
| uses: webfactory/[email protected] | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| with: | ||
| ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }} | ||
| - name: Clone submodules | ||
| if: github.repository == 'element-hq/element-x-android' | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| run: git submodule update --init --recursive | ||
| - name: Use JDK 17 | ||
| uses: actions/setup-java@v4 | ||
|
|
@@ -198,10 +202,11 @@ jobs: | |
| ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }} | ||
| - name: Add SSH private keys for submodule repositories | ||
| uses: webfactory/[email protected] | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| with: | ||
| ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }} | ||
| - name: Clone submodules | ||
| if: github.repository == 'element-hq/element-x-android' | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| run: git submodule update --init --recursive | ||
| - name: Use JDK 17 | ||
| uses: actions/setup-java@v4 | ||
|
|
@@ -237,10 +242,11 @@ jobs: | |
| ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }} | ||
| - name: Add SSH private keys for submodule repositories | ||
| uses: webfactory/[email protected] | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| with: | ||
| ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }} | ||
| - name: Clone submodules | ||
| if: github.repository == 'element-hq/element-x-android' | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| run: git submodule update --init --recursive | ||
| - name: Use JDK 17 | ||
| uses: actions/setup-java@v4 | ||
|
|
@@ -271,6 +277,7 @@ jobs: | |
| name: Project Check Suite | ||
| runs-on: ubuntu-latest | ||
| needs: [konsist, lint, ktlint, detekt] | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,13 +42,15 @@ jobs: | |
| enterprise: | ||
| name: Create App Bundle Enterprise | ||
| runs-on: ubuntu-latest | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| concurrency: | ||
| group: ${{ format('build-release-main-gplay-{0}', github.sha) }} | ||
| cancel-in-progress: true | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Add SSH private keys for submodule repositories | ||
| uses: webfactory/[email protected] | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| with: | ||
| ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }} | ||
| - name: Clone submodules | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,10 +40,11 @@ jobs: | |
| ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }} | ||
| - name: Add SSH private keys for submodule repositories | ||
| uses: webfactory/[email protected] | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| with: | ||
| ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }} | ||
| - name: Clone submodules | ||
| if: github.repository == 'element-hq/element-x-android' | ||
| if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }} | ||
| run: git submodule update --init --recursive | ||
| - name: ☕️ Use JDK 17 | ||
| uses: actions/setup-java@v4 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
app/src/fdroid/kotlin/io/element/android/x/licenses/FdroidOpenSourceLicensesProvider.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * Copyright (c) 2024 New Vector Ltd | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.element.android.x.licenses | ||
|
|
||
| import android.app.Activity | ||
| import com.squareup.anvil.annotations.ContributesBinding | ||
| import io.element.android.features.preferences.api.OpenSourceLicensesProvider | ||
| import io.element.android.libraries.di.AppScope | ||
| import javax.inject.Inject | ||
|
|
||
| @ContributesBinding(AppScope::class) | ||
| class FdroidOpenSourceLicensesProvider @Inject constructor() : OpenSourceLicensesProvider { | ||
| override val hasOpenSourceLicenses: Boolean = false | ||
|
|
||
| override fun navigateToOpenSourceLicenses(activity: Activity) { | ||
| error("Not supported, please ensure that hasOpenSourcesLicenses is true before calling this method") | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||
|
|
||
| <application> | ||
| <activity | ||
| android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity" | ||
| android:theme="@style/Theme.OssLicenses" /> | ||
| <activity | ||
| android:name="com.google.android.gms.oss.licenses.OssLicensesActivity" | ||
| android:theme="@style/Theme.OssLicenses" /> | ||
| </application> | ||
|
|
||
| </manifest> |
Oops, something went wrong.