From 940ce889462dc929fdb70174e2e2163b2a3e43cb Mon Sep 17 00:00:00 2001
From: fridtjof <2780577+fridtjof@users.noreply.github.com>
Date: Mon, 7 Jan 2019 18:42:08 +0100
Subject: [PATCH 1/7] Rename PiwikTracker to MatomoTracker and update to
 version 6.0.0

---
 Podfile                             | 12 ++----
 Podfile.lock                        | 23 ++++-------
 Riot.xcodeproj/project.pbxproj      |  4 +-
 Riot/Managers/Analytics/Analytics.m | 63 ++++++++++++++++++-----------
 4 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/Podfile b/Podfile
index 59ed9a2fe..467fea952 100644
--- a/Podfile
+++ b/Podfile
@@ -64,15 +64,15 @@ abstract_target 'RiotPods' do
 
     # Piwik for analytics
     # While https://github.com/matomo-org/matomo-sdk-ios/pull/223 is not released, use the PR branch
-    pod 'PiwikTracker', :git => 'https://github.com/manuroe/matomo-sdk-ios.git', :branch => 'feature/CustomVariables'
-    #pod 'PiwikTracker', '~> 4.4.2'
+    #pod 'PiwikTracker', :git => 'https://github.com/manuroe/matomo-sdk-ios.git', :branch => 'feature/CustomVariables'
+    pod 'MatomoTracker', '~> 6.0.0'
 
     # Remove warnings from "bad" pods
     pod 'OLMKit', :inhibit_warnings => true
     pod 'cmark', :inhibit_warnings => true
     pod 'DTCoreText', :inhibit_warnings => true
     pod 'zxcvbn-ios'
-    
+
     # Tools
     pod 'SwiftGen', '~> 6.1'
     pod 'SwiftLint', '~> 0.30.1'
@@ -101,13 +101,7 @@ post_install do |installer|
         # Plus the app does not enable it
         target.build_configurations.each do |config|
             config.build_settings['ENABLE_BITCODE'] = 'NO'
-            
-            # Required for PiwikTracker as `swift_version` is not defined in podspec. Should be removed
-            if target.name.include? 'PiwikTracker'
-                config.build_settings['SWIFT_VERSION'] = '4.0'
-            end
         end
-
     end
 end
 
diff --git a/Podfile.lock b/Podfile.lock
index 952f5eb90..207baf23f 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -45,6 +45,9 @@ PODS:
   - JitsiMeetSDK (2.1.0)
   - libbase58 (0.1.4)
   - libPhoneNumber-iOS (0.9.13)
+  - MatomoTracker (6.0.0):
+    - MatomoTracker/Core (= 6.0.0)
+  - MatomoTracker/Core (6.0.0)
   - MatrixKit (0.9.9):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
@@ -83,9 +86,6 @@ PODS:
     - OLMKit/olmcpp (= 3.1.0)
   - OLMKit/olmc (3.1.0)
   - OLMKit/olmcpp (3.1.0)
-  - PiwikTracker (4.4.2):
-    - PiwikTracker/Core (= 4.4.2)
-  - PiwikTracker/Core (4.4.2)
   - Realm (3.13.1):
     - Realm/Headers (= 3.13.1)
   - Realm/Headers (3.13.1)
@@ -102,12 +102,12 @@ DEPENDENCIES:
   - cmark
   - DTCoreText
   - GBDeviceInfo (~> 5.2.0)
+  - MatomoTracker (~> 6.0.0)
   - MatrixKit (= 0.9.9)
   - MatrixKit/AppExtension (= 0.9.9)
   - MatrixSDK/JingleCallStack
   - MatrixSDK/SwiftSupport
   - OLMKit
-  - PiwikTracker (from `https://github.com/manuroe/matomo-sdk-ios.git`, branch `feature/CustomVariables`)
   - Reusable (~> 4.0)
   - SwiftGen (~> 6.1)
   - SwiftLint (~> 0.30.1)
