From 77e37b9460441033c19756d8e75b681c087cb615 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Fri, 16 Jun 2023 15:21:06 +0100 Subject: [PATCH] JAL-4001 Remove jgoogleanalytics code and jar --- j11lib/JGoogleAnalytics_0.3.jar | Bin 8300 -> 0 bytes j8lib/JGoogleAnalytics_0.3.jar | Bin 8300 -> 0 bytes src/jalview/bin/Cache.java | 158 +++++++-------------------------------- 3 files changed, 28 insertions(+), 130 deletions(-) delete mode 100644 j11lib/JGoogleAnalytics_0.3.jar delete mode 100644 j8lib/JGoogleAnalytics_0.3.jar diff --git a/j11lib/JGoogleAnalytics_0.3.jar b/j11lib/JGoogleAnalytics_0.3.jar deleted file mode 100644 index 0dbc98ccc90f081e9c471d2b936efb3dd9f9f6e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8300 zcmbVx1z42Z_Wno+BF!Kj(v2XEv@}Dvgv8Lz&>&KyFi4klGc;1tNFyoTAl;EoEp(L_I{ZdO3JHBBWBab8Dig(nZS&mP%|8`&Azct9*o{&YwE$GfoQv7Y;k z2mlxj(nq*-OiRO#{o@4 zp@B$m=OT!gUuVb~3W%d>jmnT;*5S=xL~ke{rnu&Y`)q`7nV#x?NTH%TTb*w#tT!K= z(x3Cay*#!D9J}Wlqq(Vd8;Rwtl2q@}mcgl@^*gnL+ znRjxQkNq%&C-7I;#bYDn&_X#v26jb^Ysi=diLd1dbZQ0ONau@l@<0;Cs@)0I&f1p zXN&8=XZS~w7Fyrc80rquA{SN~tt$;Wk&4w~Oo$mSxO7DPrto^;Q6Ve>6o9kB0XCq_y$$O= z1UzF)nV?A@Z^i~N)dar~J5Z&3HjpU|&mT_8OGu*jUq+O3lnuliX@Ft}-=xVrj_KYJ z?YM8b2CQwy_Hqny*WiT{JXl8h{8+siUy??J%F8ZLhwZh3YM~2Zl^bshfkIUUs=8(|lrlvgeJ88^_z8z*{J2uk(TBuI&($C5< zJl87H^Y(Q)tBN5-PoF1+v+{vAC5%;VKs3~0?X$7vH*qAJR1~#5;;C;G-K3=?U7So| zNb_Fun@k?$(YZ%2*P^~%V=`i;?V>g-ty>Pr^fOW?`Q)wTwKvEmPRKgHi`dRSpW;uH zU$@dch;6^V;QoVze)57jsZO}*eE@(H*^oRxw6L=%m3^Qzrl! zsdcDpRq)Z#MR)YYDa7fNo72s_@qVw+X{Pv$p5pki2(<{!TCK(yD>ST^pWk8LYr$*Z zEA6t$E&t}^vb5>`m!Lu8$#7YWW}R?D@p!OY5Kfzbsi_GXFRLDp)b{%=W?s8l>;Y8{ z5(x}Ca4mx-KfW{Z4j~V9Rtt^*`@@u5O*pf>K|o$cx{+90CX^PVmzd4+EXBR1XwlNo zQ>qOgV=!ccAESBVpaDv-@(o68Fzlew)=PYoz7&p&I(N$m6>utre%{P^tKjUdPRT1jFm3wZ4{LZhs zG@H!XWjPaUj*=XjPszbq$i9)EeD^@jh2ovagKO6+Hxu{HHs1QPnq>JP=0TOPKu&@l zP$uhO6%0Pt`4L-t@j?6z`mHV3&iBlMEbf|Y+*`dH%1Mq#^Oin}=;7MctKXR>=jtAL z7H8Xvi_xG~xwe=0j|9~+j*yMyIlVdv%UGv_OhoxGgt|Y~G-x?UNweG-fAd~%BaZom zphyq;1zq&CZ-=u@>%BkaMSvSVWYxNT1KbKZjx#xy%th+-{n|9{)noCZBNS9x5CLE0 zBVd&(L}#AFrlC_%tJ-BzeHEqG($5GtTrO&U(my)_2F-ty(i&^2M$?M7wv-OlOBmkL z#9?T!6)CF%v2)uQ(!hQE@g2NBKUo)=H>48Y2I{quR??W0xy6TM^Sv_xC^1+h95$Rw zo@m&F6-hjU0pb=o7!decQ=#E8xBMt$MftC zAk>RT?-sq^Gc$ZBm?BT1;9B*qyLrZ$lIw{chjLKAd;6_&`t@#T;0Qa`Hp+Uggjwp6 zZ)`Cn;HbZeo_g0%*?!8)hF6}NG5(x4_H$}n<29?$b(3p|u7O!>yEb+0io7DN*V(#Y zHKRqpc8R6CE$b!9m7C*4&l)FH1=){ z+?hv}{uybOvoV=R)|*55ItG$0O@acY8~M${m34VKZLXTO&Ywx*YFkg%M1w0aAF5R3 z@|t~C$WAymec07OG{5_Z3%*TmPI8z@8l9V>QkFOT>3q{;th?rwZlQ-FrAk>< z)e>s)YS5X=@yh);dbRwuTvKm|Hn!sYeIx5yQE2TqFlWho^RAA~_FDznMu)F)pL|Va zP)IC1sIC;3#BKs7v5--)C1XQrZocG4MXrrhDv^AVFZc>)mvSldB7>yGOe0 znOv{)Tp3iC<%2BemAOS+FmtLWk$o*Np0ckk_KkRy-CHR@Z`++Xl&aN`h2vSE?z2!S zE|a&zC2WmAYx2ZrdzCklEewKYbXw=s5Dfh^@A+!IZB9BX4o&ax zvd6lLJxuC7>nA)s42qU1VDv%C3y>+mJWNJoD7_-shP};^#U%-OE6v$Bq2l}snFI!( zqu8{#r5L5+(eGM24sJ)QCJnI*r>lPSVR!Zfj;f^`UlTs_354@q(gv$C7#hI?g-FXJ ziPt^NK7I4e??t0n!KSmRy~_U+-Kjq`0M4hE|{CV`!7` zkYa9r`{+=07S+c*(*+&ls6rtmseEO1DeB`irvdu1ch*t-avu`w%c9B3U}RtVFXA!z zx{?(+3w6eu+olaoR}GE&4Z&m0J&Cu;8mAcB*Mer3Ug%61gsOL|O{V`_d3eIPYJY@R z3^{*iOd(%DSGI3VFCnegyOf@11ID3a!^L`^_?AP4k4VX}nCs%lRZWIYFdrTFC%!u$ z#?joP7B~Su;y`kOt>=vpp zPoA&r;_&;mm}$&X5xRR@L(grgNgVR9$kv0&vXzz?YgyUO#BMH7{xhB7yL&LzA_D+U z4*>wK-$`dO>gvkUU18Y2b)rU$)v69AiKlDF^RCkAOrJIX^BdR2N$^? z@)_X0oj{%-;bfaw0DL4L?OH zXS~)9{>;$&?txw_7apVj)5_71=+K$P#d2nKwUlwGDvu-P+>|lajL+jKi!QS$h*+R` z4#t)dd&P&#Z=#{XiK%JB#R)vI!$E^)dh#GEP1PM|@$jcfm9#s)Wd$wTJKtXKg>DQK z@w3iufQV(+;ekD`m6=~$D)$1lve$B z-z8cym!v7w5wZ5l%2;SP0+iqz9TiNe&t+Q2zt{4mroP8n)o_s`g}amNKPf=K*Bxa| z;^}eM>hN+m>_DlJ!UG9r>m2Ifqu@k2>UX@Ud3+C-$@6N;q^;OISdiU~Katd0n57kN z!X)*iV2Rqh&-0~L!5LDQyLIb$vE7AL*(;{2drmI!GhkZ&nVvgmpc?K;3bBKHIlEz$ z^p#!1Raj03`)~!DNHpjhk=Rrd4q5Nw)ez*_z}JCnwR|3Y6NLE&*>m_A!bIQ^2~$(M z7Ow7oiWZUKQy?DHaY!$7J>!iv{eyRs*CuMtD}6~ZTx}92$kCIo(+JECb=odq+iJ0x zepjXU{&4H)K;4rzOBk{(KQsFN?GknLQo?!IH0~sDsK!95Lai>+!EA2A-*&9$)UMmd zMyJ<|3C#9xdqfuY>X_pQX#jSbIrM0EOPJ}L;XEWWb8$C`u<86EO;^RaaSQG94d-1A zcF(%Xj2DPxU^4yjro}hjF+-i<8U!M#8Wxhg;yX!C-0&wmuWzD!NPKM!N*Xg==FZav zncJTQNsy+k?J+pwCl>~!h=|p#&iiyqKHSvYnu50N^++zFdIH>NC#PzbT)G{vB|;kpD&NW_*3AWr37g%S@Cx$mbBYxT~N!9Ql)_z8p&je0am6qly9 zCT$GPL9k2>C2mr6+3fpNFB03oGB0YuZjd%{%3!`Ui7JR9#Dp1`uMV(YVqKKQ`%GbC z+|x6G1T|ZYM<+MqE<;$hb1G9vHDZeAC68+dxNV3YxE5!CD`%ox#_blW(W~7qU4bk` zK&dLHZlX(>@fvhjSMvjlh_(`m)JIBqHy3d;-f&mEvGwOEYHZ%|`DuUkIgU8dd=IGzLr>05zK~5bzaCN9btHHwTCcnr0?B)IEolrguntbXV>71=I-gI7xpdqdr{` zs_D|V3##$X+I1E(iEL!lX`C6*;`d-TA_nCEe zKtWB46!AJ_gRj(#0Ky3qU|WjfjDOm_91>PolbeyA(VcGZp}D~;G=o8?NgT&p1Znsf zNpbE+co8c$c7y&llPk$}L;0>@jhZl^QG$ebX7R z&PeROGMJ(F8PAK}hx*~haj}qSi%p3lYhV=KFIk2{xe<9CVHqdk#%2i`IO?Q(Crl;` z%dm7tTcv5S=awv^V=j9N1v2ly#?g9Qj23{Y_Tkc$|E>UZSWO~>1aagD} zUf*jA#xaNt(^pvAKno>(V1 z(ynh9iKEieY0CmOg&qsh0aqIE9}?D=Q2QbE$LN2`KV$hWywwA2cl*ypE5u?h3A<|- zenbZVe)La&bPfN#C-`4ozQ0+tKP#E4xP3JeNy4sX5=sI#X!don|l=HWeZ<^-)Fwk>3QF_w^};0*)ZHG80`df*{nAXudo?jE8s zL?{YT+m!rTvKGp`-}{r%EIL%G>wB2@yDM-@|J$b0P0&0kj@U^5Ej%JxAF7EWt>pSyp4&#LR&gMkVf2tZVjV-W zp68I8FEE*U1s)QtvWE`E<*G%=&=1dBva1Ue^v)hbqIt4Ewm?z!!TT101tj;YP}K5) z0W2bHY(!gfCfFJAN_3KOuAr)Es-I@5Tb&S_B9OZ=q<&l-h5b*lS1aWvQJhj zrB}8Psj!3l?fKUkt=JSIhx@XjVAEc}%Y`+7V%Qcww~?u|$5|y?67b!SH<4_^aJY=TB5D^WciB(^XktD42zo=5?vLLMvXX2zy# ziWY=xj``-~X$y`a-ewBxO2PfEK0P=W^IwQP`hZqKC!!op@hKsOfOS!ZL?`;2ZV?}+ zgit0sAuMfJHOD0s7#+2sMWnHe0*)ZM9>UiEvufzzv}}c5-+Lqy=-C(AjSa$fj?#SM z;!l$ANbOXCbV|ObRf}AkFY1qgmrH0lR3h>Gtxr&agdS_wi?>6*lsET>0GN)&1}>?X zT?oam4g;++a}z(UyHjd3!}E!ODjZhu+-bGai${$wKDZP4ys0r@KMO^g*zmdz{HhFc zfHM(dyV+|v7y)XJJ(%o{~Nv_3jO5&w<9 z7jc`k{Im>iM^j<|)>nz(&ouK+vlOQ{&kO-P44f-Ox#+b#l^@5op&jKm9r_Neo=dSG zK}s`Y?=w(ivz!zo&@wrBna47Q#QNkVfL8Ue8c*_lx0>T3Eg0W zjTYYF!&{=Zol~!Z7qr)bevieTM{$NmAoz7fN^k}Xm;Xz_`Pph!mg?Z|xSK4+Jpe%9 zcP9O}ebu0_Mmq!!>_GDe4p*p*AR6*T3u80^CROE>=ScqZ>ozQDeL4b{RC{9#?f`PM zMfqriY@3SV9bQ4_#uRqI8X-L)9U;zr58IuIS4lXUmbtSkD|@47ohZVdDi-UNU>&&` zq^t&QL5)i#^PaL~aL`p`YmX{SAFhxe9~it|wrXEeb8&qhC#+h5XjJL!lH+d6f|rYP zZDHMRZEE^*uHhq3>(YXhQbXWG^B0go8JZ75Mu4k;e(S?J(OIEyS>iIfWC4Q8^7jyc zh<~pZ-aVnafeqLd`*Ho3Aox=|{KNIH)x#eSKSs76^WFJhuK%Vb{x9$!YTeKA1N{2# z_NR9D2j*SGU&PHH>fO)r!{f*M{WWj@FT5XW-k;u}zwrLAtp8`YzgGAD2$<~``a9u% z)%t!7|EoywXZY;9;`-OQ{@1VlrLO*;lEJUgzczIKgm%6wk^Z01f6?Cg72(%?!k-AQ zaDM~gZwj!#+%^0P{cE-NC-hVN|9|M8?D#9zuax^I7BTT}VEq*V{|fOd!Tkw=Me-XE ae@l1D^2m1z6##&K_hGvGce0TF`1XINdVo0q diff --git a/j8lib/JGoogleAnalytics_0.3.jar b/j8lib/JGoogleAnalytics_0.3.jar deleted file mode 100644 index 0dbc98ccc90f081e9c471d2b936efb3dd9f9f6e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8300 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 ae@l1D^2m1z6##&K_hGvGce0TF`1XINdVo0q diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index fc9ddda..8015cd5 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -954,143 +954,41 @@ public class Cache } /** - * GA tracker object - actually JGoogleAnalyticsTracker null if tracking not - * enabled. - */ - protected static Object tracker = null; - - protected static Class trackerfocus = null; - - protected static Class jgoogleanalyticstracker = null; - - private static boolean useGA4 = true; - - /** * Initialise the google tracker if it is not done already. */ public static void initGoogleTracker() { - if (useGA4) - { - GoogleAnalytics4.setEnabled(true); + GoogleAnalytics4.setEnabled(true); - String appName = ChannelProperties.getProperty("app_name") - + " Desktop"; - String version = Cache.getProperty("VERSION") + "_" - + Cache.getDefault("BUILD_DATE", "unknown"); - String path; - /* we don't want to encode ':' as "%3A" for backward compatibility with the UA setup - try - { - path = "/" + String.join("/", URLEncoder.encode(appName, "UTF-8"), - URLEncoder.encode(version, "UTF-8"), - URLEncoder.encode(APPLICATION_STARTED, "UTF-8")); - } catch (UnsupportedEncodingException e) - { - */ - path = ("/" + String.join("/", appName, version, APPLICATION_STARTED)) - .replace(' ', '+'); - /* - } - */ - GoogleAnalytics4 ga4 = GoogleAnalytics4.getInstance(); - - // This will add a page_view similar to the old UA analytics. - // We probably want to get rid of this once the application_launch event - // is being processed properly. - ga4.sendAnalytics("page_view", "page_location", path, "page_title", - APPLICATION_STARTED); - - // This will send a new "application_launch" event with parameters - // including the old-style "path", the channel name and version - ga4.sendAnalytics("application_launch", true, "page_location", path); - } - else + String appName = ChannelProperties.getProperty("app_name") + " Desktop"; + String version = Cache.getProperty("VERSION") + "_" + + Cache.getDefault("BUILD_DATE", "unknown"); + String path; + /* we don't want to encode ':' as "%3A" for backward compatibility with the UA setup + try { - if (tracker == null) - { - if (jgoogleanalyticstracker == null) - { - // try to get the tracker class - try - { - jgoogleanalyticstracker = Cache.class.getClassLoader() - .loadClass( - "com.boxysystems.jgoogleanalytics.JGoogleAnalyticsTracker"); - trackerfocus = Cache.class.getClassLoader().loadClass( - "com.boxysystems.jgoogleanalytics.FocusPoint"); - } catch (Exception e) - { - Console.debug( - "com.boxysystems.jgoogleanalytics package is not present - tracking not enabled."); - tracker = null; - jgoogleanalyticstracker = null; - trackerfocus = null; - return; - } - } - // now initialise tracker - Exception re = null, ex = null; - Error err = null; - String vrs = "No Version Accessible"; - try - { - // Google analytics tracking code for Library Finder - tracker = jgoogleanalyticstracker - .getConstructor(new Class[] - { String.class, String.class, String.class }) - .newInstance(new Object[] - { ChannelProperties.getProperty("app_name") + " Desktop", - (vrs = Cache.getProperty("VERSION") + "_" - + Cache.getDefault("BUILD_DATE", "unknown")), - "UA-9060947-1" }); - jgoogleanalyticstracker - .getMethod("trackAsynchronously", new Class[] - { trackerfocus }) - .invoke(tracker, new Object[] - { trackerfocus - .getConstructor(new Class[] - { String.class }) - .newInstance(new Object[] - { APPLICATION_STARTED }) }); - } catch (RuntimeException e) - { - re = e; - } catch (Exception e) - { - ex = e; - } catch (Error e) - { - err = e; - } - if (re != null || ex != null || err != null) - { - if (re != null) - { - Console.debug("Caught runtime exception in googletracker init:", - re); - } - if (ex != null) - { - Console.warn( - "Failed to initialise GoogleTracker for Jalview Desktop with version " - + vrs, - ex); - } - if (err != null) - { - Console.error( - "Whilst initing GoogleTracker for Jalview Desktop version " - + vrs, - err); - } - } - else - { - Console.debug("Successfully initialised tracker."); - } - } + path = "/" + String.join("/", URLEncoder.encode(appName, "UTF-8"), + URLEncoder.encode(version, "UTF-8"), + URLEncoder.encode(APPLICATION_STARTED, "UTF-8")); + } catch (UnsupportedEncodingException e) + { + */ + path = ("/" + String.join("/", appName, version, APPLICATION_STARTED)) + .replace(' ', '+'); + /* } + */ + GoogleAnalytics4 ga4 = GoogleAnalytics4.getInstance(); + + // This will add a page_view similar to the old UA analytics. + // We probably want to get rid of this once the application_launch event + // is being processed properly. + ga4.sendAnalytics("page_view", "page_location", path, "page_title", + APPLICATION_STARTED); + + // This will send a new "application_launch" event with parameters + // including the old-style "path", the channel name and version + ga4.sendAnalytics("application_launch", true, "page_location", path); } private static final String APPLICATION_STARTED = "Application Started."; -- 1.7.10.2