Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Replace piwik SDK with matomo #3163

Merged
merged 1 commit into from
May 22, 2019
Merged

Replace piwik SDK with matomo #3163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion vector/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ dependencies {

/************* analytics **************/
// another tracking than GA
implementation 'org.piwik.sdk:piwik-sdk:2.0.0'
implementation 'org.matomo.sdk:tracker:4.0.2'

/************* flavors management **************/

Expand Down
6 changes: 3 additions & 3 deletions vector/src/main/java/im/vector/VectorApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
import im.vector.activity.WidgetActivity;
import im.vector.analytics.Analytics;
import im.vector.analytics.AppAnalytics;
import im.vector.analytics.PiwikAnalytics;
import im.vector.analytics.MatomoAnalytics;
import im.vector.analytics.e2e.DecryptionFailureTracker;
import im.vector.contacts.ContactsManager;
import im.vector.contacts.PIDsRetriever;
Expand Down Expand Up @@ -212,7 +212,7 @@ public void onCreate() {

instance = this;
mCallsManager = new CallsManager(this);
mAppAnalytics = new AppAnalytics(this, new PiwikAnalytics(this));
mAppAnalytics = new AppAnalytics(this, new MatomoAnalytics(this));
mDecryptionFailureTracker = new DecryptionFailureTracker(mAppAnalytics);

mActivityTransitionTimer = null;
Expand Down Expand Up @@ -253,7 +253,7 @@ public void onCreate() {
public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
Log.d(LOG_TAG, "onActivityCreated " + activity);
mCreatedActivities.add(activity.toString());
// piwik
// matomo
onNewScreen(activity);
}

Expand Down
22 changes: 12 additions & 10 deletions ...ava/im/vector/analytics/PiwikAnalytics.kt → ...va/im/vector/analytics/MatomoAnalytics.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,24 @@ package im.vector.analytics

import android.content.Context
import im.vector.R
import org.piwik.sdk.Piwik
import org.piwik.sdk.QueryParams
import org.piwik.sdk.Tracker
import org.piwik.sdk.TrackerConfig
import org.piwik.sdk.extra.CustomVariables
import org.piwik.sdk.extra.TrackHelper
import org.matomo.sdk.Matomo
import org.matomo.sdk.QueryParams
import org.matomo.sdk.Tracker
import org.matomo.sdk.TrackerBuilder
import org.matomo.sdk.extra.CustomVariables
import org.matomo.sdk.extra.TrackHelper

/**
* A class implementing the Analytics interface for the Piwik solution
* A class implementing the Analytics interface for the Matomo solution
*/
class PiwikAnalytics(context: Context) : Analytics {
class MatomoAnalytics(context: Context) : Analytics {
private val tracker: Tracker

init {
val config = TrackerConfig(context.getString(R.string.piwik_server_url), 1, " AndroidPiwikTracker")
tracker = Piwik.getInstance(context).newTracker(config)
val builder = TrackerBuilder(context.getString(R.string.matomo_server_url),
context.getString(R.string.matomo_site_id).toInt(),
context.getString(R.string.matomo_tracker_name))
tracker = builder.build(Matomo.getInstance(context))
}

override fun trackScreen(screen: String, title: String?) {
Expand Down
4 changes: 3 additions & 1 deletion vector/src/main/res/values/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
<string name="matrix_org_server_url" translatable="false">https://matrix.org</string>
<string name="default_hs_server_url" translatable="false">https://matrix.org</string>
<string name="default_identity_server_url" translatable="false">https://vector.im</string>
<string name="piwik_server_url" translatable="false">https://piwik.riot.im</string>
<string name="matomo_server_url" translatable="false">https://piwik.riot.im</string>
<string name="matomo_site_id" translatable="false">1</string>
<string name="matomo_tracker_name" translatable="false">AndroidMatomoTracker</string>
<string name="bug_report_url" translatable="false">https://riot.im/bugreports/submit</string>

<!-- Widget urls -->
Expand Down