From 7a7e96388b4a1fc9c93f84b6cadbab3e220a142c Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Thu, 2 May 2019 07:06:42 +0100 Subject: [PATCH] Replace Mixpanel with Firebase (Google) analytics (#535) * replace mixpanel with firebase analytics * add encrypted google-services.json file --- .gitignore | 1 + .gitsecret/paths/mapping.cfg | 1 + app/src/component/fileDownloadButton/view.js | 4 +- app/src/component/fileItem/view.js | 4 +- app/src/component/searchInput/index.js | 4 +- app/src/index.js | 4 +- app/src/page/discover/view.js | 6 +- app/src/page/file/view.js | 12 +-- app/src/page/splash/view.js | 4 +- buildozer.spec.sample | 2 +- buildozer.spec.travis | 2 +- buildozer.spec.vagrant | 2 +- lbry-android.keystore.secret | Bin 2736 -> 2736 bytes .../bootstraps/lbry/build/build.py | 8 +- .../lbry/build/templates/build.tmpl.gradle | 4 + .../templates/google-services.json.secret | Bin 0 -> 1025 bytes .../{settings.tmpl.gradle => settings.gradle} | 0 .../browser/reactmodules/FirebaseModule.java | 80 ++++++++++++++++ .../browser/reactmodules/MixpanelModule.java | 87 ------------------ .../reactpackages/LbryReactPackage.java | 4 +- 20 files changed, 114 insertions(+), 115 deletions(-) create mode 100644 p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.json.secret rename p4a/pythonforandroid/bootstraps/lbry/build/templates/{settings.tmpl.gradle => settings.gradle} (100%) create mode 100644 src/main/java/io/lbry/browser/reactmodules/FirebaseModule.java delete mode 100644 src/main/java/io/lbry/browser/reactmodules/MixpanelModule.java diff --git a/.gitignore b/.gitignore index 37caade..47509c2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ src/main/assets/index.android.bundle.meta lbry-android.keystore p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.json .gitsecret/keys/random_seed + diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg index dba9043..3c5cb73 100644 --- a/.gitsecret/paths/mapping.cfg +++ b/.gitsecret/paths/mapping.cfg @@ -1 +1,2 @@ lbry-android.keystore: +p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.json diff --git a/app/src/component/fileDownloadButton/view.js b/app/src/component/fileDownloadButton/view.js index 985a3a2..c326016 100644 --- a/app/src/component/fileDownloadButton/view.js +++ b/app/src/component/fileDownloadButton/view.js @@ -73,8 +73,8 @@ class FileDownloadButton extends React.PureComponent { text={(isPlayable ? 'Play' : (isViewable ? 'View' : 'Download'))} onLayout={onButtonLayout} style={[style, fileDownloadButtonStyle.container]} onPress={() => { - if (NativeModules.Mixpanel) { - NativeModules.Mixpanel.track('Purchase Uri', { Uri: uri }); + if (NativeModules.Firebase) { + NativeModules.Firebase.track('purchase_uri', { uri: uri }); } purchaseUri(uri, onStartDownloadFailed); if (isPlayable && onPlay) { diff --git a/app/src/component/fileItem/view.js b/app/src/component/fileItem/view.js index 3ca2f77..c4b60f9 100644 --- a/app/src/component/fileItem/view.js +++ b/app/src/component/fileItem/view.js @@ -36,8 +36,8 @@ class FileItem extends React.PureComponent { navigateToFileUri = () => { const { navigation, uri } = this.props; const normalizedUri = normalizeURI(uri); - if (NativeModules.Mixpanel) { - NativeModules.Mixpanel.track('Discover Tap', { Uri: normalizeURI }); + if (NativeModules.Firebase) { + NativeModules.Firebase.track('explore_click', { uri: normalizedUri }); } navigateToUri(navigation, normalizedUri); } diff --git a/app/src/component/searchInput/index.js b/app/src/component/searchInput/index.js index a7cefcb..5469f35 100644 --- a/app/src/component/searchInput/index.js +++ b/app/src/component/searchInput/index.js @@ -5,8 +5,8 @@ import SearchInput from './view'; const perform = dispatch => ({ search: search => { - if (NativeModules.Mixpanel) { - NativeModules.Mixpanel.track('Search', { Query: search }); + if (NativeModules.Firebase) { + NativeModules.Firebase.track('search', { query: search }); } return dispatch(doSearch(search)); }, diff --git a/app/src/index.js b/app/src/index.js index f8dff4e..6c5892a 100644 --- a/app/src/index.js +++ b/app/src/index.js @@ -43,8 +43,8 @@ import thunk from 'redux-thunk'; const globalExceptionHandler = (error, isFatal) => { - if (error && NativeModules.Mixpanel) { - NativeModules.Mixpanel.logException(isFatal, error.message ? error.message : "No message", error); + if (error && NativeModules.Firebase) { + NativeModules.Firebase.logException(isFatal, error.message ? error.message : "No message", error); } }; setJSExceptionHandler(globalExceptionHandler, true); diff --git a/app/src/page/discover/view.js b/app/src/page/discover/view.js index 32e8674..4bf95f0 100644 --- a/app/src/page/discover/view.js +++ b/app/src/page/discover/view.js @@ -34,9 +34,9 @@ class DiscoverPage extends React.PureComponent { AsyncStorage.getItem('firstLaunchSuspended').then(suspended => { AsyncStorage.removeItem('firstLaunchSuspended'); const appSuspended = (suspended === 'true'); - if (NativeModules.Mixpanel) { - NativeModules.Mixpanel.track('First Run Time', { - 'Total Seconds': delta, 'App Suspended': appSuspended + if (NativeModules.Firebase) { + NativeModules.Firebase.track('first_run_time', { + 'total_seconds': delta, 'app_suspended': appSuspended }); } }); diff --git a/app/src/page/file/view.js b/app/src/page/file/view.js index f032d5d..d24d614 100644 --- a/app/src/page/file/view.js +++ b/app/src/page/file/view.js @@ -88,8 +88,8 @@ class FilePage extends React.PureComponent { this.fetchFileInfo(this.props); this.fetchCostInfo(this.props); - if (NativeModules.Mixpanel) { - NativeModules.Mixpanel.track('Open File Page', { Uri: uri }); + if (NativeModules.Firebase) { + NativeModules.Firebase.track('open_file_page', { uri: uri }); } if (NativeModules.UtilityModule) { NativeModules.UtilityModule.keepAwakeOn(); @@ -301,12 +301,12 @@ class FilePage extends React.PureComponent { const { uri } = navigation.state.params; this.logFileView(uri, fileInfo, timeToStartMillis); - let payload = { 'Uri': uri }; + let payload = { 'uri': uri }; if (!isNaN(timeToStart)) { - payload['Time to Start (seconds)'] = timeToStart; - payload['Time to Start (ms)'] = timeToStartMillis; + payload['time_to_start_seconds'] = timeToStart; + payload['time_to_start_ms'] = timeToStartMillis; } - NativeModules.Mixpanel.track('Play', payload); + NativeModules.Firebase.track('play', payload); } onPlaybackFinished = () => { diff --git a/app/src/page/splash/view.js b/app/src/page/splash/view.js index 3365adc..1df1e39 100644 --- a/app/src/page/splash/view.js +++ b/app/src/page/splash/view.js @@ -254,8 +254,8 @@ class SplashScreen extends React.PureComponent { } componentDidMount() { - if (NativeModules.Mixpanel) { - NativeModules.Mixpanel.track('App Launch', null); + if (NativeModules.Firebase) { + NativeModules.Firebase.track('app_launch', null); } Linking.getInitialURL().then((url) => { diff --git a/buildozer.spec.sample b/buildozer.spec.sample index cb4aec9..2a10e12 100644 --- a/buildozer.spec.sample +++ b/buildozer.spec.sample @@ -148,7 +148,7 @@ android.react_src = ./app # (list) Gradle dependencies to add (currently works only with sdl2_gradle # bootstrap) -android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.59.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828 +android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.59.3, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828, com.google.firebase:firebase-core:16.0.1 # (str) python-for-android branch to use, defaults to master #p4a.branch = stable diff --git a/buildozer.spec.travis b/buildozer.spec.travis index cb4aec9..2a10e12 100644 --- a/buildozer.spec.travis +++ b/buildozer.spec.travis @@ -148,7 +148,7 @@ android.react_src = ./app # (list) Gradle dependencies to add (currently works only with sdl2_gradle # bootstrap) -android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.59.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828 +android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.59.3, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828, com.google.firebase:firebase-core:16.0.1 # (str) python-for-android branch to use, defaults to master #p4a.branch = stable diff --git a/buildozer.spec.vagrant b/buildozer.spec.vagrant index cb4aec9..2a10e12 100644 --- a/buildozer.spec.vagrant +++ b/buildozer.spec.vagrant @@ -148,7 +148,7 @@ android.react_src = ./app # (list) Gradle dependencies to add (currently works only with sdl2_gradle # bootstrap) -android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.59.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828 +android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.59.3, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828, com.google.firebase:firebase-core:16.0.1 # (str) python-for-android branch to use, defaults to master #p4a.branch = stable diff --git a/lbry-android.keystore.secret b/lbry-android.keystore.secret index 3768f7c991b1b014e63663ca7b5df19dd15c1423..ae36c4be00887bbdc8a015cb49598b0225c8a27e 100644 GIT binary patch literal 2736 zcmV;h3QzTg0t^G$jRG(+f;S!k5CEjJ46L8mDb`qHqIc4TQP)bD%VcoWXVt{N=FA@^ z2!iu;tWF|x)zAfz#jUMBti;VIQ0BV!Tt(tLHNkJV9UW7SGr8(p-}K!0CZmFh9#{1d zX1Q5@ng8dpU?|;DJ<9f7eRW<_zV^Z%}qehaI8{KmfJB zG;;G#qLqt#?o*&X%`he``OY!nzn|qm^Z99fXSWl)Ww2*rdGiA7ZL|A0hQ`RW$I9HB zE7?wFzz&(kcx6}+t4=}&tj)qj#5Ykh7V+z~P9}vG_X75~IfvZJ%0KYVryA>iw!Mij z24u__c)7%?ujaj~;ylyzo``gygl<6rONVpQZj3zmPA$3)oMM!@WA0$EOZhj<+&58O zesoifK&!E?$b0b5gC!E9=7dH5Qdhlr?ZBKXpfW^u+aIG#q#ktEJ6W+CrECpoq6W}Q z!mKfkmv|KnkyZ%WLaPyJS6H}18xAMk79=9`{qTz)4*A)S5OZx!KSBU2wROQty_-H6 zV*@y&>2_6bG3}ar$;h}o;2!!blOpzUE0PoYq;_zmUiLFD^b|*9bW9xu%iacF&k$EuDBs7uSh*_3%3LPCh8Cq;Z zGC;3XK~c4iWN$PsdNGl@WM|;_vP0<2zp72f%T8KV_7x^hz3XRjOB<$1m z6N&=WMHG5*-_o@&Bto?h^Ooq;q^p#FzKdh0Bg}*I0NSeG}!&xRvl>UQGUt>Ud>sc;JYjy?r+XW9#|w zDr{2k6D5vnQM5Ko+)(V|@*AL}>srjcEH7@N zg@Qkr+90y>O#pqv7^*+H5KY;5%yX!;bE6<_tN2b1Vl11Ib8 zHSC$6wc#8OP=KIL8Wl$1m4Fciog;eiTP;_Sy;te8)f53^l~siY{*ogiZL2KOjP(f} z2G41IcbxY!IWA@#;4X=_1tj1jbXes5ZnCM|xPFdls<|}8e3~4+@NILCch73Ae?^I1 zAqK;tzZVM+K!9Ud4@AIu6zQs~0~6_lq*Jn6A_?fMv2NONV`*~Yos`72QOR#Weunly zFQlD!W;Q~18|f?sEfhczZ#dc&TMd?pYnVBL18IFUF(E}?9%Zhm3mIk$w*4$I-D$oN z+rFEhXN*Rex4%JA(k}U1-9|76N*vo`*~MIUMjLKX zoB`_D|K-!Rf2zVWBV>$E{Qk?nftK*Ki3hvhSc&F7$sl(cRTI0y6VlBcl5RyIEHm zECc+Buqs_F2L+?JI@N7OploF}C_k zA+YU1h$F;qYZkr9$?RFyQ@VmC|+bodb{R6D&{uv%%`u0%b_XEFVc7P=JuU1w17%}>EW+v=@>}~NFRg)&?zf#$a zl=))9yRWYuBigXimxuTWiE>%%eh7V&eX>eDWEDpK(1lCHf536^l|*`JsO#kWxaezS%(lCWFuVbQDPpxr{WEg(HbF2IbWr29I9?yoKvxac^RqMCsSxdkH1(i zeke+_#X1Z*ekV$vU_qXx9-%L{r(xTfD%RV5{{+)0X_$LW8F9iOfoCo*_~RZ{K3ndQ z1(U+XqU5Ml?BBa0^rD8d*QoTmYI<4%Tb4OVUUhK9&dWtDLG6NLBxUAd{bApEvf4(c z(l!Y0Eqf-{!m9!MJx`TT#c;a_s^o-=ZrqK^gqfd$ZNd86ddh5Zmfe8ejU0R_T377J z3)d(+;L*?eypp8_&D*m^2&BSSx1cV4n;ZeDK5skiElw3i*(M=T#Tld+m!o;7QKX~B z#i1*x*tgkS6%G%XcQksyWGV2i6<_&1dCjVyuz0yr@^Joha9S^wmn;2O2S^?j`y|~! z5h=*2UcfjnrtiRY7Q_br1=BbZOOk@{$Y0}!gy7PXR9_#i71l<8_m#AWeXxwe!%Iz@ zPuJisnA;8uvOyL>rQ*D1o);Cp)7AZRYdMzM)?1pM#k)^g@4&Hbxl3T50jsNIWTZ{$ zDr5G2$XNk*fsD$`<;?Ug^Rad76-$y?p>g(iDS4X-vu}b17(rY|zR`_4YRb39%=>N9 zhS*39@(1dF=LyQ(RQSpSPLb-0_8TWX#_X(QGBQ0n9I`fX_1>F- z%2(D#Z*Y7U#+n-u(z zRB9qO)YAmfn=2J1$EdpQ!Yct2)_Uq*LTH@foYI#>@9!~_a_oo=3eZBT7Ls??)mx8jHsQs0+QP6wh7}#pjjlApmYSQH*xzPP zEoq$m^oy_(A9P8pos+4TM2>@b&TA)=#e9ys^oK8us92Jxo-8h-Gk`Wu(H6dG6LTzZ zZNJ${Y(#_z%aybm^HuR-~Ba$_0i7t4!#3N#IfXja8 zU18wZoy2qS&y*}P_*rbIaX6XeBJ#oqrdz}eImjTg0<1Xh6&sCJCK0KVIWdG~ppOrF z><=pv{n^GUK*gDfE-pI5^oi?I?h}J-%F@(j;pSQ>ZC_h+2g2A+Uh#s!90@CPDy0@g zP;v9o%gw&w`2dTIx!zTiA6FvB+BgEZ9Sac`K9h(TrC{W*gSQDsmka$b`~hWn_%mnm z+i2kIGql*dapIx~)nRX}DDrB-pE9FmRoV}xNUIdrW>qY{kjR6l4aPg!0mc9ryf|)( z(rvgw@*O`743w8kMRN7l*EdrwhT}~SCmumo;KS^%+>If&k7HI>+BbKEMzmU5xHY>T*OesWcuEZO@?CcCnc`Ikia;k6yGZFLz!yB91ypTic850w(E_+svS6>std-Mf(`49E>$imdHQ`>|PTA z5tV?wNJ!E1nX6D^$9FU_Bt$* z6wiF1Y_D9Y%<}qWV^D!q50||v)F9`d>5=0&fDB9AtUi2PQ_MKo>Cj<}0L1!~ss-kM zM-hZI%T7$EYjKr{8@zX!TuyjN2!gD!j*AI7V*Y?!N#3N6>^%dRsT0PjWwBT$o>mA={ML~EtjX9; zJK7Mk9Bj9-!_@~~r$-7I7gJ_UKOnw7mWU|M@1YHjz*(p2tRm&_iQ&Tg`PR-W=QUL&akvT(+=AuS0W|zYS27aU5*Ar(pNdKEJLFR{nQvtyCMr_CaFt2RTII&FJz?0SKI#Pu(xSEtoVuphBjVJRJD@x+hNGtdThV@5aGhTOcmbMzEC9-rwqSne`&y^9SiMXSj@ zJ9*f%Y9GcM`;oA-A^%JpSSZ^GRpVYEaf8c8z$luh$t5_^_OSfSv%WmKecI=G)QsJ8 z%)!PT$iE_2W!MlS)!^v*KA?-wGN~17ha>dB&6W|_F<4Uc=~tm78`UviGV3I$&`*Jv zFc&}(sh@jrt*a_ZWW(|XRpBLsQOIHu*k=psffqpl*w|UdArt@CkCqt*&xF4e9L?!P zBrtZ~K=STjG`E*NSd%3pjY+gLjSVFznsC)?S>vSL)?tA!r5#LL9s`Bs7=aRP6^REk zi|*Ior6*MhYM3xVnV@#2U1;c8mijM@iRn9$Y+8t?dE~1?g^&kEbR*vMdB{W)otmO^ z==kuUFqK#GsvOrSPiiMWGh#`0)p3R)DVfL?9JeV!-HkSijc8$>Y|T->8g@3H;-BZj z-L&H@W#?jR=lpUrU?dPC)rY_Q9I5AiU%`b z!sj2WrDlIjhZbpk4o{%eg#pE}eH==x$k%Vf-C{DjrUbp?^0!BVP4Y}*q%;p9| zVQTnf-P2h%+FNV&0?J)(PERJ*X`zK4g8c1TrN7rtO+~7vReEa4X|B1HTjd)rUwdUS z_VuuxE|3ZtMr^ge-wXhn-LgKmk&U}q{{oksn?@*|?0ojPCpQPMl{<-J2U1!ihT2Zz zIkcd7U_B_1?=xs}-6`f>hoRMw7+B?O~hFssr>r?uv=*}FsLii>ud z;-_6re#JHj@fqIzADx}w1!`xjZ6oV>ovrD-`|8me@||&=(~=P7|DevA*I5#xPYNRv z>PrnRJi_741_E^({>w=l<-Jq4X_8o)z-omQxD)uD@Ytg2G9C9m zLWB3m=#v78+^0R8Q=D`D2exi05GEZ1ky=V+FLUi+ zhP%9bFoAqZ2yF!c3xnsvepZzIEec<9IG?AjOqhazA!Pqe(vgtC$|#cO*$D$}hPF-o z#qb*Ok7lgO-S{3tF}PAkAjIu0Tiu}aWiYF@j-drdc3A)qy4DRyNXO`-%0iBwTq9D2 qv|YzX^i?|{Ys}=<2f(Bn$CD~``$`KqEQrQw)X(V5z-nu(3=CzsR7CFp diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/build.py b/p4a/pythonforandroid/bootstraps/lbry/build/build.py index 6c64175..71e5e7c 100755 --- a/p4a/pythonforandroid/bootstraps/lbry/build/build.py +++ b/p4a/pythonforandroid/bootstraps/lbry/build/build.py @@ -405,10 +405,10 @@ main.py that loads it.''') android_api=android_api, build_tools_version=build_tools_version) - render( - 'settings.tmpl.gradle', - 'settings.gradle' - ) + render('settings.gradle', 'settings.gradle') + + ## google-services.json for firebase + render('google-services.json', 'google-services.json') # copy icon drawables for folder in ('drawable-hdpi', 'drawable-mdpi', 'drawable-xhdpi', 'drawable-xxhdpi', 'drawable-xxxhdpi'): diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle index fcde802..744f259 100644 --- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle +++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle @@ -6,6 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.google.gms:google-services:4.0.1' } } @@ -112,3 +113,6 @@ dependencies { {%- endfor %} {%- endif %} } + +apply plugin: 'com.google.gms.google-services' +com.google.gms.googleservices.GoogleServicesPlugin.config.disableVersionCheck = true diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.json.secret b/p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.json.secret new file mode 100644 index 0000000000000000000000000000000000000000..faf326fb88d467a0452b12a18a197a96aca80f0b GIT binary patch literal 1025 zcmV+c1pfPl0t^G$jRG(+f;S!k5CFU=KKPm0{+X1fZ;vrPB_+Cz%IMFT?-c7dW}k(q z2-Ti(OKxH+5RPsHEasogl+YD@_7-`{+qkr%q5XblbXZ9IssK6A^kTcZQcN$K-%=ow z8S4eOm@>x}8nSAFZyzGTH_OB}M?Ki{j+FbGh-;Q=i36q4=y+)9^{Lv;X`W+lvOr6@ zrCJIEgrFWhB$K%-q&2vntnULm%b|wo!r&ZV8cIDeF+87AB1uk@eN4`s5{}nn|5Mni zwy()eX>WP4ta(s}*NyB4m?hGn0Ro1QuC1a0+!C0tJi?`w4S(9X)3PLVLoqvi3BJmtjvN&mGbr zet`u&`r7XIiL2vt+=RU-oifMBunQjh1+=u-TX3sfkbSUs@5t3qi6S<3<`P8%LEoUK zR7%smQr`m_;*Y^g^MJpu1&y;|H!0>eXA(D7JWN9T4=&QVdG4Bc?z|tEVGL2i5tI2` zHSXmqJN37-S%NW3-$D|v;TSSKbLUBy%%B_d^?E1moj&3x_x%KEP%22 z4%x?Py(OougYm@IB3Q`h&m;)n8t~+=eYfp~K1nUu$q)&d+RN$eE-9bA8W?r%PuA!4 zex^Q7aRz#7JVgS{U}Sr_>>$bkmjLj*>R6jJT@7Jp_Zl$a)pGti4P%-E z1vNUkkf>Z+^eZ0QBBOl`?;6T&VVNvf3jRBHFoIg|#v^H`L&;=bT-e@az)fvEjSSFi z<_5Y$4f%k|VBtJlH^PiqKMy{xJP=W;HT{h}!VC?X<w535ViVshR0#Tgm-|hpup>>$*F)tH5FIQzTAFRttlLi() zSc=Wi-1M6w4~u@DJN#y58b)iegimn$(F|ub)#??7H%1oE5UAx37CO+i+U_&!-Dx|< zTGapwO_R~Opl=7{X$lMa)RJ?<4SQyWz%I8`_Kh11X0@1L2no<@)FIb(%e`zLy payloadMap = payload.toHashMap(); + for (Map.Entry entry : payloadMap.entrySet()) { + Object value = entry.getValue(); + if (value != null) { + bundle.putString(entry.getKey(), entry.getValue().toString()); + } + } + } + + if (firebaseAnalytics != null) { + firebaseAnalytics.logEvent(name, bundle); + } + } + + @ReactMethod + public void logException(boolean fatal, String message, ReadableMap payload) { + Bundle bundle = new Bundle(); + if (payload != null) { + HashMap payloadMap = payload.toHashMap(); + for (Map.Entry entry : payloadMap.entrySet()) { + Object value = entry.getValue(); + if (value != null) { + bundle.putString(entry.getKey(), entry.getValue().toString()); + } + } + } + + if (firebaseAnalytics != null) { + firebaseAnalytics.logEvent(fatal ? "exception" : "warning", bundle); + } + + if (fatal) { + Toast.makeText(context, + "An application error occurred which has been automatically logged. " + + "If you keep seeing this message, please provide feedback to the LBRY " + + "team by emailing hello@lbry.io.", + Toast.LENGTH_LONG).show(); + } + } +} \ No newline at end of file diff --git a/src/main/java/io/lbry/browser/reactmodules/MixpanelModule.java b/src/main/java/io/lbry/browser/reactmodules/MixpanelModule.java deleted file mode 100644 index 57874d1..0000000 --- a/src/main/java/io/lbry/browser/reactmodules/MixpanelModule.java +++ /dev/null @@ -1,87 +0,0 @@ -package io.lbry.browser.reactmodules; - -import android.content.Context; -import android.widget.Toast; - -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.ReactContextBaseJavaModule; -import com.facebook.react.bridge.ReactMethod; -import com.facebook.react.bridge.ReadableMap; - -import com.mixpanel.android.mpmetrics.MixpanelAPI; - -import io.lbry.browser.BuildConfig; - -import java.util.HashMap; -import java.util.Map; -import org.json.JSONObject; -import org.json.JSONException; - -public class MixpanelModule extends ReactContextBaseJavaModule { - - private static final String MIXPANEL_TOKEN = BuildConfig.DEBUG ? - "bc1630b8be64c5dfaa4700b3a62969f3" /* Dev Testing */ : - "93b81fb957cb0ddcd3198c10853a6a95"; /* Production */ - - private Context context; - - private MixpanelAPI mixpanel; - - public MixpanelModule(ReactApplicationContext reactContext) { - super(reactContext); - this.context = reactContext; - this.mixpanel = MixpanelAPI.getInstance(this.context, MIXPANEL_TOKEN); - } - - @Override - public String getName() { - return "Mixpanel"; - } - - @ReactMethod - public void track(String name, ReadableMap payload) { - JSONObject props = new JSONObject(); - try { - if (payload != null) { - HashMap payloadMap = payload.toHashMap(); - for (Map.Entry entry : payloadMap.entrySet()) { - props.put(entry.getKey(), entry.getValue()); - } - } - } catch (JSONException e) { - // Cannot use props. Stick with empty props. - } - - if (mixpanel != null) { - mixpanel.track(name, props); - } - } - - @ReactMethod - public void logException(boolean fatal, String message, ReadableMap payload) { - JSONObject props = new JSONObject(); - try { - props.put("Message", message); - if (payload != null) { - HashMap payloadMap = payload.toHashMap(); - for (Map.Entry entry : payloadMap.entrySet()) { - props.put(entry.getKey(), entry.getValue()); - } - } - } catch (JSONException e) { - // Cannot use props. Stick with empty props. - } - - if (mixpanel != null) { - mixpanel.track(fatal ? "Exception" : "Warning", props); - } - - if (fatal) { - Toast.makeText(context, - "An application error occurred which has been automatically logged. " + - "If you keep seeing this message, please provide feedback to the LBRY " + - "team by emailing hello@lbry.io.", - Toast.LENGTH_LONG).show(); - } - } -} diff --git a/src/main/java/io/lbry/browser/reactpackages/LbryReactPackage.java b/src/main/java/io/lbry/browser/reactpackages/LbryReactPackage.java index 6ec81d0..fb6862c 100644 --- a/src/main/java/io/lbry/browser/reactpackages/LbryReactPackage.java +++ b/src/main/java/io/lbry/browser/reactpackages/LbryReactPackage.java @@ -9,7 +9,7 @@ import io.lbry.browser.reactmodules.BackgroundMediaModule; import io.lbry.browser.reactmodules.DaemonServiceControlModule; import io.lbry.browser.reactmodules.DownloadManagerModule; import io.lbry.browser.reactmodules.FirstRunModule; -import io.lbry.browser.reactmodules.MixpanelModule; +import io.lbry.browser.reactmodules.FirebaseModule; import io.lbry.browser.reactmodules.ScreenOrientationModule; import io.lbry.browser.reactmodules.VersionInfoModule; import io.lbry.browser.reactmodules.UtilityModule;; @@ -32,7 +32,7 @@ public class LbryReactPackage implements ReactPackage { modules.add(new DaemonServiceControlModule(reactContext)); modules.add(new DownloadManagerModule(reactContext)); modules.add(new FirstRunModule(reactContext)); - modules.add(new MixpanelModule(reactContext)); + modules.add(new FirebaseModule(reactContext)); modules.add(new ScreenOrientationModule(reactContext)); modules.add(new UtilityModule(reactContext)); modules.add(new VersionInfoModule(reactContext));