Skip to content

Commit f9a8451

Browse files
authored
Merge pull request #8790 from element-hq/feature/bma/externalAnalyticsPlan
Add dependency on `com.github.matrix-org:matrix-analytics-events`
2 parents 085bf82 + 6e1b346 commit f9a8451

29 files changed

+5
-2684
lines changed

.github/workflows/sync-from-external-sources.yml

-24
Original file line numberDiff line numberDiff line change
@@ -58,27 +58,3 @@ jobs:
5858
- Update SAS Strings from matrix-doc.
5959
branch: sync-sas-strings
6060
base: develop
61-
62-
sync-analytics-plan:
63-
runs-on: ubuntu-latest
64-
# Skip in forks
65-
if: github.repository == 'element-hq/element-android'
66-
# No concurrency required, runs every time on a schedule.
67-
steps:
68-
- uses: actions/checkout@v3
69-
- name: Run analytics import script
70-
run: ./tools/import_analytic_plan.sh
71-
- name: Create Pull Request for analytics plan
72-
uses: peter-evans/create-pull-request@v5
73-
with:
74-
commit-message: Sync analytics plan
75-
title: Sync analytics plan
76-
body: |
77-
### Update analytics plan
78-
Reviewers:
79-
- [ ] Please remove usage of Event or Enum which may have been removed or updated
80-
- [ ] please ensure new Events or new Enums are used to send analytics by pushing new commit(s) to this PR.
81-
82-
*Note*: Change are coming from [this project](https://github.com/matrix-org/matrix-analytics-events)
83-
branch: sync-analytics-plan
84-
base: develop

dependencies_groups.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ext.groups = [
99
'com.github.hyuwah',
1010
'com.github.jetradarmobile',
1111
'com.github.MatrixFrog',
12+
'com.github.matrix-org',
1213
'com.github.tapadoo',
1314
'com.github.UnifiedPush',
1415
'com.github.yalantis',

docs/analytics.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ We ask for the user to give consent before sending any analytics data.
1717

1818
The analytics plan is shared between all Element clients. To add an Event, please open a PR to this project: https://github.com/matrix-org/matrix-analytics-events
1919

20-
Then, once the PR has been merged, you can run the tool `import_analytic_plan.sh` to import the plan to Element, and then you can use the new Event. Note that this tool is run by Github action once a week.
20+
Then, once the PR has been merged, and the library is release, you can update the version of the library in the `build.gradle` file.
2121

2222
## Forks of Element
2323

tools/import_analytic_plan.sh

-18
This file was deleted.

vector/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@ dependencies {
159159
// Debug
160160
api 'com.facebook.stetho:stetho:1.6.0'
161161

162+
// Analytics
163+
api 'com.github.matrix-org:matrix-analytics-events:0.15.0'
164+
162165
api libs.google.phonenumber
163166

164167
// FlowBinding

vector/src/main/java/im/vector/app/features/analytics/itf/VectorAnalyticsEvent.kt

-22
This file was deleted.

vector/src/main/java/im/vector/app/features/analytics/itf/VectorAnalyticsScreen.kt

-22
This file was deleted.

vector/src/main/java/im/vector/app/features/analytics/plan/CallEnded.kt

-56
This file was deleted.

vector/src/main/java/im/vector/app/features/analytics/plan/CallError.kt

-51
This file was deleted.

vector/src/main/java/im/vector/app/features/analytics/plan/CallStarted.kt

-51
This file was deleted.

vector/src/main/java/im/vector/app/features/analytics/plan/Composer.kt

-90
This file was deleted.

0 commit comments

Comments
 (0)