More generic usual suspects regex

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 9407da29411fb8619233008663fe6ebe6c10bb90..f4b51a27362718bf44a96947eea287017d29568d 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1405,15 +1405,15 @@ def scan_source(build_dir, root_dir, thisbuild):
     usual_suspects = [
         re.compile(r'flurryagent', re.IGNORECASE),
         re.compile(r'paypal.*mpl', re.IGNORECASE),
-        re.compile(r'libgoogleanalytics', re.IGNORECASE),
+        re.compile(r'google.*analytics', re.IGNORECASE),
         re.compile(r'admob.*sdk.*android', re.IGNORECASE),
-        re.compile(r'googleadview', re.IGNORECASE),
-        re.compile(r'googleadmobadssdk', re.IGNORECASE),
+        re.compile(r'google.*ad.*view', re.IGNORECASE),
+        re.compile(r'google.*admob', re.IGNORECASE),
         re.compile(r'google.*play.*services', re.IGNORECASE),
         re.compile(r'crittercism', re.IGNORECASE),
         re.compile(r'heyzap', re.IGNORECASE),
         re.compile(r'jpct.*ae', re.IGNORECASE),
-        re.compile(r'youtubeandroidplayerapi', re.IGNORECASE),
+        re.compile(r'youtube.*android.*player.*api', re.IGNORECASE),
         re.compile(r'bugsense', re.IGNORECASE),
         re.compile(r'crashlytics', re.IGNORECASE),
         re.compile(r'ouya.*sdk', re.IGNORECASE),