@@ -125,6 +125,7 @@ SPEC REPOS:
     - JitsiMeetSDK
     - libbase58
     - libPhoneNumber-iOS
+    - MatomoTracker
     - MatrixKit
     - MatrixSDK
     - OLMKit
@@ -134,16 +135,6 @@ SPEC REPOS:
     - SwiftLint
     - zxcvbn-ios
 
-EXTERNAL SOURCES:
-  PiwikTracker:
-    :branch: feature/CustomVariables
-    :git: https://github.com/manuroe/matomo-sdk-ios.git
-
-CHECKOUT OPTIONS:
-  PiwikTracker:
-    :commit: dfb048f25f4eefbe13ff7515c3c1c2cad5d94491
-    :git: https://github.com/manuroe/matomo-sdk-ios.git
-
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
   cmark: ec0275215b504780287b6fca360224e384368af8
@@ -155,16 +146,16 @@ SPEC CHECKSUMS:
   JitsiMeetSDK: 3e66564af7f38a19142338955dd7f581801852b3
   libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
   libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
+  MatomoTracker: f1d0adbe609f8db3740d24e59e16a1855d263921
   MatrixKit: 6f553797e1ad42794b5336afb5cecb975ec69daa
   MatrixSDK: ed0d0cee4877955052f19730bb3ee727e01ec948
   OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639
-  PiwikTracker: 42862c7b13028065c3dfd36b4dc38db8a5765acf
   Realm: 50071da38fe079e0735e47c9f2eae738c68c5996
   Reusable: 188be1a54ac0691bc66e5bb24ec6eb91971b315b
   SwiftGen: f872ca75cbd17bf7103c17f13dcfa0d9a15667b0
   SwiftLint: a54bf1fe12b55c68560eb2a7689dfc81458508f7
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
 
-PODFILE CHECKSUM: cfb6be050dfbb227d58b14434629e447ea54554b
+PODFILE CHECKSUM: c43860700c490d04f7c96ecaa573cd991c27a3c4
 
 COCOAPODS: 1.6.1
diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj
index df79a4230..39b96c6e5 100644
--- a/Riot.xcodeproj/project.pbxproj
+++ b/Riot.xcodeproj/project.pbxproj
@@ -3688,10 +3688,10 @@
 				"${BUILT_PRODUCTS_DIR}/HPGrowingTextView/HPGrowingTextView.framework",
 				"${PODS_ROOT}/JitsiMeetSDK/Frameworks/JitsiMeet.framework",
 				"${PODS_ROOT}/JitsiMeetSDK/Frameworks/WebRTC.framework",
+				"${BUILT_PRODUCTS_DIR}/MatomoTracker/MatomoTracker.framework",
 				"${BUILT_PRODUCTS_DIR}/MatrixKit/MatrixKit.framework",
 				"${BUILT_PRODUCTS_DIR}/MatrixSDK.common-JingleCallStack/MatrixSDK.framework",
 				"${BUILT_PRODUCTS_DIR}/OLMKit/OLMKit.framework",
-				"${BUILT_PRODUCTS_DIR}/PiwikTracker/PiwikTracker.framework",
 				"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
 				"${BUILT_PRODUCTS_DIR}/Reusable/Reusable.framework",
 				"${BUILT_PRODUCTS_DIR}/cmark/cmark.framework",
@@ -3714,10 +3714,10 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HPGrowingTextView.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JitsiMeet.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebRTC.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MatomoTracker.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MatrixKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MatrixSDK.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OLMKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PiwikTracker.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reusable.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cmark.framework",
diff --git a/Riot/Managers/Analytics/Analytics.m b/Riot/Managers/Analytics/Analytics.m
index 552e9e0ab..09a4108f8 100644
--- a/Riot/Managers/Analytics/Analytics.m
+++ b/Riot/Managers/Analytics/Analytics.m
@@ -31,7 +31,29 @@ NSString *const kAnalyticsE2eCategory = @"E2E";
 NSString *const kAnalyticsE2eDecryptionFailureAction = @"Decryption failure";
 
 
