From 3c398e2aa6af89150b6325d21958f6a9c330dce6 Mon Sep 17 00:00:00 2001
From: Mike Hardy <gitlab@mikehardy.net>
Date: Sat, 2 Nov 2019 18:40:58 +0000
Subject: [PATCH 1/2] remove redundant google analytics match

'google.*play.*services' and 'firebase' will catch both manners of including analytics I think
https://developers.google.com/android/guides/setup#split
https://firebase.google.com/support/release-notes/android#latest_sdk_versions

This has the desired side effect of also allowing the libre analytics library
'net.mikehardy:google-analytics-java' and 'net.mikehardy:google-analytics-java7'
---
 fdroidserver/scanner.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index bc07f8a9..acc19e72 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -61,7 +61,6 @@ def scan_source(build_dir, build=metadata.Build()):
         exp: re.compile(r'.*' + exp, re.IGNORECASE) for exp in [
             r'flurryagent',
             r'paypal.*mpl',
-            r'google.*analytics',
             r'admob.*sdk.*android',
             r'google.*ad.*view',
             r'google.*admob',

From 3648ef1f2e21fd9e9853e7af87109e8f7825e06c Mon Sep 17 00:00:00 2001
From: Mike Hardy <gitlab@mikehardy.net>
Date: Sat, 2 Nov 2019 18:54:54 +0000
Subject: [PATCH 2/2] Update scanner.TestCase to match new regex regime

scanning for analytics is now handled by firebase/play-services regexes
---
 tests/scanner.TestCase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/scanner.TestCase b/tests/scanner.TestCase
index 22f9417b..6e94d5fb 100755
--- a/tests/scanner.TestCase
+++ b/tests/scanner.TestCase
@@ -30,7 +30,7 @@ class ScannerTest(unittest.TestCase):
         projects = {
             'Zillode': 1,
             'firebase-suspect': 1,
-            'org.mozilla.rocket': 4,
+            'org.mozilla.rocket': 3,
             'realm': 1,
         }
         for d in glob.glob(os.path.join(source_files, '*')):