-
Notifications
You must be signed in to change notification settings - Fork 176
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop' into feature/jme/offlin…
…e-status-banner
- Loading branch information
Showing
291 changed files
with
12,092 additions
and
232 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 |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| name: Sync Localazy | ||
| on: | ||
| schedule: | ||
| # At 00:00 on every Monday UTC | ||
| - cron: '0 0 * * 1' | ||
|
|
||
| jobs: | ||
| sync-localazy: | ||
| runs-on: ubuntu-latest | ||
| # Skip in forks | ||
| if: github.repository == 'vector-im/element-x-android' | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Set up Python 3.9 | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: 3.9 | ||
| - name: Setup Localazy | ||
| run: | | ||
| curl -sS https://dist.localazy.com/debian/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/localazy.gpg | ||
| echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/localazy.gpg] https://maven.localazy.com/repository/apt/ stable main" | sudo tee /etc/apt/sources.list.d/localazy.list | ||
| sudo apt-get update && sudo apt-get install localazy | ||
| - name: Run Localazy script | ||
| run: ./tools/localazy/downloadStrings.sh --all | ||
| - name: Create Pull Request for Strings | ||
| uses: peter-evans/create-pull-request@v5 | ||
| with: | ||
| commit-message: Sync Strings from Localazy | ||
| title: Sync Strings | ||
| body: | | ||
| - Update Strings from Localazy | ||
| branch: sync-localazy | ||
| base: develop |
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
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,49 @@ | ||
| { | ||
| "project_info": { | ||
| "project_number": "912726360885", | ||
| "firebase_url": "https://vector-alpha.firebaseio.com", | ||
| "project_id": "vector-alpha", | ||
| "storage_bucket": "vector-alpha.appspot.com" | ||
| }, | ||
|
|
||
| "client": [ | ||
| { | ||
| "client_info": { | ||
| "mobilesdk_app_id": "1:912726360885:android:def0a4e454042e9b00427c", | ||
| "android_client_info": { | ||
| "package_name": "io.element.android.x.debug" | ||
| } | ||
| }, | ||
| "oauth_client": [ | ||
| { | ||
| "client_id": "912726360885-hvgoj23p6plt7hikhtdrakihojghaftv.apps.googleusercontent.com", | ||
| "client_type": 1, | ||
| "android_info": { | ||
| "package_name": "io.element.android.x.debug", | ||
| "certificate_hash": "41bd63b3b612a15d9ba36a5245c393f2a9b992d1" | ||
| } | ||
| }, | ||
| { | ||
| "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com", | ||
| "client_type": 3 | ||
| } | ||
| ], | ||
| "api_key": [ | ||
| { | ||
| "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c" | ||
| } | ||
| ], | ||
| "services": { | ||
| "appinvite_service": { | ||
| "other_platform_oauth_client": [ | ||
| { | ||
| "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com", | ||
| "client_type": 3 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "configuration_version": "1" | ||
| } |
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
44 changes: 44 additions & 0 deletions
44
app/src/main/kotlin/io/element/android/x/intent/IntentProviderImpl.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,44 @@ | ||
| /* | ||
| * Copyright (c) 2023 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 | ||
| * | ||
| * http://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.intent | ||
|
|
||
| import android.content.Context | ||
| import android.content.Intent | ||
| import com.squareup.anvil.annotations.ContributesBinding | ||
| import io.element.android.libraries.di.AppScope | ||
| import io.element.android.libraries.di.ApplicationContext | ||
| import io.element.android.libraries.matrix.api.core.RoomId | ||
| import io.element.android.libraries.matrix.api.core.SessionId | ||
| import io.element.android.libraries.matrix.api.core.ThreadId | ||
| import io.element.android.libraries.push.impl.intent.IntentProvider | ||
| import io.element.android.x.MainActivity | ||
| import javax.inject.Inject | ||
|
|
||
| // TODO EAx change to deep-link. | ||
| @ContributesBinding(AppScope::class) | ||
| class IntentProviderImpl @Inject constructor( | ||
| @ApplicationContext private val context: Context, | ||
| ) : IntentProvider { | ||
| override fun getMainIntent(): Intent { | ||
| return Intent(context, MainActivity::class.java) | ||
| } | ||
|
|
||
| override fun getIntent(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?): Intent { | ||
| // TODO Handle deeplink or pass parameters | ||
| return Intent(context, MainActivity::class.java) | ||
| } | ||
| } |
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 |
|---|---|---|
|
|
@@ -37,4 +37,4 @@ | |
| } | ||
| ], | ||
| "configuration_version": "1" | ||
| } | ||
| } | ||
Oops, something went wrong.