-@import PiwikTracker;
+@import MatomoTracker;
+
+@interface MatomoTracker (MatomoTrackerMigration)
++ (MatomoTracker *)shared;
+
++ (void)migrateFromFourPointFourSharedInstance;
+@end
+
+@implementation MatomoTracker (MatomoTrackerMigration)
++ (MatomoTracker *)shared
+{
+    NSDictionary *piwikConfig = [[NSUserDefaults standardUserDefaults] objectForKey:@"piwik"];
+    MatomoTracker *matomoTracker = [[MatomoTracker alloc] initWithSiteId:piwikConfig[@"siteId"] baseURL:[NSURL URLWithString:piwikConfig[@"url"]] userAgent:@"iOSMatomoTracker"];
+    return matomoTracker;
+}
+
++ (void)migrateFromFourPointFourSharedInstance
+{
+    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"migratedFromFourPointFourSharedInstance"]) return;
+    
+    [[NSUserDefaults standardUserDefaults] setBool:true forKey:@"migratedFromFourPointFourSharedInstance"];
+}
+@end
 
 @implementation Analytics
 
@@ -49,29 +71,24 @@ NSString *const kAnalyticsE2eDecryptionFailureAction = @"Decryption failure";
 
 - (void)start
 {
-    NSDictionary *piwikConfig = [[NSUserDefaults standardUserDefaults] objectForKey:@"piwik"];
-    [PiwikTracker configureSharedInstanceWithSiteID:piwikConfig[@"siteId"]
-                                            baseURL:[NSURL URLWithString:piwikConfig[@"url"]]
-                                          userAgent:@"iOSPiwikTracker"];
-
     // Check whether the user has enabled the sending of crash reports.
     if (RiotSettings.shared.enableCrashReport)
     {
-        [PiwikTracker shared].isOptedOut = NO;
+        [MatomoTracker shared].isOptedOut = NO;
 
-        [[PiwikTracker shared] setCustomVariableWithIndex:1 name:@"App Platform" value:@"iOS Platform"];
-        [[PiwikTracker shared] setCustomVariableWithIndex:2 name:@"App Version" value:[AppDelegate theDelegate].appVersion];
+        [[MatomoTracker shared] setCustomVariableWithIndex:1 name:@"App Platform" value:@"iOS Platform"];
+        [[MatomoTracker shared] setCustomVariableWithIndex:2 name:@"App Version" value:[AppDelegate theDelegate].appVersion];
 
         // The language is either the one selected by the user within the app
         // or, else, the one configured by the OS
         NSString *language = [NSBundle mxk_language] ? [NSBundle mxk_language] : [[NSBundle mainBundle] preferredLocalizations][0];
-        [[PiwikTracker shared] setCustomVariableWithIndex:4 name:@"Chosen Language" value:language];
+        [[MatomoTracker shared] setCustomVariableWithIndex:4 name:@"Chosen Language" value:language];
 
         MXKAccount* account = [MXKAccountManager sharedManager].activeAccounts.firstObject;
         if (account)
         {
-            [[PiwikTracker shared] setCustomVariableWithIndex:7 name:@"Homeserver URL" value:account.mxCredentials.homeServer];
-            [[PiwikTracker shared] setCustomVariableWithIndex:8 name:@"Identity Server URL" value:account.identityServerURL];
+            [[MatomoTracker shared] setCustomVariableWithIndex:7 name:@"Homeserver URL" value:account.mxCredentials.homeServer];
+            [[MatomoTracker shared] setCustomVariableWithIndex:8 name:@"Identity Server URL" value:account.identityServerURL];
         }
 
         // TODO: We should also track device and os version
@@ -83,20 +100,20 @@ NSString *const kAnalyticsE2eDecryptionFailureAction = @"Decryption failure";
 
 #ifdef DEBUG
         // Disable analytics in debug as it pollutes stats
-        [PiwikTracker shared].isOptedOut = YES;
+        [MatomoTracker shared].isOptedOut = YES;
 #endif
     }
     else
     {
         NSLog(@"[AppDelegate] The user decided to not send analytics");
-        [PiwikTracker shared].isOptedOut = YES;
+        [MatomoTracker shared].isOptedOut = YES;
         [MXLogger logCrashes:NO];
     }
 }
 
 - (void)stop
 {
-    [PiwikTracker shared].isOptedOut = YES;
+    [MatomoTracker shared].isOptedOut = YES;
     [MXLogger logCrashes:NO];
 }
 
@@ -106,20 +123,20 @@ NSString *const kAnalyticsE2eDecryptionFailureAction = @"Decryption failure";
     NSString *appName = [[NSBundle mainBundle] infoDictionary][@"CFBundleDisplayName"];
     NSString *appVersion = [AppDelegate theDelegate].appVersion;
 
-    [[PiwikTracker shared] trackWithView:@[@"ios", appName, appVersion, screenName]
+    [[MatomoTracker shared] trackWithView:@[@"ios", appName, appVersion, screenName]
                                      url:nil];
 }
 
 - (void)dispatch
 {
-    [[PiwikTracker shared] dispatch];
+    [[MatomoTracker shared] dispatch];
 }
 
 - (void)trackLaunchScreenDisplayDuration:(NSTimeInterval)seconds
 {
     NSString *action = [NSString stringWithFormat:kAnalyticsMetricsActionPattern, kMXAnalyticsStartupCategory];
 
-    [[PiwikTracker shared] trackWithEventWithCategory:kAnalyticsMetricsCategory
+    [[MatomoTracker shared] trackWithEventWithCategory:kAnalyticsMetricsCategory
                                                action:action
                                                  name:kMXAnalyticsStartupLaunchScreen
                                                number:@(seconds * 1000)
@@ -132,7 +149,7 @@ NSString *const kAnalyticsE2eDecryptionFailureAction = @"Decryption failure";
 {
     NSString *action = [NSString stringWithFormat:kAnalyticsMetricsActionPattern, kMXAnalyticsStartupCategory];
 
-    [[PiwikTracker shared] trackWithEventWithCategory:kAnalyticsMetricsCategory
+    [[MatomoTracker shared] trackWithEventWithCategory:kAnalyticsMetricsCategory
                                                action:action
                                                  name:kMXAnalyticsStartupStorePreload
                                                number:@(seconds * 1000)
@@ -143,7 +160,7 @@ NSString *const kAnalyticsE2eDecryptionFailureAction = @"Decryption failure";
 {
     NSString *action = [NSString stringWithFormat:kAnalyticsMetricsActionPattern, kMXAnalyticsStartupCategory];
 
-    [[PiwikTracker shared] trackWithEventWithCategory:kAnalyticsMetricsCategory
+    [[MatomoTracker shared] trackWithEventWithCategory:kAnalyticsMetricsCategory
                                                action:action
                                                  name:kMXAnalyticsStartupMountData
                                                number:@(seconds * 1000)
@@ -154,7 +171,7 @@ NSString *const kAnalyticsE2eDecryptionFailureAction = @"Decryption failure";
 {
     NSString *action = [NSString stringWithFormat:kAnalyticsMetricsActionPattern, kMXAnalyticsStartupCategory];
 
-    [[PiwikTracker shared] trackWithEventWithCategory:kAnalyticsMetricsCategory
+    [[MatomoTracker shared] trackWithEventWithCategory:kAnalyticsMetricsCategory
                                                action:action
                                                  name:isInitial ? kMXAnalyticsStartupInititialSync : kMXAnalyticsStartupIncrementalSync
                                                number:@(seconds * 1000)
@@ -165,7 +182,7 @@ NSString *const kAnalyticsE2eDecryptionFailureAction = @"Decryption failure";
 {
     NSString *action = [NSString stringWithFormat:kAnalyticsMetricsActionPattern, kMXAnalyticsStatsCategory];
 
-    [[PiwikTracker shared] trackWithEventWithCategory:kAnalyticsMetricsCategory
+    [[MatomoTracker shared] trackWithEventWithCategory:kAnalyticsMetricsCategory
                                                action:action
                                                  name:kMXAnalyticsStatsRooms
                                                number:@(roomCount)
@@ -178,7 +195,7 @@ NSString *const kAnalyticsE2eDecryptionFailureAction = @"Decryption failure";
 {
     for (NSString *reason in failuresCounts)
     {
-        [[PiwikTracker shared] trackWithEventWithCategory:kAnalyticsE2eCategory
+        [[MatomoTracker shared] trackWithEventWithCategory:kAnalyticsE2eCategory
                                                    action:kAnalyticsE2eDecryptionFailureAction
                                                      name:reason
                                                    number:failuresCounts[reason]

From ed507ff52412e2b7015ba6258b5cefda14de9173 Mon Sep 17 00:00:00 2001
From: fridtjof <2780577+fridtjof@users.noreply.github.com>
Date: Mon, 7 Jan 2019 19:03:16 +0100
Subject: [PATCH 2/7] Document changes done (PiwikTracker ~4.4.2 ->
 MatomoTracker 6.0.0)

---
 CHANGES.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index d61561705..e204657a9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,6 +8,7 @@ Improvements:
  * Menu actions: Display message time (#2463).
  * Reactions Menu: Fix position (#2447).
  * Context menu polish (#2466).
+ * Upgrade Piwik/MatomoTracker (v6.0.1) (#2159).
 
 Bug fix:
  * Registration with an email is broken (#2417).
@@ -52,7 +53,7 @@ Changes in 0.8.4 (2019-03-21)
 Improvements:
  * Upgrade MatrixKit version ([v0.9.8](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.9.8)).
  * Share extension: Remove image large size resizing choice if output dimension is too high to prevent memory limit exception (PR #2342).
- 
+
 Bug fix:
  * Unable to open a file attachment of a room message (#2338).
 
@@ -61,7 +62,7 @@ Changes in 0.8.3 (2019-03-13)
 
 Improvements:
  * Upgrade MatrixKit version ([v0.9.7](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.9.7)).
- 
+
 Bug fix:
  * Widgets: Attempt to re-register for a scalar token if ours is invalid (#2326).
  * Widgets: Pass scalar_token only when required.
@@ -123,7 +124,7 @@ Improvements:
  * Key backup: Update key backup setup UI and UX (PR #2243).
  * Key backup: Logout warning (#2245).
  * Key backup: new recover method detected (#2230).
- 
+
 Bug fix:
  * Use white scroll bar on dark themes (#2158).
  * Registration: fix tap gesture on checkboxes in the terms screen.

From 05e9fb0afcd7c229b4316e7a424a3990f0c087b7 Mon Sep 17 00:00:00 2001
From: fridtjof <2780577+fridtjof@users.noreply.github.com>
Date: Mon, 7 Jan 2019 19:24:09 +0100
Subject: [PATCH 3/7] (Almost) fix the Matomo migration code

---
 Riot/Managers/Analytics/Analytics.m | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Riot/Managers/Analytics/Analytics.m b/Riot/Managers/Analytics/Analytics.m
index 09a4108f8..84bc65b5d 100644
--- a/Riot/Managers/Analytics/Analytics.m
+++ b/Riot/Managers/Analytics/Analytics.m
@@ -36,7 +36,7 @@ NSString *const kAnalyticsE2eDecryptionFailureAction = @"Decryption failure";
 @interface MatomoTracker (MatomoTrackerMigration)
 + (MatomoTracker *)shared;
 
-+ (void)migrateFromFourPointFourSharedInstance;
+- (void)migrateFromFourPointFourSharedInstance;
 @end
 
 @implementation MatomoTracker (MatomoTrackerMigration)
@@ -44,10 +44,11 @@ NSString *const kAnalyticsE2eDecryptionFailureAction = @"Decryption failure";
 {
     NSDictionary *piwikConfig = [[NSUserDefaults standardUserDefaults] objectForKey:@"piwik"];
     MatomoTracker *matomoTracker = [[MatomoTracker alloc] initWithSiteId:piwikConfig[@"siteId"] baseURL:[NSURL URLWithString:piwikConfig[@"url"]] userAgent:@"iOSMatomoTracker"];
+    [matomoTracker migrateFromFourPointFourSharedInstance];
     return matomoTracker;
 }
 
-+ (void)migrateFromFourPointFourSharedInstance
+- (void)migrateFromFourPointFourSharedInstance
 {
     if ([[NSUserDefaults standardUserDefaults] boolForKey:@"migratedFromFourPointFourSharedInstance"]) return;
     

From 47a3618144d4479e14db1689773b0cd60bf1a87d Mon Sep 17 00:00:00 2001
From: fridtjof <2780577+fridtjof@users.noreply.github.com>
Date: Mon, 7 Jan 2019 21:14:34 +0100
Subject: [PATCH 4/7] Removed a comment about why Piwik was pulled in directly
 from git before

---
 Podfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Podfile b/Podfile
index 467fea952..e0e6f35f5 100644
--- a/Podfile
+++ b/Podfile
@@ -63,8 +63,6 @@ abstract_target 'RiotPods' do
     pod 'Reusable', '~> 4.0'
 
     # Piwik for analytics
-    # While https://github.com/matomo-org/matomo-sdk-ios/pull/223 is not released, use the PR branch
-    #pod 'PiwikTracker', :git => 'https://github.com/manuroe/matomo-sdk-ios.git', :branch => 'feature/CustomVariables'
     pod 'MatomoTracker', '~> 6.0.0'
 
     # Remove warnings from "bad" pods

From b466af96314b7ac5f4c9dfe03749e7b4552017df Mon Sep 17 00:00:00 2001
From: fridtjof <2780577+fridtjof@users.noreply.github.com>
Date: Mon, 7 Jan 2019 23:02:03 +0100
Subject: [PATCH 5/7] Complete the migration code

---
 Riot/Managers/Analytics/Analytics.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Managers/Analytics/Analytics.m b/Riot/Managers/Analytics/Analytics.m
index 84bc65b5d..4491c4158 100644
--- a/Riot/Managers/Analytics/Analytics.m
+++ b/Riot/Managers/Analytics/Analytics.m
@@ -51,7 +51,7 @@ NSString *const kAnalyticsE2eDecryptionFailureAction = @"Decryption failure";
 - (void)migrateFromFourPointFourSharedInstance
 {
     if ([[NSUserDefaults standardUserDefaults] boolForKey:@"migratedFromFourPointFourSharedInstance"]) return;
-    
+    [self copyFromOldSharedInstance];
     [[NSUserDefaults standardUserDefaults] setBool:true forKey:@"migratedFromFourPointFourSharedInstance"];
 }
 @end

From 853627fba13459e4a7b56a3440836e89fac9a695 Mon Sep 17 00:00:00 2001
From: fridtjof <2780577+fridtjof@users.noreply.github.com>
Date: Thu, 23 May 2019 21:57:26 +0200
Subject: [PATCH 6/7] bump MatomoTracker to 6.0.1

---
 Podfile      |  2 +-
 Podfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Podfile b/Podfile
index e0e6f35f5..a3b5996a7 100644
--- a/Podfile
+++ b/Podfile
@@ -63,7 +63,7 @@ abstract_target 'RiotPods' do
     pod 'Reusable', '~> 4.0'
 
     # Piwik for analytics
-    pod 'MatomoTracker', '~> 6.0.0'
+    pod 'MatomoTracker', '~> 6.0.1'
 
     # Remove warnings from "bad" pods
     pod 'OLMKit', :inhibit_warnings => true
diff --git a/Podfile.lock b/Podfile.lock
index 207baf23f..c795bbc57 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -45,9 +45,9 @@ PODS:
   - JitsiMeetSDK (2.1.0)
   - libbase58 (0.1.4)
   - libPhoneNumber-iOS (0.9.13)
-  - MatomoTracker (6.0.0):
-    - MatomoTracker/Core (= 6.0.0)
-  - MatomoTracker/Core (6.0.0)
+  - MatomoTracker (6.0.1):
+    - MatomoTracker/Core (= 6.0.1)
+  - MatomoTracker/Core (6.0.1)
   - MatrixKit (0.9.9):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
@@ -102,7 +102,7 @@ DEPENDENCIES:
   - cmark
   - DTCoreText
   - GBDeviceInfo (~> 5.2.0)
-  - MatomoTracker (~> 6.0.0)
+  - MatomoTracker (~> 6.0.1)
   - MatrixKit (= 0.9.9)
   - MatrixKit/AppExtension (= 0.9.9)
   - MatrixSDK/JingleCallStack
@@ -146,7 +146,7 @@ SPEC CHECKSUMS:
   JitsiMeetSDK: 3e66564af7f38a19142338955dd7f581801852b3
   libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
   libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
-  MatomoTracker: f1d0adbe609f8db3740d24e59e16a1855d263921
+  MatomoTracker: 3ae4f65a1f5ace8043bda7244888fee28a734de5
   MatrixKit: 6f553797e1ad42794b5336afb5cecb975ec69daa
   MatrixSDK: ed0d0cee4877955052f19730bb3ee727e01ec948
   OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639

From 863b1a719b1e90a53b6c4ce3fd7ad3ad88fb496d Mon Sep 17 00:00:00 2001
From: fridtjof <2780577+fridtjof@users.noreply.github.com>
Date: Thu, 23 May 2019 22:11:00 +0200
Subject: [PATCH 7/7] update Podfile.lock

---
 Podfile.lock | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Podfile.lock b/Podfile.lock
index c795bbc57..7f3b5e2b7 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -15,6 +15,7 @@ PODS:
   - AFNetworking/UIKit (3.2.1):
     - AFNetworking/NSURLSession
   - cmark (0.24.1)
+  - DGCollectionViewLeftAlignFlowLayout (1.0.4)
   - DTCoreText (1.6.21):
     - DTCoreText/Core (= 1.6.21)
     - DTFoundation/Core (~> 1.7.5)
@@ -100,6 +101,7 @@ PODS:
 
 DEPENDENCIES:
   - cmark
+  - DGCollectionViewLeftAlignFlowLayout (~> 1.0.4)
   - DTCoreText
   - GBDeviceInfo (~> 5.2.0)
   - MatomoTracker (~> 6.0.1)
@@ -117,6 +119,7 @@ SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - AFNetworking
     - cmark
+    - DGCollectionViewLeftAlignFlowLayout
     - DTCoreText
     - DTFoundation
     - GBDeviceInfo
@@ -138,6 +141,7 @@ SPEC REPOS:
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
   cmark: ec0275215b504780287b6fca360224e384368af8
+  DGCollectionViewLeftAlignFlowLayout: a0fa58797373ded039cafba8133e79373d048399
   DTCoreText: e5d688cffc9f6a61eddd1a4f94e2046851230de3
   DTFoundation: f03be9fd786f11e505bb8fc44e2a3732bf0917df
   GBDeviceInfo: 2c65ceb9404f9079264d4c238f5b81916fdfc5e2
@@ -156,6 +160,6 @@ SPEC CHECKSUMS:
   SwiftLint: a54bf1fe12b55c68560eb2a7689dfc81458508f7
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
 
-PODFILE CHECKSUM: c43860700c490d04f7c96ecaa573cd991c27a3c4
+PODFILE CHECKSUM: 16b6518b09d4e3af0af46ed9c1338e9df8674aff
 
 COCOAPODS: 1.6.1